From 1b91a6ed8278885aa4d814f8993d295eb2fd0921 Mon Sep 17 00:00:00 2001
From: Ali Caglayan <alizter@gmail.com>
Date: Wed, 12 Nov 2025 10:23:34 +0000
Subject: [PATCH 1/2] test: switching to custom lock dir

Signed-off-by: Ali Caglayan <alizter@gmail.com>
---
 .../test-cases/pkg/lockdir-switch.t           | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 test/blackbox-tests/test-cases/pkg/lockdir-switch.t

diff --git a/test/blackbox-tests/test-cases/pkg/lockdir-switch.t b/test/blackbox-tests/test-cases/pkg/lockdir-switch.t
new file mode 100644
index 00000000000..bbe758f2624
--- /dev/null
+++ b/test/blackbox-tests/test-cases/pkg/lockdir-switch.t
@@ -0,0 +1,72 @@
+This test checks what happens when you lock with default directory then change
+workspace to use a custom lock directory.
+
+  $ . ./helpers.sh
+  $ mkrepo
+  $ mkpkg foo
+  $ add_mock_repo_if_needed
+
+  $ cat > dune-project <<EOF
+  > (lang dune 3.21)
+  > (package
+  >  (name myproject)
+  >  (depends foo))
+  > EOF
+
+Lock with default directory name:
+
+  $ dune pkg lock
+  Solution for dune.lock
+  
+  Dependencies common to all supported platforms:
+  - foo.0.0.1
+
+Now change the workspace to use a custom lock directory:
+
+  $ cat > dune-workspace <<EOF
+  > (lang dune 3.21)
+  > (lock_dir
+  >  (path custom.lock)
+  >  (repositories mock))
+  > (repository
+  >  (name mock)
+  >  (url "file://$PWD/mock-opam-repository"))
+  > EOF
+
+  $ cat > dune <<EOF
+  > (executable
+  >  (public_name bar))
+  > EOF
+
+  $ cat > bar.ml <<EOF
+  > let () = print_endline "hello from bar" ;;
+  > EOF
+
+  $ dune exec -- bar
+  Error: No rule found for default/.lock/dune.lock (context _private)
+  -> required by lock directory environment for context "default"
+  -> required by base environment for context "default"
+  -> required by loading findlib for context "default"
+  -> required by creating installed environment for "default"
+  [1]
+
+Now try with a context stanza that references the custom lock directory with a
+context stanza:
+
+  $ cat > dune-workspace <<EOF
+  > (lang dune 3.21)
+  > (context
+  >  (default
+  >   (lock_dir custom.lock)))
+  > (lock_dir
+  >  (path custom.lock)
+  >  (repositories mock))
+  > (repository
+  >  (name mock)
+  >  (url "file://$PWD/mock-opam-repository"))
+  > EOF
+
+This is working as intended. The error is not relevant here.
+
+  $ dune exec -- bar 
+  hello from bar

From 7e67f0293376b2e4ec470cb34b43be89a8ce65d5 Mon Sep 17 00:00:00 2001
From: Ali Caglayan <alizter@gmail.com>
Date: Wed, 12 Nov 2025 13:19:46 +0000
Subject: [PATCH 2/2] fix: default lock directory selection

Signed-off-by: Ali Caglayan <alizter@gmail.com>
---
 src/dune_rules/lock_dir.ml                         | 14 +++++++++++++-
 .../blackbox-tests/test-cases/pkg/lockdir-switch.t |  7 +------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/dune_rules/lock_dir.ml b/src/dune_rules/lock_dir.ml
index c3343249a1d..4126e245224 100644
--- a/src/dune_rules/lock_dir.ml
+++ b/src/dune_rules/lock_dir.ml
@@ -177,11 +177,23 @@ let get_source_path_for_context ctx_name =
       | false -> None
       | true -> Some ctx)
   with
-  | None | Some (Default { lock_dir = None; _ }) -> Memo.return (Some default_source_path)
   | Some (Default { lock_dir = Some lock_dir_selection; _ }) ->
     let+ source_lock_dir = select_lock_dir lock_dir_selection in
     Some source_lock_dir
   | Some (Opam _) -> Memo.return None
+  | None | Some (Default { lock_dir = None; _ }) ->
+    (* CR-someday Alizter: The logic here is hard to follow. Improve the lock
+       directory selection logic so that it is harder to make a mistake. This
+       can be done by enforcing invariants about contexts and their lock
+       directories slightly earlier. *)
+    Memo.return
+    @@
+    (* Context doesn't specify a lock_dir, check if there's a top-level one *)
+    (match workspace.lock_dirs with
+      | [ lock_dir ] -> Some lock_dir.path
+      | [] | _ :: _ :: _ ->
+        (* No clear choice, fall back to default *)
+        Some default_source_path)
 ;;
 
 let get_path ctx_name =
diff --git a/test/blackbox-tests/test-cases/pkg/lockdir-switch.t b/test/blackbox-tests/test-cases/pkg/lockdir-switch.t
index bbe758f2624..d1c98b10dce 100644
--- a/test/blackbox-tests/test-cases/pkg/lockdir-switch.t
+++ b/test/blackbox-tests/test-cases/pkg/lockdir-switch.t
@@ -43,12 +43,7 @@ Now change the workspace to use a custom lock directory:
   > EOF
 
   $ dune exec -- bar
-  Error: No rule found for default/.lock/dune.lock (context _private)
-  -> required by lock directory environment for context "default"
-  -> required by base environment for context "default"
-  -> required by loading findlib for context "default"
-  -> required by creating installed environment for "default"
-  [1]
+  hello from bar
 
 Now try with a context stanza that references the custom lock directory with a
 context stanza: