@adhdev/daemon-core 0.9.82-rc.91 → 0.9.82-rc.93

package/dist/index.js

@@ -5881,7 +5881,7 @@ ${lastSnapshot}`;
         const parseScreenText = this.getParseScreenText(screenText);
         const cached = this.parsedStatusCache;
         const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
-        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBufferKey === accumulatedRawBufferKey && cached.screenText === parseScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
+        if (!this.providerOwnsTranscript() && cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBufferKey === accumulatedRawBufferKey && cached.screenText === parseScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
           return cached.result;
         }
         const parsed = this.runParseSession();
@@ -15999,6 +15999,13 @@ function getCurrentManagerKey(h) {
 function getTargetedCliAdapter(h, args, providerType) {
   return h.getCliAdapter(args?.targetSessionId || providerType || h.currentSession?.providerType || h.currentManagerKey);
 }
+function getExplicitHistorySessionId(args) {
+  const explicit = typeof args?.historySessionId === "string" ? args.historySessionId.trim() : "";
+  if (explicit) return explicit;
+  const explicitProviderSessionId = typeof args?.providerSessionId === "string" ? args.providerSessionId.trim() : "";
+  if (explicitProviderSessionId) return explicitProviderSessionId;
+  return void 0;
+}
 function getTargetInstance(h, args) {
   const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
   const sessionId = targetSessionId || h.currentSession?.sessionId || "";
@@ -16067,13 +16074,14 @@ async function waitOnceForFreshHermesCliStart(adapter, log) {
   await sleep(HERMES_CLI_STARTING_SEND_SETTLE_MS);
 }
 function getHistorySessionId(h, args) {
-  const explicit = typeof args?.historySessionId === "string" ? args.historySessionId.trim() : "";
+  const explicit = getExplicitHistorySessionId(args);
   if (explicit) return explicit;
-  const explicitProviderSessionId = typeof args?.providerSessionId === "string" ? args.providerSessionId.trim() : "";
-  if (explicitProviderSessionId) return explicitProviderSessionId;
   const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
   if (!targetSessionId) return void 0;
-  const instance = h.ctx.instanceManager?.getInstance(targetSessionId);
+  const session = h.ctx.sessionRegistry?.get(targetSessionId);
+  const registeredProviderSessionId = typeof session?.providerSessionId === "string" ? session.providerSessionId.trim() : "";
+  if (registeredProviderSessionId) return registeredProviderSessionId;
+  const instance = getTargetInstance(h, args);
   const state = instance?.getState?.();
   const providerSessionId = typeof state?.providerSessionId === "string" ? state.providerSessionId.trim() : "";
   if (providerSessionId) return providerSessionId;
@@ -16084,6 +16092,15 @@ function getHistorySessionId(h, args) {
   }
   return targetSessionId;
 }
+function resolveCliNativeHistorySessionId(args, currentHistorySessionId, parsedProviderSessionId) {
+  const explicit = getExplicitHistorySessionId(args);
+  if (explicit) return explicit;
+  const parsed = typeof parsedProviderSessionId === "string" ? parsedProviderSessionId.trim() : "";
+  const current = typeof currentHistorySessionId === "string" ? currentHistorySessionId.trim() : "";
+  const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
+  if (parsed && (!current || current === targetSessionId)) return parsed;
+  return current || parsed || void 0;
+}
 function getInteractionId(args) {
   return typeof args?._interactionId === "string" && args._interactionId.trim() ? args._interactionId.trim() : void 0;
 }
@@ -16228,6 +16245,29 @@ function supportsCliNativeTranscript(providerType, provider) {
   if (CLI_NATIVE_TRANSCRIPT_PROVIDERS.has(providerType)) return true;
   return provider?.category === "cli" && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
 }
+function getComparableVisibleText(message) {
+  if (!message) return "";
+  const role = String(message.role || "").trim().toLowerCase();
+  if (role !== "user" && role !== "assistant") return "";
+  const kind = String(message.kind || "standard").trim().toLowerCase();
+  if (kind && kind !== "standard") return "";
+  const content = flattenContent(message.content).replace(/\s+/g, " ").trim();
+  return content;
+}
+function hasOverlappingVisibleConversationText(nativeMessages, ptyMessages) {
+  const nativeTexts = nativeMessages.map(getComparableVisibleText).filter(Boolean);
+  const ptyTexts = ptyMessages.map(getComparableVisibleText).filter(Boolean);
+  if (nativeTexts.length === 0 || ptyTexts.length === 0) return false;
+  for (const nativeText of nativeTexts) {
+    for (const ptyText of ptyTexts) {
+      if (nativeText === ptyText) return true;
+      const shorter = nativeText.length <= ptyText.length ? nativeText : ptyText;
+      const longer = nativeText.length <= ptyText.length ? ptyText : nativeText;
+      if (shorter.length >= 32 && longer.includes(shorter)) return true;
+    }
+  }
+  return false;
+}
 function hasSafeNativeHistoryMapping(args) {
   const explicitSessionId = String(args.historySessionId || args.providerSessionId || "").trim();
   if (explicitSessionId) {
@@ -16237,7 +16277,10 @@ function hasSafeNativeHistoryMapping(args) {
   }
   const workspace = String(args.workspace || "").trim();
   if (!workspace) return false;
-  return args.nativeMessages.some((message) => String(message?.workspace || "").trim() === workspace);
+  const workspaceMatches = args.nativeMessages.some((message) => String(message?.workspace || "").trim() === workspace);
+  if (!workspaceMatches) return false;
+  if (!args.requireWorkspaceContentOverlap) return true;
+  return hasOverlappingVisibleConversationText(args.nativeMessages, args.ptyMessages || []);
 }
 function readCliProviderNativeHistory(agentStr, args) {
   const sessionHistory = readProviderChatHistory(agentStr, {
@@ -16276,6 +16319,19 @@ function isNativeHistoryFreshEnough(args) {
 function shouldPreserveReadChatPayloadField(key) {
   return key === "messageSource" || key === "transcriptProvenance";
 }
+function updateMessageSourceReturnedCount(value, returnedMessageCount) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return value;
+  const record = value;
+  const coverage = record.coverage && typeof record.coverage === "object" && !Array.isArray(record.coverage) ? record.coverage : void 0;
+  if (!coverage) return value;
+  return {
+    ...record,
+    coverage: {
+      ...coverage,
+      returnedMessageCount
+    }
+  };
+}
 function deriveHistoryDedupKey(message) {
   const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
   if (unitKey) return `read_chat:${unitKey}`;
@@ -16387,6 +16443,13 @@ function buildReadChatCommandResult(payload, args) {
   const visibleMessages = filterUserFacingChatMessages(messages);
   const sync = buildFullTail(visibleMessages, normalizeReadChatTailLimit(args));
   const hiddenMsgCount = Math.max(0, messages.length - visibleMessages.length);
+  const preservedPayloadFields = Object.fromEntries(Object.entries(payload).filter(([key]) => shouldPreserveReadChatPayloadField(key)));
+  if (preservedPayloadFields.messageSource) {
+    preservedPayloadFields.messageSource = updateMessageSourceReturnedCount(preservedPayloadFields.messageSource, sync.messages.length);
+  }
+  if (preservedPayloadFields.transcriptProvenance) {
+    preservedPayloadFields.transcriptProvenance = updateMessageSourceReturnedCount(preservedPayloadFields.transcriptProvenance, sync.messages.length);
+  }
   const returnedDebugReadChat = debugReadChat ? {
     ...debugReadChat,
     fullMsgCount: typeof debugReadChat.fullMsgCount === "number" ? debugReadChat.fullMsgCount : messages.length,
@@ -16397,7 +16460,7 @@ function buildReadChatCommandResult(payload, args) {
   return {
     success: true,
     ...validatedPayload,
-    ...Object.fromEntries(Object.entries(payload).filter(([key]) => shouldPreserveReadChatPayloadField(key))),
+    ...preservedPayloadFields,
     messages: sync.messages,
     totalMessages: sync.totalMessages,
     ...returnedDebugReadChat ? { debugReadChat: returnedDebugReadChat } : {}
@@ -16872,14 +16935,16 @@ async function handleReadChat(h, args) {
           returnedMessages.length,
           200
         );
+        const nativeHistorySessionId = resolveCliNativeHistorySessionId(args, historySessionId, providerSessionId);
+        const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
         const exactNativeHistoryScope = Boolean(
-          typeof args?.historySessionId === "string" && args.historySessionId.trim() || typeof args?.providerSessionId === "string" && args.providerSessionId.trim() || providerSessionId || h.currentSession?.sessionId === args?.targetSessionId && typeof h.currentSession?.providerSessionId === "string" && h.currentSession.providerSessionId.trim()
+          typeof args?.historySessionId === "string" && args.historySessionId.trim() || typeof args?.providerSessionId === "string" && args.providerSessionId.trim() || providerSessionId || nativeHistorySessionId && nativeHistorySessionId !== targetSessionId || h.currentSession?.sessionId === args?.targetSessionId && typeof h.currentSession?.providerSessionId === "string" && h.currentSession.providerSessionId.trim()
         );
         let nativeHistory = null;
         try {
           nativeHistory = readCliProviderNativeHistory(agentStr, {
             canonicalHistory: provider?.canonicalHistory,
-            historySessionId,
+            historySessionId: nativeHistorySessionId,
             workspace,
             offset: 0,
             limit: nativeHistoryLimit,
@@ -16902,13 +16967,15 @@ async function handleReadChat(h, args) {
         }
         if (nativeHistory) {
           const nativeMessages = Array.isArray(nativeHistory.messages) ? normalizeNativeHistoryMessages(agentStr, nativeHistory.messages) : [];
-          const historyProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId : readHistorySessionIdFromMessages(nativeMessages) || historySessionId;
+          const historyProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId : readHistorySessionIdFromMessages(nativeMessages) || nativeHistorySessionId || historySessionId;
           const lookup = nativeHistory.lookup === "workspace" ? "workspace" : "session";
           const safeMapping = hasSafeNativeHistoryMapping({
-            historySessionId: lookup === "workspace" ? void 0 : historySessionId,
-            providerSessionId: lookup === "workspace" ? void 0 : providerSessionId,
+            historySessionId: lookup === "workspace" ? void 0 : nativeHistorySessionId,
+            providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId || providerSessionId,
             workspace,
-            nativeMessages
+            nativeMessages,
+            ptyMessages: returnedMessages,
+            requireWorkspaceContentOverlap: lookup === "workspace" && !exactNativeHistoryScope
           });
           const freshEnough = isNativeHistoryFreshEnough({
             sourceMtimeMs: nativeHistory.sourceMtimeMs,
@@ -16923,7 +16990,7 @@ async function handleReadChat(h, args) {
             messageSource = buildCliMessageSourceProvenance({
               selected: "native-history",
               provider: adapter.cliType,
-              nativeHandle: selectedProviderSessionId || historySessionId,
+              nativeHandle: selectedProviderSessionId || nativeHistorySessionId || historySessionId,
               nativeSource: nativeHistory.source,
               sourcePath: nativeHistory.sourcePath,
               sourceMtimeMs: nativeHistory.sourceMtimeMs,
@@ -16946,7 +17013,7 @@ async function handleReadChat(h, args) {
             messageSource = buildCliMessageSourceProvenance({
               selected: "pty-parser",
               provider: adapter.cliType,
-              nativeHandle: historyProviderSessionId || historySessionId,
+              nativeHandle: historyProviderSessionId || nativeHistorySessionId || historySessionId,
               fallbackReason,
               nativeSource: nativeHistory.source,
               sourcePath: nativeHistory.sourcePath,