@adhdev/daemon-core 0.9.82-rc.440 → 0.9.82-rc.441

package/dist/index.js

@@ -409,10 +409,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "c3062ac83f65cfbd83e0bc4236972b64a80435cc" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "c3062ac8" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.440" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-01T05:56:51.525Z" : void 0);
+  const commit = readInjected(true ? "88526551632362f9601e9ebc31340627700a82fd" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "88526551" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.441" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-01T06:40:04.206Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -31105,6 +31105,19 @@ var CHAT_SOURCE_REGISTRY = new ChatSourceRegistry();
 init_chat_message_normalization();
 var HOT_TAIL_MIN_LIMIT = 60;
 var CLI_NATIVE_TRANSCRIPT_PROVIDERS = /* @__PURE__ */ new Set(["codex-cli", "claude-cli", "hermes-cli", "antigravity-cli"]);
+var lastBoundProviderSessionIdByMeshSession = /* @__PURE__ */ new Map();
+function recordBoundProviderSessionId(meshSessionId, providerSessionId) {
+  const key2 = typeof meshSessionId === "string" ? meshSessionId.trim() : "";
+  const value = typeof providerSessionId === "string" ? providerSessionId.trim() : "";
+  if (!key2 || !value) return;
+  lastBoundProviderSessionIdByMeshSession.set(key2, value);
+}
+function getBoundProviderSessionIdPin(meshSessionId) {
+  const key2 = typeof meshSessionId === "string" ? meshSessionId.trim() : "";
+  if (!key2) return void 0;
+  const pinned = lastBoundProviderSessionIdByMeshSession.get(key2);
+  return pinned && pinned.trim() ? pinned.trim() : void 0;
+}
 var warnedLegacyNativeAllowlistHits = /* @__PURE__ */ new Set();
 function warnLegacyNativeAllowlistHit(providerType) {
   if (warnedLegacyNativeAllowlistHits.has(providerType)) return;
@@ -31679,7 +31692,10 @@ function sessionSpawnEnvFromAdapter(h, targetSessionId) {
 }
 function readCliProviderNativeHistory(agentStr, args) {
   const canBindFromLiveSession = !args.historySessionId && typeof args.sessionStartedAtMs === "number" && args.sessionStartedAtMs > 0 && typeof args.workspace === "string" && args.workspace.trim().length > 0;
-  if (!args.historySessionId && !canBindFromLiveSession) {
+  const pinnedProviderSessionId = typeof args.pinnedProviderSessionId === "string" ? args.pinnedProviderSessionId.trim() : "";
+  const effectiveHistorySessionId = args.historySessionId || (!canBindFromLiveSession ? pinnedProviderSessionId : "");
+  const workspaceLatestFallback = !effectiveHistorySessionId && !canBindFromLiveSession && !pinnedProviderSessionId && args.allowWorkspaceLatestFallback === true && typeof args.workspace === "string" && args.workspace.trim().length > 0;
+  if (!effectiveHistorySessionId && !canBindFromLiveSession && !workspaceLatestFallback) {
     return {
       messages: [],
       hasMore: false,
@@ -31690,7 +31706,7 @@ function readCliProviderNativeHistory(agentStr, args) {
   }
   const sessionHistory = readProviderChatHistory(agentStr, {
     canonicalHistory: args.canonicalHistory,
-    historySessionId: args.historySessionId,
+    historySessionId: effectiveHistorySessionId || void 0,
     workspace: args.workspace,
     offset: args.offset,
     limit: args.limit,
@@ -31704,7 +31720,7 @@ function readCliProviderNativeHistory(agentStr, args) {
   const boundProviderSessionId = typeof sessionHistory?.providerSessionId === "string" ? sessionHistory.providerSessionId.trim() : "";
   return {
     ...sessionHistory,
-    lookup: args.historySessionId || canBindFromLiveSession && boundProviderSessionId ? "session" : "workspace"
+    lookup: effectiveHistorySessionId || canBindFromLiveSession && boundProviderSessionId ? "session" : "workspace"
   };
 }
 function readLiveCodexWorkspaceNativeHistory(agentStr, args) {
@@ -31957,7 +31973,8 @@ async function handleChatHistory(h, args) {
       historyBehavior: provider?.historyBehavior,
       scripts: provider?.scripts,
       sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
-      envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId)
+      envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+      pinnedProviderSessionId: getBoundProviderSessionIdPin(args?.targetSessionId)
     }) : readProviderChatHistory(agentStr, {
       canonicalHistory: provider?.nativeHistory,
       historySessionId,
@@ -31972,6 +31989,9 @@ async function handleChatHistory(h, args) {
       const lookup = result.lookup === "workspace" ? "workspace" : "session";
       const messages = Array.isArray(result.messages) ? normalizeAndFilterNativeHistory(h, agentStr, args, result.messages, result?.providerSessionId) : [];
       const historyProviderSessionId = typeof result?.providerSessionId === "string" ? result.providerSessionId : readHistorySessionIdFromMessages(messages) || historySessionId;
+      if (typeof result?.providerSessionId === "string" && result.providerSessionId.trim()) {
+        recordBoundProviderSessionId(args?.targetSessionId, result.providerSessionId.trim());
+      }
       const safeMapping = hasSafeNativeHistoryMapping({
         historySessionId: lookup === "workspace" ? void 0 : historySessionId,
         providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId,
@@ -32106,8 +32126,17 @@ async function handleReadChat(h, args) {
             scripts: provider?.scripts,
             excludeInProgressTurn: returnedStatus === "waiting_approval",
             sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
-            envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId)
+            envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+            pinnedProviderSessionId: getBoundProviderSessionIdPin(targetSessionId),
+            // Last-resort only when no pin was ever recorded for this
+            // session; the downstream workspace-overlap safety gate
+            // still filters an aliased session out.
+            allowWorkspaceLatestFallback: !getBoundProviderSessionIdPin(targetSessionId)
           });
+          const resolvedProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId.trim() : "";
+          if (resolvedProviderSessionId) {
+            recordBoundProviderSessionId(targetSessionId, resolvedProviderSessionId);
+          }
         } catch (error) {
           nativeHistoryError = error;
           nativeHistory = null;
@@ -32353,9 +32382,14 @@ async function handleReadChat(h, args) {
       const workspace = targetSid ? typeof registrySessionWorkspace === "string" ? registrySessionWorkspace : argsWorkspace ?? currentSessionWorkspace : typeof currentSessionWorkspace === "string" ? currentSessionWorkspace : void 0;
       const intendedWorkspace = argsWorkspace;
       const supportsNative = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory);
+      const pinnedProviderSessionIdForHistory = getBoundProviderSessionIdPin(targetSid);
+      const historySessionIdIsRuntimeFallback = Boolean(
+        targetSid && historySessionId === targetSid && !getExplicitHistorySessionId(args)
+      );
+      const effectiveHistorySessionIdForRead = historySessionIdIsRuntimeFallback ? pinnedProviderSessionIdForHistory || void 0 : historySessionId;
       const history = supportsNative ? readCliProviderNativeHistory(agentStr, {
         canonicalHistory: provider?.nativeHistory,
-        historySessionId,
+        historySessionId: effectiveHistorySessionIdForRead,
         workspace,
         offset: 0,
         limit: historyLimit,
@@ -32363,7 +32397,11 @@ async function handleReadChat(h, args) {
         historyBehavior: provider?.historyBehavior,
         scripts: provider?.scripts,
         sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
-        envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId)
+        envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+        pinnedProviderSessionId: pinnedProviderSessionIdForHistory,
+        // Last-resort only when no pin was ever recorded AND the
+        // runtime fallback did not resolve a real provider session.
+        allowWorkspaceLatestFallback: !pinnedProviderSessionIdForHistory && historySessionIdIsRuntimeFallback
       }) : readProviderChatHistory(agentStr, {
         canonicalHistory: provider?.nativeHistory,
         historySessionId,
@@ -32376,14 +32414,18 @@ async function handleReadChat(h, args) {
       });
       const lookup = history?.lookup === "workspace" ? "workspace" : "session";
       const historyMessages = Array.isArray(history?.messages) ? normalizeAndFilterNativeHistory(h, agentStr, args, history.messages, history?.providerSessionId) : [];
-      const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : readHistorySessionIdFromMessages(historyMessages) || historySessionId;
+      const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : readHistorySessionIdFromMessages(historyMessages) || effectiveHistorySessionIdForRead;
+      if (typeof history?.providerSessionId === "string" && history.providerSessionId.trim()) {
+        recordBoundProviderSessionId(targetSid, history.providerSessionId.trim());
+      }
+      const mappingSessionId = effectiveHistorySessionIdForRead;
       const safeMapping = supportsNative ? hasSafeNativeHistoryMapping({
-        historySessionId: lookup === "workspace" ? void 0 : historySessionId,
+        historySessionId: lookup === "workspace" ? void 0 : mappingSessionId,
         providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId,
         workspace,
         nativeMessages: historyMessages
       }) : false;
-      const trustedExactNativeIdentity = lookup !== "workspace" && Boolean(historySessionId) && Boolean(historyProviderSessionId) && historySessionId === historyProviderSessionId;
+      const trustedExactNativeIdentity = lookup !== "workspace" && Boolean(mappingSessionId) && Boolean(historyProviderSessionId) && mappingSessionId === historyProviderSessionId;
       const machineSessionKey = String(
         args?.targetSessionId || historyProviderSessionId || historySessionId || h.currentSession?.sessionId || ""
       );