@adhdev/daemon-standalone 0.9.48 → 0.9.50

package/dist/index.js

@@ -29342,7 +29342,12 @@ var require_dist2 = __commonJS({
       const isWin = os8.platform() === "win32";
       try {
         const cmd = isWin ? `where ${trimmed}` : `which ${trimmed}`;
-        return (0, import_child_process4.execSync)(cmd, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim().split("\n")[0].trim();
+        return (0, import_child_process4.execSync)(cmd, {
+          encoding: "utf-8",
+          timeout: 5e3,
+          stdio: ["pipe", "pipe", "pipe"],
+          ...isWin ? { windowsHide: true } : {}
+        }).trim().split("\n")[0].trim();
       } catch {
         return isWin ? `${trimmed}.cmd` : trimmed;
       }
@@ -32027,6 +32032,83 @@ var require_dist2 = __commonJS({
             if (!this.isWaitingForResponse) return "";
             return this.responseBuffer;
           }
+          getDebugSnapshot() {
+            const screenText = this.readTerminalScreenText();
+            const parsedResult = this.parsedStatusCache?.result && typeof this.parsedStatusCache.result === "object" ? this.parsedStatusCache.result : null;
+            return {
+              cliType: this.cliType,
+              cliName: this.cliName,
+              workingDir: this.workingDir,
+              currentStatus: this.currentStatus,
+              ready: this.ready,
+              isWaitingForResponse: this.isWaitingForResponse,
+              activeModal: this.activeModal,
+              parseErrorMessage: this.parseErrorMessage,
+              messageCounts: {
+                committed: this.committedMessages.length,
+                structured: this.structuredMessages.length,
+                visible: this.messages.length,
+                parsedCache: Array.isArray(parsedResult?.messages) ? parsedResult.messages.length : void 0
+              },
+              buffers: {
+                accumulatedLength: this.accumulatedBuffer.length,
+                accumulatedRawLength: this.accumulatedRawBuffer.length,
+                recentOutputLength: this.recentOutputBuffer.length,
+                responseLength: this.responseBuffer.length,
+                startupLength: this.startupBuffer.length,
+                accumulatedTail: this.accumulatedBuffer.slice(-24e3),
+                accumulatedRawTail: this.accumulatedRawBuffer.slice(-24e3),
+                recentOutputTail: this.recentOutputBuffer.slice(-12e3),
+                responseTail: this.responseBuffer.slice(-12e3)
+              },
+              terminal: {
+                screenText,
+                lastScreenSnapshot: this.lastScreenSnapshot,
+                lastScreenText: this.lastScreenText,
+                lastOutputAt: this.lastOutputAt,
+                lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
+                lastScreenChangeAt: this.lastScreenChangeAt,
+                lastScreenSnapshotReadAt: this.lastScreenSnapshotReadAt
+              },
+              parser: {
+                scriptNames: listCliScriptNames(this.cliScripts),
+                traceSessionId: this.traceSessionId,
+                traceSeq: this.traceSeq,
+                currentTurnScope: this.currentTurnScope,
+                parsedStatusCache: parsedResult ? {
+                  id: parsedResult.id,
+                  status: parsedResult.status,
+                  title: parsedResult.title,
+                  providerSessionId: parsedResult.providerSessionId,
+                  transcriptAuthority: parsedResult.transcriptAuthority,
+                  coverage: parsedResult.coverage,
+                  messageCount: Array.isArray(parsedResult.messages) ? parsedResult.messages.length : void 0,
+                  activeModal: parsedResult.activeModal
+                } : null,
+                pendingScriptStatus: this.pendingScriptStatus,
+                pendingScriptStatusSince: this.pendingScriptStatusSince
+              },
+              runtimeMetadata: this.getRuntimeMetadata(),
+              statusHistory: this.statusHistory.slice(-80),
+              traceEntries: this.traceEntries.slice(-120),
+              timing: {
+                spawnAt: this.spawnAt,
+                startupFirstOutputAt: this.startupFirstOutputAt,
+                submitPendingUntil: this.submitPendingUntil,
+                responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
+                responseEpoch: this.responseEpoch,
+                resizeSuppressUntil: this.resizeSuppressUntil,
+                lastApprovalResolvedAt: this.lastApprovalResolvedAt,
+                committedMessagesChangedAt: this.committedMessagesChangedAt
+              },
+              finish: {
+                idleFinishCandidate: this.idleFinishCandidate,
+                finishRetryCount: this.finishRetryCount,
+                submitRetryUsed: this.submitRetryUsed,
+                submitRetryPromptSnippet: this.submitRetryPromptSnippet
+              }
+            };
+          }
           getRuntimeMetadata() {
             if (!this.ptyProcess || typeof this.ptyProcess.getMetadata !== "function") return null;
             return this.ptyProcess.getMetadata();
@@ -32382,6 +32464,7 @@ var require_dist2 = __commonJS({
       detectCLIs: () => detectCLIs,
       detectIDEs: () => detectIDEs,
       ensureSessionHostReady: () => ensureSessionHostReady2,
+      execNpmCommandSync: () => execNpmCommandSync,
       findCdpManager: () => findCdpManager,
       flattenMessageParts: () => flattenMessageParts,
       forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance2,
@@ -32392,6 +32475,7 @@ var require_dist2 = __commonJS({
       getDebugRuntimeConfig: () => getDebugRuntimeConfig,
       getHostMemorySnapshot: () => getHostMemorySnapshot,
       getLogLevel: () => getLogLevel,
+      getNpmExecOptions: () => getNpmExecOptions,
       getRecentActivity: () => getRecentActivity,
       getRecentCommands: () => getRecentCommands,
       getRecentDebugTrace: () => getRecentDebugTrace,
@@ -33120,7 +33204,11 @@ var require_dist2 = __commonJS({
     }
     function execAsync(cmd, timeoutMs = 5e3) {
       return new Promise((resolve12) => {
-        const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
+        const child = (0, import_child_process2.exec)(cmd, {
+          encoding: "utf-8",
+          timeout: timeoutMs,
+          ...process.platform === "win32" ? { windowsHide: true } : {}
+        }, (err, stdout) => {
           if (err || !stdout?.trim()) {
             resolve12(null);
           } else {
@@ -38728,6 +38816,248 @@ ${effect.notification.body || ""}`.trim();
         ...debugReadChat ? { debugReadChat } : {}
       };
     }
+    var DEFAULT_DEBUG_SANITIZE_OPTIONS = {
+      maxDepth: 8,
+      maxArrayLength: 80,
+      maxObjectKeys: 120,
+      maxStringLength: 16e3
+    };
+    var SECRET_KEY_PATTERN = /(?:token|secret|password|passwd|authorization|cookie|api[_-]?key|access[_-]?key|refresh[_-]?token|client[_-]?secret|private[_-]?key)/i;
+    function truncateDebugString(value, maxLength) {
+      if (value.length <= maxLength) return value;
+      return `${value.slice(0, maxLength)}\u2026[truncated ${value.length - maxLength} chars]`;
+    }
+    function redactDebugSecrets(value) {
+      return value.replace(/(Authorization\s*:\s*Bearer\s+)[^\s'"`]+/gi, "$1[REDACTED:bearer]").replace(/(Bearer\s+)[A-Za-z0-9._~+\/-]{16,}=*/gi, "$1[REDACTED:bearer]").replace(/\b(?:gh[pousr]|github_pat)_[A-Za-z0-9_]{20,}\b/g, "[REDACTED:github-token]").replace(/\bsk-[A-Za-z0-9_-]{16,}\b/g, "[REDACTED:api-key]").replace(/\bxox[baprs]-[A-Za-z0-9-]{12,}\b/g, "[REDACTED:slack-token]").replace(/\b(?:adk|adm)_[A-Za-z0-9_-]{16,}\b/g, "[REDACTED:adhdev-token]").replace(/((?:api[_-]?key|token|secret|password|passwd|client[_-]?secret)\s*[:=]\s*)[^\s,'"`}&]+/gi, "$1[REDACTED:secret]").replace(/([?&](?:api[_-]?key|token|secret|password|client_secret)=)[^&#\s]+/gi, "$1[REDACTED:secret]");
+    }
+    function sanitizeDebugBundleValue(value, options = {}, depth = 0, keyHint = "") {
+      const normalizedOptions = { ...DEFAULT_DEBUG_SANITIZE_OPTIONS, ...options };
+      if (value === null || value === void 0) return value;
+      if (typeof value === "number" || typeof value === "boolean") return value;
+      if (typeof value === "bigint") return String(value);
+      if (typeof value === "string") {
+        if (SECRET_KEY_PATTERN.test(keyHint) && value.trim()) return "[REDACTED:secret-field]";
+        return truncateDebugString(redactDebugSecrets(value), normalizedOptions.maxStringLength);
+      }
+      if (typeof value === "function") return `[Function ${value.name || "anonymous"}]`;
+      if (typeof value !== "object") return String(value);
+      if (depth >= normalizedOptions.maxDepth) return "[MaxDepth]";
+      if (Array.isArray(value)) {
+        const items = value.slice(0, normalizedOptions.maxArrayLength).map((item) => sanitizeDebugBundleValue(item, normalizedOptions, depth + 1, keyHint));
+        if (value.length > normalizedOptions.maxArrayLength) {
+          items.push(`[truncated ${value.length - normalizedOptions.maxArrayLength} items]`);
+        }
+        return items;
+      }
+      const record2 = value;
+      const result = {};
+      const entries = Object.entries(record2).slice(0, normalizedOptions.maxObjectKeys);
+      for (const [key, item] of entries) {
+        result[key] = sanitizeDebugBundleValue(item, normalizedOptions, depth + 1, key);
+      }
+      const remaining = Object.keys(record2).length - entries.length;
+      if (remaining > 0) result.__truncatedKeys = remaining;
+      return result;
+    }
+    function summarizeProviderForDebug(provider) {
+      if (!provider) return null;
+      const scripts = provider.scripts && typeof provider.scripts === "object" ? Object.keys(provider.scripts) : [];
+      const controls = Array.isArray(provider.controls) ? provider.controls.map((control) => ({
+        id: control?.id,
+        label: control?.label,
+        type: control?.type,
+        settingKey: control?.settingKey,
+        invokeScript: control?.invokeScript,
+        listScript: control?.listScript,
+        location: control?.location
+      })) : [];
+      return {
+        type: provider.type,
+        name: provider.name,
+        category: provider.category,
+        version: provider.version,
+        canonicalHistory: provider.canonicalHistory,
+        historyBehavior: provider.historyBehavior,
+        webviewMatchText: provider.webviewMatchText,
+        scriptNames: scripts,
+        controls,
+        resume: provider.resume
+      };
+    }
+    function summarizeSessionForDebug(session) {
+      if (!session || typeof session !== "object") return null;
+      return {
+        sessionId: session.sessionId,
+        instanceKey: session.instanceKey,
+        adapterKey: session.adapterKey,
+        providerType: session.providerType,
+        providerName: session.providerName,
+        transport: session.transport,
+        kind: session.kind,
+        cdpManagerKey: session.cdpManagerKey,
+        parentSessionId: session.parentSessionId,
+        providerSessionId: session.providerSessionId,
+        workspace: session.workspace,
+        title: session.title,
+        status: session.status,
+        mode: session.mode,
+        capabilities: session.capabilities
+      };
+    }
+    function summarizeStateForDebug(state) {
+      if (!state || typeof state !== "object") return null;
+      const activeChat = state.activeChat && typeof state.activeChat === "object" ? state.activeChat : null;
+      return {
+        type: state.type,
+        name: state.name,
+        category: state.category,
+        status: state.status,
+        instanceId: state.instanceId,
+        providerSessionId: state.providerSessionId,
+        title: state.title,
+        transport: state.transport,
+        mode: state.mode,
+        workspace: state.workspace,
+        runtime: state.runtime,
+        errorMessage: state.errorMessage,
+        errorReason: state.errorReason,
+        activeChat: activeChat ? {
+          status: activeChat.status,
+          title: activeChat.title,
+          messageCount: Array.isArray(activeChat.messages) ? activeChat.messages.length : void 0,
+          activeModal: activeChat.activeModal,
+          messagesTail: Array.isArray(activeChat.messages) ? activeChat.messages.slice(-10) : void 0
+        } : null,
+        controlValues: state.controlValues,
+        summaryMetadata: state.summaryMetadata
+      };
+    }
+    function buildDebugBundleText(bundle) {
+      return [
+        "# ADHDev Chat Debug Bundle",
+        "",
+        "```json",
+        JSON.stringify(bundle, null, 2),
+        "```"
+      ].join("\n");
+    }
+    async function handleGetChatDebugBundle(h, args) {
+      const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
+      if (!targetSessionId && !h.currentSession) {
+        return { success: false, error: "No targetSessionId specified \u2014 cannot route command" };
+      }
+      const provider = h.getProvider(args?.agentType);
+      const transport = getTargetTransport(h, provider);
+      const providerType = provider?.type || getCurrentProviderType(h, args?.agentType || "");
+      const adapter = isCliLikeTransport(transport) ? getTargetedCliAdapter(h, args, provider?.type) : null;
+      const targetInstance = getTargetInstance(h, args);
+      let adapterStatus = null;
+      let parsedStatus = null;
+      let adapterDebugSnapshot = null;
+      let partialResponse = "";
+      if (adapter) {
+        try {
+          adapterStatus = adapter.getStatus?.();
+        } catch (error48) {
+          adapterStatus = { error: error48?.message || String(error48) };
+        }
+        try {
+          parsedStatus = typeof adapter.getScriptParsedStatus === "function" ? parseMaybeJson(adapter.getScriptParsedStatus()) : null;
+        } catch (error48) {
+          parsedStatus = { error: error48?.message || String(error48) };
+        }
+        try {
+          adapterDebugSnapshot = typeof adapter.getDebugSnapshot === "function" ? adapter.getDebugSnapshot() : null;
+        } catch (error48) {
+          adapterDebugSnapshot = { error: error48?.message || String(error48) };
+        }
+        try {
+          partialResponse = adapter.getPartialResponse?.() || "";
+        } catch {
+          partialResponse = "";
+        }
+      }
+      let instanceState = null;
+      if (targetInstance?.getState) {
+        try {
+          instanceState = summarizeStateForDebug(targetInstance.getState());
+        } catch (error48) {
+          instanceState = { error: error48?.message || String(error48) };
+        }
+      }
+      let readChat = null;
+      try {
+        const readResult = await handleReadChat(h, { ...args, tailLimit: Math.max(1, Math.min(40, Number(args?.tailLimit || 40))) });
+        readChat = readResult.success ? {
+          success: true,
+          status: readResult.status,
+          title: readResult.title,
+          totalMessages: readResult.totalMessages,
+          returnedMessages: Array.isArray(readResult.messages) ? readResult.messages.length : void 0,
+          syncMode: readResult.syncMode,
+          replaceFrom: readResult.replaceFrom,
+          lastMessageSignature: readResult.lastMessageSignature,
+          providerSessionId: readResult.providerSessionId,
+          transcriptAuthority: readResult.transcriptAuthority,
+          coverage: readResult.coverage,
+          activeModal: readResult.activeModal,
+          messagesTail: Array.isArray(readResult.messages) ? readResult.messages.slice(-20) : [],
+          debugReadChat: readResult.debugReadChat
+        } : { success: false, error: readResult.error };
+      } catch (error48) {
+        readChat = { success: false, error: error48?.message || String(error48) };
+      }
+      const cdp = h.getCdp();
+      const rawBundle = {
+        version: 1,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        target: {
+          targetSessionId,
+          providerType,
+          transport,
+          routeManagerKey: h.currentManagerKey,
+          currentIdeType: h.currentIdeType
+        },
+        session: summarizeSessionForDebug(h.currentSession),
+        provider: summarizeProviderForDebug(provider),
+        daemon: {
+          pid: process.pid,
+          platform: process.platform,
+          nodeVersion: process.version,
+          cwd: process.cwd()
+        },
+        cdp: {
+          requested: !!cdp,
+          connected: !!cdp?.isConnected,
+          managerKey: getCurrentManagerKey(h)
+        },
+        instanceState,
+        cli: adapter ? {
+          cliType: adapter.cliType,
+          cliName: adapter.cliName,
+          workingDir: adapter.workingDir,
+          status: adapterStatus?.status,
+          activeModal: adapterStatus?.activeModal,
+          messageCount: Array.isArray(adapterStatus?.messages) ? adapterStatus.messages.length : void 0,
+          messagesTail: Array.isArray(adapterStatus?.messages) ? adapterStatus.messages.slice(-20) : void 0,
+          parsedStatus,
+          partialResponse,
+          ready: typeof adapter.isReady === "function" ? adapter.isReady() : void 0,
+          processing: typeof adapter.isProcessing === "function" ? adapter.isProcessing() : void 0,
+          debugSnapshot: adapterDebugSnapshot
+        } : null,
+        readChat,
+        frontend: args?.frontendSnapshot && typeof args.frontendSnapshot === "object" ? args.frontendSnapshot : null,
+        recentLogs: getRecentLogs(80, "debug"),
+        recentDebugTrace: getRecentDebugTrace({ limit: 120 })
+      };
+      const bundle = sanitizeDebugBundleValue(rawBundle);
+      return {
+        success: true,
+        bundle,
+        text: buildDebugBundleText(bundle)
+      };
+    }
     function didProviderConfirmSend(result) {
       const parsed = parseMaybeJson(result);
       if (parsed === true) return true;
@@ -40863,6 +41193,7 @@ ${effect.notification.body || ""}`.trim();
         this.logCommandStart(cmd, args);
         const sessionScopedCommands = /* @__PURE__ */ new Set([
           "read_chat",
+          "get_chat_debug_bundle",
           "send_chat",
           "list_chats",
           "new_chat",
@@ -40910,6 +41241,8 @@ ${effect.notification.body || ""}`.trim();
           // ─── Chat commands (chat-commands.ts) ───────────────
           case "read_chat":
             return handleReadChat(this, args);
+          case "get_chat_debug_bundle":
+            return handleGetChatDebugBundle(this, args);
           case "chat_history":
             return handleChatHistory(this, args);
           case "send_chat":
@@ -42580,7 +42913,8 @@ ${effect.notification.body || ""}`.trim();
           cwd: this.workingDir,
           env,
           stdio: ["pipe", "pipe", "pipe"],
-          shell: spawnConfig.shell || false
+          shell: spawnConfig.shell || false,
+          ...process.platform === "win32" ? { windowsHide: true } : {}
         });
         const AUTH_ERROR_PATTERNS = [
           /unauthorized|unauthenticated/i,
@@ -43270,7 +43604,10 @@ ${rawInput}` : rawInput;
         return (0, import_fs5.existsSync)(expandExecutable(trimmed));
       }
       try {
-        (0, import_child_process6.execFileSync)(process.platform === "win32" ? "where" : "which", [trimmed], { stdio: "ignore" });
+        (0, import_child_process6.execFileSync)(process.platform === "win32" ? "where" : "which", [trimmed], {
+          stdio: "ignore",
+          ...process.platform === "win32" ? { windowsHide: true } : {}
+        });
         return true;
       } catch {
         return false;
@@ -46191,7 +46528,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       const canUseAppLauncher = !!appName;
       const useAppLauncher = preferredMethod === "app" ? canUseAppLauncher : preferredMethod === "cli" ? false : !canUseCli && canUseAppLauncher;
       if (!useAppLauncher && ide.cliCommand) {
-        (0, import_child_process7.spawn)(ide.cliCommand, args, { detached: true, stdio: "ignore" }).unref();
+        (0, import_child_process7.spawn)(ide.cliCommand, args, { detached: true, stdio: "ignore", windowsHide: true }).unref();
       } else if (appName) {
         const openArgs = ["-a", appName, "--args", ...args];
         (0, import_child_process7.spawn)("open", openArgs, { detached: true, stdio: "ignore" }).unref();
@@ -46220,7 +46557,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       const args = ["--remote-debugging-port=" + port];
       if (newWindow) args.push("--new-window");
       if (workspace) args.push(workspace);
-      (0, import_child_process7.spawn)(cli, args, { detached: true, stdio: "ignore" }).unref();
+      (0, import_child_process7.spawn)(cli, args, { detached: true, stdio: "ignore", windowsHide: true }).unref();
     }
     function getAvailableIdeIds() {
       return getProviderLoader().getAvailableIdeTypes();
@@ -46699,23 +47036,23 @@ Run 'adhdev doctor' for detailed diagnostics.`
       if (platform10 === "win32") {
         const npmCliPath = path16.join(binDir, "node_modules", "npm", "bin", "npm-cli.js");
         if (fs8.existsSync(npmCliPath)) {
-          return { executable: nodeExecutable, argsPrefix: [npmCliPath], execOptions: { shell: false } };
+          return { executable: nodeExecutable, argsPrefix: [npmCliPath], execOptions: getNpmExecOptions(platform10) };
         }
         for (const candidate of ["npm.exe", "npm"]) {
           const candidatePath = path16.join(binDir, candidate);
           if (fs8.existsSync(candidatePath)) {
-            return { executable: candidatePath, argsPrefix: [], execOptions: { shell: false } };
+            return { executable: candidatePath, argsPrefix: [], execOptions: getNpmExecOptions(platform10) };
           }
         }
-        return { executable: nodeExecutable, argsPrefix: [npmCliPath], execOptions: { shell: false } };
+        return { executable: nodeExecutable, argsPrefix: [npmCliPath], execOptions: getNpmExecOptions(platform10) };
       }
       for (const candidate of ["npm"]) {
         const candidatePath = path16.join(binDir, candidate);
         if (fs8.existsSync(candidatePath)) {
-          return { executable: candidatePath, argsPrefix: [], execOptions: { shell: false } };
+          return { executable: candidatePath, argsPrefix: [], execOptions: getNpmExecOptions(platform10) };
         }
       }
-      return { executable: "npm", argsPrefix: [], execOptions: { shell: false } };
+      return { executable: "npm", argsPrefix: [], execOptions: getNpmExecOptions(platform10) };
     }
     function findCurrentPackageRoot(currentCliPath, packageName) {
       if (!currentCliPath) return null;
@@ -46786,13 +47123,28 @@ Run 'adhdev doctor' for detailed diagnostics.`
         execOptions: surface.execOptions || getNpmExecOptions(options.platform)
       };
     }
-    function getNpmExecOptions(_platform = process.platform) {
+    function getNpmExecOptions(platform10 = process.platform) {
+      if (platform10 === "win32") {
+        return { shell: false, windowsHide: true };
+      }
       return { shell: false };
     }
+    function execNpmCommandSync(args, options = {}, surface) {
+      const execOptions = surface?.execOptions || getNpmExecOptions();
+      return (0, import_child_process8.execFileSync)(
+        surface?.npmExecutable || "npm",
+        [...surface?.npmArgsPrefix || [], ...args],
+        {
+          ...options,
+          ...execOptions,
+          ...process.platform === "win32" ? { windowsHide: true } : {}
+        }
+      );
+    }
     function killPid2(pid) {
       try {
         if (process.platform === "win32") {
-          (0, import_child_process8.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
+          (0, import_child_process8.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
         } else {
           process.kill(pid, "SIGTERM");
         }
@@ -46811,7 +47163,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           "Bypass",
           "-Command",
           `(Get-CimInstance Win32_Process -Filter "${pidFilter}").CommandLine`
-        ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }).trim();
+        ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true }).trim();
         if (psOut) return psOut;
       } catch {
       }
@@ -46822,7 +47174,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           pidFilter,
           "get",
           "CommandLine"
-        ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }).trim();
+        ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true }).trim();
         if (wmicOut) return wmicOut;
       } catch {
       }
@@ -46883,9 +47235,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     function cleanupStaleGlobalInstallDirs(pkgName, surface) {
       const prefixArgs = surface.installPrefix ? ["--prefix", surface.installPrefix] : [];
-      const npmRoot = (0, import_child_process8.execFileSync)(surface.npmExecutable, [...surface.npmArgsPrefix || [], "root", "-g", ...prefixArgs], { encoding: "utf8", ...surface.execOptions }).trim();
+      const npmRoot = String(execNpmCommandSync(["root", "-g", ...prefixArgs], { encoding: "utf8" }, surface)).trim();
       if (!npmRoot) return;
-      const npmPrefix = surface.installPrefix || (0, import_child_process8.execFileSync)(surface.npmExecutable, [...surface.npmArgsPrefix || [], "prefix", "-g", ...prefixArgs], { encoding: "utf8", ...surface.execOptions }).trim();
+      const npmPrefix = surface.installPrefix || String(execNpmCommandSync(["prefix", "-g", ...prefixArgs], { encoding: "utf8" }, surface)).trim();
       const binDir = process.platform === "win32" ? npmPrefix : path16.join(npmPrefix, "bin");
       const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
       const binNames = /* @__PURE__ */ new Set([packageBaseName]);
@@ -47374,6 +47726,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
             const wantsAll = args?.all === true;
             const offset = wantsAll ? 0 : Math.max(0, Number(args?.offset) || 0);
             const limit = wantsAll ? Number.MAX_SAFE_INTEGER : Math.max(1, Math.min(100, Number(args?.limit) || 30));
+            const requestedWorkspace = typeof args?.workspace === "string" ? args.workspace.trim() : "";
+            const requestedProviderSessionId = typeof args?.providerSessionId === "string" ? args.providerSessionId.trim() : typeof args?.activeProviderSessionId === "string" ? args.activeProviderSessionId.trim() : "";
             const providerMeta = this.deps.providerLoader.resolve?.(providerType) || this.deps.providerLoader.getMeta(providerType);
             const { sessions: historySessions, hasMore, source } = listProviderHistorySessions(providerType, {
               canonicalHistory: providerMeta?.canonicalHistory,
@@ -47393,6 +47747,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               sessions: historySessions.map((session) => {
                 const saved = savedSessionById.get(session.historySessionId);
                 const recent = recentSessionById.get(session.historySessionId);
+                const workspace = saved?.workspace || recent?.workspace || session.workspace || (requestedWorkspace && requestedProviderSessionId === session.historySessionId ? requestedWorkspace : void 0);
                 return {
                   id: session.historySessionId,
                   providerSessionId: session.historySessionId,
@@ -47400,13 +47755,13 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   providerName: saved?.providerName || recent?.providerName || providerType,
                   kind: saved?.kind || recent?.kind || kind,
                   title: saved?.title || recent?.title || session.sessionTitle || session.preview || providerType,
-                  workspace: saved?.workspace || recent?.workspace || session.workspace,
+                  workspace,
                   summaryMetadata: saved?.summaryMetadata || recent?.summaryMetadata,
                   preview: session.preview,
                   messageCount: session.messageCount,
                   firstMessageAt: session.firstMessageAt,
                   lastMessageAt: session.lastMessageAt,
-                  canResume: !!(saved?.workspace || recent?.workspace || session.workspace) && canResumeById,
+                  canResume: !!workspace && canResumeById,
                   historySource: session.source,
                   sourcePath: session.sourcePath,
                   sourceMtimeMs: session.sourceMtimeMs
@@ -47668,18 +48023,18 @@ Run 'adhdev doctor' for detailed diagnostics.`
           case "daemon_upgrade": {
             LOG2.info("Upgrade", "Remote upgrade requested from dashboard");
             try {
-              const { execSync: execSync7 } = await import("child_process");
               const isStandalone = this.deps.packageName === "@adhdev/daemon-standalone" || process.argv[1]?.includes("daemon-standalone");
               const pkgName = isStandalone ? "@adhdev/daemon-standalone" : "adhdev";
-              const latest = execSync7(`npm view ${pkgName} version`, { encoding: "utf-8", timeout: 1e4 }).trim();
+              const npmSurface = resolveCurrentGlobalInstallSurface({ packageName: pkgName });
+              const latest = String(execNpmCommandSync(["view", pkgName, "version"], { encoding: "utf-8", timeout: 1e4 }, npmSurface)).trim();
               LOG2.info("Upgrade", `Latest ${pkgName}: v${latest}`);
               let currentInstalled = null;
               try {
-                const currentJson = execSync7(`npm ls -g ${pkgName} --depth=0 --json`, {
+                const currentJson = String(execNpmCommandSync(["ls", "-g", pkgName, "--depth=0", "--json"], {
                   encoding: "utf-8",
                   timeout: 1e4,
                   stdio: ["pipe", "pipe", "pipe"]
-                }).trim();
+                }, npmSurface)).trim();
                 const parsed = JSON.parse(currentJson);
                 currentInstalled = parsed?.dependencies?.[pkgName]?.version || null;
               } catch {