@adhdev/daemon-core 0.9.82-rc.113 → 0.9.82-rc.114

package/dist/index.js

@@ -16490,7 +16490,16 @@ function readHistorySessionIdFromMessages(messages) {
   }
   return void 0;
 }
-function normalizeNativeHistoryMessages(providerType, messages) {
+function shouldPreserveNativeIdentity(providerType, sessionId, message) {
+  const providerUnitKey = typeof message.providerUnitKey === "string" ? message.providerUnitKey.trim() : "";
+  const turnKey = typeof message._turnKey === "string" ? message._turnKey.trim() : "";
+  if (!providerUnitKey || !turnKey) return false;
+  if (providerType === "hermes-cli" && sessionId) {
+    return providerUnitKey.startsWith(`${providerType}:native:${sessionId}:`) && turnKey.startsWith(`${providerType}:native-turn:${sessionId}:`);
+  }
+  return true;
+}
+function normalizeNativeHistoryMessages(providerType, messages, nativeSessionId) {
   let turnIndex = 0;
   return normalizeChatMessages(messages).map((message, index) => {
     const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
@@ -16505,7 +16514,11 @@ function normalizeNativeHistoryMessages(providerType, messages) {
       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 nativeIdentitySessionId = historySessionId || (typeof nativeSessionId === "string" ? nativeSessionId.trim() : "");
+    const preserveNativeIdentity = shouldPreserveNativeIdentity(providerType, nativeIdentitySessionId, message);
+    const existingProviderUnitKey = typeof message.providerUnitKey === "string" ? message.providerUnitKey.trim() : "";
+    const existingTurnKey = typeof message._turnKey === "string" ? message._turnKey.trim() : "";
+    const providerUnitKey = preserveNativeIdentity ? existingProviderUnitKey : `${providerType}:native:${nativeIdentitySessionId || "workspace"}:${index}:${role || "message"}:${kind}:${contentHash}`;
     const meta = 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");
@@ -16514,8 +16527,8 @@ function normalizeNativeHistoryMessages(providerType, messages) {
       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}`,
+      bubbleId: typeof message.bubbleId === "string" && message.bubbleId.trim() && preserveNativeIdentity ? message.bubbleId.trim() : `bubble:${providerUnitKey}`,
+      _turnKey: preserveNativeIdentity ? existingTurnKey : `${providerType}:native-turn:${nativeIdentitySessionId || "workspace"}:${turnIndex}`,
       bubbleState: message.bubbleState || "final",
       ...isSystemSessionStart ? {
         visibility: message.visibility || "hidden",
@@ -17226,7 +17239,7 @@ async function handleChatHistory(h, args) {
     });
     if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory)) {
       const lookup = result.lookup === "workspace" ? "workspace" : "session";
-      const messages = Array.isArray(result.messages) ? normalizeNativeHistoryMessages(agentStr, result.messages) : [];
+      const messages = Array.isArray(result.messages) ? normalizeNativeHistoryMessages(agentStr, result.messages, result?.providerSessionId) : [];
       const historyProviderSessionId = typeof result?.providerSessionId === "string" ? result.providerSessionId : readHistorySessionIdFromMessages(messages) || historySessionId;
       const safeMapping = hasSafeNativeHistoryMapping({
         historySessionId: lookup === "workspace" ? void 0 : historySessionId,
@@ -17334,7 +17347,7 @@ async function handleReadChat(h, args) {
           nativeHistory = null;
         }
         if (nativeHistory) {
-          const nativeMessages = Array.isArray(nativeHistory.messages) ? normalizeNativeHistoryMessages(agentStr, nativeHistory.messages) : [];
+          const nativeMessages = Array.isArray(nativeHistory.messages) ? normalizeNativeHistoryMessages(agentStr, nativeHistory.messages, nativeHistory?.providerSessionId) : [];
           const historyProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId : readHistorySessionIdFromMessages(nativeMessages) || nativeHistorySessionId || historySessionId;
           const nativeHistoryCoverage = typeof nativeHistory?.nativeHistoryCoverage === "string" ? nativeHistory.nativeHistoryCoverage : void 0;
           const partialReason = typeof nativeHistory?.partialReason === "string" ? nativeHistory.partialReason : void 0;
@@ -17462,7 +17475,7 @@ async function handleReadChat(h, args) {
         scripts: provider?.scripts
       });
       const lookup = history.lookup === "workspace" ? "workspace" : "session";
-      const historyMessages = Array.isArray(history?.messages) ? normalizeNativeHistoryMessages(agentStr, history.messages) : [];
+      const historyMessages = Array.isArray(history?.messages) ? normalizeNativeHistoryMessages(agentStr, history.messages, history?.providerSessionId) : [];
       const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : readHistorySessionIdFromMessages(historyMessages) || historySessionId;
       const nativeHistoryCoverage = typeof history?.nativeHistoryCoverage === "string" ? history.nativeHistoryCoverage : void 0;
       const partialReason = typeof history?.partialReason === "string" ? history.partialReason : void 0;