@adhdev/daemon-standalone 0.9.30 → 0.9.32

package/dist/index.js

@@ -28204,14 +28204,13 @@ var require_dist2 = __commonJS({
       const shouldOutput = LEVEL_NUM[level] >= LEVEL_NUM[currentLevel];
       const label = LEVEL_LABEL[level];
       const line = `[${ts2()}] [${label}] [${category}] ${msg}`;
+      if (!shouldOutput) return;
       writeToFile(line);
       ringBuffer.push({ ts: Date.now(), level, category, message: msg });
       if (ringBuffer.length > RING_BUFFER_SIZE) {
         ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
       }
-      if (shouldOutput) {
-        origConsoleLog(line);
-      }
+      origConsoleLog(line);
     }
     function installGlobalInterceptor() {
       if (interceptorInstalled) return;
@@ -30031,6 +30030,7 @@ var require_dist2 = __commonJS({
           static STATUS_HOT_PATH_PARSE_MIN_INTERVAL_MS = 1e3;
           static SCREEN_SNAPSHOT_MIN_INTERVAL_MS = 250;
           static MAX_TRACE_ENTRIES = 250;
+          static PARSE_MESSAGE_TAIL_LIMIT = 100;
           providerResolutionMeta;
           static FINISH_RETRY_DELAY_MS = 300;
           static MAX_FINISH_RETRIES = 2;
@@ -30062,6 +30062,32 @@ var require_dist2 = __commonJS({
             }
             return null;
           }
+          selectParseBaseMessages(baseMessages) {
+            if (baseMessages.length <= _ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT) return baseMessages;
+            return baseMessages.slice(-_ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT);
+          }
+          messagesComparable(left, right) {
+            if (!left || !right) return false;
+            if ((left.role || "") !== (right.role || "")) return false;
+            const leftText = normalizeComparableTranscriptText(left.content);
+            const rightText = normalizeComparableTranscriptText(right.content);
+            return !!leftText && leftText === rightText;
+          }
+          stitchParsedMessagesWithCommittedBase(parsedMessages, fullBaseMessages, parseBaseMessages) {
+            if (!Array.isArray(parsedMessages) || parsedMessages.length === 0) return parsedMessages;
+            if (fullBaseMessages.length <= parseBaseMessages.length) return parsedMessages;
+            const parsedFirst = parsedMessages[0];
+            const fullFirst = fullBaseMessages[0];
+            if (parsedMessages.length >= fullBaseMessages.length && this.messagesComparable(parsedFirst, fullFirst)) {
+              return parsedMessages;
+            }
+            const tailFirst = parseBaseMessages[0];
+            if (tailFirst && this.messagesComparable(parsedFirst, tailFirst)) {
+              const prefixLength = fullBaseMessages.length - parseBaseMessages.length;
+              return [...fullBaseMessages.slice(0, prefixLength), ...parsedMessages];
+            }
+            return [...fullBaseMessages, ...parsedMessages];
+          }
           getIdleFinishConfirmMs() {
             return this.timeouts.idleFinishConfirm;
           }
@@ -30647,7 +30673,7 @@ var require_dist2 = __commonJS({
             const ctx = { now, modal, status, parsedMessages, lastParsedAssistant, parsedStatus: parsedStatus || null, prevStatus };
             if (!this.applyPendingScriptStatusDebounce(ctx)) return;
             const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
-            LOG2.info(
+            LOG2.debug(
               "CLI",
               `[${this.cliType}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 140)} status=${String(status || "")} parsedStatus=${String(parsedStatus || "")} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify(summarizeCliTraceText(lastParsedAssistant?.content || "", 120)).slice(0, 160)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 160)).slice(0, 220)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 160)).slice(0, 220)}`
             );
@@ -31014,18 +31040,26 @@ var require_dist2 = __commonJS({
               try {
                 const screenText = this.terminalScreen.getText();
                 const tail = this.recentOutputBuffer.slice(-500);
+                const parseBaseMessages = this.selectParseBaseMessages(this.committedMessages);
                 const input = buildCliParseInput({
                   accumulatedBuffer: this.accumulatedBuffer,
                   accumulatedRawBuffer: this.accumulatedRawBuffer,
                   recentOutputBuffer: this.recentOutputBuffer,
                   terminalScreenText: screenText,
-                  baseMessages: this.committedMessages,
+                  baseMessages: parseBaseMessages,
                   partialResponse: this.responseBuffer,
                   isWaitingForResponse: this.isWaitingForResponse,
                   scope: this.currentTurnScope,
                   runtimeSettings: this.runtimeSettings
                 });
                 const session = this.cliScripts.parseSession({ ...input, tail, tailScreen: buildCliScreenSnapshot(tail) });
+                if (session && typeof session === "object" && Array.isArray(session.messages)) {
+                  session.messages = this.stitchParsedMessagesWithCommittedBase(
+                    session.messages,
+                    this.committedMessages,
+                    parseBaseMessages
+                  );
+                }
                 this.parseErrorMessage = null;
                 return session && typeof session === "object" ? session : null;
               } catch (e) {
@@ -31346,12 +31380,13 @@ var require_dist2 = __commonJS({
             }
             try {
               const screenText = typeof screenTextOverride === "string" ? screenTextOverride : this.terminalScreen.getText();
+              const parseBaseMessages = this.selectParseBaseMessages(baseMessages);
               const input = buildCliParseInput({
                 accumulatedBuffer: this.accumulatedBuffer,
                 accumulatedRawBuffer: this.accumulatedRawBuffer,
                 recentOutputBuffer: this.recentOutputBuffer,
                 terminalScreenText: screenText,
-                baseMessages,
+                baseMessages: parseBaseMessages,
                 partialResponse,
                 isWaitingForResponse: this.isWaitingForResponse,
                 scope,
@@ -31363,6 +31398,11 @@ var require_dist2 = __commonJS({
               }
               const normalizedParsed = this.suppressStaleParsedApproval(parsed, input.recentBuffer, input.screenText);
               if (normalizedParsed && Array.isArray(normalizedParsed.messages)) {
+                normalizedParsed.messages = this.stitchParsedMessagesWithCommittedBase(
+                  normalizedParsed.messages,
+                  baseMessages,
+                  parseBaseMessages
+                );
                 this.trimLastAssistantEcho(normalizedParsed.messages, scope?.prompt || getLastUserPromptText(baseMessages));
               }
               this.parseErrorMessage = null;
@@ -31972,7 +32012,7 @@ var require_dist2 = __commonJS({
       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_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS: () => DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS2,
       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,
@@ -32955,7 +32995,7 @@ var require_dist2 = __commonJS({
       "waiting_approval",
       "starting"
     ]);
-    var DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS = 8e3;
+    var DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS2 = 8e3;
     var LIVE_RUNTIME_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
     function parseMessageTimestamp(value) {
       if (typeof value === "number" && Number.isFinite(value)) return value;
@@ -32986,9 +33026,10 @@ var require_dist2 = __commonJS({
       const now = options.now ?? Date.now();
       const recentMessageGraceMs = Math.max(
         0,
-        Number.isFinite(options.recentMessageGraceMs) ? Number(options.recentMessageGraceMs) : DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS
+        Number.isFinite(options.recentMessageGraceMs) ? Number(options.recentMessageGraceMs) : DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS2
       );
       const activeStatuses = options.activeStatuses ?? DEFAULT_ACTIVE_CHAT_POLL_STATUSES;
+      const activeSessionIds = options.activeSessionIds ?? /* @__PURE__ */ new Set();
       const active = /* @__PURE__ */ new Set();
       const excluded = /* @__PURE__ */ new Set();
       for (const session of sessions) {
@@ -32998,6 +33039,10 @@ var require_dist2 = __commonJS({
           excluded.add(sessionId);
           continue;
         }
+        if (activeSessionIds.has(sessionId)) {
+          active.add(sessionId);
+          continue;
+        }
         const status = String(session?.status || "").toLowerCase();
         const unread = session?.unread === true;
         const inboxBucket = String(session?.inboxBucket || "").toLowerCase();
@@ -38483,6 +38528,7 @@ ${effect.notification.body || ""}`.trim();
         return { success: false, error: `${transport} adapter not found` };
       }
       if (isExtensionTransport(transport)) {
+        let extensionReadChatError = "";
         try {
           const evalResult = await h.evaluateProviderScript("readChat", void 0, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
           if (evalResult?.result) {
@@ -38490,7 +38536,8 @@ ${effect.notification.body || ""}`.trim();
             if (typeof parsed === "string") {
               try {
                 parsed = JSON.parse(parsed);
-              } catch {
+              } catch (e) {
+                extensionReadChatError = `extension read_chat parse failed: ${e?.message || String(e)}`;
               }
             }
             if (parsed && typeof parsed === "object") {
@@ -38515,8 +38562,14 @@ ${effect.notification.body || ""}`.trim();
               );
               return buildReadChatCommandResult(validated, args);
             }
+            if (!extensionReadChatError) {
+              extensionReadChatError = "extension read_chat returned a non-object payload";
+            }
+          } else {
+            extensionReadChatError = "extension read_chat returned no payload";
           }
         } catch (e) {
+          extensionReadChatError = `extension read_chat failed: ${e?.message || String(e)}`;
           _log(`Extension error: ${e.message}`);
           traceProviderEvent(args, "provider", "extension.read_chat.error", {
             h,
@@ -38530,8 +38583,8 @@ ${effect.notification.body || ""}`.trim();
           const parentSessionId = h.currentSession?.parentSessionId;
           if (cdp2 && parentSessionId) {
             const stream = await h.agentStream.collectActiveSession(cdp2, parentSessionId);
-            if (stream?.agentType !== provider?.type) {
-              return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
+            if (stream && stream.agentType !== provider?.type) {
+              return { success: false, error: `extension read_chat stream agent mismatch for ${provider?.type || "unknown_extension"}` };
             }
             if (stream) {
               h.historyWriter.appendNewMessages(
@@ -38549,12 +38602,13 @@ ${effect.notification.body || ""}`.trim();
             }
           }
         }
-        return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
+        return { success: false, error: extensionReadChatError || "extension read_chat unavailable" };
       }
       const cdp = h.getCdp();
       if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
       const webviewScript = h.getProviderScript("webviewReadChat") || h.getProviderScript("webview_read_chat");
       if (webviewScript) {
+        let webviewReadChatError = "";
         try {
           const matchText = provider?.webviewMatchText;
           const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
@@ -38564,7 +38618,8 @@ ${effect.notification.body || ""}`.trim();
             if (typeof parsed === "string") {
               try {
                 parsed = JSON.parse(parsed);
-              } catch {
+              } catch (e) {
+                webviewReadChatError = `webview read_chat parse failed: ${e?.message || String(e)}`;
               }
             }
             if (parsed && typeof parsed === "object") {
@@ -38579,14 +38634,21 @@ ${effect.notification.body || ""}`.trim();
               );
               return buildReadChatCommandResult(validated, args);
             }
+            if (!webviewReadChatError) {
+              webviewReadChatError = "webview read_chat returned a non-object payload";
+            }
+          } else {
+            webviewReadChatError = "webview read_chat returned no payload";
           }
         } catch (e) {
+          webviewReadChatError = `webview read_chat failed: ${e?.message || String(e)}`;
           _log(`Webview readChat error: ${e.message}`);
         }
-        return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
+        return { success: false, error: webviewReadChatError || "webview read_chat unavailable" };
       }
       const script = h.getProviderScript("readChat") || h.getProviderScript("read_chat");
       if (script) {
+        let ideReadChatError = "";
         try {
           const evalResult = await h.evaluateProviderScript("readChat", void 0, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
           if (evalResult?.result) {
@@ -38594,12 +38656,13 @@ ${effect.notification.body || ""}`.trim();
             if (typeof parsed === "string") {
               try {
                 parsed = JSON.parse(parsed);
-              } catch {
+              } catch (e) {
+                ideReadChatError = `ide read_chat parse failed: ${e?.message || String(e)}`;
               }
             }
-            if (parsed && typeof parsed === "object" && parsed.messages?.length > 0) {
+            if (parsed && typeof parsed === "object") {
               const validated = validateReadChatResultPayload(parsed, "ide read_chat");
-              _log(`OK: ${validated.messages?.length} msgs`);
+              _log(`OK: ${validated.messages?.length || 0} msgs`);
               traceProviderEvent(args, "provider", "ide.read_chat.success", {
                 h,
                 provider,
@@ -38619,8 +38682,14 @@ ${effect.notification.body || ""}`.trim();
               );
               return buildReadChatCommandResult(validated, args);
             }
+            if (!ideReadChatError) {
+              ideReadChatError = "ide read_chat returned a non-object payload";
+            }
+          } else {
+            ideReadChatError = "ide read_chat returned no payload";
           }
         } catch (e) {
+          ideReadChatError = `ide read_chat failed: ${e?.message || String(e)}`;
           LOG2.info("Command", `[read_chat] Script error: ${e.message}`);
           traceProviderEvent(args, "provider", "ide.read_chat.error", {
             h,
@@ -38629,8 +38698,9 @@ ${effect.notification.body || ""}`.trim();
             payload: { method: "evaluate", error: e.message }
           });
         }
+        return { success: false, error: ideReadChatError || "ide read_chat unavailable" };
       }
-      return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
+      return { success: false, error: "read_chat unavailable" };
     }
     async function handleSendChat(h, args) {
       const input = getSendChatInputEnvelope(args);
@@ -43834,6 +43904,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
       log(msg) {
         this.logFn(`[ProviderLoader] ${msg}`);
       }
+      debugLog(msg) {
+        LOG2.debug("Provider", `[ProviderLoader] ${msg}`);
+      }
       // ─── Public API ────────────────────────────────
       /**
        * User override root (~/.adhdev/providers by default).
@@ -44440,7 +44513,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 const loaded = this.loadScriptsFromDir(type, entry.scriptDir);
                 if (loaded) {
                   resolved.scripts = loaded;
-                  this.log(`  [compatibility] ${type} v${currentVersion} \u2192 ${entry.scriptDir}`);
+                  this.debugLog(`  [compatibility] ${type} v${currentVersion} \u2192 ${entry.scriptDir}`);
                   resolved._resolvedScriptDir = entry.scriptDir;
                   resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
                   if (providerDir) {
@@ -44456,7 +44529,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               const loaded = this.loadScriptsFromDir(type, base.defaultScriptDir);
               if (loaded) {
                 resolved.scripts = loaded;
-                this.log(`  [compatibility] ${type} v${currentVersion} \u2192 default: ${base.defaultScriptDir}`);
+                this.debugLog(`  [compatibility] ${type} v${currentVersion} \u2192 default: ${base.defaultScriptDir}`);
                 resolved._resolvedScriptDir = base.defaultScriptDir;
                 resolved._resolvedScriptsSource = "defaultScriptDir:version_miss";
                 if (providerDir) {
@@ -44491,7 +44564,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           const loaded = this.loadScriptsFromDir(type, base.defaultScriptDir);
           if (loaded) {
             resolved.scripts = loaded;
-            this.log(`  [compatibility] ${type} no version detected \u2192 default: ${base.defaultScriptDir}`);
+            this.debugLog(`  [compatibility] ${type} no version detected \u2192 default: ${base.defaultScriptDir}`);
             resolved._resolvedScriptDir = base.defaultScriptDir;
             resolved._resolvedScriptsSource = "defaultScriptDir:no_version";
             if (providerDir) {
@@ -55511,6 +55584,8 @@ async function getWorkspaceSocketInfo(workspaceName) {
 var import_daemon_core3 = __toESM(require_dist2());
 var DEFAULT_PORT = 3847;
 var STATUS_INTERVAL = 2e3;
+var CHAT_OUTPUT_ACTIVITY_HOT_MS = import_daemon_core3.DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS;
+var CHAT_OUTPUT_FLUSH_DEBOUNCE_MS = 700;
 var STANDALONE_AUTH_SESSION_COOKIE = "adhdev_standalone_session";
 var STANDALONE_PASSWORD_CONFIG_FILE = "standalone-auth.json";
 var STANDALONE_PREFERENCES_CONFIG_FILE = "standalone-network.json";
@@ -55711,6 +55786,8 @@ var StandaloneServer = class {
   wsChatFlushInFlight = false;
   pendingWsChatFlush = null;
   hotWsChatSessionIds = /* @__PURE__ */ new Set();
+  wsChatOutputActiveAt = /* @__PURE__ */ new Map();
+  wsChatOutputFlushTimer = null;
   running = false;
   components = null;
   devServer = null;
@@ -55760,6 +55837,26 @@ var StandaloneServer = class {
     const mode = this.getCliPresentationMode(sessionId);
     return mode === "chat" || mode === "terminal";
   }
+  getRecentlyOutputActiveChatSessionIds(now) {
+    const active = /* @__PURE__ */ new Set();
+    for (const [sessionId, lastOutputAt] of this.wsChatOutputActiveAt) {
+      if (now - lastOutputAt <= CHAT_OUTPUT_ACTIVITY_HOT_MS) {
+        active.add(sessionId);
+      } else {
+        this.wsChatOutputActiveAt.delete(sessionId);
+      }
+    }
+    return active;
+  }
+  markWsChatOutputActivity(sessionId) {
+    if (!sessionId || !this.isCliSession(sessionId)) return;
+    this.wsChatOutputActiveAt.set(sessionId, Date.now());
+    if (this.wsChatOutputFlushTimer || this.clients.size === 0) return;
+    this.wsChatOutputFlushTimer = setTimeout(() => {
+      this.wsChatOutputFlushTimer = null;
+      void this.flushWsChatSubscriptions(void 0, { onlyActive: true });
+    }, CHAT_OUTPUT_FLUSH_DEBOUNCE_MS);
+  }
   hasPasswordAuth() {
     return !!this.passwordConfig;
   }
@@ -55857,6 +55954,7 @@ var StandaloneServer = class {
         getP2p: () => ({
           broadcastSessionOutput: (key, data) => {
             if (this.clients.size === 0 || !this.isCliSession(key)) return;
+            this.markWsChatOutputActivity(key);
             const msg = JSON.stringify({ type: "session_output", sessionId: key, data });
             for (const client of this.clients) {
               if (client.readyState === 1) {
@@ -56617,10 +56715,12 @@ var StandaloneServer = class {
     return prepared.update;
   }
   getHotChatSessionIdsForWsFlush() {
+    const now = Date.now();
     const snapshot = this.buildSharedSnapshot("live");
     const hotSessions = (0, import_daemon_core3.classifyHotChatSessionsForSubscriptionFlush)(
       snapshot.sessions,
-      this.hotWsChatSessionIds
+      this.hotWsChatSessionIds,
+      { now, activeSessionIds: this.getRecentlyOutputActiveChatSessionIds(now) }
     );
     this.hotWsChatSessionIds = hotSessions.active;
     return hotSessions;