@adhdev/daemon-core 0.8.13 → 0.8.15

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.8.13",
+  "version": "0.8.15",
   "description": "ADHDev local session host core — session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.8.13",
+  "version": "0.8.15",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -38,13 +38,13 @@
   "author": "vilmire",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@agentclientprotocol/sdk": "^0.16.1",
     "@adhdev/session-host-core": "*",
+    "@agentclientprotocol/sdk": "^0.16.1",
     "@xterm/xterm": "^6.0.0",
     "chalk": "^5.3.0",
     "chokidar": "^5.0.0",
     "conf": "^13.0.0",
-    "node-pty": "^1.1.0",
+    "node-pty": "^1.2.0-beta.12",
     "ws": "^8.19.0"
   },
   "bundleDependencies": [

package/src/cli-adapters/provider-cli-adapter.ts

@@ -27,15 +27,7 @@ import {
     type PtyRuntimeTransport,
     type PtyTransportFactory,
 } from './pty-transport.js';
-import { sanitizeSpawnEnv, ensureNodePtySpawnHelperPermissions } from './spawn-env.js';
-
-let pty: any;
-try {
-    pty = require('node-pty');
-    ensureNodePtySpawnHelperPermissions((msg: string) => LOG.info('CLI', msg));
-} catch {
-    LOG.error('CLI', '[ProviderCliAdapter] node-pty not found. Terminal features disabled.');
-}
+import { sanitizeSpawnEnv } from './spawn-env.js';
 
 // ─── Types ──────────────────────────────────────────
 
@@ -759,7 +751,10 @@ export class ProviderCliAdapter implements CliAdapter {
         );
         // On Windows, .cmd/.bat shims cannot be spawned directly — must go through cmd.exe
         const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-        const useShell = isWin ? (!!spawnConfig.shell || isCmdShim) : useShellUnix;
+        const useShellWin = isCmdShim
+            || !path.isAbsolute(binaryPath)
+            || isScriptBinary(binaryPath);
+        const useShell = isWin ? useShellWin : useShellUnix;
 
         if (useShell) {
             if (!spawnConfig.shell && !isWin) {
@@ -767,6 +762,8 @@ export class ProviderCliAdapter implements CliAdapter {
             }
             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) {
@@ -780,6 +777,9 @@ export class ProviderCliAdapter implements CliAdapter {
                 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;
         }

package/src/cli-adapters/pty-transport.ts

@@ -1,10 +1,20 @@
 import * as os from 'os';
-
-let pty: any;
-try {
-  pty = require('node-pty');
-} catch {
-  pty = null;
+import { ensureNodePtySpawnHelperPermissions } from './spawn-env.js';
+
+let cachedPty: any | null | undefined;
+
+function loadNodePty(): any {
+  if (cachedPty !== undefined) return cachedPty;
+  try {
+    // Keep node-pty out of processes that delegate PTY ownership elsewhere
+    // (for example via session-host on Windows), so native PTY crashes do not
+    // take down the daemon just by importing this module.
+    cachedPty = require('node-pty');
+    ensureNodePtySpawnHelperPermissions();
+  } catch {
+    cachedPty = null;
+  }
+  return cachedPty;
 }
 
 export interface PtySpawnOptions {
@@ -90,6 +100,7 @@ class NodePtyRuntimeTransport implements PtyRuntimeTransport {
 
 export class NodePtyTransportFactory implements PtyTransportFactory {
   spawn(command: string, args: string[], options: PtySpawnOptions): PtyRuntimeTransport {
+    const pty = loadNodePty();
     if (!pty) throw new Error('node-pty is not installed');
     // Validate cwd — an invalid directory causes a native crash on Windows
     // (node-pty error code 267: ERROR_DIRECTORY) that bypasses JS try/catch

package/src/commands/workspace-commands.ts

@@ -3,12 +3,31 @@
  */
 
 import { loadConfig, saveConfig } from '../config/config.js';
+import type { ADHDevConfig } from '../config/config.js';
 import * as W from '../config/workspaces.js';
 
 export type WorkspaceCommandResult = { success: boolean;[key: string]: unknown };
 
+function loadWorkspaceConfig(): ADHDevConfig | { error: string } {
+    try {
+        return loadConfig();
+    } catch (e: any) {
+        return { error: `Could not load config: ${e?.message || 'unknown error'}` };
+    }
+}
+
+function persistWorkspaceConfig(config: ADHDevConfig): { ok: true } | { error: string } {
+    try {
+        saveConfig(config);
+        return { ok: true };
+    } catch (e: any) {
+        return { error: `Could not save config: ${e?.message || 'unknown error'}` };
+    }
+}
+
 export function handleWorkspaceList(): WorkspaceCommandResult {
-    const config = loadConfig();
+    const config = loadWorkspaceConfig();
+    if ('error' in config) return { success: false, error: config.error };
     const state = W.getWorkspaceState(config);
     return {
         success: true,
@@ -24,11 +43,13 @@ export function handleWorkspaceAdd(args: any): WorkspaceCommandResult {
     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 = W.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 = W.getWorkspaceState(result.config);
     return { success: true, entry: result.entry, ...state };
 }
@@ -37,12 +58,14 @@ export function handleWorkspaceRemove(args: any): WorkspaceCommandResult {
     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 = W.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 = W.getWorkspaceState(result.config);
     return { success: true, removedId: id, ...state };
 }
@@ -50,10 +73,12 @@ export function handleWorkspaceRemove(args: any): WorkspaceCommandResult {
 export function handleWorkspaceSetDefault(args: any): WorkspaceCommandResult {
     const clear = args?.clear === true || args?.id === null || args?.id === '';
     if (clear) {
-        const config = loadConfig();
+        const config = loadWorkspaceConfig();
+        if ('error' in config) return { success: false, error: config.error };
         const result = W.setDefaultWorkspaceId(config, null);
         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 = W.getWorkspaceState(result.config);
         return {
             success: true,
@@ -70,7 +95,9 @@ export function handleWorkspaceSetDefault(args: any): WorkspaceCommandResult {
         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: string;
 
     if (pathArg) {
@@ -89,7 +116,8 @@ export function handleWorkspaceSetDefault(args: any): WorkspaceCommandResult {
     const result = W.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 = W.getWorkspaceState(result.config);
     return { success: true, ...state };
 }