adhdev 0.8.86 → 0.8.88

package/dist/index.js

@@ -5847,6 +5847,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({
@@ -5855,6 +5874,7 @@ var init_scanner = __esm({
     init_manager();
     init_setup();
     init_logger();
+    init_runtime_defaults();
     DaemonCdpScanner = class {
       ctx;
       opts;
@@ -5888,7 +5908,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)) {
@@ -5908,7 +5928,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()) {
@@ -6008,6 +6028,7 @@ var init_initializer = __esm({
     init_setup();
     init_setup();
     init_logger();
+    init_runtime_defaults();
     DaemonCdpInitializer = class {
       config;
       scanTimer = null;
@@ -6139,7 +6160,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;
@@ -6153,7 +6174,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()) {
@@ -12450,8 +12471,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,
@@ -37193,6 +37231,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 {
@@ -37213,19 +37252,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) {
@@ -37243,14 +37282,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) {
@@ -44676,7 +44715,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;
   }
 });
@@ -45056,8 +45096,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",
@@ -45196,6 +45236,7 @@ var init_daemon_lifecycle = __esm({
     init_cli_detector();
     init_registry();
     init_logger();
+    init_runtime_defaults();
     init_config();
   }
 });
@@ -45210,10 +45251,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,
@@ -45225,10 +45275,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,
@@ -45367,6 +45420,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();
@@ -45626,6 +45680,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})...`);
@@ -45653,6 +45711,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`);
               }
@@ -46271,9 +46331,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(() => {
@@ -46431,6 +46526,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 {
@@ -53832,8 +53928,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;
   }
 });
 
@@ -54675,7 +54772,8 @@ var init_adhdev_daemon = __esm({
     init_source2();
     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;
@@ -54707,7 +54805,7 @@ var init_adhdev_daemon = __esm({
         "session_host_restart_session"
       ]);
       constructor() {
-        this.localPort = 19222;
+        this.localPort = DEFAULT_DAEMON_PORT;
       }
       applyDebugRuntime(options) {
         this.debugConfig = resolveDebugRuntimeConfig({
@@ -54898,7 +54996,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;
@@ -54919,7 +55020,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;
@@ -87042,7 +87146,7 @@ async function startDaemonFlow() {
         });
       }
     } catch {
-      daemon.start({ localPort: 19222, foreground: false }).catch(() => {
+      daemon.start({ localPort: DEFAULT_DAEMON_PORT, foreground: false }).catch(() => {
       });
     }
     let started = false;