adhdev 0.9.30 → 0.9.32

package/dist/cli/index.js

@@ -1738,6 +1738,7 @@ function classifyHotChatSessionsForSubscriptionFlush(sessions, previousHotSessio
     Number.isFinite(options.recentMessageGraceMs) ? Number(options.recentMessageGraceMs) : DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS
   );
   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) {
@@ -1747,6 +1748,10 @@ function classifyHotChatSessionsForSubscriptionFlush(sessions, previousHotSessio
       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();
@@ -1862,14 +1867,13 @@ function daemonLog(category, msg, level = "info") {
   const shouldOutput = LEVEL_NUM[level] >= LEVEL_NUM[currentLevel];
   const label = LEVEL_LABEL[level];
   const line = `[${ts()}] [${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;
@@ -8213,6 +8217,7 @@ async function handleReadChat(h, args) {
     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) {
@@ -8220,7 +8225,8 @@ async function handleReadChat(h, args) {
         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") {
@@ -8245,8 +8251,14 @@ async function handleReadChat(h, args) {
           );
           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,
@@ -8260,8 +8272,8 @@ async function handleReadChat(h, args) {
       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(
@@ -8279,12 +8291,13 @@ async function handleReadChat(h, args) {
         }
       }
     }
-    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;
@@ -8294,7 +8307,8 @@ async function handleReadChat(h, args) {
         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") {
@@ -8309,14 +8323,21 @@ async function handleReadChat(h, args) {
           );
           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) {
@@ -8324,12 +8345,13 @@ async function handleReadChat(h, args) {
         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,
@@ -8349,8 +8371,14 @@ async function handleReadChat(h, args) {
           );
           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)}`;
       LOG.info("Command", `[read_chat] Script error: ${e.message}`);
       traceProviderEvent(args, "provider", "ide.read_chat.error", {
         h,
@@ -8359,8 +8387,9 @@ async function handleReadChat(h, args) {
         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);
@@ -12771,6 +12800,7 @@ var init_provider_cli_adapter = __esm({
       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;
@@ -12802,6 +12832,32 @@ var init_provider_cli_adapter = __esm({
         }
         return null;
       }
+      selectParseBaseMessages(baseMessages) {
+        if (baseMessages.length <= _ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT) return baseMessages;
+        return baseMessages.slice(-_ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT);
+      }
+      messagesComparable(left2, right2) {
+        if (!left2 || !right2) return false;
+        if ((left2.role || "") !== (right2.role || "")) return false;
+        const leftText = normalizeComparableTranscriptText(left2.content);
+        const rightText = normalizeComparableTranscriptText(right2.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;
       }
@@ -13387,7 +13443,7 @@ var init_provider_cli_adapter = __esm({
         const ctx = { now, modal, status, parsedMessages, lastParsedAssistant, parsedStatus: parsedStatus || null, prevStatus };
         if (!this.applyPendingScriptStatusDebounce(ctx)) return;
         const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
-        LOG.info(
+        LOG.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)}`
         );
@@ -13754,18 +13810,26 @@ var init_provider_cli_adapter = __esm({
           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) {
@@ -14086,12 +14150,13 @@ var init_provider_cli_adapter = __esm({
         }
         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,
@@ -14103,6 +14168,11 @@ var init_provider_cli_adapter = __esm({
           }
           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;
@@ -35963,6 +36033,9 @@ var init_provider_loader = __esm({
       log(msg) {
         this.logFn(`[ProviderLoader] ${msg}`);
       }
+      debugLog(msg) {
+        LOG.debug("Provider", `[ProviderLoader] ${msg}`);
+      }
       // ─── Public API ────────────────────────────────
       /**
        * User override root (~/.adhdev/providers by default).
@@ -36569,7 +36642,7 @@ var init_provider_loader = __esm({
                 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) {
@@ -36585,7 +36658,7 @@ var init_provider_loader = __esm({
               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) {
@@ -36620,7 +36693,7 @@ var init_provider_loader = __esm({
           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) {
@@ -87766,7 +87839,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.30" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.32" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -87780,8 +87853,12 @@ var init_adhdev_daemon = __esm({
       pendingP2PChatFlush = false;
       pendingP2PChatFlushOnlyActive = true;
       hotP2PChatSessionIds = /* @__PURE__ */ new Set();
+      p2pChatOutputActiveAt = /* @__PURE__ */ new Map();
+      p2pChatOutputFlushTimer = null;
       hotChatSnapshotCache = null;
       static HOT_CHAT_SNAPSHOT_CACHE_TTL_MS = 1500;
+      static CHAT_OUTPUT_ACTIVITY_HOT_MS = DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS;
+      static CHAT_OUTPUT_FLUSH_DEBOUNCE_MS = 700;
       components = null;
       sessionHostEndpoint = null;
       sessionHostController = null;
@@ -87966,6 +88043,26 @@ var init_adhdev_daemon = __esm({
       invalidateHotChatSnapshotCache() {
         this.hotChatSnapshotCache = null;
       }
+      getRecentlyOutputActiveChatSessionIds(now) {
+        const active = /* @__PURE__ */ new Set();
+        for (const [sessionId, lastOutputAt] of this.p2pChatOutputActiveAt) {
+          if (now - lastOutputAt <= _AdhdevDaemon.CHAT_OUTPUT_ACTIVITY_HOT_MS) {
+            active.add(sessionId);
+          } else {
+            this.p2pChatOutputActiveAt.delete(sessionId);
+          }
+        }
+        return active;
+      }
+      markP2PChatOutputActivity(sessionId) {
+        if (!sessionId || !this.isCliSession(sessionId)) return;
+        this.p2pChatOutputActiveAt.set(sessionId, Date.now());
+        if (this.p2pChatOutputFlushTimer || !this.p2p?.isConnected || !this.p2p.hasChatSubscriptions()) return;
+        this.p2pChatOutputFlushTimer = setTimeout(() => {
+          this.p2pChatOutputFlushTimer = null;
+          void this.flushP2PChatSubscriptions({ onlyActive: true });
+        }, _AdhdevDaemon.CHAT_OUTPUT_FLUSH_DEBOUNCE_MS);
+      }
       getHotChatSessionIdsForP2PFlush() {
         const now = Date.now();
         const cached2 = this.hotChatSnapshotCache;
@@ -87976,7 +88073,8 @@ var init_adhdev_daemon = __esm({
         })();
         const hotSessions = classifyHotChatSessionsForSubscriptionFlush(
           sessions,
-          this.hotP2PChatSessionIds
+          this.hotP2PChatSessionIds,
+          { activeSessionIds: this.getRecentlyOutputActiveChatSessionIds(now) }
         );
         this.hotP2PChatSessionIds = hotSessions.active;
         return hotSessions;
@@ -88201,6 +88299,7 @@ ${err?.stack || ""}`);
               getP2p: () => ({
                 broadcastSessionOutput: (key, data) => {
                   if (!this.isCliSession(key)) return;
+                  this.markP2PChatOutputActivity(key);
                   this.p2p?.broadcastSessionOutput(key, data);
                 }
               }),