@adhdev/daemon-standalone 0.8.87 → 0.8.89

package/dist/index.js

@@ -30308,8 +30308,7 @@ var require_dist2 = __commonJS({
             const buttons = Array.isArray(modal.buttons) ? modal.buttons : [];
             if (buttons.length !== 1) return false;
             const buttonLabel = String(buttons[0] || "").trim();
-            const modalText = `${modal.message || ""} ${buttonLabel}`.trim();
-            return looksLikeConfirmOnlyLabel(buttonLabel) || /Quick safety check|project trust|trust (?:this project|the contents of this directory|the files in this folder)|Enter to confirm/i.test(modalText);
+            return looksLikeConfirmOnlyLabel(buttonLabel);
           }
           async waitForInteractivePrompt(maxWaitMs = 5e3) {
             const startedAt = Date.now();
@@ -30925,11 +30924,14 @@ var require_dist2 = __commonJS({
           }
           // ─── Public API (CliAdapter) ───────────────────
           getStatus() {
+            const screenText = this.terminalScreen.getText() || "";
+            const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
+            const effectiveStatus = this.parseErrorMessage ? "error" : startupModal ? "waiting_approval" : this.currentStatus;
             return {
-              status: this.parseErrorMessage ? "error" : this.currentStatus,
+              status: effectiveStatus,
               messages: [...this.committedMessages],
               workingDir: this.workingDir,
-              activeModal: this.activeModal,
+              activeModal: startupModal || this.activeModal,
               errorMessage: this.parseErrorMessage || void 0,
               errorReason: this.parseErrorMessage ? "parse_error" : void 0
             };
@@ -30982,8 +30984,38 @@ var require_dist2 = __commonJS({
                 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 visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
+              const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedHydratedMessages.length > committedHydratedMessages.length && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && visibleIdlePrompt);
+              if (shouldAdoptParsedIdleReplay) {
+                this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
+                  committedMessages: this.committedMessages,
+                  scope: this.currentTurnScope,
+                  lastOutputAt: this.lastOutputAt
+                });
+                this.syncMessageViews();
+                if (this.currentStatus !== "idle" || this.isWaitingForResponse) {
+                  this.responseBuffer = "";
+                  this.isWaitingForResponse = false;
+                  this.responseSettleIgnoreUntil = 0;
+                  this.submitRetryUsed = false;
+                  this.submitRetryPromptSnippet = "";
+                  this.finishRetryCount = 0;
+                  this.currentTurnScope = null;
+                  this.activeModal = null;
+                  this.setStatus("idle", "parsed_idle_replay_commit");
+                  this.onStatusChange?.();
+                }
+              }
+              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,
@@ -31584,8 +31616,9 @@ ${data.message || ""}`.trim();
             this.ptyProcess?.write(data);
           }
           resolveModal(buttonIndex) {
-            if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !this.activeModal) return;
-            const modal = this.activeModal;
+            const screenText = this.terminalScreen.getText() || "";
+            const modal = this.activeModal || this.getStartupConfirmationModal(screenText);
+            if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !modal) return;
             this.clearIdleFinishCandidate("resolve_modal");
             this.recordTrace("resolve_modal", {
               buttonIndex,
@@ -31600,7 +31633,10 @@ ${data.message || ""}`.trim();
             }
             this.setStatus("generating", "approval_resolved");
             this.onStatusChange?.();
-            if (this.shouldResolveModalWithEnter(modal, buttonIndex)) {
+            const startupTrustModal = /Quick safety check|project trust|trust (?:this project|the contents of this directory|the files in this folder)/i.test(String(modal?.message || ""));
+            if (startupTrustModal && buttonIndex in this.approvalKeys) {
+              this.ptyProcess.write(`${this.approvalKeys[buttonIndex]}\r`);
+            } else if (this.shouldResolveModalWithEnter(modal, buttonIndex)) {
               this.ptyProcess.write("\r");
             } else if (buttonIndex in this.approvalKeys) {
               this.ptyProcess.write(this.approvalKeys[buttonIndex]);
@@ -31621,20 +31657,24 @@ ${data.message || ""}`.trim();
             }
           }
           getDebugState() {
+            const screenText = sanitizeTerminalText(this.terminalScreen.getText());
+            const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
+            const effectiveStatus = startupModal ? "waiting_approval" : this.currentStatus;
+            const effectiveReady = this.ready || !!startupModal;
             return {
               type: this.cliType,
               name: this.cliName,
               providerResolution: this.providerResolutionMeta,
-              status: this.currentStatus,
-              ready: this.ready,
+              status: effectiveStatus,
+              ready: effectiveReady,
               startupParseGate: this.startupParseGate,
               spawnAt: this.spawnAt,
               workingDir: this.workingDir,
-              messages: this.messages.slice(-20),
-              committedMessages: this.committedMessages.slice(-20),
-              structuredMessages: this.structuredMessages.slice(-20),
+              messages: this.messages,
+              committedMessages: this.committedMessages,
+              structuredMessages: this.structuredMessages,
               messageCount: this.committedMessages.length,
-              screenText: sanitizeTerminalText(this.terminalScreen.getText()).slice(-4e3),
+              screenText: screenText.slice(-4e3),
               currentTurnScope: this.currentTurnScope,
               startupBuffer: this.startupBuffer.slice(-4e3),
               recentOutputBuffer: this.recentOutputBuffer.slice(-500),
@@ -31649,7 +31689,7 @@ ${data.message || ""}`.trim();
               lastScreenChangeAt: this.lastScreenChangeAt,
               lastScreenSnapshot: this.lastScreenSnapshot.slice(-500),
               isWaitingForResponse: this.isWaitingForResponse,
-              activeModal: this.activeModal,
+              activeModal: startupModal || this.activeModal,
               lastApprovalResolvedAt: this.lastApprovalResolvedAt,
               sendDelayMs: this.sendDelayMs,
               sendKey: this.sendKey,
@@ -31699,10 +31739,19 @@ ${data.message || ""}`.trim();
       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_MS2,
       DEFAULT_SESSION_HOST_APP_NAME: () => DEFAULT_SESSION_HOST_APP_NAME,
+      DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS: () => DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS2,
+      DEFAULT_SESSION_HOST_READY_TIMEOUT_MS: () => DEFAULT_SESSION_HOST_READY_TIMEOUT_MS2,
       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,
@@ -31714,10 +31763,13 @@ ${data.message || ""}`.trim();
       DevServer: () => DevServer,
       IdeProviderInstance: () => IdeProviderInstance,
       LOG: () => LOG2,
+      MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS: () => MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS2,
+      MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS: () => MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS2,
       NodePtyTransportFactory: () => NodePtyTransportFactory,
       ProviderCliAdapter: () => ProviderCliAdapter,
       ProviderInstanceManager: () => ProviderInstanceManager,
       ProviderLoader: () => ProviderLoader,
+      STANDALONE_CDP_SCAN_INTERVAL_MS: () => STANDALONE_CDP_SCAN_INTERVAL_MS2,
       SessionHostPtyTransportFactory: () => SessionHostPtyTransportFactory2,
       VersionArchive: () => VersionArchive,
       appendRecentActivity: () => appendRecentActivity,
@@ -36520,6 +36572,17 @@ ${effect.notification.body || ""}`.trim();
       }
     }
     init_logger();
+    var DEFAULT_CDP_SCAN_INTERVAL_MS = 3e4;
+    var DEFAULT_CDP_DISCOVERY_INTERVAL_MS = 3e4;
+    var DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS = 2e3;
+    var DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS = 3e4;
+    var DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS = 5e3;
+    var MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS2 = 5e3;
+    var DEFAULT_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS2 = 15e3;
+    var MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS2 = 5e3;
+    var DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS2 = 1e4;
+    var DEFAULT_SESSION_HOST_READY_TIMEOUT_MS2 = 15e3;
+    var STANDALONE_CDP_SCAN_INTERVAL_MS2 = 15e3;
     var DaemonCdpScanner = class {
       ctx;
       opts;
@@ -36553,7 +36616,7 @@ ${effect.notification.body || ""}`.trim();
        */
       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)) {
@@ -36573,7 +36636,7 @@ ${effect.notification.body || ""}`.trim();
       /**
        * 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()) {
@@ -36793,7 +36856,7 @@ ${effect.notification.body || ""}`.trim();
        * 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;
@@ -36807,7 +36870,7 @@ ${effect.notification.body || ""}`.trim();
       /**
        * 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()) {
@@ -45935,19 +45998,19 @@ Run 'adhdev doctor' for detailed diagnostics.`
       startReporting() {
         setTimeout(() => {
           this.sendUnifiedStatusReport({ forceServer: true, reason: "initial" }).catch((e) => LOG2.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) => LOG2.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) => LOG2.warn("Status", `P2P status send failed: ${e?.message}`));
           }
-        }, 5e3);
+        }, DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS);
       }
       stopReporting() {
         if (this.statusTimer) {
@@ -45965,14 +46028,14 @@ Run 'adhdev doctor' for detailed diagnostics.`
       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) => LOG2.warn("Status", `Throttled report failed: ${e?.message}`));
         } else if (!this.statusPendingThrottle) {
           this.statusPendingThrottle = true;
           setTimeout(() => {
             this.statusPendingThrottle = false;
             this.sendUnifiedStatusReport().catch((e) => LOG2.warn("Status", `Deferred report failed: ${e?.message}`));
-          }, 5e3 - elapsed);
+          }, DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS - elapsed);
         }
       }
       toDaemonStatusEventName(value) {
@@ -53183,7 +53246,7 @@ data: ${JSON.stringify(msg.data)}
       return resolveSessionHostAppNameResolution2(options).appName;
     }
     var import_session_host_core32 = require_dist();
-    var STARTUP_TIMEOUT_MS = 8e3;
+    var STARTUP_TIMEOUT_MS = DEFAULT_SESSION_HOST_READY_TIMEOUT_MS2;
     var STARTUP_POLL_MS = 200;
     async function canConnect(endpoint) {
       const client = new import_session_host_core32.SessionHostClient({ endpoint });
@@ -53591,8 +53654,8 @@ data: ${JSON.stringify(msg.data)}
         }
       });
       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",
@@ -53806,9 +53869,19 @@ var fs3 = __toESM(require("fs"));
 var os2 = __toESM(require("os"));
 var path2 = __toESM(require("path"));
 var import_daemon_core = __toESM(require_dist2());
+
+// ../daemon-core/src/runtime-defaults.ts
+var MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS = 5e3;
+var DEFAULT_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS = 15e3;
+var MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS = 5e3;
+var DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS = 1e4;
+var DEFAULT_SESSION_HOST_READY_TIMEOUT_MS = 15e3;
+var STANDALONE_CDP_SCAN_INTERVAL_MS = 15e3;
+
+// src/session-host.ts
 var SESSION_HOST_APP_NAME_RESOLUTION = (0, import_daemon_core.resolveSessionHostAppNameResolution)({ standalone: true });
 var SESSION_HOST_APP_NAME = SESSION_HOST_APP_NAME_RESOLUTION.appName;
-var SESSION_HOST_START_TIMEOUT_MS = 15e3;
+var SESSION_HOST_START_TIMEOUT_MS = DEFAULT_SESSION_HOST_READY_TIMEOUT_MS;
 function getStandaloneSessionHostAppName() {
   return SESSION_HOST_APP_NAME;
 }
@@ -54703,7 +54776,7 @@ var StandaloneServer = class {
         this.scheduleBroadcastStatus();
       },
       tickIntervalMs: 3e3,
-      cdpScanIntervalMs: 15e3
+      cdpScanIntervalMs: STANDALONE_CDP_SCAN_INTERVAL_MS
     });
     if (shouldAutoRestoreHostedSessionsOnStartup(process.env)) {
       await this.components.cliManager.restoreHostedSessions();
@@ -55467,7 +55540,10 @@ var StandaloneServer = class {
     }
   }
   buildMachineRuntimeUpdate(state, key) {
-    const intervalMs = Math.max(5e3, Number(state.request.params.intervalMs || 15e3));
+    const intervalMs = Math.max(
+      MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS,
+      Number(state.request.params.intervalMs || DEFAULT_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS)
+    );
     const now = Date.now();
     if (state.lastSentAt > 0 && now - state.lastSentAt < intervalMs) {
       return null;
@@ -55497,7 +55573,10 @@ var StandaloneServer = class {
   }
   async buildSessionHostDiagnosticsUpdate(state, key) {
     if (!this.sessionHostControl) return null;
-    const intervalMs = Math.max(5e3, Number(state.request.params.intervalMs || 1e4));
+    const intervalMs = Math.max(
+      MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS,
+      Number(state.request.params.intervalMs || DEFAULT_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS)
+    );
     const now = Date.now();
     if (state.lastSentAt > 0 && now - state.lastSentAt < intervalMs) {
       return null;