adhdev 0.7.43 → 0.7.45

package/dist/index.js

@@ -18257,6 +18257,27 @@ var init_snapshot = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/commands/upgrade-helper.ts
+function spawnDetachedDaemonUpgradeHelper(payload) {
+  const env = { ...process.env, [UPGRADE_HELPER_ENV]: JSON.stringify(payload) };
+  const child = (0, import_child_process5.spawn)(process.execPath, process.argv.slice(1), {
+    detached: true,
+    stdio: "ignore",
+    windowsHide: true,
+    cwd: payload.cwd || process.cwd(),
+    env
+  });
+  child.unref();
+}
+var import_child_process5, UPGRADE_HELPER_ENV;
+var init_upgrade_helper = __esm({
+  "../../oss/packages/daemon-core/src/commands/upgrade-helper.ts"() {
+    "use strict";
+    import_child_process5 = require("child_process");
+    UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/commands/router.ts
 var fs8, CHAT_COMMANDS, READ_DEBUG_ENABLED2, DaemonCommandRouter;
 var init_router = __esm({
@@ -18274,6 +18295,7 @@ var init_router = __esm({
     init_logger();
     init_builders();
     init_snapshot();
+    init_upgrade_helper();
     fs8 = __toESM(require("fs"));
     CHAT_COMMANDS = [
       "send_chat",
@@ -18494,31 +18516,35 @@ var init_router = __esm({
               const pkgName = isStandalone ? "@adhdev/daemon-standalone" : "adhdev";
               const latest = execSync6(`npm view ${pkgName} version`, { encoding: "utf-8", timeout: 1e4 }).trim();
               LOG.info("Upgrade", `Latest ${pkgName}: v${latest}`);
-              execSync6(`npm install -g ${pkgName}@latest --force`, {
-                encoding: "utf-8",
-                timeout: 12e4,
-                stdio: ["pipe", "pipe", "pipe"]
+              let currentInstalled = null;
+              try {
+                const currentJson = execSync6(`npm ls -g ${pkgName} --depth=0 --json`, {
+                  encoding: "utf-8",
+                  timeout: 1e4,
+                  stdio: ["pipe", "pipe", "pipe"]
+                }).trim();
+                const parsed = JSON.parse(currentJson);
+                currentInstalled = parsed?.dependencies?.[pkgName]?.version || null;
+              } catch {
+              }
+              if (currentInstalled === latest) {
+                LOG.info("Upgrade", `Already on latest version v${latest}; skipping install`);
+                return { success: true, upgraded: false, alreadyLatest: true, version: latest };
+              }
+              spawnDetachedDaemonUpgradeHelper({
+                packageName: pkgName,
+                targetVersion: latest,
+                parentPid: process.pid,
+                restartArgv: process.argv.slice(1),
+                cwd: process.cwd(),
+                sessionHostAppName: process.env.ADHDEV_SESSION_HOST_NAME || "adhdev"
               });
-              LOG.info("Upgrade", `\u2705 Upgraded to v${latest}`);
+              LOG.info("Upgrade", `Scheduled detached upgrade to v${latest}`);
               setTimeout(() => {
-                LOG.info("Upgrade", "Restarting daemon with new version...");
-                try {
-                  const path18 = require("path");
-                  const fs16 = require("fs");
-                  const pidFile = path18.join(process.env.HOME || process.env.USERPROFILE || "", ".adhdev", "daemon.pid");
-                  if (fs16.existsSync(pidFile)) fs16.unlinkSync(pidFile);
-                } catch {
-                }
-                const { spawn: spawn4 } = require("child_process");
-                const child = spawn4(process.execPath, process.argv.slice(1), {
-                  detached: true,
-                  stdio: "ignore",
-                  env: { ...process.env }
-                });
-                child.unref();
+                LOG.info("Upgrade", "Exiting daemon so detached upgrader can continue...");
                 process.exit(0);
               }, 3e3);
-              return { success: true, upgraded: true, version: latest };
+              return { success: true, upgraded: true, version: latest, restarting: true };
             } catch (e) {
               LOG.error("Upgrade", `Failed: ${e.message}`);
               return { success: false, error: e.message };
@@ -18920,7 +18946,7 @@ function findBinary(name) {
   const isWin = os13.platform() === "win32";
   try {
     const cmd = isWin ? `where ${name}` : `which ${name}`;
-    return (0, import_child_process5.execSync)(cmd, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim().split("\n")[0].trim();
+    return (0, import_child_process6.execSync)(cmd, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim().split("\n")[0].trim();
   } catch {
     return isWin ? `${name}.cmd` : name;
   }
@@ -18970,7 +18996,7 @@ function shSingleQuote(arg) {
   }
   return `'${arg.replace(/'/g, `'\\''`)}'`;
 }
-function estimatePromptDisplayLines(text, cols = 100) {
+function estimatePromptDisplayLines(text, cols = 80) {
   const normalized = String(text || "").replace(/\r/g, "");
   if (!normalized) return 1;
   return normalized.split("\n").reduce((sum, line) => sum + Math.max(1, Math.ceil(Math.max(1, line.length) / cols)), 0);
@@ -19026,13 +19052,13 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os13, path9, import_child_process5, pty2, ProviderCliAdapter;
+var os13, path9, import_child_process6, pty2, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
     os13 = __toESM(require("os"));
     path9 = __toESM(require("path"));
-    import_child_process5 = require("child_process");
+    import_child_process6 = require("child_process");
     init_logger();
     init_terminal_screen();
     init_pty_transport();
@@ -19254,8 +19280,8 @@ var init_provider_cli_adapter = __esm({
           shellArgs = allArgs;
         }
         const ptyOpts = {
-          cols: 100,
-          rows: 30,
+          cols: 80,
+          rows: 24,
           cwd: this.workingDir,
           env: buildCliSpawnEnv(process.env, spawnConfig.env)
         };
@@ -19311,7 +19337,7 @@ var init_provider_cli_adapter = __esm({
         this.spawnAt = Date.now();
         this.startupParseGate = true;
         this.startupBuffer = "";
-        this.terminalScreen.reset(30, 100);
+        this.terminalScreen.reset(24, 80);
         this.pendingTerminalQueryTail = "";
         this.currentTurnScope = null;
         this.ready = false;
@@ -36620,12 +36646,12 @@ var init_contracts = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/providers/acp-provider-instance.ts
-var import_stream, import_child_process6, AcpProviderInstance;
+var import_stream, import_child_process7, AcpProviderInstance;
 var init_acp_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/acp-provider-instance.ts"() {
     "use strict";
     import_stream = require("stream");
-    import_child_process6 = require("child_process");
+    import_child_process7 = require("child_process");
     init_acp();
     init_contracts();
     init_status_monitor();
@@ -36949,7 +36975,7 @@ var init_acp_provider_instance = __esm({
         this.errorMessage = null;
         this.errorReason = null;
         this.stderrBuffer = [];
-        this.process = (0, import_child_process6.spawn)(command, args, {
+        this.process = (0, import_child_process7.spawn)(command, args, {
           cwd: this.workingDir,
           env,
           stdio: ["pipe", "pipe", "pipe"],
@@ -38904,7 +38930,7 @@ var init_provider_instance_manager = __esm({
 // ../../oss/packages/daemon-core/src/providers/version-archive.ts
 function runCommand(cmd, timeout = 1e4) {
   try {
-    return (0, import_child_process7.execSync)(cmd, {
+    return (0, import_child_process8.execSync)(cmd, {
       encoding: "utf-8",
       timeout,
       stdio: ["pipe", "pipe", "pipe"]
@@ -39011,14 +39037,14 @@ async function detectAllVersions(loader, archive) {
   }
   return results;
 }
-var fs9, path11, os15, import_child_process7, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
+var fs9, path11, os15, import_child_process8, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
 var init_version_archive = __esm({
   "../../oss/packages/daemon-core/src/providers/version-archive.ts"() {
     "use strict";
     fs9 = __toESM(require("fs"));
     path11 = __toESM(require("path"));
     os15 = __toESM(require("os"));
-    import_child_process7 = require("child_process");
+    import_child_process8 = require("child_process");
     import_os3 = require("os");
     ARCHIVE_PATH = path11.join(os15.homedir(), ".adhdev", "version-history.json");
     MAX_ENTRIES_PER_PROVIDER = 20;
@@ -40797,8 +40823,8 @@ async function handleAutoImplement(ctx, type, req, res) {
     fs11.writeFileSync(promptFile, prompt, "utf-8");
     ctx.log(`Auto-implement prompt written to ${promptFile} (${prompt.length} chars)`);
     const agentProvider = ctx.providerLoader.resolve(agent) || ctx.providerLoader.getMeta(agent);
-    const spawn4 = agentProvider?.spawn;
-    if (!spawn4?.command) {
+    const spawn5 = agentProvider?.spawn;
+    if (!spawn5?.command) {
       try {
         fs11.unlinkSync(promptFile);
       } catch {
@@ -40808,21 +40834,21 @@ async function handleAutoImplement(ctx, type, req, res) {
     }
     const agentCategory = agentProvider?.category;
     if (agentCategory === "acp") {
-      sendAutoImplSSE(ctx, { event: "progress", data: { function: "_init", status: "spawning", message: `Spawning ACP agent: ${spawn4.command} ${(spawn4.args || []).join(" ")}` } });
+      sendAutoImplSSE(ctx, { event: "progress", data: { function: "_init", status: "spawning", message: `Spawning ACP agent: ${spawn5.command} ${(spawn5.args || []).join(" ")}` } });
       ctx.autoImplStatus = { running: true, type, progress: [] };
       const { ClientSideConnection: ClientSideConnection2, ndJsonStream: ndJsonStream2, PROTOCOL_VERSION: PROTOCOL_VERSION2 } = await Promise.resolve().then(() => (init_acp(), acp_exports));
       const { Readable: Readable3, Writable: Writable2 } = await import("stream");
       const { spawn: spawnFn2 } = await import("child_process");
-      const acpArgs = [...spawn4.args || []];
+      const acpArgs = [...spawn5.args || []];
       if (model) {
         acpArgs.push("--model", model);
         ctx.log(`Auto-implement ACP using model: ${model}`);
       }
-      const child2 = spawnFn2(spawn4.command, acpArgs, {
+      const child2 = spawnFn2(spawn5.command, acpArgs, {
         cwd: providerDir,
         stdio: ["pipe", "pipe", "pipe"],
-        shell: spawn4.shell ?? false,
-        env: { ...process.env, ...spawn4.env || {} }
+        shell: spawn5.shell ?? false,
+        env: { ...process.env, ...spawn5.env || {} }
       });
       ctx.autoImplProcess = child2;
       child2.stderr?.on("data", (d) => {
@@ -40932,7 +40958,7 @@ async function handleAutoImplement(ctx, type, req, res) {
       ctx.json(res, 202, {
         started: true,
         type,
-        agent: spawn4.command,
+        agent: spawn5.command,
         functions,
         providerDir,
         message: "ACP Auto-implement started. Connect to SSE for progress.",
@@ -40940,9 +40966,9 @@ async function handleAutoImplement(ctx, type, req, res) {
       });
       return;
     }
-    const command = spawn4.command;
+    const command = spawn5.command;
     const interactiveFlags = ["--yolo", "--interactive", "-i"];
-    const baseArgs = [...spawn4.args || []].filter((a) => !interactiveFlags.includes(a));
+    const baseArgs = [...spawn5.args || []].filter((a) => !interactiveFlags.includes(a));
     let shellCmd;
     const isWin = os16.platform() === "win32";
     const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
@@ -40993,7 +41019,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         cols: 120,
         rows: 40,
         cwd: providerDir,
-        env: { ...process.env, ...spawn4.env || {} }
+        env: { ...process.env, ...spawn5.env || {} }
       });
       isPty = true;
     } catch (err) {
@@ -41005,7 +41031,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         stdio: ["pipe", "pipe", "pipe"],
         env: {
           ...process.env,
-          ...spawn4.env || {},
+          ...spawn5.env || {},
           ...command === "gemini" ? { SANDBOX: "1", GEMINI_CLI_NO_RELAUNCH: "1" } : {}
         }
       });
@@ -41857,16 +41883,16 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const spawn4 = provider.spawn;
-        if (!spawn4) {
+        const spawn5 = provider.spawn;
+        if (!spawn5) {
           this.json(res, 400, { error: `Provider ${type} has no spawn config` });
           return;
         }
         const { spawn: spawnFn } = await import("child_process");
         const start = Date.now();
         try {
-          const child = spawnFn(spawn4.command, [...spawn4.args || []], {
-            shell: spawn4.shell ?? false,
+          const child = spawnFn(spawn5.command, [...spawn5.args || []], {
+            shell: spawn5.shell ?? false,
             timeout: 5e3,
             stdio: ["pipe", "pipe", "pipe"]
           });
@@ -41898,7 +41924,7 @@ var init_dev_server = __esm({
           const elapsed = Date.now() - start;
           this.json(res, 200, {
             success: true,
-            command: `${spawn4.command} ${(spawn4.args || []).join(" ")}`,
+            command: `${spawn5.command} ${(spawn5.args || []).join(" ")}`,
             elapsed,
             stdout: stdout.trim(),
             stderr: stderr.trim(),
@@ -41908,7 +41934,7 @@ var init_dev_server = __esm({
           const elapsed = Date.now() - start;
           this.json(res, 200, {
             success: false,
-            command: `${spawn4.command} ${(spawn4.args || []).join(" ")}`,
+            command: `${spawn5.command} ${(spawn5.args || []).join(" ")}`,
             elapsed,
             error: e.message
           });
@@ -42377,20 +42403,20 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const spawn4 = provider.spawn;
-        if (!spawn4) {
+        const spawn5 = provider.spawn;
+        if (!spawn5) {
           this.json(res, 400, { error: `Provider ${type} has no spawn config` });
           return;
         }
         const { spawn: spawnFn } = await import("child_process");
         const start = Date.now();
         try {
-          const args = [...spawn4.args || [], message];
-          const child = spawnFn(spawn4.command, args, {
-            shell: spawn4.shell ?? false,
+          const args = [...spawn5.args || [], message];
+          const child = spawnFn(spawn5.command, args, {
+            shell: spawn5.shell ?? false,
             timeout,
             stdio: ["pipe", "pipe", "pipe"],
-            env: { ...process.env, ...spawn4.env || {} }
+            env: { ...process.env, ...spawn5.env || {} }
           });
           let stdout = "";
           let stderr = "";
@@ -43953,6 +43979,7 @@ var init_src = __esm({
     init_initializer();
     init_handler();
     init_router();
+    init_upgrade_helper();
     init_reporter();
     init_builders();
     init_snapshot();
@@ -45281,7 +45308,7 @@ async function ensureSessionHostReady2() {
     appName: SESSION_HOST_APP_NAME,
     spawnHost: () => {
       const entry = resolveSessionHostEntry();
-      const child = (0, import_child_process8.spawn)(process.execPath, [entry], {
+      const child = (0, import_child_process9.spawn)(process.execPath, [entry], {
         detached: true,
         stdio: "ignore",
         windowsHide: true,
@@ -45297,11 +45324,11 @@ async function ensureSessionHostReady2() {
 async function listHostedCliRuntimes2(endpoint) {
   return listHostedCliRuntimes(endpoint);
 }
-var import_child_process8, fs14, path16, SESSION_HOST_APP_NAME;
+var import_child_process9, fs14, path16, SESSION_HOST_APP_NAME;
 var init_session_host = __esm({
   "src/session-host.ts"() {
     "use strict";
-    import_child_process8 = require("child_process");
+    import_child_process9 = require("child_process");
     fs14 = __toESM(require("fs"));
     path16 = __toESM(require("path"));
     init_src();
@@ -45369,7 +45396,7 @@ var init_adhdev_daemon = __esm({
     fs15 = __toESM(require("fs"));
     path17 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.7.43";
+    pkgVersion = "0.7.45";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -45424,6 +45451,10 @@ var init_adhdev_daemon = __esm({
       isTerminalCliSession(sessionId) {
         return this.getCliPresentationMode(sessionId) === "terminal";
       }
+      isCliSession(sessionId) {
+        const mode = this.getCliPresentationMode(sessionId);
+        return mode === "chat" || mode === "terminal";
+      }
       async start(options = {}) {
         try {
           const { installGlobalInterceptor: installGlobalInterceptor2 } = require("./logging/logger");
@@ -45464,7 +45495,7 @@ ${err?.stack || ""}`);
               getServerConn: () => this.serverConn,
               getP2p: () => ({
                 broadcastPtyOutput: (key, data) => {
-                  if (!this.isTerminalCliSession(key)) return;
+                  if (!this.isCliSession(key)) return;
                   this.p2p?.broadcastPtyOutput(key, data);
                 }
               }),
@@ -45729,8 +45760,8 @@ ${err?.stack || ""}`);
             case "get_runtime_snapshot": {
               const sessionId = typeof data.sessionId === "string" ? data.sessionId : "";
               if (!sessionId) return { success: false, error: "sessionId is required" };
-              if (!this.isTerminalCliSession(sessionId)) {
-                return { success: false, error: "CLI session is not in terminal mode", code: "CLI_VIEW_MODE_NOT_TERMINAL" };
+              if (!this.isCliSession(sessionId)) {
+                return { success: false, error: "CLI session runtime unavailable", code: "CLI_RUNTIME_UNAVAILABLE" };
               }
               if (!this.sessionHostEndpoint) return { success: false, error: "Session host unavailable" };
               const client = new SessionHostClient({ endpoint: this.sessionHostEndpoint });