@adhdev/daemon-core 0.8.13 → 0.8.15

package/dist/index.js

@@ -705,17 +705,32 @@ var init_terminal_screen = __esm({
   }
 });
 
+// src/cli-adapters/spawn-env.ts
+var import_session_host_core;
+var init_spawn_env = __esm({
+  "src/cli-adapters/spawn-env.ts"() {
+    "use strict";
+    import_session_host_core = require("@adhdev/session-host-core");
+  }
+});
+
 // src/cli-adapters/pty-transport.ts
-var os7, pty, NodePtyRuntimeTransport, NodePtyTransportFactory;
+function loadNodePty() {
+  if (cachedPty !== void 0) return cachedPty;
+  try {
+    cachedPty = require("node-pty");
+    (0, import_session_host_core.ensureNodePtySpawnHelperPermissions)();
+  } catch {
+    cachedPty = null;
+  }
+  return cachedPty;
+}
+var os7, cachedPty, NodePtyRuntimeTransport, NodePtyTransportFactory;
 var init_pty_transport = __esm({
   "src/cli-adapters/pty-transport.ts"() {
     "use strict";
     os7 = __toESM(require("os"));
-    try {
-      pty = require("node-pty");
-    } catch {
-      pty = null;
-    }
+    init_spawn_env();
     NodePtyRuntimeTransport = class {
       constructor(handle) {
         this.handle = handle;
@@ -746,6 +761,7 @@ var init_pty_transport = __esm({
     };
     NodePtyTransportFactory = class {
       spawn(command, args, options) {
+        const pty = loadNodePty();
         if (!pty) throw new Error("node-pty is not installed");
         let cwd = options.cwd;
         if (cwd) {
@@ -770,15 +786,6 @@ var init_pty_transport = __esm({
   }
 });
 
-// src/cli-adapters/spawn-env.ts
-var import_session_host_core;
-var init_spawn_env = __esm({
-  "src/cli-adapters/spawn-env.ts"() {
-    "use strict";
-    import_session_host_core = require("@adhdev/session-host-core");
-  }
-});
-
 // src/cli-adapters/provider-cli-adapter.ts
 var provider_cli_adapter_exports = {};
 __export(provider_cli_adapter_exports, {
@@ -922,7 +929,7 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os8, path7, import_child_process4, pty2, buildCliSpawnEnv, ProviderCliAdapter;
+var os8, path7, import_child_process4, buildCliSpawnEnv, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
@@ -933,12 +940,6 @@ var init_provider_cli_adapter = __esm({
     init_terminal_screen();
     init_pty_transport();
     init_spawn_env();
-    try {
-      pty2 = require("node-pty");
-      (0, import_session_host_core.ensureNodePtySpawnHelperPermissions)((msg) => LOG.info("CLI", msg));
-    } catch {
-      LOG.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
-    }
     buildCliSpawnEnv = import_session_host_core.sanitizeSpawnEnv;
     ProviderCliAdapter = class _ProviderCliAdapter {
       constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
@@ -1262,13 +1263,16 @@ var init_provider_cli_adapter = __esm({
         let shellArgs;
         const useShellUnix = !isWin && (!!spawnConfig.shell || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
         const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-        const useShell = isWin ? !!spawnConfig.shell || isCmdShim : useShellUnix;
+        const useShellWin = isCmdShim || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
+        const useShell = isWin ? useShellWin : useShellUnix;
         if (useShell) {
           if (!spawnConfig.shell && !isWin) {
             LOG.info("CLI", `[${this.cliType}] Using login shell (script shim or non-native binary)`);
           }
           if (isCmdShim) {
             LOG.info("CLI", `[${this.cliType}] Using cmd.exe shell for .cmd/.bat shim: ${binaryPath}`);
+          } else if (isWin) {
+            LOG.info("CLI", `[${this.cliType}] Using cmd.exe shell on Windows: ${binaryPath}`);
           }
           shellCmd = isWin ? "cmd.exe" : process.env.SHELL || "/bin/zsh";
           if (isWin) {
@@ -1278,6 +1282,9 @@ var init_provider_cli_adapter = __esm({
             shellArgs = ["-l", "-c", fullCmd];
           }
         } else {
+          if (isWin && spawnConfig.shell) {
+            LOG.info("CLI", `[${this.cliType}] Spawning Windows binary directly without cmd.exe: ${binaryPath}`);
+          }
           shellCmd = binaryPath;
           shellArgs = allArgs;
         }
@@ -7328,8 +7335,24 @@ function handleSetIdeExtension(h, args) {
 
 // src/commands/workspace-commands.ts
 init_config();
+function loadWorkspaceConfig() {
+  try {
+    return loadConfig();
+  } catch (e) {
+    return { error: `Could not load config: ${e?.message || "unknown error"}` };
+  }
+}
+function persistWorkspaceConfig(config) {
+  try {
+    saveConfig(config);
+    return { ok: true };
+  } catch (e) {
+    return { error: `Could not save config: ${e?.message || "unknown error"}` };
+  }
+}
 function handleWorkspaceList() {
-  const config = loadConfig();
+  const config = loadWorkspaceConfig();
+  if ("error" in config) return { success: false, error: config.error };
   const state = getWorkspaceState(config);
   return {
     success: true,
@@ -7343,31 +7366,37 @@ function handleWorkspaceAdd(args) {
   const label = (args?.label || "").trim() || void 0;
   const createIfMissing = args?.createIfMissing === true;
   if (!rawPath) return { success: false, error: "path required" };
-  const config = loadConfig();
+  const config = loadWorkspaceConfig();
+  if ("error" in config) return { success: false, error: config.error };
   const result = addWorkspaceEntry(config, rawPath, label, { createIfMissing });
   if ("error" in result) return { success: false, error: result.error };
-  saveConfig(result.config);
+  const saveResult = persistWorkspaceConfig(result.config);
+  if ("error" in saveResult) return { success: false, error: saveResult.error };
   const state = getWorkspaceState(result.config);
   return { success: true, entry: result.entry, ...state };
 }
 function handleWorkspaceRemove(args) {
   const id = (args?.id || "").trim();
   if (!id) return { success: false, error: "id required" };
-  const config = loadConfig();
+  const config = loadWorkspaceConfig();
+  if ("error" in config) return { success: false, error: config.error };
   const removed = (config.workspaces || []).find((w) => w.id === id);
   const result = removeWorkspaceEntry(config, id);
   if ("error" in result) return { success: false, error: result.error };
-  saveConfig(result.config);
+  const saveResult = persistWorkspaceConfig(result.config);
+  if ("error" in saveResult) return { success: false, error: saveResult.error };
   const state = getWorkspaceState(result.config);
   return { success: true, removedId: id, ...state };
 }
 function handleWorkspaceSetDefault(args) {
   const clear = args?.clear === true || args?.id === null || args?.id === "";
   if (clear) {
-    const config2 = loadConfig();
+    const config2 = loadWorkspaceConfig();
+    if ("error" in config2) return { success: false, error: config2.error };
     const result2 = setDefaultWorkspaceId(config2, null);
     if ("error" in result2) return { success: false, error: result2.error };
-    saveConfig(result2.config);
+    const saveResult2 = persistWorkspaceConfig(result2.config);
+    if ("error" in saveResult2) return { success: false, error: saveResult2.error };
     const state2 = getWorkspaceState(result2.config);
     return {
       success: true,
@@ -7379,7 +7408,9 @@ function handleWorkspaceSetDefault(args) {
   if (!pathArg && !idArg) {
     return { success: false, error: "id or path required (or clear: true)" };
   }
-  let config = loadConfig();
+  const configResult = loadWorkspaceConfig();
+  if ("error" in configResult) return { success: false, error: configResult.error };
+  let config = configResult;
   let nextId;
   if (pathArg) {
     let w = findWorkspaceByPath(config, pathArg);
@@ -7395,7 +7426,8 @@ function handleWorkspaceSetDefault(args) {
   }
   const result = setDefaultWorkspaceId(config, nextId);
   if ("error" in result) return { success: false, error: result.error };
-  saveConfig(result.config);
+  const saveResult = persistWorkspaceConfig(result.config);
+  if ("error" in saveResult) return { success: false, error: saveResult.error };
   const state = getWorkspaceState(result.config);
   return { success: true, ...state };
 }
@@ -16024,10 +16056,10 @@ async function handleAutoImplement(ctx, type, req, res) {
     let isPty = false;
     const { spawn: spawnFn } = await import("child_process");
     try {
-      const pty3 = require("node-pty");
+      const pty = require("node-pty");
       ctx.log(`Auto-implement spawn (PTY): ${shellCmd}`);
       const isWin2 = os17.platform() === "win32";
-      child = pty3.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
+      child = pty.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
         name: "xterm-256color",
         cols: 120,
         rows: 40,