@adhdev/daemon-core 0.9.82-rc.318 → 0.9.82-rc.319

package/src/providers/spec/fsm-driver.ts

@@ -22,6 +22,7 @@ import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { TerminalAdapter, type TerminalAdapterOpts } from './adapter.js';
+import { resolveCliSpawnPlanFromParts } from '../../cli-adapters/provider-cli-runtime.js';
 import type { PtyTransportFactory } from '../../cli-adapters/pty-transport.js';
 import { DEFAULT_SESSION_HOST_COLS, DEFAULT_SESSION_HOST_ROWS } from '@adhdev/session-host-core';
 import {
@@ -389,15 +390,35 @@ export class FsmDriver implements ISpecDriver {
     }
 
     private buildAdapterOpts(): TerminalAdapterOpts {
-        const baseArgs = this.spec.spawn_args ?? [];
-        const extra = this.opts.extraCliArgs ?? [];
+        // Single-source spawn resolution: route the spec's binary/args/env
+        // through the SAME planner the legacy ProviderCliAdapter uses
+        // (resolveCliSpawnPlanFromParts). This gives the spec/FSM path
+        // findBinary (PATH + npm-global / Node-dir fallback so an off-PATH
+        // `codex`/`claude` resolves), `{{workingDir}}` token substitution, shell
+        // wrapping for script-shims / non-absolute / non-native binaries, and a
+        // sanitized env with TERMINAL_CWD — none of which it had when it passed
+        // `this.spec.binary` straight to the PTY.
+        const cols = this.opts.cols ?? DEFAULT_SESSION_HOST_COLS;
+        const rows = this.opts.rows ?? DEFAULT_SESSION_HOST_ROWS;
+        const plan = resolveCliSpawnPlanFromParts({
+            command: this.spec.binary,
+            baseArgs: this.spec.spawn_args ?? [],
+            baseEnv: this.spec.env ?? {},
+            workingDir: this.opts.workingDir,
+            extraArgs: this.opts.extraCliArgs ?? [],
+            extraEnv: this.opts.extraEnv ?? {},
+            geometry: { cols, rows },
+        });
         return {
-            binary: this.spec.binary,
-            args: [...baseArgs, ...extra],
-            cwd: this.opts.workingDir,
-            env: { ...(this.spec.env ?? {}), ...(this.opts.extraEnv ?? {}) },
-            cols: this.opts.cols ?? DEFAULT_SESSION_HOST_COLS,
-            rows: this.opts.rows ?? DEFAULT_SESSION_HOST_ROWS,
+            binary: plan.shellCmd,
+            args: plan.shellArgs,
+            cwd: plan.ptyOptions.cwd,
+            // plan.ptyOptions.env is already a complete, sanitized environment —
+            // pass it verbatim, do not overlay process.env (see envIsComplete).
+            env: plan.ptyOptions.env,
+            envIsComplete: true,
+            cols,
+            rows,
             transportFactory: this.opts.transportFactory,
         };
     }

package/src/providers/version-archive.ts

@@ -16,6 +16,7 @@ import * as os from 'os';
 import { platform } from 'os';
 import type { ProviderLoader } from './provider-loader.js';
 import type { ProviderModule } from './contracts.js';
+import { isKnownWin32GuiExe, readWin32IdeVersionFromDisk } from '../detection/win32-ide-version.js';
 
 // ─── Types ──────────────────────────────────────
 
@@ -226,6 +227,10 @@ export async function detectAllVersions(
 ): Promise<ProviderVersionInfo[]> {
   const results: ProviderVersionInfo[] = [];
   const currentOs = platform() as string;
+  // Map of provider type → GUI exe names (win32), used to refuse spawning a
+  // GUI executable for version detection (which would boot the IDE window).
+  const win32ProcessNames: Record<string, string[]> =
+    typeof loader.getWinProcessNames === 'function' ? loader.getWinProcessNames() : {};
 
   for (const provider of loader.getAll()) {
     const info: ProviderVersionInfo = {
@@ -258,12 +263,29 @@ export async function detectAllVersions(
       info.path = appPath || null;
       info.binary = resolvedBin || null;
 
-      // Version: try CLI first, then plist
-      if (resolvedBin) {
-        info.version = await getVersion(resolvedBin, versionCommand);
-      }
-      if (!info.version && appPath) {
-        info.version = await getMacAppVersion(appPath);
+      // Version detection for IDEs must avoid spawning the GUI executable.
+      // On Windows the resolved binary is frequently the GUI Electron exe
+      // (case-insensitive FS), and `<exe> --version` boots the IDE window.
+      // Strategy (all spawn-free where possible):
+      //   1. win32: read bundled product.json/package.json next to the exe.
+      //   2. darwin: read Info.plist via PlistBuddy (read-only).
+      //   3. Fallback to `<bin> --version` ONLY when the binary is not a
+      //      known GUI exe — the safety-net guard (#4).
+      if (currentOs === 'win32') {
+        info.version = readWin32IdeVersionFromDisk(resolvedBin || appPath || '');
+        if (!info.version && resolvedBin && !isKnownWin32GuiExe(resolvedBin, win32ProcessNames)) {
+          info.version = await getVersion(resolvedBin, versionCommand);
+        }
+      } else if (currentOs === 'darwin') {
+        if (appPath) info.version = await getMacAppVersion(appPath);
+        if (!info.version && resolvedBin) {
+          info.version = await getVersion(resolvedBin, versionCommand);
+        }
+      } else {
+        // linux and others: bundled CLI wrappers are real CLIs, safe to exec.
+        if (resolvedBin) {
+          info.version = await getVersion(resolvedBin, versionCommand);
+        }
       }
 
     } else if (provider.category === 'cli' || provider.category === 'acp') {

package/src/providers/working-dir.ts

@@ -0,0 +1,23 @@
+/**
+ * working-dir — shared helpers for deriving display names from a session's
+ * working directory. Used by CLI/ACP provider instances to build session/tab
+ * titles.
+ */
+
+/**
+ * OS-aware basename of a working directory path.
+ *
+ * Splits on BOTH POSIX (`/`) and Windows (`\`) separators so a win32 path like
+ * `D:\gh\adhdev-cloud` resolves to `adhdev-cloud` even when the daemon's own
+ * `path.basename` is POSIX-only — and a path that mixes separators still works.
+ * Trailing separators and root-only paths fall back to `'session'`, matching
+ * the historical `.split('/').filter(Boolean).pop() || 'session'` behavior.
+ *
+ * Mirrors the web dashboard's `getWorkspaceName` (`ws.split(/[/\\]/)`).
+ */
+export function workingDirBasename(p: string): string {
+    return (p || '')
+        .split(/[\\/]/)
+        .filter(Boolean)
+        .pop() || 'session';
+}