adhdev 0.8.86 → 0.8.88

package/dist/cli/index.js

@@ -6367,6 +6367,25 @@ var init_setup = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/runtime-defaults.ts
+var DEFAULT_CDP_SCAN_INTERVAL_MS, DEFAULT_CDP_DISCOVERY_INTERVAL_MS, DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS, DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS, DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS, MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS, DEFAULT_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS, MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS, DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS, DEFAULT_SESSION_HOST_READY_TIMEOUT_MS, STANDALONE_CDP_SCAN_INTERVAL_MS;
+var init_runtime_defaults = __esm({
+  "../../oss/packages/daemon-core/src/runtime-defaults.ts"() {
+    "use strict";
+    DEFAULT_CDP_SCAN_INTERVAL_MS = 3e4;
+    DEFAULT_CDP_DISCOVERY_INTERVAL_MS = 3e4;
+    DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS = 2e3;
+    DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS = 3e4;
+    DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS = 5e3;
+    MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS = 5e3;
+    DEFAULT_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS = 15e3;
+    MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS = 5e3;
+    DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS = 1e4;
+    DEFAULT_SESSION_HOST_READY_TIMEOUT_MS = 15e3;
+    STANDALONE_CDP_SCAN_INTERVAL_MS = 15e3;
+  }
+});
+
 // ../../oss/packages/daemon-core/src/cdp/scanner.ts
 var DaemonCdpScanner;
 var init_scanner = __esm({
@@ -6375,6 +6394,7 @@ var init_scanner = __esm({
     init_manager();
     init_setup();
     init_logger();
+    init_runtime_defaults();
     DaemonCdpScanner = class {
       ctx;
       opts;
@@ -6408,7 +6428,7 @@ var init_scanner = __esm({
        */
       startPeriodicScan() {
         if (this.scanTimer) return;
-        const interval = this.opts.scanIntervalMs || 3e4;
+        const interval = this.opts.scanIntervalMs || DEFAULT_CDP_SCAN_INTERVAL_MS;
         this.scanTimer = setInterval(async () => {
           const portMap = this.ctx.providerLoader.getCdpPortMap();
           for (const [ide, ports] of Object.entries(portMap)) {
@@ -6428,7 +6448,7 @@ var init_scanner = __esm({
       /**
        * Start periodic agent webview discovery on all connected CDPs.
        */
-      startWebviewDiscovery(intervalMs = 3e4) {
+      startWebviewDiscovery(intervalMs = DEFAULT_CDP_DISCOVERY_INTERVAL_MS) {
         if (this.discoveryTimer) return;
         this.discoveryTimer = setInterval(async () => {
           for (const m of this.ctx.cdpManagers.values()) {
@@ -6528,6 +6548,7 @@ var init_initializer = __esm({
     init_setup();
     init_setup();
     init_logger();
+    init_runtime_defaults();
     DaemonCdpInitializer = class {
       config;
       scanTimer = null;
@@ -6659,7 +6680,7 @@ var init_initializer = __esm({
        * Start periodic scanning for newly opened IDEs.
        * Idempotent — ignored if already started.
        */
-      startPeriodicScan(intervalMs = 3e4) {
+      startPeriodicScan(intervalMs = DEFAULT_CDP_SCAN_INTERVAL_MS) {
         if (this.scanTimer) return;
         this.scanTimer = setInterval(async () => {
           const { providerLoader, cdpManagers } = this.config;
@@ -6673,7 +6694,7 @@ var init_initializer = __esm({
       /**
        * Start periodic agent webview discovery.
        */
-      startDiscovery(intervalMs = 3e4) {
+      startDiscovery(intervalMs = DEFAULT_CDP_DISCOVERY_INTERVAL_MS) {
         if (this.discoveryTimer) return;
         this.discoveryTimer = setInterval(async () => {
           for (const m of this.config.cdpManagers.values()) {
@@ -13391,8 +13412,25 @@ var init_provider_cli_adapter = __esm({
             index: typeof message.index === "number" ? message.index : index,
             receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
           }));
-          const shouldPreferCommittedHistoryReplay = !this.currentTurnScope && !this.activeModal && committedHydratedMessages.length > parsedHydratedMessages.length;
-          const hydratedMessages = shouldPreferCommittedMessages || shouldPreferCommittedHistoryReplay ? committedHydratedMessages : parsedHydratedMessages;
+          const parsedLastAssistant = [...parsedHydratedMessages].reverse().find((message) => message.role === "assistant" && typeof message.content === "string" && message.content.trim());
+          const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && this.currentStatus === "idle" && parsedHydratedMessages.length > committedHydratedMessages.length && !!parsedLastAssistant;
+          if (shouldAdoptParsedIdleReplay) {
+            this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
+              committedMessages: this.committedMessages,
+              scope: this.currentTurnScope,
+              lastOutputAt: this.lastOutputAt
+            });
+            this.syncMessageViews();
+          }
+          const effectiveCommittedHydratedMessages = shouldAdoptParsedIdleReplay ? this.committedMessages.map((message, index) => buildChatMessage({
+            ...message,
+            id: message.id || `msg_${index}`,
+            index: typeof message.index === "number" ? message.index : index,
+            receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
+          })) : committedHydratedMessages;
+          const shouldPreferCommittedHistoryReplay = !this.currentTurnScope && !this.activeModal && effectiveCommittedHydratedMessages.length > parsedHydratedMessages.length;
+          const shouldPreferCommittedIdleReplay = shouldPreferCommittedMessages && !shouldAdoptParsedIdleReplay;
+          const hydratedMessages = shouldPreferCommittedIdleReplay || shouldPreferCommittedHistoryReplay ? effectiveCommittedHydratedMessages : parsedHydratedMessages;
           result = {
             id: parsed.id || "cli_session",
             status: parsed.status || this.currentStatus,
@@ -38134,6 +38172,7 @@ var init_reporter = __esm({
   "../../oss/packages/daemon-core/src/status/reporter.ts"() {
     "use strict";
     init_logger();
+    init_runtime_defaults();
     init_builders();
     init_snapshot();
     DaemonStatusReporter = class {
@@ -38154,19 +38193,19 @@ var init_reporter = __esm({
       startReporting() {
         setTimeout(() => {
           this.sendUnifiedStatusReport({ forceServer: true, reason: "initial" }).catch((e) => LOG.warn("Status", `Initial report failed: ${e?.message}`));
-        }, 2e3);
+        }, DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS);
         const scheduleServerReport = () => {
           this.statusTimer = setTimeout(() => {
             this.sendUnifiedStatusReport({ forceServer: true, reason: "periodic" }).catch((e) => LOG.warn("Status", `Periodic report failed: ${e?.message}`));
             scheduleServerReport();
-          }, 3e4);
+          }, DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS);
         };
         scheduleServerReport();
         this.p2pTimer = setInterval(() => {
           if (this.deps.p2p?.isConnected) {
             this.sendUnifiedStatusReport({ p2pOnly: true }).catch((e) => LOG.warn("Status", `P2P status send failed: ${e?.message}`));
           }
-        }, 5e3);
+        }, DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS);
       }
       stopReporting() {
         if (this.statusTimer) {
@@ -38184,14 +38223,14 @@ var init_reporter = __esm({
       throttledReport() {
         const now = Date.now();
         const elapsed = now - this.lastStatusSentAt;
-        if (elapsed >= 5e3) {
+        if (elapsed >= DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS) {
           this.sendUnifiedStatusReport().catch((e) => LOG.warn("Status", `Throttled report failed: ${e?.message}`));
         } else if (!this.statusPendingThrottle) {
           this.statusPendingThrottle = true;
           setTimeout(() => {
             this.statusPendingThrottle = false;
             this.sendUnifiedStatusReport().catch((e) => LOG.warn("Status", `Deferred report failed: ${e?.message}`));
-          }, 5e3 - elapsed);
+          }, DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS - elapsed);
         }
       }
       toDaemonStatusEventName(value) {
@@ -45617,7 +45656,8 @@ var init_runtime_support = __esm({
   "../../oss/packages/daemon-core/src/session-host/runtime-support.ts"() {
     "use strict";
     init_dist();
-    STARTUP_TIMEOUT_MS = 8e3;
+    init_runtime_defaults();
+    STARTUP_TIMEOUT_MS = DEFAULT_SESSION_HOST_READY_TIMEOUT_MS;
     STARTUP_POLL_MS = 200;
   }
 });
@@ -45997,8 +46037,8 @@ async function initDaemonComponents(config2) {
     }
   });
   await cdpInitializer.connectAll(detectedIdesRef.value);
-  cdpInitializer.startPeriodicScan(config2.cdpScanIntervalMs ?? 3e4);
-  cdpInitializer.startDiscovery(3e4);
+  cdpInitializer.startPeriodicScan(config2.cdpScanIntervalMs ?? DEFAULT_CDP_SCAN_INTERVAL_MS);
+  cdpInitializer.startDiscovery(DEFAULT_CDP_DISCOVERY_INTERVAL_MS);
   const commandHandler = new DaemonCommandHandler({
     cdpManagers,
     ideType: "unknown",
@@ -46137,6 +46177,7 @@ var init_daemon_lifecycle = __esm({
     init_cli_detector();
     init_registry();
     init_logger();
+    init_runtime_defaults();
     init_config();
   }
 });
@@ -46151,10 +46192,19 @@ __export(src_exports, {
   CliProviderInstance: () => CliProviderInstance,
   DAEMON_WS_PATH: () => DAEMON_WS_PATH,
   DEFAULT_ACTIVE_CHAT_POLL_STATUSES: () => DEFAULT_ACTIVE_CHAT_POLL_STATUSES,
+  DEFAULT_CDP_DISCOVERY_INTERVAL_MS: () => DEFAULT_CDP_DISCOVERY_INTERVAL_MS,
+  DEFAULT_CDP_SCAN_INTERVAL_MS: () => DEFAULT_CDP_SCAN_INTERVAL_MS,
   DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS: () => DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS,
   DEFAULT_DAEMON_PORT: () => DEFAULT_DAEMON_PORT,
+  DEFAULT_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS: () => DEFAULT_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS,
   DEFAULT_SESSION_HOST_APP_NAME: () => DEFAULT_SESSION_HOST_APP_NAME,
+  DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS: () => DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS,
+  DEFAULT_SESSION_HOST_READY_TIMEOUT_MS: () => DEFAULT_SESSION_HOST_READY_TIMEOUT_MS,
   DEFAULT_STANDALONE_SESSION_HOST_APP_NAME: () => DEFAULT_STANDALONE_SESSION_HOST_APP_NAME,
+  DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS: () => DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS,
+  DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS: () => DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS,
+  DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS: () => DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS,
+  DEV_SERVER_PORT: () => DEV_SERVER_PORT,
   DaemonAgentStreamManager: () => DaemonAgentStreamManager,
   DaemonCdpInitializer: () => DaemonCdpInitializer,
   DaemonCdpManager: () => DaemonCdpManager,
@@ -46166,10 +46216,13 @@ __export(src_exports, {
   DevServer: () => DevServer,
   IdeProviderInstance: () => IdeProviderInstance,
   LOG: () => LOG,
+  MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS: () => MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS,
+  MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS: () => MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS,
   NodePtyTransportFactory: () => NodePtyTransportFactory,
   ProviderCliAdapter: () => ProviderCliAdapter,
   ProviderInstanceManager: () => ProviderInstanceManager,
   ProviderLoader: () => ProviderLoader,
+  STANDALONE_CDP_SCAN_INTERVAL_MS: () => STANDALONE_CDP_SCAN_INTERVAL_MS,
   SessionHostPtyTransportFactory: () => SessionHostPtyTransportFactory,
   VersionArchive: () => VersionArchive,
   appendRecentActivity: () => appendRecentActivity,
@@ -46308,6 +46361,7 @@ var init_src = __esm({
     init_cli_manager();
     init_launch();
     init_ipc_protocol();
+    init_runtime_defaults();
     init_chat_history();
     init_chat_signatures();
     init_subscription_updates();
@@ -46350,7 +46404,7 @@ function resolveDaemonCommandPort(port, env3 = process.env) {
     return explicitPort;
   }
   const envPort = parseInt(env3.ADHDEV_DAEMON_PORT || "", 10);
-  return Number.isFinite(envPort) && envPort > 0 ? envPort : 19222;
+  return Number.isFinite(envPort) && envPort > 0 ? envPort : DEFAULT_DAEMON_PORT;
 }
 async function sendDaemonCommand(cmd, args = {}, port) {
   const resolvedPort = resolveDaemonCommandPort(port);
@@ -46474,6 +46528,7 @@ async function directCdpEval(expression, port = 9222) {
 var init_cdp_utils = __esm({
   "src/cli/cdp-utils.ts"() {
     "use strict";
+    init_src();
   }
 });
 
@@ -77797,6 +77852,10 @@ var init_server_connection = __esm({
         }
       }
       scheduleReconnect() {
+        if (this.reconnectTimer) {
+          clearTimeout(this.reconnectTimer);
+          this.reconnectTimer = null;
+        }
         const delay = Math.min(2e3 * Math.pow(1.5, this.reconnectAttempts), 6e4);
         this.reconnectAttempts++;
         LOG.info("Server", `[ServerConn] Reconnecting in ${(delay / 1e3).toFixed(1)}s (attempt ${this.reconnectAttempts})...`);
@@ -77824,6 +77883,8 @@ var init_server_connection = __esm({
               if (misses >= 3 && this.ws) {
                 LOG.warn("Server", `[ServerConn] Pong timeout (${misses}x) \u2014 closing stale WS`);
                 this.ws.terminate();
+              } else if (misses === 1) {
+                LOG.info("Server", `[ServerConn] Pong timeout (${misses}x) \u2014 keeping WS open and retrying`);
               } else {
                 LOG.warn("Server", `[ServerConn] Pong timeout (${misses}x) \u2014 keeping WS open and retrying`);
               }
@@ -78442,9 +78503,44 @@ async function initiateConnection(deps, peerId, sharePermission) {
           clearTimeout(peer.failedCleanupTimer);
           peer.failedCleanupTimer = void 0;
         }
+        if (peer.disconnectTimer) {
+          clearTimeout(peer.disconnectTimer);
+          peer.disconnectTimer = void 0;
+        }
         deps.notifyStateChange();
+      } else if (pcState === "disconnected") {
+        log(`Peer ${pid} ICE disconnected \u2014 waiting 3s for recovery`);
+        if (peer.disconnectTimer) clearTimeout(peer.disconnectTimer);
+        peer.disconnectTimer = setTimeout(() => {
+          const p = deps.peers.get(pid);
+          if (!p) return;
+          p.disconnectTimer = void 0;
+          let currentState;
+          try {
+            currentState = pc.state?.();
+          } catch {
+          }
+          if (currentState !== "connected") {
+            log(`Peer ${pid} ICE recovery timeout (state=${currentState ?? "unknown"}) \u2014 marking failed`);
+            p.state = "failed";
+            deps.notifyStateChange();
+            if (!p.failedCleanupTimer) {
+              p.failedCleanupTimer = setTimeout(() => {
+                const pp = deps.peers.get(pid);
+                if (pp?.state === "failed") {
+                  log(`Auto-cleanup stale failed peer ${pid}`);
+                  disconnectPeer(deps.peers, pid, deps.notifyStateChange);
+                }
+              }, 3e4);
+            }
+          }
+        }, 3e3);
       } else if (pcState === "failed" || pcState === "closed") {
         peer.state = "failed";
+        if (peer.disconnectTimer) {
+          clearTimeout(peer.disconnectTimer);
+          peer.disconnectTimer = void 0;
+        }
         deps.notifyStateChange();
         if (!peer.failedCleanupTimer) {
           peer.failedCleanupTimer = setTimeout(() => {
@@ -78602,6 +78698,7 @@ function disconnectPeer(peers, peerId, notifyStateChange) {
   if (peer.failedCleanupTimer) clearTimeout(peer.failedCleanupTimer);
   if (peer.heartbeatTimer) clearInterval(peer.heartbeatTimer);
   if (peer.connectionTimeout) clearTimeout(peer.connectionTimeout);
+  if (peer.disconnectTimer) clearTimeout(peer.disconnectTimer);
   if (peer.dataChannel) try {
     peer.dataChannel.close();
   } catch {
@@ -86056,8 +86153,9 @@ var init_session_host = __esm({
     init_src();
     init_dist();
     init_session_host_hygiene();
+    init_runtime_defaults();
     SESSION_HOST_APP_NAME = process.env.ADHDEV_SESSION_HOST_NAME || DEFAULT_SESSION_HOST_APP_NAME;
-    SESSION_HOST_START_TIMEOUT_MS = 15e3;
+    SESSION_HOST_START_TIMEOUT_MS = DEFAULT_SESSION_HOST_READY_TIMEOUT_MS;
   }
 });
 
@@ -86379,7 +86477,8 @@ var init_adhdev_daemon = __esm({
     init_source();
     init_version();
     init_src();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.86" });
+    init_runtime_defaults();
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.88" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -86411,7 +86510,7 @@ var init_adhdev_daemon = __esm({
         "session_host_restart_session"
       ]);
       constructor() {
-        this.localPort = 19222;
+        this.localPort = DEFAULT_DAEMON_PORT;
       }
       applyDebugRuntime(options) {
         this.debugConfig = resolveDebugRuntimeConfig({
@@ -86602,7 +86701,10 @@ var init_adhdev_daemon = __esm({
         }
       }
       buildMachineRuntimeUpdateForSubscription(subscription) {
-        const intervalMs = Math.max(5e3, Number(subscription.params.intervalMs || 15e3));
+        const intervalMs = Math.max(
+          MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS,
+          Number(subscription.params.intervalMs || DEFAULT_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS)
+        );
         const now = Date.now();
         if (subscription.lastSentAt > 0 && now - subscription.lastSentAt < intervalMs) {
           return null;
@@ -86623,7 +86725,10 @@ var init_adhdev_daemon = __esm({
       }
       async buildSessionHostDiagnosticsUpdateForSubscription(subscription) {
         if (!this.sessionHostController) return null;
-        const intervalMs = Math.max(5e3, Number(subscription.params.intervalMs || 1e4));
+        const intervalMs = Math.max(
+          MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS,
+          Number(subscription.params.intervalMs || DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS)
+        );
         const now = Date.now();
         if (subscription.lastSentAt > 0 && now - subscription.lastSentAt < intervalMs) {
           return null;
@@ -87694,7 +87799,7 @@ async function startDaemonFlow() {
         });
       }
     } catch {
-      daemon.start({ localPort: 19222, foreground: false }).catch(() => {
+      daemon.start({ localPort: DEFAULT_DAEMON_PORT, foreground: false }).catch(() => {
       });
     }
     let started = false;
@@ -88841,6 +88946,7 @@ init_src();
 
 // src/cli/setup-commands.ts
 init_source();
+init_src();
 
 // src/cli/provider-source-status.ts
 function buildProviderSourceStatusLines(config2) {
@@ -88855,6 +88961,7 @@ function buildProviderSourceStatusLines(config2) {
 
 // src/cli/setup-commands.ts
 init_cdp_utils();
+var DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS = 1500;
 function resolveLaunchableProviderTarget(providerLoader, targetArg) {
   if (!targetArg) return null;
   const resolvedType = providerLoader.resolveAlias(targetArg.toLowerCase());
@@ -89091,7 +89198,7 @@ function registerSetupCommands(program2, providerLoader) {
         if (!isDaemonRunning2({ port: daemonPort })) {
           spinner2.stop();
           console.log(source_default.yellow(`
-  \u26A0 Daemon not running on port ${daemonPort}. Start with 'adhdev daemon${daemonPort === 19222 ? "" : ` -p ${daemonPort}`}' first.
+  \u26A0 Daemon not running on port ${daemonPort}. Start with 'adhdev daemon${daemonPort === DEFAULT_DAEMON_PORT ? "" : ` -p ${daemonPort}`}' first.
 `));
           console.log(source_default.gray("  Then run: adhdev launch " + targetArg));
           process.exit(1);
@@ -89227,7 +89334,7 @@ function registerSetupCommands(program2, providerLoader) {
     const daemonPort = resolveDaemonCommandPort();
     if (!isDaemonRunning2({ port: daemonPort })) {
       console.log(source_default.yellow(`
-  \u26A0 Daemon not running on port ${daemonPort}. Start with 'adhdev daemon${daemonPort === 19222 ? "" : ` -p ${daemonPort}`}' first.
+  \u26A0 Daemon not running on port ${daemonPort}. Start with 'adhdev daemon${daemonPort === DEFAULT_DAEMON_PORT ? "" : ` -p ${daemonPort}`}' first.
 `));
       console.log(source_default.gray(`  Then run: adhdev history list ${providerArg}`));
       process.exit(1);
@@ -89299,7 +89406,7 @@ function registerSetupCommands(program2, providerLoader) {
     const daemonPort = resolveDaemonCommandPort();
     if (!isDaemonRunning2({ port: daemonPort })) {
       console.log(source_default.yellow(`
-  \u26A0 Daemon not running on port ${daemonPort}. Start with 'adhdev daemon${daemonPort === 19222 ? "" : ` -p ${daemonPort}`}' first.
+  \u26A0 Daemon not running on port ${daemonPort}. Start with 'adhdev daemon${daemonPort === DEFAULT_DAEMON_PORT ? "" : ` -p ${daemonPort}`}' first.
 `));
       console.log(source_default.gray(`  Then run: adhdev history resume ${providerArg} ${historySessionId}`));
       process.exit(1);
@@ -89434,8 +89541,8 @@ function registerSetupCommands(program2, providerLoader) {
     if (daemonRunning) {
       try {
         const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(), 1500);
-        const res = await fetch("http://127.0.0.1:19222/health", { signal: controller.signal });
+        const timer = setTimeout(() => controller.abort(), DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS);
+        const res = await fetch(`http://127.0.0.1:${DEFAULT_DAEMON_PORT}/health`, { signal: controller.signal });
         clearTimeout(timer);
         if (res.ok) {
           const data = await res.json();
@@ -89611,6 +89718,7 @@ function registerSetupCommands(program2, providerLoader) {
 
 // src/cli/daemon-commands.ts
 init_source();
+init_src();
 
 // src/cli/runtime-tools.ts
 var fs24 = __toESM(require("fs"));
@@ -89774,6 +89882,11 @@ function formatDebugTraceEntryLine(entry) {
 }
 
 // src/cli/daemon-commands.ts
+var DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS2 = 1500;
+var DEFAULT_TRACE_FOLLOW_INTERVAL_MS = 1500;
+var DEFAULT_DAEMON_PORT_TEXT = String(DEFAULT_DAEMON_PORT);
+var DEV_SERVER_PORT2 = 19280;
+var DEV_SERVER_BASE_URL = `http://127.0.0.1:${DEV_SERVER_PORT2}`;
 function hideCommand(command) {
   if (typeof command.hideHelp === "function") {
     command.hideHelp();
@@ -89783,7 +89896,7 @@ function hideCommand(command) {
 }
 async function fetchLocalDaemonHealth(port) {
   const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), 1500);
+  const timer = setTimeout(() => controller.abort(), DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS2);
   try {
     const res = await fetch(`http://127.0.0.1:${port}/health`, { signal: controller.signal });
     if (!res.ok) return null;
@@ -89975,9 +90088,9 @@ async function printRuntimeGroups(records, options) {
   }
 }
 async function handleTraceCommand(options) {
-  const port = parseInt(String(options.port ?? "19222"), 10) || 19222;
+  const port = parseInt(String(options.port ?? DEFAULT_DAEMON_PORT_TEXT), 10) || DEFAULT_DAEMON_PORT;
   const count = Math.max(1, Math.min(500, parseInt(String(options.count ?? "40"), 10) || 40));
-  const intervalMs = Math.max(250, Math.min(3e4, parseInt(String(options.interval ?? "1500"), 10) || 1500));
+  const intervalMs = Math.max(250, Math.min(3e4, parseInt(String(options.interval ?? String(DEFAULT_TRACE_FOLLOW_INTERVAL_MS)), 10) || DEFAULT_TRACE_FOLLOW_INTERVAL_MS));
   const baseArgs = {
     count,
     category: options.category,
@@ -90081,11 +90194,11 @@ async function handleTraceCommand(options) {
   }
 }
 function registerDaemonCommands(program2, pkgVersion3) {
-  program2.command("daemon").description("\u{1F680} Start ADHDev Daemon \u2014 unified hub for IDE monitoring, agent management, and remote control").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL for testing").option("--dev", "Enable Dev Mode \u2014 HTTP API on :19280 for script debugging + structured trace collection").option("--log-level <level>", "Console log level (debug|info|warn|error)").option("--trace", "Enable structured debug trace collection").option("--trace-content", "Include richer content snapshots in debug traces").option("--trace-buffer-size <count>", "Structured trace ring buffer size").action(async (options) => {
+  program2.command("daemon").description("\u{1F680} Start ADHDev Daemon \u2014 unified hub for IDE monitoring, agent management, and remote control").option("-p, --port <port>", "Local WS server port", DEFAULT_DAEMON_PORT_TEXT).option("--server <url>", "Override server URL for testing").option("--dev", "Enable Dev Mode \u2014 HTTP API on :19280 for script debugging + structured trace collection").option("--log-level <level>", "Console log level (debug|info|warn|error)").option("--trace", "Enable structured debug trace collection").option("--trace-content", "Include richer content snapshots in debug traces").option("--trace-buffer-size <count>", "Structured trace ring buffer size").action(async (options) => {
     const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
     const daemon = new AdhdevDaemon2();
     await daemon.start({
-      localPort: parseInt(options.port) || 19222,
+      localPort: parseInt(options.port) || DEFAULT_DAEMON_PORT,
       serverUrl: options.server,
       foreground: true,
       dev: options.dev || false,
@@ -90095,7 +90208,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
       traceBufferSize: options.traceBufferSize ? parseInt(options.traceBufferSize, 10) || void 0 : void 0
     });
   });
-  program2.command("trace").description("Inspect structured daemon trace from the running local daemon (for example: --category session_host)").option("-p, --port <port>", "Local daemon IPC port", "19222").option("--category <category>", "Filter by trace category (for example: session_host)").option("--interaction <id>", "Filter by interaction id").option("--count <count>", "Maximum number of trace entries to fetch", "40").option("--follow", "Keep polling and print new trace entries as they arrive").option("--interval <ms>", "Polling interval for --follow mode", "1500").option("--json", "Print raw trace JSON output").action(async (options) => {
+  program2.command("trace").description("Inspect structured daemon trace from the running local daemon (for example: --category session_host)").option("-p, --port <port>", "Local daemon IPC port", DEFAULT_DAEMON_PORT_TEXT).option("--category <category>", "Filter by trace category (for example: session_host)").option("--interaction <id>", "Filter by interaction id").option("--count <count>", "Maximum number of trace entries to fetch", "40").option("--follow", "Keep polling and print new trace entries as they arrive").option("--interval <ms>", "Polling interval for --follow mode", String(DEFAULT_TRACE_FOLLOW_INTERVAL_MS)).option("--json", "Print raw trace JSON output").action(async (options) => {
     try {
       await handleTraceCommand(options);
     } catch (error48) {
@@ -90175,11 +90288,11 @@ function registerDaemonCommands(program2, pkgVersion3) {
     console.log(source_default.gray(`  Set with: adhdev daemon:api ${enabled ? "disable" : "enable"}
 `));
   }));
-  hideCommand(program2.command("daemon:status").description("Check ADHDev Daemon status").option("-p, --port <port>", "Local WS server port", "19222").action(async (options) => {
+  hideCommand(program2.command("daemon:status").description("Check ADHDev Daemon status").option("-p, --port <port>", "Local WS server port", DEFAULT_DAEMON_PORT_TEXT).action(async (options) => {
     const { isDaemonRunning: isDaemonRunning2, getDaemonPid: getDaemonPid2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
     const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2 } = await Promise.resolve().then(() => (init_src(), src_exports));
     const { probeSessionHostStatus: probeSessionHostStatus2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
-    const port = parseInt(options.port, 10) || 19222;
+    const port = parseInt(options.port, 10) || DEFAULT_DAEMON_PORT;
     const { loadConfig: loadConfig2, ProviderLoader: ProviderLoader2 } = await Promise.resolve().then(() => (init_src(), src_exports));
     const config2 = loadConfig2();
     const providerLoader = new ProviderLoader2({
@@ -90252,8 +90365,8 @@ function registerDaemonCommands(program2, pkgVersion3) {
       }
       try {
         const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(), 1500);
-        const res = await fetch("http://127.0.0.1:19280/api/status", { signal: controller.signal });
+        const timer = setTimeout(() => controller.abort(), DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS2);
+        const res = await fetch(`${DEV_SERVER_BASE_URL}/api/status`, { signal: controller.signal });
         clearTimeout(timer);
         if (res.ok) {
           const data = await res.json();
@@ -90277,10 +90390,10 @@ function registerDaemonCommands(program2, pkgVersion3) {
 `));
     }
   }));
-  hideCommand(program2.command("daemon:session-host").description("Advanced operator diagnostics and control for the raw session-host surface").option("-p, --port <port>", "Local WS server port", "19222").option("--json", "Print raw JSON diagnostics/result").option("--limit <count>", "Number of diagnostics entries to include", "20").option("--session <sessionId>", "Target session ID").option("--restart", "Restart the target session").option("--resume", "Resume the target session").option("--stop", "Stop the target session").option("--signal <signal>", "Send a signal to the target session").option("--detach-client <clientId>", "Force-detach a client from the target session").option("--prune-duplicates", "Stop and remove duplicate hosted runtimes that share the same provider session binding").option("--acquire-write <clientId>", "Force-acquire write ownership for a client").option("--release-write <clientId>", "Release write ownership for a client").option("--owner-type <type>", "ownerType for --acquire-write (user|agent)", "user").action(async (options) => {
+  hideCommand(program2.command("daemon:session-host").description("Advanced operator diagnostics and control for the raw session-host surface").option("-p, --port <port>", "Local WS server port", DEFAULT_DAEMON_PORT_TEXT).option("--json", "Print raw JSON diagnostics/result").option("--limit <count>", "Number of diagnostics entries to include", "20").option("--session <sessionId>", "Target session ID").option("--restart", "Restart the target session").option("--resume", "Resume the target session").option("--stop", "Stop the target session").option("--signal <signal>", "Send a signal to the target session").option("--detach-client <clientId>", "Force-detach a client from the target session").option("--prune-duplicates", "Stop and remove duplicate hosted runtimes that share the same provider session binding").option("--acquire-write <clientId>", "Force-acquire write ownership for a client").option("--release-write <clientId>", "Release write ownership for a client").option("--owner-type <type>", "ownerType for --acquire-write (user|agent)", "user").action(async (options) => {
     const sessionId = typeof options.session === "string" ? options.session.trim() : "";
     const limit = Math.max(1, Math.min(200, parseInt(options.limit, 10) || 20));
-    const port = parseInt(options.port, 10) || 19222;
+    const port = parseInt(options.port, 10) || DEFAULT_DAEMON_PORT;
     const requireSessionId = () => {
       if (!sessionId) {
         throw new Error("--session is required for this action");
@@ -90599,9 +90712,9 @@ function registerDaemonCommands(program2, pkgVersion3) {
       process.exit(1);
     }
   });
-  hideCommand(program2.command("daemon:stop").description("Stop ADHDev Daemon").option("-p, --port <port>", "Local WS server port", "19222").action(async (options) => {
+  hideCommand(program2.command("daemon:stop").description("Stop ADHDev Daemon").option("-p, --port <port>", "Local WS server port", DEFAULT_DAEMON_PORT_TEXT).action(async (options) => {
     const { stopDaemon: stopDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-    const port = parseInt(options.port, 10) || 19222;
+    const port = parseInt(options.port, 10) || DEFAULT_DAEMON_PORT;
     if (stopDaemon2({ port })) {
       console.log(source_default.green(`
   \u2713 ADHDev Daemon stopped.
@@ -90612,19 +90725,19 @@ function registerDaemonCommands(program2, pkgVersion3) {
 `));
     }
   }));
-  hideCommand(program2.command("daemon:restart").description("Restart ADHDev Daemon (stop \u2192 start)").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL").option("--dev", "Enable Dev Mode").action(async (options) => {
+  hideCommand(program2.command("daemon:restart").description("Restart ADHDev Daemon (stop \u2192 start)").option("-p, --port <port>", "Local WS server port", DEFAULT_DAEMON_PORT_TEXT).option("--server <url>", "Override server URL").option("--dev", "Enable Dev Mode").action(async (options) => {
     const { stopDaemon: stopDaemon2, isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
     const { stopManagedSessionHostProcess: stopManagedSessionHostProcess2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
     const { spawn: spawn6 } = await import("child_process");
-    if (isDaemonRunning2({ port: parseInt(options.port, 10) || 19222 })) {
+    if (isDaemonRunning2({ port: parseInt(options.port, 10) || DEFAULT_DAEMON_PORT })) {
       console.log(source_default.yellow("\n  Stopping existing daemon..."));
-      stopDaemon2({ port: parseInt(options.port, 10) || 19222 });
+      stopDaemon2({ port: parseInt(options.port, 10) || DEFAULT_DAEMON_PORT });
       await new Promise((r) => setTimeout(r, 2e3));
     }
     stopManagedSessionHostProcess2();
     await new Promise((r) => setTimeout(r, 500));
     console.log(source_default.cyan("  Starting new daemon..."));
-    const args = ["daemon", "-p", options.port || "19222"];
+    const args = ["daemon", "-p", options.port || DEFAULT_DAEMON_PORT_TEXT];
     if (options.server) args.push("--server", options.server);
     if (options.dev) args.push("--dev");
     const child = spawn6(process.execPath, [process.argv[1], ...args], {
@@ -90635,7 +90748,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
     });
     child.unref();
     await new Promise((r) => setTimeout(r, 3e3));
-    if (isDaemonRunning2({ port: parseInt(options.port, 10) || 19222 })) {
+    if (isDaemonRunning2({ port: parseInt(options.port, 10) || DEFAULT_DAEMON_PORT })) {
       console.log(source_default.green(`  \u2713 ADHDev Daemon restarted (PID: ${child.pid})
 `));
     } else {
@@ -90709,7 +90822,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
           packageName: "adhdev",
           targetVersion: latest,
           parentPid: process.pid,
-          restartArgv: daemonWasRunning ? [process.argv[1], "daemon", "-p", "19222"] : [],
+          restartArgv: daemonWasRunning ? [process.argv[1], "daemon", "-p", DEFAULT_DAEMON_PORT_TEXT] : [],
           cwd: process.cwd()
         });
         if (daemonWasRunning) {
@@ -90730,7 +90843,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
       await new Promise((r) => setTimeout(r, 2e3));
       stopManagedSessionHostProcess2();
       await new Promise((r) => setTimeout(r, 500));
-      const child = spawn6(process.execPath, [process.argv[1], "daemon", "-p", "19222"], {
+      const child = spawn6(process.execPath, [process.argv[1], "daemon", "-p", DEFAULT_DAEMON_PORT_TEXT], {
         detached: true,
         stdio: "ignore",
         windowsHide: true,
@@ -91270,6 +91383,7 @@ function registerDoctorCommands(program2, pkgVersion3) {
 init_source();
 var path33 = __toESM(require("path"));
 init_cdp_utils();
+var DEV_SERVER_PORT3 = 19280;
 var IDE_AUTO_FIX_FUNCTIONS = [
   "openPanel",
   "sendMessage",
@@ -91502,7 +91616,7 @@ function registerProviderCommands(program2) {
         const result = await new Promise((resolve17, reject) => {
           const req = http3.request({
             hostname: "127.0.0.1",
-            port: 19280,
+            port: DEV_SERVER_PORT3,
             path: "/api/providers/reload",
             method: "POST",
             headers: { "Content-Type": "application/json", "Content-Length": "2" }
@@ -91639,7 +91753,7 @@ function registerProviderCommands(program2) {
         const postData = JSON.stringify({ type, name, category, location, cdpPorts, osPaths, processNames });
         const req = http3.request({
           hostname: "127.0.0.1",
-          port: 19280,
+          port: DEV_SERVER_PORT3,
           path: "/api/scaffold",
           method: "POST",
           headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
@@ -91847,7 +91961,7 @@ function registerProviderCommands(program2) {
         const startResult = await new Promise((resolve17, reject) => {
           const req = http3.request({
             hostname: "127.0.0.1",
-            port: 19280,
+            port: DEV_SERVER_PORT3,
             path: `/api/providers/${type}/auto-implement`,
             method: "POST",
             headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
@@ -91893,7 +92007,7 @@ function registerProviderCommands(program2) {
 `);
         console.log(source_default.gray(`  Agent logs: ${logFile}`));
         await new Promise((resolve17, reject) => {
-          http3.get(`http://127.0.0.1:19280${startResult.sseUrl}`, (res) => {
+          http3.get(`http://127.0.0.1:${DEV_SERVER_PORT3}${startResult.sseUrl}`, (res) => {
             let buffer = "";
             res.on("data", (chunk) => {
               const rawStr = chunk.toString();
@@ -92002,7 +92116,7 @@ function registerProviderCommands(program2) {
       const result = await new Promise((resolve17, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
-          port: 19280,
+          port: DEV_SERVER_PORT3,
           path: `/api/providers/${type}/script`,
           method: "POST",
           headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
@@ -92050,7 +92164,7 @@ function registerProviderCommands(program2) {
     try {
       const http3 = await import("http");
       const result = await new Promise((resolve17, reject) => {
-        http3.get(`http://127.0.0.1:19280/api/providers/${type}/source`, (res) => {
+        http3.get(`http://127.0.0.1:${DEV_SERVER_PORT3}/api/providers/${type}/source`, (res) => {
           let data = "";
           res.on("data", (c) => data += c);
           res.on("end", () => {
@@ -92108,7 +92222,7 @@ function registerProviderCommands(program2) {
       const result = await new Promise((resolve17, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
-          port: 19280,
+          port: DEV_SERVER_PORT3,
           path: `/api/providers/${type}/script`,
           method: "POST",
           headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
@@ -92414,6 +92528,7 @@ var import_node_os6 = __toESM(require("os"));
 var import_node_child_process6 = require("child_process");
 init_source();
 init_src();
+var DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS3 = 1500;
 var LAUNCHD_LABEL = "dev.adhf.daemon";
 var ADHDEV_DIR = import_node_path4.default.join(import_node_os6.default.homedir(), ".adhdev");
 var LOG_OUT = import_node_path4.default.join(ADHDEV_DIR, "daemon-launchd.out");
@@ -92437,7 +92552,7 @@ function ensureDir(dir) {
 }
 async function fetchHealth() {
   const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), 1500);
+  const timer = setTimeout(() => controller.abort(), DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS3);
   try {
     const res = await fetch(`http://127.0.0.1:${DEFAULT_DAEMON_PORT}/health`, { signal: controller.signal });
     if (!res.ok) return null;