kcode-cli 1.3.19 → 1.3.21

package/dist/cli.js

@@ -121556,41 +121556,71 @@ import { execFile as execFile4 } from "node:child_process";
 function quoteAppleScript(value) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
-function createWindowsDirectoryPickerCommand(title) {
+function createWindowsPickerScript(title, strategy) {
   const description = JSON.stringify(title?.trim() || "Select a project");
-  const script = [
+  if (strategy === "owner") {
+    return [
+      "Add-Type -AssemblyName System.Windows.Forms",
+      "$owner = $null",
+      "$dialog = $null",
+      "$result = @{ status = 'cancelled' }",
+      "try {",
+      "  $owner = New-Object System.Windows.Forms.Form",
+      "  $owner.StartPosition = [System.Windows.Forms.FormStartPosition]::Manual",
+      "  $owner.Left = -32000",
+      "  $owner.Top = -32000",
+      "  $owner.Width = 1",
+      "  $owner.Height = 1",
+      "  $owner.ShowInTaskbar = $false",
+      "  $owner.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::FixedToolWindow",
+      "  $owner.Opacity = 0",
+      "  $owner.TopMost = $true",
+      "  $null = $owner.Show()",
+      "  $owner.Activate()",
+      "  $dialog = New-Object System.Windows.Forms.FolderBrowserDialog",
+      `  $dialog.Description = ${description}`,
+      "  $dialog.ShowNewFolderButton = $false",
+      "  $status = $dialog.ShowDialog($owner)",
+      "  if ($status -eq [System.Windows.Forms.DialogResult]::OK) {",
+      "    $result = @{ status = 'selected'; path = $dialog.SelectedPath }",
+      "  }",
+      "} finally {",
+      "  if ($dialog) { $dialog.Dispose() }",
+      "  if ($owner) { $owner.Close(); $owner.Dispose() }",
+      "}",
+      "[Console]::Out.Write(($result | ConvertTo-Json -Compress))"
+    ].join("\n");
+  }
+  return [
     "Add-Type -AssemblyName System.Windows.Forms",
-    "$owner = New-Object System.Windows.Forms.Form",
-    "$owner.StartPosition = [System.Windows.Forms.FormStartPosition]::Manual",
-    "$owner.Left = -32000",
-    "$owner.Top = -32000",
-    "$owner.Width = 1",
-    "$owner.Height = 1",
-    "$owner.ShowInTaskbar = $false",
-    "$owner.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::FixedToolWindow",
-    "$owner.Opacity = 0",
-    "$owner.TopMost = $true",
-    "$null = $owner.Show()",
-    "$owner.Activate()",
     "$dialog = $null",
+    "$result = @{ status = 'cancelled' }",
     "try {",
     "  $dialog = New-Object System.Windows.Forms.FolderBrowserDialog",
     `  $dialog.Description = ${description}`,
     "  $dialog.ShowNewFolderButton = $false",
-    "  if ($dialog.ShowDialog($owner) -eq [System.Windows.Forms.DialogResult]::OK) {",
-    "    [Console]::Out.Write($dialog.SelectedPath)",
+    "  $status = $dialog.ShowDialog()",
+    "  if ($status -eq [System.Windows.Forms.DialogResult]::OK) {",
+    "    $result = @{ status = 'selected'; path = $dialog.SelectedPath }",
     "  }",
     "} finally {",
     "  if ($dialog) { $dialog.Dispose() }",
-    "  $owner.Close()",
-    "  $owner.Dispose()",
-    "}"
+    "}",
+    "[Console]::Out.Write(($result | ConvertTo-Json -Compress))"
   ].join("\n");
+}
+function createWindowsPickerCommand(title, strategy) {
+  const script = createWindowsPickerScript(title, strategy);
   return {
     file: "powershell.exe",
-    args: ["-NoLogo", "-NoProfile", "-NonInteractive", "-STA", "-Command", script]
+    args: ["-NoLogo", "-NoProfile", "-NonInteractive", "-STA", "-Command", script],
+    strategy,
+    title
   };
 }
+function createWindowsDirectoryPickerCommand(title) {
+  return createWindowsPickerCommand(title, "owner");
+}
 function createMacDirectoryPickerCommand(title) {
   const prompt2 = quoteAppleScript(title?.trim() || "Select a project");
   return {
@@ -121651,6 +121681,55 @@ function unexpectedFailure(command3, error2) {
     `Failed to open directory picker via ${command3.file}${detail ? `: ${detail}` : ""}`
   );
 }
+function invalidWindowsPickerResult(command3, detail) {
+  return new DirectoryPickerExecutionError(
+    `Failed to open directory picker via ${command3.file}: invalid ${command3.strategy} picker result (${detail})`
+  );
+}
+function parseWindowsPickerResult(result) {
+  const raw2 = result.stdout.trim();
+  if (!raw2) {
+    return {
+      kind: "invalid",
+      detail: "empty stdout"
+    };
+  }
+  try {
+    const parsed = JSON.parse(raw2);
+    if (parsed?.status === "selected" && typeof parsed.path === "string" && parsed.path.trim()) {
+      return {
+        kind: "selected",
+        path: parsed.path
+      };
+    }
+    if (parsed?.status === "cancelled") {
+      return {
+        kind: "cancelled"
+      };
+    }
+    return {
+      kind: "invalid",
+      detail: `unexpected payload ${raw2}`
+    };
+  } catch (error2) {
+    const reason = error2 instanceof Error ? error2.message : String(error2);
+    return {
+      kind: "invalid",
+      detail: `invalid JSON (${reason})`
+    };
+  }
+}
+function logWindowsPickerResult(command3, result, parsed, startedAt) {
+  debugLogger61.debug("Windows directory picker completed", {
+    strategy: command3.strategy,
+    elapsedMs: Date.now() - startedAt,
+    stderr: result.stderr.trim() || void 0,
+    stdout: result.stdout.trim() || void 0,
+    outcome: parsed.kind,
+    path: parsed.kind === "selected" ? parsed.path : void 0,
+    detail: parsed.kind === "invalid" ? parsed.detail : void 0
+  });
+}
 async function runLinuxDirectoryPicker(options2, deps) {
   if (isMissingDisplay(deps.env)) {
     throw new DirectoryPickerUnsupportedError("Directory picker is unavailable because no graphical display is active");
@@ -121676,13 +121755,50 @@ async function runLinuxDirectoryPicker(options2, deps) {
   }
   throw new DirectoryPickerUnsupportedError("Directory picker is unavailable on this Linux environment");
 }
+async function runWindowsPickerCommand(command3, deps) {
+  const startedAt = Date.now();
+  try {
+    const result = await deps.run(command3);
+    const parsed = parseWindowsPickerResult(result);
+    logWindowsPickerResult(command3, result, parsed, startedAt);
+    return parsed;
+  } catch (error2) {
+    debugLogger61.error("Windows directory picker failed", {
+      strategy: command3.strategy,
+      elapsedMs: Date.now() - startedAt,
+      error: error2
+    });
+    throw unexpectedFailure(command3, error2);
+  }
+}
 async function runWindowsDirectoryPicker(command3, deps) {
   if (activeWindowsPicker) {
+    debugLogger61.debug("Windows directory picker request dropped because another picker is active");
     return null;
   }
-  const task = deps.run(command3).then((result) => normalizePickedPath(result.stdout, deps.platform)).catch((error2) => {
-    throw unexpectedFailure(command3, error2);
-  });
+  const ownerCommand = command3;
+  const task = (async () => {
+    const initialCommand = ownerCommand.strategy === "owner" ? ownerCommand : createWindowsPickerCommand(ownerCommand.title, "owner");
+    const plainCommand = createWindowsPickerCommand(initialCommand.title, "plain");
+    const ownerResult = await runWindowsPickerCommand(initialCommand, deps);
+    if (ownerResult.kind === "selected") {
+      return normalizePickedPath(ownerResult.path, deps.platform);
+    }
+    if (ownerResult.kind === "cancelled") {
+      return null;
+    }
+    debugLogger61.warn("Windows directory picker owner strategy returned an invalid result, retrying plain dialog", {
+      detail: ownerResult.detail
+    });
+    const plainResult = await runWindowsPickerCommand(plainCommand, deps);
+    if (plainResult.kind === "selected") {
+      return normalizePickedPath(plainResult.path, deps.platform);
+    }
+    if (plainResult.kind === "cancelled") {
+      return null;
+    }
+    throw invalidWindowsPickerResult(plainCommand, plainResult.detail);
+  })();
   const guarded = task.finally(() => {
     if (activeWindowsPicker === guarded) {
       activeWindowsPicker = void 0;
@@ -121719,10 +121835,12 @@ async function pickDirectory(options2 = {}, deps = {}) {
   }
   throw new DirectoryPickerUnsupportedError(`Directory picker is unavailable on platform ${platform3}`);
 }
-var activeWindowsPicker, DirectoryPickerUnsupportedError, DirectoryPickerExecutionError;
+var activeWindowsPicker, debugLogger61, DirectoryPickerUnsupportedError, DirectoryPickerExecutionError;
 var init_picker = __esm({
   "../../apps/server/src/services/picker.ts"() {
     "use strict";
+    init_debug();
+    debugLogger61 = createDebugLogger("PICKER");
     DirectoryPickerUnsupportedError = class extends Error {
       constructor(message2) {
         super(message2);
@@ -122515,9 +122633,9 @@ function parseCliArgs(argv) {
     port
   };
 }
-function resolveCliArgs(parsed, env = process.env) {
+function resolveCliArgs(parsed, env = process.env, cwd2 = process.cwd()) {
   return {
-    directory: parsed.directory ?? readStringEnv(env.KCODE_DIRECTORY),
+    directory: parsed.directory ?? readStringEnv(env.KCODE_DIRECTORY) ?? cwd2,
     hostname: parsed.hostname ?? readStringEnv(env.KCODE_SERVER_HOST) ?? DEFAULT_HOSTNAME,
     logLevel: parsed.logLevel,
     mode: parsed.mode,
@@ -122535,7 +122653,7 @@ function formatHelp() {
     "Options:",
     "  --hostname <host>    Bind address (default: 127.0.0.1)",
     "  --port <port>        Bind port (default: 4096)",
-    "  --directory <path>   Default project directory",
+    "  --directory <path>   Override project directory (default: current working directory)",
     "  --log-level <level>  Accepted for SDK compatibility",
     "  -h, --help           Show this message"
   ].join("\n");
@@ -122567,11 +122685,7 @@ function resolveRuntimeRoot() {
 function applyEnvironment(input) {
   process8.env.KCODE_SERVER_HOST = input.hostname;
   process8.env.KCODE_SERVER_PORT = String(input.port);
-  if (input.directory) {
-    process8.env.KCODE_DIRECTORY = input.directory;
-  } else {
-    delete process8.env.KCODE_DIRECTORY;
-  }
+  process8.env.KCODE_DIRECTORY = input.directory;
 }
 async function loadRuntime() {
   return await Promise.resolve().then(() => (init_server_runtime(), server_runtime_exports));