adhdev 0.8.13 → 0.8.15

package/dist/index.js

@@ -5459,8 +5459,24 @@ var init_stream_commands = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/commands/workspace-commands.ts
+function loadWorkspaceConfig() {
+  try {
+    return loadConfig();
+  } catch (e) {
+    return { error: `Could not load config: ${e?.message || "unknown error"}` };
+  }
+}
+function persistWorkspaceConfig(config2) {
+  try {
+    saveConfig(config2);
+    return { ok: true };
+  } catch (e) {
+    return { error: `Could not save config: ${e?.message || "unknown error"}` };
+  }
+}
 function handleWorkspaceList() {
-  const config2 = loadConfig();
+  const config2 = loadWorkspaceConfig();
+  if ("error" in config2) return { success: false, error: config2.error };
   const state = getWorkspaceState(config2);
   return {
     success: true,
@@ -5474,31 +5490,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 config2 = loadConfig();
+  const config2 = loadWorkspaceConfig();
+  if ("error" in config2) return { success: false, error: config2.error };
   const result = addWorkspaceEntry(config2, 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 config2 = loadConfig();
+  const config2 = loadWorkspaceConfig();
+  if ("error" in config2) return { success: false, error: config2.error };
   const removed = (config2.workspaces || []).find((w) => w.id === id);
   const result = removeWorkspaceEntry(config2, 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 config3 = loadConfig();
+    const config3 = loadWorkspaceConfig();
+    if ("error" in config3) return { success: false, error: config3.error };
     const result2 = setDefaultWorkspaceId(config3, 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,
@@ -5510,7 +5532,9 @@ function handleWorkspaceSetDefault(args) {
   if (!pathArg && !idArg) {
     return { success: false, error: "id or path required (or clear: true)" };
   }
-  let config2 = loadConfig();
+  const configResult = loadWorkspaceConfig();
+  if ("error" in configResult) return { success: false, error: configResult.error };
+  let config2 = configResult;
   let nextId;
   if (pathArg) {
     let w = findWorkspaceByPath(config2, pathArg);
@@ -5526,7 +5550,8 @@ function handleWorkspaceSetDefault(args) {
   }
   const result = setDefaultWorkspaceId(config2, 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 };
 }
@@ -6297,71 +6322,6 @@ var init_terminal_screen = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/src/cli-adapters/pty-transport.ts
-var os7, pty, NodePtyRuntimeTransport, NodePtyTransportFactory;
-var init_pty_transport = __esm({
-  "../../oss/packages/daemon-core/src/cli-adapters/pty-transport.ts"() {
-    "use strict";
-    os7 = __toESM(require("os"));
-    try {
-      pty = require("node-pty");
-    } catch {
-      pty = null;
-    }
-    NodePtyRuntimeTransport = class {
-      constructor(handle) {
-        this.handle = handle;
-      }
-      ready = Promise.resolve();
-      terminalQueriesHandled = false;
-      get pid() {
-        return this.handle.pid;
-      }
-      write(data) {
-        this.handle.write(data);
-      }
-      resize(cols, rows) {
-        this.handle.resize(cols, rows);
-      }
-      kill() {
-        this.handle.kill();
-      }
-      getMetadata() {
-        return null;
-      }
-      onData(callback) {
-        this.handle.onData(callback);
-      }
-      onExit(callback) {
-        this.handle.onExit(callback);
-      }
-    };
-    NodePtyTransportFactory = class {
-      spawn(command, args, options) {
-        if (!pty) throw new Error("node-pty is not installed");
-        let cwd = options.cwd;
-        if (cwd) {
-          try {
-            const fs18 = require("fs");
-            const stat4 = fs18.statSync(cwd);
-            if (!stat4.isDirectory()) cwd = os7.homedir();
-          } catch {
-            cwd = os7.homedir();
-          }
-        }
-        const handle = pty.spawn(command, args, {
-          name: "xterm-256color",
-          cols: options.cols,
-          rows: options.rows,
-          cwd,
-          env: options.env
-        });
-        return new NodePtyRuntimeTransport(handle);
-      }
-    };
-  }
-});
-
 // ../../oss/packages/session-host-core/dist/index.mjs
 function getDefaultSessionHostEndpoint(appName = "adhdev") {
   if (process.platform === "win32") {
@@ -6372,7 +6332,7 @@ function getDefaultSessionHostEndpoint(appName = "adhdev") {
   }
   return {
     kind: "unix",
-    path: path22.join(os8.tmpdir(), `${appName}-session-host.sock`)
+    path: path22.join(os7.tmpdir(), `${appName}-session-host.sock`)
   };
 }
 function serializeEnvelope(envelope) {
@@ -6437,11 +6397,11 @@ function ensureNodePtySpawnHelperPermissions(logFn) {
   } catch {
   }
 }
-var os8, path22, net, import_crypto3, os22, path32, __require, SessionHostClient;
+var os7, path22, net, import_crypto3, os22, path32, __require, SessionHostClient;
 var init_dist = __esm({
   "../../oss/packages/session-host-core/dist/index.mjs"() {
     "use strict";
-    os8 = __toESM(require("os"), 1);
+    os7 = __toESM(require("os"), 1);
     path22 = __toESM(require("path"), 1);
     net = __toESM(require("net"), 1);
     import_crypto3 = require("crypto");
@@ -6570,6 +6530,78 @@ var init_spawn_env = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/cli-adapters/pty-transport.ts
+function loadNodePty() {
+  if (cachedPty !== void 0) return cachedPty;
+  try {
+    cachedPty = require("node-pty");
+    ensureNodePtySpawnHelperPermissions();
+  } catch {
+    cachedPty = null;
+  }
+  return cachedPty;
+}
+var os8, cachedPty, NodePtyRuntimeTransport, NodePtyTransportFactory;
+var init_pty_transport = __esm({
+  "../../oss/packages/daemon-core/src/cli-adapters/pty-transport.ts"() {
+    "use strict";
+    os8 = __toESM(require("os"));
+    init_spawn_env();
+    NodePtyRuntimeTransport = class {
+      constructor(handle) {
+        this.handle = handle;
+      }
+      ready = Promise.resolve();
+      terminalQueriesHandled = false;
+      get pid() {
+        return this.handle.pid;
+      }
+      write(data) {
+        this.handle.write(data);
+      }
+      resize(cols, rows) {
+        this.handle.resize(cols, rows);
+      }
+      kill() {
+        this.handle.kill();
+      }
+      getMetadata() {
+        return null;
+      }
+      onData(callback) {
+        this.handle.onData(callback);
+      }
+      onExit(callback) {
+        this.handle.onExit(callback);
+      }
+    };
+    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) {
+          try {
+            const fs18 = require("fs");
+            const stat4 = fs18.statSync(cwd);
+            if (!stat4.isDirectory()) cwd = os8.homedir();
+          } catch {
+            cwd = os8.homedir();
+          }
+        }
+        const handle = pty.spawn(command, args, {
+          name: "xterm-256color",
+          cols: options.cols,
+          rows: options.rows,
+          cwd,
+          env: options.env
+        });
+        return new NodePtyRuntimeTransport(handle);
+      }
+    };
+  }
+});
+
 // ../../oss/packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts
 var provider_cli_adapter_exports = {};
 __export(provider_cli_adapter_exports, {
@@ -6713,7 +6745,7 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os9, path7, import_child_process4, pty2, buildCliSpawnEnv, ProviderCliAdapter;
+var os9, path7, import_child_process4, buildCliSpawnEnv, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
@@ -6724,12 +6756,6 @@ var init_provider_cli_adapter = __esm({
     init_terminal_screen();
     init_pty_transport();
     init_spawn_env();
-    try {
-      pty2 = require("node-pty");
-      ensureNodePtySpawnHelperPermissions((msg) => LOG.info("CLI", msg));
-    } catch {
-      LOG.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
-    }
     buildCliSpawnEnv = sanitizeSpawnEnv;
     ProviderCliAdapter = class _ProviderCliAdapter {
       constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
@@ -7053,13 +7079,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) {
@@ -7069,6 +7098,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;
         }
@@ -34494,10 +34526,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 = os18.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,
@@ -45833,7 +45865,7 @@ function getSessionHostPidFile() {
 function killPid2(pid) {
   try {
     if (process.platform === "win32") {
-      (0, import_child_process11.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
+      (0, import_child_process11.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
     } else {
       process.kill(pid, "SIGTERM");
     }
@@ -45851,7 +45883,7 @@ function getWindowsProcessCommandLine(pid) {
       pidFilter,
       "get",
       "CommandLine"
-    ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] });
+    ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
     const text = wmicOut.trim();
     if (text) return text;
   } catch {
@@ -45864,7 +45896,7 @@ function getWindowsProcessCommandLine(pid) {
       "Bypass",
       "-Command",
       `(Get-CimInstance Win32_Process -Filter "${pidFilter}").CommandLine`
-    ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] });
+    ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
     const text = psOut.trim();
     if (text) return text;
   } catch {
@@ -45893,7 +45925,8 @@ function stopSessionHost() {
       const raw = (0, import_child_process11.execFileSync)("tasklist", ["/FO", "CSV", "/NH", "/FI", "IMAGENAME eq node.exe"], {
         encoding: "utf8",
         timeout: 5e3,
-        stdio: ["ignore", "pipe", "ignore"]
+        stdio: ["ignore", "pipe", "ignore"],
+        windowsHide: true
       }).trim();
       for (const line of raw.split(/\r?\n/)) {
         const match = line.match(/^"node\.exe","(\d+)"/i);
@@ -46077,7 +46110,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     import_chalk2 = __toESM(require("chalk"));
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.13" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.15" });
     DANGEROUS_PATTERNS = [
       /\brm\s+(-[a-z]*f|-[a-z]*r|--force|--recursive)/i,
       /\bsudo\b/i,