@adhdev/daemon-standalone 0.8.13 → 0.8.15

package/dist/index.js

@@ -28501,19 +28501,32 @@ var require_dist2 = __commonJS({
         };
       }
     });
+    var import_session_host_core2;
+    var init_spawn_env = __esm2({
+      "src/cli-adapters/spawn-env.ts"() {
+        "use strict";
+        import_session_host_core2 = require_dist();
+      }
+    });
+    function loadNodePty() {
+      if (cachedPty !== void 0) return cachedPty;
+      try {
+        cachedPty = require("node-pty");
+        (0, import_session_host_core2.ensureNodePtySpawnHelperPermissions)();
+      } catch {
+        cachedPty = null;
+      }
+      return cachedPty;
+    }
     var os7;
-    var pty;
+    var cachedPty;
     var NodePtyRuntimeTransport;
     var NodePtyTransportFactory;
     var init_pty_transport = __esm2({
       "src/cli-adapters/pty-transport.ts"() {
         "use strict";
         os7 = __toESM2(require("os"));
-        try {
-          pty = require("node-pty");
-        } catch {
-          pty = null;
-        }
+        init_spawn_env();
         NodePtyRuntimeTransport = class {
           constructor(handle) {
             this.handle = handle;
@@ -28544,6 +28557,7 @@ var require_dist2 = __commonJS({
         };
         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) {
@@ -28567,13 +28581,6 @@ var require_dist2 = __commonJS({
         };
       }
     });
-    var import_session_host_core2;
-    var init_spawn_env = __esm2({
-      "src/cli-adapters/spawn-env.ts"() {
-        "use strict";
-        import_session_host_core2 = require_dist();
-      }
-    });
     var provider_cli_adapter_exports = {};
     __export2(provider_cli_adapter_exports, {
       ProviderCliAdapter: () => ProviderCliAdapter,
@@ -28719,7 +28726,6 @@ var require_dist2 = __commonJS({
     var os8;
     var path7;
     var import_child_process4;
-    var pty2;
     var buildCliSpawnEnv;
     var ProviderCliAdapter;
     var init_provider_cli_adapter = __esm2({
@@ -28732,12 +28738,6 @@ var require_dist2 = __commonJS({
         init_terminal_screen();
         init_pty_transport();
         init_spawn_env();
-        try {
-          pty2 = require("node-pty");
-          (0, import_session_host_core2.ensureNodePtySpawnHelperPermissions)((msg) => LOG2.info("CLI", msg));
-        } catch {
-          LOG2.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
-        }
         buildCliSpawnEnv = import_session_host_core2.sanitizeSpawnEnv;
         ProviderCliAdapter = class _ProviderCliAdapter {
           constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
@@ -29061,13 +29061,16 @@ var require_dist2 = __commonJS({
             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) {
                 LOG2.info("CLI", `[${this.cliType}] Using login shell (script shim or non-native binary)`);
               }
               if (isCmdShim) {
                 LOG2.info("CLI", `[${this.cliType}] Using cmd.exe shell for .cmd/.bat shim: ${binaryPath}`);
+              } else if (isWin) {
+                LOG2.info("CLI", `[${this.cliType}] Using cmd.exe shell on Windows: ${binaryPath}`);
               }
               shellCmd = isWin ? "cmd.exe" : process.env.SHELL || "/bin/zsh";
               if (isWin) {
@@ -29077,6 +29080,9 @@ var require_dist2 = __commonJS({
                 shellArgs = ["-l", "-c", fullCmd];
               }
             } else {
+              if (isWin && spawnConfig.shell) {
+                LOG2.info("CLI", `[${this.cliType}] Spawning Windows binary directly without cmd.exe: ${binaryPath}`);
+              }
               shellCmd = binaryPath;
               shellArgs = allArgs;
             }
@@ -35079,8 +35085,24 @@ ${data.message || ""}`.trim();
       return { success: false, error: "Failed to save setting" };
     }
     init_config();
+    function loadWorkspaceConfig() {
+      try {
+        return loadConfig2();
+      } 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 = loadConfig2();
+      const config2 = loadWorkspaceConfig();
+      if ("error" in config2) return { success: false, error: config2.error };
       const state = getWorkspaceState2(config2);
       return {
         success: true,
@@ -35094,31 +35116,37 @@ ${data.message || ""}`.trim();
       const label = (args?.label || "").trim() || void 0;
       const createIfMissing = args?.createIfMissing === true;
       if (!rawPath) return { success: false, error: "path required" };
-      const config2 = loadConfig2();
+      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 = getWorkspaceState2(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 = loadConfig2();
+      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 = getWorkspaceState2(result.config);
       return { success: true, removedId: id, ...state };
     }
     function handleWorkspaceSetDefault(args) {
       const clear = args?.clear === true || args?.id === null || args?.id === "";
       if (clear) {
-        const config22 = loadConfig2();
+        const config22 = loadWorkspaceConfig();
+        if ("error" in config22) return { success: false, error: config22.error };
         const result2 = setDefaultWorkspaceId(config22, 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 = getWorkspaceState2(result2.config);
         return {
           success: true,
@@ -35130,7 +35158,9 @@ ${data.message || ""}`.trim();
       if (!pathArg && !idArg) {
         return { success: false, error: "id or path required (or clear: true)" };
       }
-      let config2 = loadConfig2();
+      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);
@@ -35146,7 +35176,8 @@ ${data.message || ""}`.trim();
       }
       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 = getWorkspaceState2(result.config);
       return { success: true, ...state };
     }
@@ -43713,10 +43744,10 @@ async (params) => {
         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,
@@ -47448,6 +47479,14 @@ if (pkgVersion === "unknown") {
   } catch {
   }
 }
+if (process.platform === "win32") {
+  const nodeMajor = Number.parseInt(process.versions.node.split(".")[0] || "0", 10);
+  if (nodeMajor >= 24) {
+    console.error("\n\u2717 Windows is currently unsupported on Node.js 24+ for ADHDev standalone.");
+    console.error("  Install Node.js 22.x on Windows, then retry.\n");
+    process.exit(1);
+  }
+}
 var SESSION_TARGET_COMMANDS = /* @__PURE__ */ new Set([
   "send_chat",
   "read_chat",