@adhdev/daemon-standalone 0.9.82-rc.90 → 0.9.82-rc.92

package/dist/index.js

@@ -31533,7 +31533,19 @@ ${lastSnapshot}`;
       if (!node) return { staleReason: "direct task node is no longer in the live mesh" };
       if (!sessionId) return {};
       const candidates = [];
-      for (const value of [node.sessions, node.activeSessions, node.active_sessions, node.lastProbe?.sessions, node.last_probe?.sessions, node.lastProbe?.status?.sessions, node.last_probe?.status?.sessions]) {
+      for (const value of [
+        node.sessions,
+        node.activeSessions,
+        node.active_sessions,
+        node.activeSessionDetails,
+        node.active_session_details,
+        node.sessionDetails,
+        node.session_details,
+        node.lastProbe?.sessions,
+        node.last_probe?.sessions,
+        node.lastProbe?.status?.sessions,
+        node.last_probe?.status?.sessions
+      ]) {
         if (Array.isArray(value)) candidates.push(...value);
       }
       for (const value of [node.activeSession, node.active_session, node.currentSession, node.current_session, node.runtimeSession, node.runtime_session, node.session]) {
@@ -33847,15 +33859,6 @@ ${lastSnapshot}`;
           if (text) return text.slice(0, maxChars);
         }
       }
-      for (let i = messages.length - 1; i >= 0; i--) {
-        const msg = messages[i];
-        if (!msg) continue;
-        const classification = classifyChatMessageVisibility(msg);
-        if (classification.isUserFacing) {
-          const text = flattenContent(msg.content).trim();
-          if (text) return text.slice(0, maxChars);
-        }
-      }
       return "";
     }
     var BUILTIN_CHAT_MESSAGE_KINDS = ["standard", "thought", "tool", "terminal", "system"];
@@ -38026,6 +38029,13 @@ ${effect.notification.body || ""}`.trim();
     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 || "";
@@ -38094,13 +38104,14 @@ ${effect.notification.body || ""}`.trim();
       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;
@@ -38111,6 +38122,15 @@ ${effect.notification.body || ""}`.trim();
       }
       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;
     }
@@ -38255,6 +38275,29 @@ ${effect.notification.body || ""}`.trim();
       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) {
@@ -38264,7 +38307,10 @@ ${effect.notification.body || ""}`.trim();
       }
       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, {
@@ -38277,8 +38323,8 @@ ${effect.notification.body || ""}`.trim();
         historyBehavior: args.historyBehavior,
         scripts: args.scripts
       });
-      if (sessionHistory.source !== "native-unavailable" || !args.historySessionId || !args.workspace) {
-        return { ...sessionHistory, lookup: "session" };
+      if (sessionHistory.source !== "native-unavailable" || args.exactSessionScoped || !args.historySessionId || !args.workspace) {
+        return { ...sessionHistory, lookup: args.historySessionId ? "session" : "workspace" };
       }
       const workspaceHistory = readProviderChatHistory(agentStr, {
         canonicalHistory: args.canonicalHistory,
@@ -38303,6 +38349,19 @@ ${effect.notification.body || ""}`.trim();
     function shouldPreserveReadChatPayloadField(key) {
       return key === "messageSource" || key === "transcriptProvenance";
     }
+    function updateMessageSourceReturnedCount(value, returnedMessageCount) {
+      if (!value || typeof value !== "object" || Array.isArray(value)) return value;
+      const record2 = value;
+      const coverage = record2.coverage && typeof record2.coverage === "object" && !Array.isArray(record2.coverage) ? record2.coverage : void 0;
+      if (!coverage) return value;
+      return {
+        ...record2,
+        coverage: {
+          ...coverage,
+          returnedMessageCount
+        }
+      };
+    }
     function deriveHistoryDedupKey(message) {
       const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
       if (unitKey) return `read_chat:${unitKey}`;
@@ -38414,6 +38473,13 @@ ${effect.notification.body || ""}`.trim();
       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,
@@ -38424,7 +38490,7 @@ ${effect.notification.body || ""}`.trim();
       return {
         success: true,
         ...validatedPayload,
-        ...Object.fromEntries(Object.entries(payload).filter(([key]) => shouldPreserveReadChatPayloadField(key))),
+        ...preservedPayloadFields,
         messages: sync.messages,
         totalMessages: sync.totalMessages,
         ...returnedDebugReadChat ? { debugReadChat: returnedDebugReadChat } : {}
@@ -38899,17 +38965,23 @@ ${effect.notification.body || ""}`.trim();
               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 || 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,
                 excludeRecentCount: 0,
                 historyBehavior: provider?.historyBehavior,
-                scripts: provider?.scripts
+                scripts: provider?.scripts,
+                exactSessionScoped: exactNativeHistoryScope
               });
             } catch (error48) {
               const fallbackReason = `native_history_error:${error48?.message || String(error48)}`;
@@ -38925,13 +38997,15 @@ ${effect.notification.body || ""}`.trim();
             }
             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,
@@ -38946,7 +39020,7 @@ ${effect.notification.body || ""}`.trim();
                 messageSource = buildCliMessageSourceProvenance({
                   selected: "native-history",
                   provider: adapter.cliType,
-                  nativeHandle: selectedProviderSessionId || historySessionId,
+                  nativeHandle: selectedProviderSessionId || nativeHistorySessionId || historySessionId,
                   nativeSource: nativeHistory.source,
                   sourcePath: nativeHistory.sourcePath,
                   sourceMtimeMs: nativeHistory.sourceMtimeMs,
@@ -38969,7 +39043,7 @@ ${effect.notification.body || ""}`.trim();
                 messageSource = buildCliMessageSourceProvenance({
                   selected: "pty-parser",
                   provider: adapter.cliType,
-                  nativeHandle: historyProviderSessionId || historySessionId,
+                  nativeHandle: historyProviderSessionId || nativeHistorySessionId || historySessionId,
                   fallbackReason,
                   nativeSource: nativeHistory.source,
                   sourcePath: nativeHistory.sourcePath,
@@ -39013,6 +39087,9 @@ ${effect.notification.body || ""}`.trim();
         try {
           const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h);
           const workspace = typeof args?.workspace === "string" ? args.workspace : typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : void 0;
+          const exactNativeHistoryScope = Boolean(
+            typeof args?.historySessionId === "string" && args.historySessionId.trim() || typeof args?.providerSessionId === "string" && args.providerSessionId.trim() || h.currentSession?.sessionId === args?.targetSessionId && typeof h.currentSession?.providerSessionId === "string" && h.currentSession.providerSessionId.trim()
+          );
           const history = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory) ? readCliProviderNativeHistory(agentStr, {
             canonicalHistory: provider?.canonicalHistory,
             historySessionId,
@@ -39021,7 +39098,8 @@ ${effect.notification.body || ""}`.trim();
             limit: historyLimit,
             excludeRecentCount: 0,
             historyBehavior: provider?.historyBehavior,
-            scripts: provider?.scripts
+            scripts: provider?.scripts,
+            exactSessionScoped: exactNativeHistoryScope
           }) : readProviderChatHistory(agentStr, {
             canonicalHistory: provider?.canonicalHistory,
             historySessionId,
@@ -41762,6 +41840,7 @@ ${effect.notification.body || ""}`.trim();
         }
         const runtime = this.adapter.getRuntimeMetadata();
         this.maybeAppendRuntimeRecoveryMessage(runtime);
+        const activeChatId = this.providerSessionId || runtime?.runtimeId || this.instanceId;
         let parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
         const historyMessageCount = Number.isFinite(parsedStatus?.historyMessageCount) ? Math.max(0, Number(parsedStatus.historyMessageCount)) : null;
         if (historyMessageCount !== null) {
@@ -41817,7 +41896,7 @@ ${effect.notification.body || ""}`.trim();
           status: visibleStatus,
           mode: this.presentationMode,
           activeChat: {
-            id: `${this.type}_${this.workingDir}`,
+            id: activeChatId,
             title: parsedStatus?.title || dirName,
             status: activeChatStatus,
             messages: mergedMessages,