@adhdev/daemon-core 0.9.82-rc.474 → 0.9.82-rc.476

package/dist/commands/chat-commands-read.d.ts

@@ -3,5 +3,13 @@
  * native-history / source-resolution / normalization helpers they use.
  */
 import type { CommandResult, CommandHelpers } from './handler.js';
+/**
+ * Test-only: clear the in-memory read-pin map and re-arm cold-start hydration so
+ * each test starts from a clean pin state. The on-disk mirror is isolated per
+ * test process via ADHDEV_CONFIG_DIR (test/helpers/setup-env.ts); this resets the
+ * module-level cache that would otherwise leak a pin across tests sharing the
+ * worker. Not part of the runtime contract.
+ */
+export declare function __resetProviderSessionPinsForTest(): void;
 export declare function handleChatHistory(h: CommandHelpers, args: any): Promise<CommandResult>;
 export declare function handleReadChat(h: CommandHelpers, args: any): Promise<CommandResult>;

package/dist/commands/chat-commands.d.ts

@@ -10,5 +10,5 @@
 export { READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS, buildSendInputSignature } from './chat-commands-shared.js';
 export { evaluateReadChatNodeWorkspaceScope } from './chat-commands-scope.js';
 export { sanitizeDebugBundleValue, handleGetChatDebugBundle } from './chat-commands-debug-bundle.js';
-export { handleChatHistory, handleReadChat } from './chat-commands-read.js';
+export { handleChatHistory, handleReadChat, __resetProviderSessionPinsForTest } from './chat-commands-read.js';
 export { handleSendChat, handleListChats, handleNewChat, handleSwitchChat, handleSetMode, handleChangeModel, handleSetThoughtLevel, handleResolveAction, } from './chat-commands-write.js';

package/dist/config/chat-history.d.ts

@@ -114,6 +114,7 @@ export declare function readProviderChatHistory(agentType: string, options?: {
     sessionStartedAtMs?: number;
     envOverrides?: Record<string, string>;
     forceRefresh?: boolean;
+    instanceId?: string;
 }): {
     messages: HistoryMessage[];
     hasMore: boolean;

package/dist/config/state-store.d.ts

@@ -21,6 +21,17 @@ export interface DaemonState {
     sessionNotificationDismissals: Record<string, string>;
     /** Current notification unread override ids keyed by stable session target */
     sessionNotificationUnreadOverrides: Record<string, string>;
+    /**
+     * Resolved provider-native conversation id for a live session, keyed by the
+     * ADHDev/mesh session id. Persisted so it survives a daemon restart: a
+     * provider whose on-disk store is keyed by an internally-generated id it
+     * never exposes on the CLI (antigravity — no --session-id) can then exact-bind
+     * its conversation .db after restart instead of re-running the mtime/recency
+     * heuristic, which drops the store once idle and collapses read_chat to the
+     * PTY parse (user echo only, assistant tail lost). Mirrors the in-memory read
+     * pin (chat-commands-read lastBoundProviderSessionIdByMeshSession).
+     */
+    sessionProviderSessionPins: Record<string, string>;
 }
 /**
  * Load runtime state from disk
@@ -34,3 +45,22 @@ export declare function saveState(state: DaemonState): void;
  * Reset runtime state
  */
 export declare function resetState(): void;
+/**
+ * Load the full persisted session→provider-conversation pin map (sessionId →
+ * provider-native conversation id). Survives daemon restart. Empty object when
+ * none recorded or the state file is unreadable.
+ */
+export declare function loadPersistedProviderSessionPins(): Record<string, string>;
+/**
+ * Persist one session→provider-conversation pin. Load-mutate-save against the
+ * on-disk state so it survives a daemon restart; a no-op when the value already
+ * matches (avoids rewriting state.json on every read). Never clears a pin with an
+ * empty value.
+ */
+export declare function recordPersistedProviderSessionPin(sessionId: string, providerSessionId: string): void;
+/**
+ * Test-only: drop all persisted session→provider-conversation pins from disk.
+ * Used by tests that assert a clean "no pin" state so a sibling test's write to
+ * the shared per-process ADHDEV_CONFIG_DIR does not leak in.
+ */
+export declare function clearPersistedProviderSessionPins(): void;

package/dist/index.js

@@ -409,10 +409,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "cfb46b13fb8f556e4cb7179c4503ac3c86923d92" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "cfb46b13" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.474" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-06T03:34:46.223Z" : void 0);
+  const commit = readInjected(true ? "f3bc279bf108da3a23da4e0e33ebdc41d851930c" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "f3bc279b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.476" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-06T08:19:57.539Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -16694,13 +16694,17 @@ function normalizeState(raw) {
   const sessionNotificationUnreadOverrides = Object.fromEntries(
     Object.entries(isPlainObject2(parsed.sessionNotificationUnreadOverrides) ? parsed.sessionNotificationUnreadOverrides : {}).filter(([, value]) => typeof value === "string" && value.length > 0)
   );
+  const sessionProviderSessionPins = Object.fromEntries(
+    Object.entries(isPlainObject2(parsed.sessionProviderSessionPins) ? parsed.sessionProviderSessionPins : {}).filter(([key2, value]) => typeof key2 === "string" && key2.length > 0 && typeof value === "string" && value.length > 0)
+  );
   return {
     recentActivity,
     savedProviderSessions,
     sessionReads,
     sessionReadMarkers,
     sessionNotificationDismissals,
-    sessionNotificationUnreadOverrides
+    sessionNotificationUnreadOverrides,
+    sessionProviderSessionPins
   };
 }
 function loadState() {
@@ -16723,6 +16727,20 @@ function saveState(state) {
 function resetState() {
   saveState({ ...DEFAULT_STATE });
 }
+function loadPersistedProviderSessionPins() {
+  return { ...loadState().sessionProviderSessionPins };
+}
+function recordPersistedProviderSessionPin(sessionId, providerSessionId) {
+  const key2 = typeof sessionId === "string" ? sessionId.trim() : "";
+  const value = typeof providerSessionId === "string" ? providerSessionId.trim() : "";
+  if (!key2 || !value) return;
+  const state = loadState();
+  if (state.sessionProviderSessionPins[key2] === value) return;
+  saveState({
+    ...state,
+    sessionProviderSessionPins: { ...state.sessionProviderSessionPins, [key2]: value }
+  });
+}
 var import_fs14, import_path11, DEFAULT_STATE;
 var init_state_store = __esm({
   "src/config/state-store.ts"() {
@@ -16736,7 +16754,8 @@ var init_state_store = __esm({
       sessionReads: {},
       sessionReadMarkers: {},
       sessionNotificationDismissals: {},
-      sessionNotificationUnreadOverrides: {}
+      sessionNotificationUnreadOverrides: {},
+      sessionProviderSessionPins: {}
     };
   }
 });
@@ -32034,10 +32053,11 @@ function normalizeProviderNativeHistoryRecords(agentType, historySessionId, reco
     return sanitizeHistoryMessage(agentType, base);
   }).filter(Boolean);
 }
-function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh) {
+function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh, instanceId) {
   const fn = getProviderNativeHistoryScript(scripts, canonicalHistory, "readSession");
   if (!fn) return null;
   const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
+  const normalizedInstanceId = typeof instanceId === "string" ? instanceId.trim() : "";
   const result = fn({
     agentType,
     sessionId: normalizedSessionId,
@@ -32052,6 +32072,12 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
     // which leaves the guard disarmed so discovery still works.
     providerSessionId: normalizedSessionId,
     historySessionId: normalizedSessionId,
+    // Stable per-session owner key for the antigravity conversation-claim
+    // registry (see dispatcher.resolveAntigravityPath / antigravityOwnerToken).
+    // Equals the session registry's sessionId and the provider instance's
+    // instanceId, so read side and instance side derive the identical claim
+    // owner token and two concurrent antigravity sessions never cross-bind.
+    instanceId: normalizedInstanceId || void 0,
     workspace,
     format: canonicalHistory?.format,
     watchPath: canonicalHistory?.watchPath,
@@ -32059,7 +32085,7 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
     sessionStartedAtMs,
     envOverrides,
     forceRefresh: forceRefresh === true,
-    args: { sessionId: normalizedSessionId, historySessionId: normalizedSessionId, workspace, excludeInProgressTurn: excludeInProgressTurn === true, sessionStartedAtMs, envOverrides, forceRefresh: forceRefresh === true }
+    args: { sessionId: normalizedSessionId, historySessionId: normalizedSessionId, instanceId: normalizedInstanceId || void 0, workspace, excludeInProgressTurn: excludeInProgressTurn === true, sessionStartedAtMs, envOverrides, forceRefresh: forceRefresh === true }
   });
   if (!result || typeof result !== "object") return null;
   const records = normalizeProviderNativeHistoryRecords(agentType, normalizedSessionId, result.messages || result.records);
@@ -32075,11 +32101,11 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
     unavailableReason: typeof result.unavailableReason === "string" ? result.unavailableReason.trim() : void 0
   };
 }
-function buildNativeHistoryReadResult(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh) {
+function buildNativeHistoryReadResult(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh, instanceId) {
   const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
   const normalizedWorkspace = typeof workspace === "string" ? workspace.trim() : "";
   if (!canonicalHistory || !normalizedSessionId && !normalizedWorkspace || !isNativeSourceCanonicalHistory(canonicalHistory)) return null;
-  return callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, normalizedSessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh);
+  return callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, normalizedSessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh, instanceId);
 }
 function materializeNativeHistoryToMirror(agentType, canonicalHistory, historySessionId, workspace, scripts) {
   const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
@@ -32108,7 +32134,7 @@ function isNativeSourceCanonicalHistory(canonicalHistory) {
 }
 function readProviderChatHistory(agentType, options = {}) {
   if (isNativeSourceCanonicalHistory(options.canonicalHistory) && (options.historySessionId || options.workspace)) {
-    const nativeResult = buildNativeHistoryReadResult(agentType, options.canonicalHistory, options.scripts, options.historySessionId, options.workspace, options.excludeInProgressTurn, options.sessionStartedAtMs, options.envOverrides, options.forceRefresh);
+    const nativeResult = buildNativeHistoryReadResult(agentType, options.canonicalHistory, options.scripts, options.historySessionId, options.workspace, options.excludeInProgressTurn, options.sessionStartedAtMs, options.envOverrides, options.forceRefresh, options.instanceId);
     if (!nativeResult) return { messages: [], hasMore: false, source: "native-unavailable" };
     return {
       ...pageHistoryRecords(agentType, nativeResult.records, options.offset || 0, options.limit || 30, options.excludeRecentCount || 0, options.historyBehavior),
@@ -34079,6 +34105,7 @@ init_debug_trace();
 // src/commands/chat-commands-read.ts
 var path16 = __toESM(require("path"));
 init_contracts2();
+init_state_store();
 init_coordinator_registry();
 init_logger();
 init_debug_trace();
@@ -34434,15 +34461,33 @@ 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();
+var persistedProviderSessionPinsHydrated = false;
+function hydratePersistedProviderSessionPinsOnce() {
+  if (persistedProviderSessionPinsHydrated) return;
+  persistedProviderSessionPinsHydrated = true;
+  try {
+    for (const [key2, value] of Object.entries(loadPersistedProviderSessionPins())) {
+      if (!lastBoundProviderSessionIdByMeshSession.has(key2)) {
+        lastBoundProviderSessionIdByMeshSession.set(key2, value);
+      }
+    }
+  } catch {
+  }
+}
 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);
+  try {
+    recordPersistedProviderSessionPin(key2, value);
+  } catch {
+  }
 }
 function getBoundProviderSessionIdPin(meshSessionId) {
   const key2 = typeof meshSessionId === "string" ? meshSessionId.trim() : "";
   if (!key2) return void 0;
+  hydratePersistedProviderSessionPinsOnce();
   const pinned = lastBoundProviderSessionIdByMeshSession.get(key2);
   return pinned && pinned.trim() ? pinned.trim() : void 0;
 }
@@ -35043,7 +35088,8 @@ function readCliProviderNativeHistory(agentStr, args) {
     scripts: args.scripts,
     excludeInProgressTurn: args.excludeInProgressTurn,
     sessionStartedAtMs: args.sessionStartedAtMs,
-    envOverrides: args.envOverrides
+    envOverrides: args.envOverrides,
+    instanceId: args.instanceId
   });
   const boundProviderSessionId = typeof sessionHistory?.providerSessionId === "string" ? sessionHistory.providerSessionId.trim() : "";
   return {
@@ -35302,6 +35348,7 @@ async function handleChatHistory(h, args) {
       scripts: provider?.scripts,
       sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
       envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+      instanceId: typeof args?.targetSessionId === "string" ? args.targetSessionId : void 0,
       pinnedProviderSessionId: getBoundProviderSessionIdPin(args?.targetSessionId)
     }) : readProviderChatHistory(agentStr, {
       canonicalHistory: provider?.nativeHistory,
@@ -35442,10 +35489,15 @@ async function handleReadChat(h, args) {
       let nativeHistory = null;
       let nativeHistoryError;
       if (supportsNative) {
+        const pinnedProviderSessionIdForRead = getBoundProviderSessionIdPin(targetSessionId);
+        const nativeReadSessionIdIsRuntimeFallback = Boolean(
+          targetSessionId && nativeHistoryReadSessionId === targetSessionId && !getExplicitHistorySessionId(args)
+        );
+        const effectiveNativeReadSessionId = nativeReadSessionIdIsRuntimeFallback ? pinnedProviderSessionIdForRead || void 0 : nativeHistoryReadSessionId;
         try {
           nativeHistory = readCliProviderNativeHistory(agentStr, {
             canonicalHistory: provider?.nativeHistory,
-            historySessionId: nativeHistoryReadSessionId,
+            historySessionId: effectiveNativeReadSessionId,
             workspace,
             offset: 0,
             limit: nativeHistoryLimit,
@@ -35455,11 +35507,14 @@ async function handleReadChat(h, args) {
             excludeInProgressTurn: returnedStatus === "waiting_approval",
             sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
             envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
-            pinnedProviderSessionId: getBoundProviderSessionIdPin(targetSessionId),
+            // Stable per-session identity for antigravity's conversation-claim
+            // owner token (== session registry sessionId == instance instanceId).
+            instanceId: typeof args?.targetSessionId === "string" ? args.targetSessionId : void 0,
+            pinnedProviderSessionId: pinnedProviderSessionIdForRead,
             // 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)
+            allowWorkspaceLatestFallback: !pinnedProviderSessionIdForRead
           });
           const resolvedProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId.trim() : "";
           if (resolvedProviderSessionId) {
@@ -35504,7 +35559,8 @@ async function handleReadChat(h, args) {
             scripts: provider?.scripts,
             excludeInProgressTurn: returnedStatus === "waiting_approval",
             sessionStartedAtMs,
-            envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId)
+            envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+            instanceId: typeof args?.targetSessionId === "string" ? args.targetSessionId : void 0
           });
           nativeHistoryError = void 0;
           nativeMessages = nativeHistory && Array.isArray(nativeHistory.messages) ? normalizeAndFilterNativeHistory(h, agentStr, args, nativeHistory.messages, nativeHistory.providerSessionId) : [];
@@ -35726,6 +35782,7 @@ async function handleReadChat(h, args) {
         scripts: provider?.scripts,
         sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
         envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+        instanceId: typeof args?.targetSessionId === "string" ? args.targetSessionId : void 0,
         pinnedProviderSessionId: pinnedProviderSessionIdForHistory,
         // Last-resort only when no pin was ever recorded AND the
         // runtime fallback did not resolve a real provider session.
@@ -45396,12 +45453,24 @@ var CliProviderInstance = class _CliProviderInstance {
   }
   /**
    * Owner token for this session in the antigravity conversation-claim
-   * registry. Derived identically to the dispatcher's read-side token
-   * (workspace + spawn time) so the claims the dispatcher records under this
-   * session are the ones dispose() releases.
+   * registry. Keyed on the daemon instance id — the SAME value the session
+   * registry stores as this session's `sessionId` (see cli-manager
+   * `sessionRegistry.register({ sessionId: cliInstance.instanceId })`) and the
+   * read side hands the dispatcher as `instanceId`. Both sides therefore
+   * derive the identical `iid:<instanceId>` token, so the claims the
+   * dispatcher records under this session are exactly the ones dispose()
+   * releases.
+   *
+   * This must NOT be derived from a spawn timestamp: the instance's
+   * `startedAt`, the adapter's `spawnedAtMs`, and the session registry's
+   * `spawnedAtMs` are three INDEPENDENT `Date.now()` samples for the one
+   * session, so a workspace+spawn-time token computed here would never equal
+   * the read side's — the claim isolation then silently collapses and two
+   * concurrent antigravity sessions cross-bind each other's conversation .db
+   * (coordinator+worker chat crosswire).
    */
   antigravityClaimOwner() {
-    return antigravityOwnerToken(this.workingDir, this.startedAt);
+    return antigravityOwnerToken(this.workingDir, this.startedAt, this.instanceId);
   }
   dispose() {
     if (this.type === "antigravity-cli") {
@@ -51274,6 +51343,13 @@ function createNativeHistoryDispatcher(reader) {
     if (requestedProviderSid && session.providerSessionId && session.providerSessionId !== requestedProviderSid) {
       return null;
     }
+    let resolvedProviderSessionId = session.providerSessionId;
+    if (reader === "antigravity-cli") {
+      const onDiskUuid = extractAntigravityConversationUuid(session.sourcePath || sourcePath);
+      if (onDiskUuid && (!resolvedProviderSessionId || resolvedProviderSessionId === sessionId)) {
+        resolvedProviderSessionId = onDiskUuid;
+      }
+    }
     return {
       messages: session.messages.map((m) => ({
         role: normalizeRole2(m.role),
@@ -51282,7 +51358,7 @@ function createNativeHistoryDispatcher(reader) {
         kind: typeof m.kind === "string" ? m.kind : "standard",
         workspace: typeof m.workspace === "string" ? m.workspace : workspace || void 0
       })),
-      providerSessionId: session.providerSessionId,
+      providerSessionId: resolvedProviderSessionId,
       sourcePath: session.sourcePath,
       sourceMtimeMs: session.sourceMtimeMs,
       nativeHistoryCoverage: session.nativeHistoryCoverage || "full"
@@ -51411,6 +51487,17 @@ function resolveRealPath(value) {
     return value;
   }
 }
+function extractAntigravityConversationUuid(sourcePath) {
+  if (!sourcePath) return "";
+  const segments = sourcePath.split(/[\\/]/);
+  const base = segments[segments.length - 1] || "";
+  const baseMatch = /^([0-9a-f-]+)\.(?:db|pb)$/i.exec(base);
+  if (baseMatch && isUuidLikeSessionId2(baseMatch[1])) return baseMatch[1];
+  for (const seg of segments) {
+    if (isUuidLikeSessionId2(seg)) return seg;
+  }
+  return "";
+}
 var AGY_SPAWN_CLAIM_GRACE_MS = 2e3;
 function resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instanceId) {
   const agyRoot = path34.join(os25.homedir(), ".gemini", "antigravity-cli");
@@ -51449,6 +51536,7 @@ function pickUnboundConversationDb(convRoot, sessionFloorMs, owner) {
   } catch {
     return null;
   }
+  const applyRecencyCutoff = !(sessionFloorMs > 0);
   const recencyCutoff = Date.now() - RECENT_WINDOW_MS;
   const candidates = [];
   for (const entry of entries) {
@@ -51459,7 +51547,7 @@ function pickUnboundConversationDb(convRoot, sessionFloorMs, owner) {
     if (isAntigravityConversationClaimedByOther(uuid, owner)) continue;
     const p = path34.join(convRoot, entry.name);
     const mtime = safeMtime(p);
-    if (mtime < recencyCutoff) continue;
+    if (applyRecencyCutoff && mtime < recencyCutoff) continue;
     candidates.push({ path: p, uuid, mtime, birth: safeBirthtime(p) });
   }
   if (candidates.length === 0) return null;