@adhdev/daemon-core 0.9.82-rc.475 → 0.9.82-rc.477

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/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 ? "c7b88fafbc63d3fc0de4b93c74facdb5145b8be6" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "c7b88faf" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.475" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-06T06:24:24.877Z" : void 0);
+  const commit = readInjected(true ? "e565a4d93874e580f3923a562a7a58229af17997" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "e565a4d9" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.477" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-06T18:09:09.172Z" : 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: {}
     };
   }
 });
@@ -19292,6 +19311,16 @@ function evaluateMeshEventSuppression(args, ctx) {
   }
   return null;
 }
+function sourceWorkerAutoApproves(components, sessionId) {
+  if (!sessionId) return false;
+  try {
+    const state = components.instanceManager?.getInstance?.(sessionId)?.getState?.();
+    const settings = state?.settings || {};
+    return settings.autoApprove === true;
+  } catch {
+    return false;
+  }
+}
 function injectMeshSystemMessage(components, args) {
   const eventSessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
   const eventNodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
@@ -19350,6 +19379,11 @@ function injectMeshSystemMessage(components, args) {
     }
   }
   const eventTimestamp = readEventTimestamp(args.metadataEvent.timestamp);
+  if (args.event === "agent:waiting_approval" && sourceWorkerAutoApproves(components, eventSessionId)) {
+    LOG.info("MeshEvents", `Suppressed agent:waiting_approval for auto-approving worker session ${eventSessionId || "(unknown)"} (mesh ${args.meshId}) \u2014 modal is resolved locally, coordinator not notified`);
+    traceMeshEventDrop("waiting_approval_auto_approving_worker", traceCtx);
+    return { success: true, forwarded: 0, suppressed: true, autoApprovingWorkerApproval: true };
+  }
   const suppression = evaluateMeshEventSuppression(args, {
     traceCtx,
     eventSessionId,
@@ -34086,6 +34120,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();
@@ -34441,15 +34476,37 @@ 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) {
+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(h, meshSessionId, providerSessionId) {
   const key2 = typeof meshSessionId === "string" ? meshSessionId.trim() : "";
   const value = typeof providerSessionId === "string" ? providerSessionId.trim() : "";
   if (!key2 || !value) return;
+  try {
+    h.ctx?.sessionRegistry?.setProviderSessionId?.(key2, value);
+  } catch {
+  }
   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;
 }
@@ -35012,8 +35069,14 @@ function hasSafeNativeHistoryMapping(args) {
   if (!args.requireWorkspaceContentOverlap) return true;
   return hasOverlappingVisibleConversationText(args.nativeMessages, args.ptyMessages || []);
 }
+function effectiveReadSessionId(h, targetSessionId) {
+  const explicit = typeof targetSessionId === "string" ? targetSessionId.trim() : "";
+  if (explicit) return explicit;
+  const current = h.currentSession?.sessionId;
+  return typeof current === "string" ? current.trim() : "";
+}
 function sessionStartedAtMsFromRegistry(h, targetSessionId) {
-  const sid = typeof targetSessionId === "string" ? targetSessionId.trim() : "";
+  const sid = effectiveReadSessionId(h, targetSessionId);
   if (!sid) return void 0;
   const target = h.ctx?.sessionRegistry?.get?.(sid);
   return typeof target?.spawnedAtMs === "number" ? target.spawnedAtMs : void 0;
@@ -35310,7 +35373,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,
+      instanceId: effectiveReadSessionId(h, args?.targetSessionId) || void 0,
       pinnedProviderSessionId: getBoundProviderSessionIdPin(args?.targetSessionId)
     }) : readProviderChatHistory(agentStr, {
       canonicalHistory: provider?.nativeHistory,
@@ -35327,7 +35390,7 @@ async function handleChatHistory(h, args) {
       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());
+        recordBoundProviderSessionId(h, effectiveReadSessionId(h, args?.targetSessionId), result.providerSessionId.trim());
       }
       const safeMapping = hasSafeNativeHistoryMapping({
         historySessionId: lookup === "workspace" ? void 0 : historySessionId,
@@ -35451,10 +35514,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,
@@ -35466,16 +35534,16 @@ async function handleReadChat(h, args) {
             envOverrides: sessionSpawnEnvFromAdapter(h, args?.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: getBoundProviderSessionIdPin(targetSessionId),
+            instanceId: effectiveReadSessionId(h, 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) {
-            recordBoundProviderSessionId(targetSessionId, resolvedProviderSessionId);
+            recordBoundProviderSessionId(h, effectiveReadSessionId(h, targetSessionId), resolvedProviderSessionId);
           }
         } catch (error) {
           nativeHistoryError = error;
@@ -35517,7 +35585,7 @@ async function handleReadChat(h, args) {
             excludeInProgressTurn: returnedStatus === "waiting_approval",
             sessionStartedAtMs,
             envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
-            instanceId: typeof args?.targetSessionId === "string" ? args.targetSessionId : void 0
+            instanceId: effectiveReadSessionId(h, args?.targetSessionId) || void 0
           });
           nativeHistoryError = void 0;
           nativeMessages = nativeHistory && Array.isArray(nativeHistory.messages) ? normalizeAndFilterNativeHistory(h, agentStr, args, nativeHistory.messages, nativeHistory.providerSessionId) : [];
@@ -35739,7 +35807,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,
+        instanceId: effectiveReadSessionId(h, 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.
@@ -35758,7 +35826,7 @@ async function handleReadChat(h, args) {
       const historyMessages = Array.isArray(history?.messages) ? normalizeAndFilterNativeHistory(h, agentStr, args, history.messages, history?.providerSessionId) : [];
       const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : readHistorySessionIdFromMessages(historyMessages) || effectiveHistorySessionIdForRead;
       if (typeof history?.providerSessionId === "string" && history.providerSessionId.trim()) {
-        recordBoundProviderSessionId(targetSid, history.providerSessionId.trim());
+        recordBoundProviderSessionId(h, effectiveReadSessionId(h, targetSid), history.providerSessionId.trim());
       }
       const mappingSessionId = effectiveHistorySessionIdForRead;
       const safeMapping = supportsNative ? hasSafeNativeHistoryMapping({
@@ -44225,6 +44293,7 @@ function createCliAdapter(provider, workingDir, cliArgs, extraEnv, transportFact
 }
 
 // src/providers/cli-provider-instance.ts
+init_state_store();
 init_logger();
 init_debug_trace();
 init_debug_config();
@@ -44257,13 +44326,10 @@ function normalizeUuid(uuid) {
   return String(uuid || "").trim().toLowerCase();
 }
 function antigravityOwnerToken(workspace, sessionStartedAtMs, instanceId) {
+  void workspace;
+  void sessionStartedAtMs;
   const iid = typeof instanceId === "string" ? instanceId.trim() : "";
-  if (iid) return `iid:${iid}`;
-  if (typeof sessionStartedAtMs === "number" && sessionStartedAtMs > 0) {
-    const ws = String(workspace || "").trim().toLowerCase();
-    return `spawn:${ws}:${sessionStartedAtMs}`;
-  }
-  return "";
+  return iid ? `iid:${iid}` : "";
 }
 function claimAntigravityConversation(uuid, owner, now = Date.now()) {
   const key2 = normalizeUuid(uuid);
@@ -45023,6 +45089,27 @@ var CliProviderInstance = class _CliProviderInstance {
       senderName: message.senderName,
       receivedAt: message.receivedAt
     })) : mergedMessages;
+    const adapterOwnsMessagesElsewhereForTail = this.adapter?.chatMessagesOwnedExternally === true;
+    if (adapterOwnsMessagesElsewhereForTail && this.lastCompletionSummary) {
+      const summary = this.lastCompletionSummary;
+      let hasTrailingAssistant = false;
+      for (let i = statusMessages.length - 1; i >= 0; i -= 1) {
+        const m = statusMessages[i];
+        const role = typeof m?.role === "string" ? m.role : "";
+        if (role === "system") continue;
+        if (typeof m?.kind === "string" && m.kind === "tool") continue;
+        hasTrailingAssistant = role === "assistant" && typeof m?.receivedAt === "number" && m.receivedAt >= summary.receivedAt - 1e3;
+        break;
+      }
+      if (!hasTrailingAssistant) {
+        statusMessages.push({
+          role: "assistant",
+          content: summary.content,
+          kind: "standard",
+          receivedAt: summary.receivedAt
+        });
+      }
+    }
     const dirName = workingDirBasename(this.workingDir);
     const parsedChatStatus = typeof parsedStatus?.status === "string" && parsedStatus.status.trim() ? parsedStatus.status.trim() : void 0;
     const suppressStaleParsedBusyStatus = this.shouldSuppressStaleParsedBusyStatus(parsedStatus, adapterStatus);
@@ -45455,6 +45542,18 @@ var CliProviderInstance = class _CliProviderInstance {
   completedDebounceTimer = null;
   completedDebouncePending = null;
   lastExternalCompletionProbe = null;
+  /**
+   * The final assistant summary of the last completed turn, cached at
+   * completion-emit time. For a native-source provider (antigravity) whose
+   * assistant answer lives only in native-history — never in the PTY parse that
+   * feeds activeChat.messages — the dashboard's preview / lastMessageRole /
+   * completionMarker would otherwise never see the answer and show the session
+   * stuck on the user prompt. getState() appends this cached assistant bubble to
+   * the status messages when the PTY tail has none, so those fields reflect the
+   * real last answer with ZERO per-tick native reads (the native read already ran
+   * once at completion). Reset on the next turn's start.
+   */
+  lastCompletionSummary = null;
   async enforceFreshSessionLaunchIfNeeded() {
     const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
     if (!scriptName) return;
@@ -45518,8 +45617,15 @@ var CliProviderInstance = class _CliProviderInstance {
   readExternalCompletionMessages() {
     const adapterOwnsMessagesElsewhere = this.adapter?.chatMessagesOwnedExternally === true;
     if (!adapterOwnsMessagesElsewhere) return null;
-    if (!this.providerSessionId) return null;
     if (!isNativeSourceCanonicalHistory(this.provider.nativeHistory)) return null;
+    let resolvedHandle = this.providerSessionId || "";
+    if (!resolvedHandle) {
+      try {
+        const pinned = loadPersistedProviderSessionPins()[this.instanceId];
+        if (typeof pinned === "string" && pinned.trim()) resolvedHandle = pinned.trim();
+      } catch {
+      }
+    }
     if (this.lastExternalCompletionProbe?.sourcePath) {
       try {
         fs21.statSync(this.lastExternalCompletionProbe.sourcePath);
@@ -45528,13 +45634,18 @@ var CliProviderInstance = class _CliProviderInstance {
     }
     const restoredHistory = readProviderChatHistory(this.type, {
       canonicalHistory: this.provider.nativeHistory,
-      historySessionId: this.providerSessionId,
+      historySessionId: resolvedHandle || void 0,
       workspace: this.workingDir,
       offset: 0,
       limit: Number.MAX_SAFE_INTEGER,
       historyBehavior: this.provider.historyBehavior,
       scripts: this.provider.scripts,
       sessionStartedAtMs: this.startedAt,
+      // The claim owner token must match read_chat's so the exact-bind on our
+      // own conversation stays idempotent rather than looking foreign, and so
+      // the floor-based resolution above claims THIS session's db under its
+      // own owner (never a sibling's).
+      instanceId: this.instanceId,
       envOverrides: this.spawnedEnvOverrides(),
       forceRefresh: true
     });
@@ -45549,6 +45660,26 @@ var CliProviderInstance = class _CliProviderInstance {
     );
     return restoredHistory.messages;
   }
+  /**
+   * The content of the LAST visible assistant bubble in a message list, or ''
+   * when the tail is not an assistant reply. Skips trailing system/tool/activity
+   * bubbles; stops (returns '') at the first user/human message. Used only for
+   * the dashboard tail-repair cache — a display value, not a completion decision.
+   */
+  lastVisibleAssistantSummary(messages) {
+    if (!Array.isArray(messages)) return "";
+    for (let i = messages.length - 1; i >= 0; i -= 1) {
+      const m = messages[i];
+      const role = typeof m?.role === "string" ? m.role : "";
+      const kind = typeof m?.kind === "string" ? m.kind : "";
+      if (role === "system") continue;
+      if (kind === "tool" || kind === "activity") continue;
+      if (role === "user" || role === "human") return "";
+      if (role === "assistant") return flattenContent(m.content).trim();
+      return "";
+    }
+    return "";
+  }
   completionFinalAssistantEvidence(parsedMessages, turnStartedAt) {
     const turnClosed = !this.hasAdapterPendingResponse();
     if (this.completionHasFinalAssistantMessage(parsedMessages, turnStartedAt)) {
@@ -45560,8 +45691,13 @@ var CliProviderInstance = class _CliProviderInstance {
     }
     const externalMessages = this.readExternalCompletionMessages();
     if (externalMessages) {
+      const present = turnClosed && this.completionHasFinalAssistantMessage(externalMessages, turnStartedAt);
+      const lastVisibleAssistant = this.lastVisibleAssistantSummary(externalMessages);
+      if (lastVisibleAssistant) {
+        this.lastCompletionSummary = { content: lastVisibleAssistant, receivedAt: Date.now() };
+      }
       return {
-        present: turnClosed && this.completionHasFinalAssistantMessage(externalMessages, turnStartedAt),
+        present,
         messages: externalMessages,
         source: "external-native"
       };
@@ -45581,7 +45717,10 @@ var CliProviderInstance = class _CliProviderInstance {
     if (adapterOwnsMessagesElsewhere) {
       const externalMessages = this.readExternalCompletionMessages();
       const externalSummary = externalMessages ? extractFinalSummaryFromMessagesAfter(externalMessages, turnStartedAt) : "";
-      if (externalSummary) return externalSummary;
+      if (externalSummary) {
+        this.lastCompletionSummary = { content: externalSummary, receivedAt: Date.now() };
+        return externalSummary;
+      }
       return parsedSummary || void 0;
     }
     return parsedSummary || void 0;
@@ -46049,6 +46188,10 @@ var CliProviderInstance = class _CliProviderInstance {
    * the emitted event, exactly as each inline builder produced before.
    */
   emitGeneratingCompleted(opts) {
+    const summary = typeof opts.finalSummary === "string" ? opts.finalSummary.trim() : "";
+    if (summary) {
+      this.lastCompletionSummary = { content: summary, receivedAt: opts.timestamp };
+    }
     this.pushEvent({
       event: "agent:generating_completed",
       chatTitle: opts.chatTitle,
@@ -46333,6 +46476,7 @@ var CliProviderInstance = class _CliProviderInstance {
           this.completedDebouncePending = null;
         }
         if (!this.generatingStartedAt) this.generatingStartedAt = now;
+        this.lastCompletionSummary = null;
         this.busyEpoch++;
         if (this.generatingDebounceTimer) clearTimeout(this.generatingDebounceTimer);
         this.generatingDebouncePending = { chatTitle, timestamp: now };
@@ -51300,6 +51444,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),
@@ -51308,7 +51459,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"
@@ -51437,6 +51588,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");
@@ -51451,10 +51613,24 @@ function resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instan
   const brainRoot2 = path34.join(agyRoot, "brain");
   if (fs26.existsSync(brainRoot2)) {
     const cutoff = spawnAwareCutoff(sessionStartedAtMs);
-    const entries = fs26.readdirSync(brainRoot2, { withFileTypes: true }).filter((e) => e.isDirectory() && isUuidLikeSessionId2(e.name)).filter((e) => !isAntigravityConversationClaimedByOther(e.name, owner)).map((e) => ({ uuid: e.name, p: path34.join(brainRoot2, e.name), mtime: safeMtime(path34.join(brainRoot2, e.name)) })).filter((e) => e.mtime >= cutoff).sort((a, b) => b.mtime - a.mtime);
-    for (const e of entries) {
-      const t = path34.join(e.p, ".system_generated", "logs", "transcript.jsonl");
-      if (fs26.existsSync(t) && safeSize(t) > 0) {
+    const nonEmptyBrain = (uuid, p) => {
+      const t = path34.join(p, ".system_generated", "logs", "transcript.jsonl");
+      return fs26.existsSync(t) && safeSize(t) > 0 ? t : null;
+    };
+    const all = fs26.readdirSync(brainRoot2, { withFileTypes: true }).filter((e) => e.isDirectory() && isUuidLikeSessionId2(e.name)).filter((e) => !isAntigravityConversationClaimedByOther(e.name, owner)).map((e) => {
+      const p = path34.join(brainRoot2, e.name);
+      return { uuid: e.name, p, mtime: safeMtime(p), birth: safeBirthtime(p) };
+    }).filter((e) => e.mtime >= cutoff);
+    let ordered = [];
+    if (sessionStartedAtMs > 0) {
+      const floor = sessionStartedAtMs - AGY_SPAWN_CLAIM_GRACE_MS;
+      ordered = all.filter((e) => (e.birth > 0 ? e.birth : e.mtime) >= floor).sort((a, b) => (a.birth || a.mtime) - (b.birth || b.mtime));
+    } else {
+      ordered = [...all].sort((a, b) => b.mtime - a.mtime);
+    }
+    for (const e of ordered) {
+      const t = nonEmptyBrain(e.uuid, e.p);
+      if (t) {
         if (owner) claimAntigravityConversation(e.uuid, owner);
         return t;
       }
@@ -51475,6 +51651,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) {
@@ -51485,7 +51662,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;
@@ -68726,7 +68903,11 @@ var SessionRegistry = class {
   byInstanceKey = /* @__PURE__ */ new Map();
   byParentSessionId = /* @__PURE__ */ new Map();
   register(target) {
+    const priorProviderSessionId = this.bySessionId.get(target.sessionId)?.providerSessionId;
     this.unregister(target.sessionId);
+    if (priorProviderSessionId && !target.providerSessionId) {
+      target = { ...target, providerSessionId: priorProviderSessionId };
+    }
     this.bySessionId.set(target.sessionId, target);
     if (target.cdpManagerKey) this.addIndex(this.byManagerKey, target.cdpManagerKey, target.sessionId);
     if (target.instanceKey) this.addIndex(this.byInstanceKey, target.instanceKey, target.sessionId);
@@ -68736,6 +68917,22 @@ var SessionRegistry = class {
     if (!sessionId) return void 0;
     return this.bySessionId.get(sessionId);
   }
+  /**
+   * Record the authoritative provider-native conversation id for a session
+   * (SSOT). Idempotent; a no-op when the session is unknown or the value is
+   * empty or unchanged. Never overwrites a known binding with an empty one.
+   * Returns whether the stored value changed.
+   */
+  setProviderSessionId(sessionId, providerSessionId) {
+    const sid = typeof sessionId === "string" ? sessionId.trim() : "";
+    const value = typeof providerSessionId === "string" ? providerSessionId.trim() : "";
+    if (!sid || !value) return false;
+    const target = this.bySessionId.get(sid);
+    if (!target) return false;
+    if (target.providerSessionId === value) return false;
+    target.providerSessionId = value;
+    return true;
+  }
   unregister(sessionId) {
     if (!sessionId) return;
     const target = this.bySessionId.get(sessionId);