Fixes for DPM (#1925)

* Provide cwd when invoking ocamlc --version

Dune Package Manager would fail when checking the compiler version
without a working directory. The process was spawned with no cwd,
causing DPM to error.

Set an explicit cwd when invoking ocamlc --version, consistent with
other toolchain commands. This avoids the DPM failure and makes
version probing reliable.

Signed-off-by: Sora Morimoto <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Sora Morimoto <[email protected]>

* Add explicit cwd to tool presence checks so commands resolve under DPM

Signed-off-by: Sora Morimoto <[email protected]>

* Prefer POSIX-style `-version` for OCaml compiler

Signed-off-by: Sora Morimoto <[email protected]>

---------

Signed-off-by: Sora Morimoto <[email protected]>

Author: smorimoto

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+- Fix DPM error when invoking `ocamlc --version` without a working directory by
+  providing an explicit cwd. (#1925)
+- Prefer POSIX-style flags for OCaml compiler (e.g. use `-version` instead of
+  `--version`) to maintain compatibility with older OCaml compilers (< 4.02).
+  (#1925)
+- Unify cwd detection for `Cmd.output` calls by using
+  `Sandbox.workspace_root ()` where commands depend on the workspace context.
+  This removes ad-hoc `Workspace.workspaceFolders()` handling and improves
+  consistency. (#1925)
+- Add explicit cwd for tool presence checks executed via the sandbox (e.g.
+  `utop --version`, `ocamlearlybird --help`, `odig --version`,
+  `ocamlobjinfo <file>`). This ensures commands resolve correctly under Dune
+  Package Management. (#1925)
+
 ## 1.32.0
 
 - Check that the dune version installed supports DPM (Dune Package Management).

src/cm_editor.ml

@@ -24,7 +24,8 @@ end = struct
       let sandbox = Extension_instance.sandbox instance in
       Sandbox.get_command sandbox "ocamlobjinfo" [ file_path ] `Exec
     in
-    Cmd.output command
+    let cwd = Sandbox.workspace_root () in
+    Cmd.output ?cwd command
   ;;
 
   let create ~(uri : Uri.t) =

src/earlybird.ml

@@ -38,7 +38,8 @@ let check_earlybird_available (sandbox : Sandbox.t) =
     (* earlybird <= 1.1.0 doesn't have --version *)
     Sandbox.get_command sandbox "ocamlearlybird" [ "--help" ] `Tool
   in
-  Cmd.output earlybird_help
+  let cwd = Sandbox.workspace_root () in
+  Cmd.output ?cwd earlybird_help
   |> Promise.Result.fold
        ~ok:(fun (_ : string) -> ())
        ~error:(fun (_ : string) ->

src/extension_instance.ml

@@ -149,11 +149,7 @@ let check_ocaml_lsp_available (sandbox : Sandbox.t) =
     let ocaml_lsp_version sandbox =
       Sandbox.get_command sandbox "ocamllsp" [ "--version" ] `Tool
     in
-    let cwd =
-      match Workspace.workspaceFolders () with
-      | [ cwd ] -> Some (cwd |> WorkspaceFolder.uri |> Uri.fsPath |> Path.of_string)
-      | _ -> None
-    in
+    let cwd = Sandbox.workspace_root () in
     Cmd.output ?cwd (ocaml_lsp_version sandbox)
     |> Promise.Result.fold
          ~ok:(fun (_ : string) -> ())
@@ -427,7 +423,10 @@ let close_repl t = t.repl <- None
 let update_ocaml_info t =
   let open Promise.Syntax in
   let+ ocaml_version =
-    let+ r = Sandbox.get_command t.sandbox "ocamlc" [ "--version" ] `Exec |> Cmd.output in
+    let cwd = Sandbox.workspace_root () in
+    let+ r =
+      Sandbox.get_command t.sandbox "ocamlc" [ "-version" ] `Exec |> Cmd.output ?cwd
+    in
     match r with
     | Ok v ->
       Ocaml_version.of_string v
@@ -436,7 +435,7 @@ let update_ocaml_info t =
       log_chan
         ~section:"Ocaml.version_semver"
         `Warn
-        "Error running `ocamlc --version`: %s"
+        "Error running `ocamlc -version`: %s"
         e;
       Error `Ocamlc_missing
   in

src/odig.ml

@@ -12,10 +12,11 @@ let of_sandbox (sandbox : Sandbox.t) =
   let make_odig_cmd = make_odig_cmd sandbox in
   let odig_version = make_odig_cmd [ "--version" ] in
   let open Promise.Syntax in
-  let* output = Cmd.output odig_version in
+  let cwd = Sandbox.workspace_root () in
+  let* output = Cmd.output ?cwd odig_version in
   match output with
   | Ok _ ->
-    let+ cache_dir = Cmd.output (make_odig_cmd [ "cache"; "path" ]) in
+    let+ cache_dir = Cmd.output ?cwd (make_odig_cmd [ "cache"; "path" ]) in
     (match cache_dir with
      | Ok cache_dir ->
        let cache_dir = cache_dir |> String.strip |> Path.of_string in
@@ -28,7 +29,11 @@ let of_sandbox (sandbox : Sandbox.t) =
           generate documentation.")
 ;;
 
-let cmd_output ~sandbox ~args = Cmd.output (make_odig_cmd sandbox args)
+let cmd_output ~sandbox ~args =
+  let cwd = Sandbox.workspace_root () in
+  Cmd.output ?cwd (make_odig_cmd sandbox args)
+;;
+
 let html_dir t = Path.(t.cache_dir / "/html/")
 
 let odoc_exec t ~sandbox ~package_name =

src/repl.ml

@@ -55,7 +55,8 @@ let name = "REPL"
 let has_utop (sandbox : Sandbox.t) =
   let open Promise.Syntax in
   let cmd = Sandbox.get_command sandbox "utop" [ "--version" ] `Tool in
-  let+ result = Cmd.output cmd in
+  let cwd = Sandbox.workspace_root () in
+  let+ result = Cmd.output ?cwd cmd in
   match result with
   | Error _ -> false
   | Ok _ -> true

src/sandbox.ml

@@ -587,8 +587,8 @@ let get_exec_command sandbox tools =
 ;;
 
 let ocaml_version sandbox =
-  let cmd = get_command sandbox "ocamlc" [ "--version" ] `Exec in
   let open Promise.Result.Syntax in
+  let cmd = get_command sandbox "ocamlc" [ "-version" ] `Exec in
   let* cmd = Cmd.check cmd in
   let+ output = Cmd.output cmd in
   String.strip output