@adhdev/daemon-standalone 0.9.82-rc.87 → 0.9.82-rc.88

package/dist/index.js

@@ -38134,6 +38134,54 @@ ${effect.notification.body || ""}`.trim();
       }
       return newest;
     }
+    function readHistorySessionIdFromMessages(messages) {
+      for (const message of messages) {
+        const historySessionId = typeof message?.historySessionId === "string" ? message.historySessionId.trim() : "";
+        if (historySessionId) return historySessionId;
+      }
+      return void 0;
+    }
+    function normalizeNativeHistoryMessages(providerType, messages) {
+      let turnIndex = 0;
+      return normalizeChatMessages(messages).map((message, index) => {
+        const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+        const kind = typeof message.kind === "string" && message.kind.trim() ? message.kind.trim() : role === "system" ? "system" : "standard";
+        if ((role === "user" || role === "human") && index > 0) turnIndex += 1;
+        const historySessionId = typeof message.historySessionId === "string" ? message.historySessionId.trim() : "";
+        const contentHash = hashSignatureParts([
+          providerType,
+          historySessionId,
+          String(message.receivedAt || message.timestamp || index),
+          role,
+          kind,
+          flattenContent(message.content)
+        ]).slice(0, 12);
+        const providerUnitKey = typeof message.providerUnitKey === "string" && message.providerUnitKey.trim() ? message.providerUnitKey.trim() : `${providerType}:native:${historySessionId || "workspace"}:${index}:${role || "message"}:${kind}:${contentHash}`;
+        const meta3 = message.meta && typeof message.meta === "object" ? message.meta : void 0;
+        const isSystemSessionStart = role === "system" || kind === "system" || kind === "session_start";
+        const isActivity = role === "assistant" && (kind === "tool" || kind === "terminal" || kind === "thought");
+        return {
+          ...message,
+          role: role === "human" ? "user" : role || "assistant",
+          kind: isSystemSessionStart ? "system" : kind,
+          providerUnitKey,
+          bubbleId: typeof message.bubbleId === "string" && message.bubbleId.trim() ? message.bubbleId.trim() : `bubble:${providerUnitKey}`,
+          _turnKey: typeof message._turnKey === "string" && message._turnKey.trim() ? message._turnKey.trim() : `${providerType}:native-turn:${historySessionId || "workspace"}:${turnIndex}`,
+          bubbleState: message.bubbleState || "final",
+          ...isSystemSessionStart ? {
+            visibility: message.visibility || "hidden",
+            transcriptVisibility: message.transcriptVisibility || "hidden",
+            audience: message.audience || "internal",
+            source: message.source || "runtime_status"
+          } : isActivity ? {
+            source: message.source || (kind === "terminal" ? "terminal_command" : "tool_call"),
+            meta: { ...meta3, label: message.senderName || meta3?.label || (kind === "terminal" ? "Terminal" : "Tool") }
+          } : {
+            source: message.source || (role === "assistant" ? "assistant_text" : void 0)
+          }
+        };
+      });
+    }
     function buildCliMessageSourceProvenance(args) {
       const sourceMtimeMs = Number(args.sourceMtimeMs || 0);
       const sourceMtimeAgeMs = sourceMtimeMs > 0 ? Math.max(0, Date.now() - sourceMtimeMs) : void 0;
@@ -38189,6 +38237,32 @@ ${effect.notification.body || ""}`.trim();
       if (!workspace) return false;
       return args.nativeMessages.some((message) => String(message?.workspace || "").trim() === workspace);
     }
+    function readCliProviderNativeHistory(agentStr, args) {
+      const sessionHistory = readProviderChatHistory(agentStr, {
+        canonicalHistory: args.canonicalHistory,
+        historySessionId: args.historySessionId,
+        workspace: args.workspace,
+        offset: args.offset,
+        limit: args.limit,
+        excludeRecentCount: args.excludeRecentCount,
+        historyBehavior: args.historyBehavior,
+        scripts: args.scripts
+      });
+      if (sessionHistory.source !== "native-unavailable" || !args.historySessionId || !args.workspace) {
+        return { ...sessionHistory, lookup: "session" };
+      }
+      const workspaceHistory = readProviderChatHistory(agentStr, {
+        canonicalHistory: args.canonicalHistory,
+        historySessionId: void 0,
+        workspace: args.workspace,
+        offset: args.offset,
+        limit: args.limit,
+        excludeRecentCount: args.excludeRecentCount,
+        historyBehavior: args.historyBehavior,
+        scripts: args.scripts
+      });
+      return { ...workspaceHistory, lookup: "workspace" };
+    }
     function isNativeHistoryFreshEnough(args) {
       const nativeNewest = getMessageNewestReceivedAt(args.nativeMessages);
       const ptyNewest = getMessageNewestReceivedAt(args.ptyMessages);
@@ -38798,7 +38872,7 @@ ${effect.notification.body || ""}`.trim();
             );
             let nativeHistory = null;
             try {
-              nativeHistory = readProviderChatHistory(agentStr, {
+              nativeHistory = readCliProviderNativeHistory(agentStr, {
                 canonicalHistory: provider?.canonicalHistory,
                 historySessionId,
                 workspace,
@@ -38821,11 +38895,12 @@ ${effect.notification.body || ""}`.trim();
               nativeHistory = null;
             }
             if (nativeHistory) {
-              const nativeMessages = Array.isArray(nativeHistory.messages) ? normalizeChatMessages(nativeHistory.messages) : [];
-              const historyProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId : historySessionId;
+              const nativeMessages = Array.isArray(nativeHistory.messages) ? normalizeNativeHistoryMessages(agentStr, nativeHistory.messages) : [];
+              const historyProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId : readHistorySessionIdFromMessages(nativeMessages) || historySessionId;
+              const lookup = nativeHistory.lookup === "workspace" ? "workspace" : "session";
               const safeMapping = hasSafeNativeHistoryMapping({
-                historySessionId,
-                providerSessionId,
+                historySessionId: lookup === "workspace" ? void 0 : historySessionId,
+                providerSessionId: lookup === "workspace" ? void 0 : providerSessionId,
                 workspace,
                 nativeMessages
               });
@@ -38909,7 +38984,16 @@ ${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 history = readProviderChatHistory(agentStr, {
+          const history = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory) ? readCliProviderNativeHistory(agentStr, {
+            canonicalHistory: provider?.canonicalHistory,
+            historySessionId,
+            workspace,
+            offset: 0,
+            limit: historyLimit,
+            excludeRecentCount: 0,
+            historyBehavior: provider?.historyBehavior,
+            scripts: provider?.scripts
+          }) : readProviderChatHistory(agentStr, {
             canonicalHistory: provider?.canonicalHistory,
             historySessionId,
             workspace,
@@ -38919,11 +39003,12 @@ ${effect.notification.body || ""}`.trim();
             historyBehavior: provider?.historyBehavior,
             scripts: provider?.scripts
           });
-          const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : historySessionId;
-          const historyMessages = Array.isArray(history?.messages) ? normalizeChatMessages(history.messages) : [];
+          const lookup = history.lookup === "workspace" ? "workspace" : "session";
+          const historyMessages = Array.isArray(history?.messages) ? normalizeNativeHistoryMessages(agentStr, history.messages) : [];
+          const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : readHistorySessionIdFromMessages(historyMessages) || historySessionId;
           const safeMapping = supportsCliNativeTranscript(agentStr, provider) ? hasSafeNativeHistoryMapping({
-            historySessionId,
-            providerSessionId: historyProviderSessionId,
+            historySessionId: lookup === "workspace" ? void 0 : historySessionId,
+            providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId,
             workspace,
             nativeMessages: historyMessages
           }) : false;