@adhdev/daemon-core 0.9.31 → 0.9.33

package/dist/cli-adapters/provider-cli-adapter.d.ts

@@ -103,6 +103,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private static readonly STATUS_HOT_PATH_PARSE_MIN_INTERVAL_MS;
     private static readonly SCREEN_SNAPSHOT_MIN_INTERVAL_MS;
     private static readonly MAX_TRACE_ENTRIES;
+    private static readonly PARSE_MESSAGE_TAIL_LIMIT;
     private readonly providerResolutionMeta;
     private static readonly FINISH_RETRY_DELAY_MS;
     private static readonly MAX_FINISH_RETRIES;
@@ -111,6 +112,9 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private shouldReadTerminalScreenSnapshot;
     private resetTerminalScreen;
     private getFreshParsedStatusCache;
+    private selectParseBaseMessages;
+    private messagesComparable;
+    private stitchParsedMessagesWithCommittedBase;
     private getIdleFinishConfirmMs;
     private getStatusActivityHoldMs;
     private setStatus;

package/dist/index.js

@@ -350,14 +350,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;
@@ -2164,6 +2163,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;
@@ -2195,6 +2195,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(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;
       }
@@ -2780,7 +2806,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)}`
         );
@@ -3147,18 +3173,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) {
@@ -3479,12 +3513,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,
@@ -3496,6 +3531,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;
@@ -5146,6 +5186,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) {
@@ -5155,6 +5196,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();
@@ -10464,6 +10509,26 @@ function toHistoryPersistedMessages(messages) {
     historyDedupKey: deriveHistoryDedupKey(message)
   }));
 }
+function findLastMessageIndexBySignature(messages, signature) {
+  if (!signature) return -1;
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    if (getChatMessageSignature(messages[index]) === signature) {
+      return index;
+    }
+  }
+  return -1;
+}
+function buildBoundedTailSync(messages, cursor) {
+  const totalMessages = messages.length;
+  const tailMessages = cursor.tailLimit > 0 && totalMessages > cursor.tailLimit ? messages.slice(-cursor.tailLimit) : messages;
+  return {
+    syncMode: "full",
+    replaceFrom: 0,
+    messages: tailMessages,
+    totalMessages,
+    lastMessageSignature: getChatMessageSignature(messages[totalMessages - 1])
+  };
+}
 function computeReadChatSync(messages, cursor) {
   const totalMessages = messages.length;
   const lastMessageSignature = getChatMessageSignature(messages[totalMessages - 1]);
@@ -10495,6 +10560,15 @@ function computeReadChatSync(messages, cursor) {
       lastMessageSignature
     };
   }
+  if (cursor.tailLimit > 0 && knownSignature === lastMessageSignature) {
+    return {
+      syncMode: "noop",
+      replaceFrom: totalMessages,
+      messages: [],
+      totalMessages,
+      lastMessageSignature
+    };
+  }
   if (knownMessageCount < totalMessages) {
     const anchorSignature = getChatMessageSignature(messages[knownMessageCount - 1]);
     if (anchorSignature === knownSignature) {
@@ -10506,6 +10580,19 @@ function computeReadChatSync(messages, cursor) {
         lastMessageSignature
       };
     }
+    if (cursor.tailLimit > 0) {
+      const signatureIndex = findLastMessageIndexBySignature(messages, knownSignature);
+      if (signatureIndex >= 0) {
+        return {
+          syncMode: "append",
+          replaceFrom: knownMessageCount,
+          messages: messages.slice(signatureIndex + 1),
+          totalMessages,
+          lastMessageSignature
+        };
+      }
+      return buildBoundedTailSync(messages, cursor);
+    }
   }
   const replaceFrom = Math.max(0, Math.min(knownMessageCount - 1, totalMessages));
   return {
@@ -16114,6 +16201,9 @@ var ProviderLoader = class _ProviderLoader {
   log(msg) {
     this.logFn(`[ProviderLoader] ${msg}`);
   }
+  debugLog(msg) {
+    LOG.debug("Provider", `[ProviderLoader] ${msg}`);
+  }
   // ─── Public API ────────────────────────────────
   /**
    * User override root (~/.adhdev/providers by default).
@@ -16503,10 +16593,22 @@ var ProviderLoader = class _ProviderLoader {
   setMachineProviderEnabled(type, enabled) {
     return this.setMachineProviderConfig(type, { enabled });
   }
+  getEffectiveProviderAvailability(type) {
+    const providerType = this.resolveAlias(type);
+    const availability = this.providerAvailability.get(providerType);
+    if (availability) return availability;
+    const machineConfig = this.getMachineProviderConfig(providerType);
+    const lastDetection = machineConfig.lastDetection;
+    if (!lastDetection) return void 0;
+    return {
+      installed: lastDetection.ok === true,
+      detectedPath: typeof lastDetection.path === "string" && lastDetection.path.trim() ? lastDetection.path.trim() : null
+    };
+  }
   getMachineProviderStatus(type) {
     const providerType = this.resolveAlias(type);
     if (!this.isMachineProviderEnabled(providerType)) return "disabled";
-    const availability = this.providerAvailability.get(providerType);
+    const availability = this.getEffectiveProviderAvailability(providerType);
     if (!availability) return "enabled_unchecked";
     return availability.installed ? "detected" : "not_detected";
   }
@@ -16634,7 +16736,7 @@ var ProviderLoader = class _ProviderLoader {
   }
   getAvailableProviderInfos() {
     return this.getAll().map((provider) => {
-      const availability = this.providerAvailability.get(provider.type);
+      const availability = this.getEffectiveProviderAvailability(provider.type);
       const enabled = this.isMachineProviderEnabled(provider.type);
       const machineConfig = this.getMachineProviderConfig(provider.type);
       return {
@@ -16720,7 +16822,7 @@ var ProviderLoader = class _ProviderLoader {
             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) {
@@ -16736,7 +16838,7 @@ var ProviderLoader = class _ProviderLoader {
           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) {
@@ -16771,7 +16873,7 @@ var ProviderLoader = class _ProviderLoader {
       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) {