@adhdev/daemon-core 0.9.82-rc.479 → 0.9.82-rc.480

package/dist/cli-adapters/cli-state-engine.d.ts

@@ -154,6 +154,26 @@ export declare class CliStateEngine {
     clearAllTimers(): void;
     resetActiveTurnState(): void;
     clearIdleFinishCandidate(reason: string): void;
+    /**
+     * Poll-driven static-idle confirm (D4). A hosted CLI session (e.g. a fresh
+     * antigravity coordinator) whose boot banner drove the FSM into 'generating'
+     * can then sit at a STATIC ready prompt emitting no further PTY output. Every
+     * output-driven busy→idle re-eval (handleOutput/resolveStartupState/settle)
+     * is starved because there is no new output, and the startup-settle loop has
+     * hard-stopped past spawnAt+10s — so currentStatus stays frozen at generating
+     * and the dashboard disables Send. This is the ONE path that can release that
+     * wedge from the read-only status poll.
+     *
+     * Safety: this must NEVER flip a real generating turn to idle. The gate is
+     * done by the caller (getStatus) reusing resolveStartupState's proven
+     * predicates: no recent PTY output for a grace window, runDetectStatus of the
+     * current screen === 'idle', and no active/parsed modal. Here we add the
+     * final structural guard: there must be NO active turn scope. A live user
+     * turn always carries a currentTurnScope (set in onTurnStarted), so this only
+     * releases the boot-banner wedge and the post-turn static-idle case, both of
+     * which have already had their scope nulled. Returns true when it transitioned.
+     */
+    confirmPollStaticIdle(reason: string): boolean;
     hasActionableApproval(startupModal?: {
         message: string;
         buttons: string[];

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

@@ -11,5 +11,13 @@ import type { CommandResult, CommandHelpers } from './handler.js';
  * worker. Not part of the runtime contract.
  */
 export declare function __resetProviderSessionPinsForTest(): void;
+/**
+ * Test-only: read the in-memory read-pin (the mesh-session → conversation-uuid
+ * bind recorded by recordBoundProviderSessionId and mirrored to state.json
+ * sessionProviderSessionPins). Lets the antigravity-coordinator-pin tests assert
+ * that an owner-confirmed workspace-latest read recorded the pin — and that a
+ * non-owner-confirmed read did NOT. Not part of the runtime contract.
+ */
+export declare function __getProviderSessionPinForTest(meshSessionId: string): string | undefined;
 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, __resetProviderSessionPinsForTest } from './chat-commands-read.js';
+export { handleChatHistory, handleReadChat, __resetProviderSessionPinsForTest, __getProviderSessionPinForTest } from './chat-commands-read.js';
 export { handleSendChat, handleListChats, handleNewChat, handleSwitchChat, handleSetMode, handleChangeModel, handleSetThoughtLevel, handleResolveAction, } from './chat-commands-write.js';

package/dist/commands/cli-manager.d.ts

@@ -61,6 +61,14 @@ export interface HostedCliRuntimeDescriptor {
     cliArgs?: string[];
     providerSessionId?: string;
     managedBy?: string;
+    /**
+     * Real spawn time (ms epoch) of the underlying session-host runtime — a PAST
+     * timestamp recorded when the runtime first started. Threaded through so an
+     * attach can restore the native-history session-floor to the runtime's actual
+     * birth instead of collapsing spawnedAtMs to 0. Undefined when unrecoverable
+     * (genuine post-restart-unknown), in which case the caller keeps the 0 fallback.
+     */
+    startedAtMs?: number;
 }
 type CliLaunchMode = 'new' | 'resume' | 'manual';
 type CliSessionBinding = {
@@ -84,6 +92,24 @@ export interface CoordinatorDelegatedCliLaunchOptions {
     cliArgs: string[];
     env: Record<string, string>;
 }
+/**
+ * Decide the session-registry spawnedAtMs (the native-history session-floor) for a
+ * newly registered CLI instance.
+ *
+ * - Fresh launch (attachExisting=false): now (nowMs). A real live spawn floor
+ *   isolates a fresh session's own store and holds prior-session leak protection.
+ * - Attach WITH a recoverable record startedAt (a PAST timestamp): that startedAt.
+ *   Restoring a hosted runtime (coordinator / MAGI replica / hermes / claude /
+ *   codex) after a daemon restart, the real spawn time is in the past. Using it
+ *   restores each session's per-session birth-floor so co-located antigravity
+ *   runtimes resolve their OWN conversation (ownerConfirmed) instead of the
+ *   floor-less newest-by-mtime path that let a replica claim the coordinator's conv.
+ * - Attach with NO recoverable startedAt: 0 — disables the floor for this session
+ *   (recent_window_ms still bounds the look-back). NEVER use nowMs here: nowMs is in
+ *   the FUTURE relative to existing transcripts and would push the floor past every
+ *   transcript file, losing them (the ANTIGRAVITY-FINAL-MESSAGE-TAIL-GAP regression).
+ */
+export declare function resolveHostedSpawnedAtMs(attachExisting: boolean, attachStartedAtMs: number | undefined, nowMs: number): number;
 export declare function buildCoordinatorDelegatedCliLaunchOptions(input: CoordinatorDelegatedCliLaunchOptionsInput): CoordinatorDelegatedCliLaunchOptions;
 export declare function supportsExplicitSessionResume(resume?: ProviderResumeCapability): boolean;
 export declare function resolveCliSessionBinding(provider: ProviderModule | undefined, normalizedType: string, cliArgs?: string[], requestedResumeSessionId?: string): CliSessionBinding;

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

@@ -126,6 +126,7 @@ export declare function readProviderChatHistory(agentType: string, options?: {
     nativeHistoryCoverage?: string;
     partialReason?: string;
     unavailableReason?: string;
+    ownerConfirmed?: boolean;
 };
 export declare function listProviderHistorySessions(agentType: string, options?: {
     canonicalHistory?: ProviderCanonicalHistoryConfig;

package/dist/index.d.ts

@@ -85,7 +85,7 @@ export type { IDEInfo } from './detection/ide-detector.js';
 export { detectCLIs } from './detection/cli-detector.js';
 export { getHostMemorySnapshot } from './system/host-memory.js';
 export type { HostMemorySnapshot } from './system/host-memory.js';
-export { classifyHotChatSessionsForSubscriptionFlush, DEFAULT_ACTIVE_CHAT_POLL_STATUSES, DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS, } from './status/chat-tail-hot-sessions.js';
+export { classifyHotChatSessionsForSubscriptionFlush, detectNewlySettledCompletedSessions, DEFAULT_ACTIVE_CHAT_POLL_STATUSES, DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS, } from './status/chat-tail-hot-sessions.js';
 export { DaemonCdpManager } from './cdp/manager.js';
 export { CdpDomHandlers } from './cdp/devtools.js';
 export { setupIdeInstance, registerExtensionProviders, connectCdpManager, probeCdpPort } from './cdp/setup.js';

package/dist/index.js

@@ -409,10 +409,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "6d7bacdddb31d77f5aa1c900d667702ab9acb472" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "6d7bacdd" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.479" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-06T19:58:17.279Z" : void 0);
+  const commit = readInjected(true ? "27de51660cbce2ce37049081744c09a168420b2f" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "27de5166" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.480" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-07T16:21:33.035Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -24257,6 +24257,41 @@ var init_cli_state_engine = __esm({
         this.recordTrace("idle_candidate_reset", { reason, candidate: this.idleFinishCandidate });
         this.idleFinishCandidate = null;
       }
+      /**
+       * Poll-driven static-idle confirm (D4). A hosted CLI session (e.g. a fresh
+       * antigravity coordinator) whose boot banner drove the FSM into 'generating'
+       * can then sit at a STATIC ready prompt emitting no further PTY output. Every
+       * output-driven busy→idle re-eval (handleOutput/resolveStartupState/settle)
+       * is starved because there is no new output, and the startup-settle loop has
+       * hard-stopped past spawnAt+10s — so currentStatus stays frozen at generating
+       * and the dashboard disables Send. This is the ONE path that can release that
+       * wedge from the read-only status poll.
+       *
+       * Safety: this must NEVER flip a real generating turn to idle. The gate is
+       * done by the caller (getStatus) reusing resolveStartupState's proven
+       * predicates: no recent PTY output for a grace window, runDetectStatus of the
+       * current screen === 'idle', and no active/parsed modal. Here we add the
+       * final structural guard: there must be NO active turn scope. A live user
+       * turn always carries a currentTurnScope (set in onTurnStarted), so this only
+       * releases the boot-banner wedge and the post-turn static-idle case, both of
+       * which have already had their scope nulled. Returns true when it transitioned.
+       */
+      confirmPollStaticIdle(reason) {
+        if (this.currentStatus !== "generating") return false;
+        if (this.currentTurnScope || this.activeModal) return false;
+        this.clearAllTimers();
+        this.clearIdleFinishCandidate(reason);
+        this.isWaitingForResponse = false;
+        this.responseSettleIgnoreUntil = 0;
+        this.submitRetryUsed = false;
+        this.submitRetryPromptSnippet = "";
+        this.finishRetryCount = 0;
+        this.currentTurnScope = null;
+        this.activeModal = null;
+        this.setStatus("idle", reason);
+        this.recordTrace("poll_static_idle_confirmed", { reason });
+        return true;
+      }
       hasActionableApproval(startupModal) {
         return !!(startupModal ?? this.activeModal);
       }
@@ -25697,6 +25732,18 @@ ${lastSnapshot}`;
         const allowParse = options.allowParse !== false;
         const startupModal = allowParse && this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
         const startupDetectedStatus = allowParse && this.startupParseGate && !startupModal ? this.runDetectStatus(this.recentOutputBuffer || this.terminalScreen.getText()) : null;
+        if (allowParse && this.engine.currentStatus === "generating" && !this.engine.currentTurnScope && !this.engine.activeModal) {
+          const now = Date.now();
+          const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
+          if (quietForMs >= this.getStatusActivityHoldMs()) {
+            const screenText = this.terminalScreen.getText();
+            const pollDetect = this.runDetectStatus(screenText || this.recentOutputBuffer);
+            const pollModal = this.runParseApproval(screenText) || this.runParseApproval(this.recentOutputBuffer);
+            if (pollDetect === "idle" && !pollModal) {
+              this.engine.confirmPollStaticIdle("poll_static_idle");
+            }
+          }
+        }
         let effectiveStatus = this.projectEffectiveStatus(startupModal);
         let effectiveModal = startupModal || this.engine.activeModal;
         if (allowParse && !effectiveModal && this.engine.isWaitingForResponse) {
@@ -27321,6 +27368,7 @@ __export(index_exports, {
   detectCLIs: () => detectCLIs,
   detectClaudeAskUserQuestionPromptFromJson: () => detectClaudeAskUserQuestionPromptFromJson,
   detectIDEs: () => detectIDEs,
+  detectNewlySettledCompletedSessions: () => detectNewlySettledCompletedSessions,
   drainPendingMeshCoordinatorEvents: () => drainPendingMeshCoordinatorEvents,
   enqueueTask: () => enqueueTask,
   ensureSessionHostReady: () => ensureSessionHostReady,
@@ -29267,8 +29315,11 @@ function classifyHotChatSessionsForSubscriptionFlush(sessions, previousHotSessio
   );
   const activeStatuses = options.activeStatuses ?? DEFAULT_ACTIVE_CHAT_POLL_STATUSES;
   const activeSessionIds = options.activeSessionIds ?? /* @__PURE__ */ new Set();
+  const deliveredCompletionTailAt = options.deliveredCompletionTailAt ?? null;
+  const underDeliveredSessionIds = options.underDeliveredSessionIds ?? null;
   const active = /* @__PURE__ */ new Set();
   const excluded = /* @__PURE__ */ new Set();
+  const guaranteedDelivery = /* @__PURE__ */ new Set();
   for (const session of sessions) {
     const sessionId = typeof session?.id === "string" ? session.id : "";
     if (!sessionId) continue;
@@ -29291,12 +29342,47 @@ function classifyHotChatSessionsForSubscriptionFlush(sessions, previousHotSessio
     const shouldKeepRecentTailHot = recentlyUpdated && (unread || inboxBucket === "task_complete" || inboxBucket === "needs_attention" || isLiveRuntime || activeStatuses.has(status));
     if (activeStatuses.has(status) || shouldKeepRecentTailHot) {
       active.add(sessionId);
+      continue;
+    }
+    if (underDeliveredSessionIds && underDeliveredSessionIds.has(sessionId)) {
+      active.add(sessionId);
+      guaranteedDelivery.add(sessionId);
+      continue;
+    }
+    const completedUnseen = unread || inboxBucket === "task_complete";
+    if (!underDeliveredSessionIds && deliveredCompletionTailAt && completedUnseen) {
+      const delivered = deliveredCompletionTailAt.get(sessionId) ?? 0;
+      const alreadyDelivered = delivered > 0 && lastMessageAt > 0 && delivered >= lastMessageAt;
+      if (!alreadyDelivered) {
+        active.add(sessionId);
+        guaranteedDelivery.add(sessionId);
+      }
     }
   }
   const finalizing = new Set(
     Array.from(previousHotSessionIds).filter((sessionId) => !active.has(sessionId) && !excluded.has(sessionId))
   );
-  return { active, finalizing };
+  return { active, finalizing, guaranteedDelivery };
+}
+function detectNewlySettledCompletedSessions(sessions, previousStatus, options = {}) {
+  const activeStatuses = options.activeStatuses ?? DEFAULT_ACTIVE_CHAT_POLL_STATUSES;
+  const settled = /* @__PURE__ */ new Set();
+  const nextStatus = /* @__PURE__ */ new Map();
+  for (const session of sessions) {
+    const sessionId = typeof session?.id === "string" ? session.id : "";
+    if (!sessionId) continue;
+    const status = String(session?.status || "").toLowerCase();
+    const prevStatus = previousStatus.get(sessionId);
+    nextStatus.set(sessionId, status);
+    const wasActive = prevStatus !== void 0 && activeStatuses.has(prevStatus);
+    const isSettledNow = !activeStatuses.has(status);
+    const inboxBucket = String(session?.inboxBucket || "").toLowerCase();
+    const completedUnseen = session?.unread === true || inboxBucket === "task_complete";
+    if (wasActive && isSettledNow && completedUnseen) {
+      settled.add(sessionId);
+    }
+  }
+  return { settled, nextStatus };
 }
 
 // src/cdp/manager.ts
@@ -32113,7 +32199,8 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
     workspace: typeof result.workspace === "string" ? result.workspace.trim() : void 0,
     nativeHistoryCoverage: typeof result.nativeHistoryCoverage === "string" ? result.nativeHistoryCoverage.trim() : void 0,
     partialReason: typeof result.partialReason === "string" ? result.partialReason.trim() : void 0,
-    unavailableReason: typeof result.unavailableReason === "string" ? result.unavailableReason.trim() : void 0
+    unavailableReason: typeof result.unavailableReason === "string" ? result.unavailableReason.trim() : void 0,
+    ownerConfirmed: typeof result.ownerConfirmed === "boolean" ? result.ownerConfirmed : void 0
   };
 }
 function buildNativeHistoryReadResult(agentType, canonicalHistory, scripts, historySessionId, workspace, excludeInProgressTurn, sessionStartedAtMs, envOverrides, forceRefresh, instanceId) {
@@ -32160,7 +32247,8 @@ function readProviderChatHistory(agentType, options = {}) {
       workspace: nativeResult.workspace,
       nativeHistoryCoverage: nativeResult.nativeHistoryCoverage,
       partialReason: nativeResult.partialReason,
-      unavailableReason: nativeResult.unavailableReason
+      unavailableReason: nativeResult.unavailableReason,
+      ownerConfirmed: nativeResult.ownerConfirmed
     };
   }
   return {
@@ -34525,6 +34613,12 @@ function getExplicitHistorySessionId(args) {
   if (explicitProviderSessionId) return explicitProviderSessionId;
   return void 0;
 }
+function isRuntimeFallbackHistorySessionId(candidateHistorySessionId, targetSessionId) {
+  const target = typeof targetSessionId === "string" ? targetSessionId.trim() : "";
+  if (!target) return false;
+  const candidate = typeof candidateHistorySessionId === "string" ? candidateHistorySessionId.trim() : "";
+  return candidate === target;
+}
 function getHistorySessionId(h, args) {
   const explicit = getExplicitHistorySessionId(args);
   if (explicit) return explicit;
@@ -35359,12 +35453,19 @@ async function handleChatHistory(h, args) {
       if (visibleCount > excludeRecentCount) excludeRecentCount = visibleCount;
     }
     const workspace = typeof args?.workspace === "string" ? args.workspace : typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : void 0;
+    const targetSidForHistory = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
+    const explicitHistorySessionIdForHistory = getExplicitHistorySessionId(args);
+    const historySessionIdIsRuntimeFallback = Boolean(
+      targetSidForHistory && isRuntimeFallbackHistorySessionId(historySessionId, targetSidForHistory) && (!explicitHistorySessionIdForHistory || isRuntimeFallbackHistorySessionId(explicitHistorySessionIdForHistory, targetSidForHistory))
+    );
+    const pinnedProviderSessionIdForHistory = getBoundProviderSessionIdPin(args?.targetSessionId);
+    const effectiveHistorySessionId = historySessionIdIsRuntimeFallback ? pinnedProviderSessionIdForHistory || void 0 : historySessionId;
     const exactNativeHistoryScope = Boolean(
-      typeof args?.targetSessionId === "string" && args.targetSessionId.trim() || typeof args?.historySessionId === "string" && args.historySessionId.trim() || typeof args?.providerSessionId === "string" && args.providerSessionId.trim()
+      typeof args?.targetSessionId === "string" && args.targetSessionId.trim() || typeof args?.historySessionId === "string" && args.historySessionId.trim() && !historySessionIdIsRuntimeFallback || typeof args?.providerSessionId === "string" && args.providerSessionId.trim()
     );
     const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory) ? readCliProviderNativeHistory(agentStr, {
       canonicalHistory: provider?.nativeHistory,
-      historySessionId,
+      historySessionId: effectiveHistorySessionId,
       workspace,
       offset: offset || 0,
       limit: limit || 30,
@@ -35374,7 +35475,8 @@ async function handleChatHistory(h, args) {
       sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
       envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
       instanceId: effectiveReadSessionId(h, args?.targetSessionId) || void 0,
-      pinnedProviderSessionId: getBoundProviderSessionIdPin(args?.targetSessionId)
+      pinnedProviderSessionId: pinnedProviderSessionIdForHistory,
+      allowWorkspaceLatestFallback: !pinnedProviderSessionIdForHistory && historySessionIdIsRuntimeFallback
     }) : readProviderChatHistory(agentStr, {
       canonicalHistory: provider?.nativeHistory,
       historySessionId,
@@ -35388,13 +35490,17 @@ async function handleChatHistory(h, args) {
     if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
       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(h, effectiveReadSessionId(h, args?.targetSessionId), result.providerSessionId.trim());
+      const historyProviderSessionId = typeof result?.providerSessionId === "string" ? result.providerSessionId : readHistorySessionIdFromMessages(messages) || effectiveHistorySessionId;
+      const resolvedProviderSessionId = typeof result?.providerSessionId === "string" ? result.providerSessionId.trim() : "";
+      const resultLookupIsWorkspace = lookup === "workspace";
+      const resultOwnerConfirmed = result?.ownerConfirmed === true;
+      const ownerConfirmedUuid = resultOwnerConfirmed && typeof historyProviderSessionId === "string" && historyProviderSessionId.trim() ? historyProviderSessionId.trim() : "";
+      if (resolvedProviderSessionId && (!resultLookupIsWorkspace || resultOwnerConfirmed)) {
+        recordBoundProviderSessionId(h, effectiveReadSessionId(h, args?.targetSessionId), resolvedProviderSessionId);
       }
       const safeMapping = hasSafeNativeHistoryMapping({
-        historySessionId: lookup === "workspace" ? void 0 : historySessionId,
-        providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId,
+        historySessionId: ownerConfirmedUuid || (lookup === "workspace" ? void 0 : effectiveHistorySessionId),
+        providerSessionId: ownerConfirmedUuid || (lookup === "workspace" ? void 0 : historyProviderSessionId),
         workspace,
         nativeMessages: messages
       });
@@ -35515,8 +35621,9 @@ async function handleReadChat(h, args) {
       let nativeHistoryError;
       if (supportsNative) {
         const pinnedProviderSessionIdForRead = getBoundProviderSessionIdPin(targetSessionId);
+        const explicitHistorySessionIdForRead = getExplicitHistorySessionId(args);
         const nativeReadSessionIdIsRuntimeFallback = Boolean(
-          targetSessionId && nativeHistoryReadSessionId === targetSessionId && !getExplicitHistorySessionId(args)
+          targetSessionId && isRuntimeFallbackHistorySessionId(nativeHistoryReadSessionId, targetSessionId) && (!explicitHistorySessionIdForRead || isRuntimeFallbackHistorySessionId(explicitHistorySessionIdForRead, targetSessionId))
         );
         const effectiveNativeReadSessionId = nativeReadSessionIdIsRuntimeFallback ? pinnedProviderSessionIdForRead || void 0 : nativeHistoryReadSessionId;
         try {
@@ -35542,7 +35649,10 @@ async function handleReadChat(h, args) {
             allowWorkspaceLatestFallback: !pinnedProviderSessionIdForRead
           });
           const resolvedProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId.trim() : "";
-          if (resolvedProviderSessionId) {
+          const resolvedLookupIsWorkspace = nativeHistory?.lookup === "workspace";
+          const nativeOwnerConfirmed = nativeHistory?.ownerConfirmed === true;
+          const mayPinResolvedProviderSessionId = resolvedProviderSessionId && (!resolvedLookupIsWorkspace || nativeOwnerConfirmed);
+          if (mayPinResolvedProviderSessionId) {
             recordBoundProviderSessionId(h, effectiveReadSessionId(h, targetSessionId), resolvedProviderSessionId);
           }
         } catch (error) {
@@ -35554,14 +35664,15 @@ async function handleReadChat(h, args) {
       const sessionStartedAtMs = sessionStartedAtMsFromRegistry(h, args?.targetSessionId);
       let historyProviderSessionId = typeof nativeHistory?.providerSessionId === "string" ? nativeHistory.providerSessionId : readHistorySessionIdFromMessages(nativeMessages) || nativeHistoryReadSessionId || historySessionId;
       let lookup = nativeHistory?.lookup === "workspace" ? "workspace" : "session";
-      let nativeHistorySessionForMapping = adapter.cliType === "antigravity-cli" && historyProviderSessionId && nativeHistoryReadSessionId && historyProviderSessionId !== nativeHistoryReadSessionId ? void 0 : nativeHistoryReadSessionId;
+      const ownerConfirmedUuid = adapter.cliType === "antigravity-cli" && nativeHistory?.ownerConfirmed === true && typeof historyProviderSessionId === "string" && historyProviderSessionId.trim() ? historyProviderSessionId.trim() : "";
+      let nativeHistorySessionForMapping = ownerConfirmedUuid ? ownerConfirmedUuid : adapter.cliType === "antigravity-cli" && historyProviderSessionId && nativeHistoryReadSessionId && historyProviderSessionId !== nativeHistoryReadSessionId ? void 0 : nativeHistoryReadSessionId;
       let safeMapping = supportsNative && nativeHistory ? hasSafeNativeHistoryMapping({
-        historySessionId: lookup === "workspace" ? void 0 : nativeHistorySessionForMapping,
-        providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId || providerSessionId,
+        historySessionId: ownerConfirmedUuid || (lookup === "workspace" ? void 0 : nativeHistorySessionForMapping),
+        providerSessionId: ownerConfirmedUuid || (lookup === "workspace" ? void 0 : historyProviderSessionId || providerSessionId),
         workspace,
         nativeMessages,
         ptyMessages: returnedMessages,
-        requireWorkspaceContentOverlap: lookup === "workspace" && !exactNativeHistoryScope
+        requireWorkspaceContentOverlap: lookup === "workspace" && !exactNativeHistoryScope && !ownerConfirmedUuid
       }) : false;
       if (skipLiveNativeHistoryWithoutProviderSession && (!safeMapping || returnedMessages.length === 0)) {
         nativeHistory = null;
@@ -35792,8 +35903,9 @@ async function handleReadChat(h, args) {
       const intendedWorkspace = argsWorkspace;
       const supportsNative = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory);
       const pinnedProviderSessionIdForHistory = getBoundProviderSessionIdPin(targetSid);
+      const explicitHistorySessionId = getExplicitHistorySessionId(args);
       const historySessionIdIsRuntimeFallback = Boolean(
-        targetSid && historySessionId === targetSid && !getExplicitHistorySessionId(args)
+        targetSid && isRuntimeFallbackHistorySessionId(historySessionId, targetSid) && (!explicitHistorySessionId || isRuntimeFallbackHistorySessionId(explicitHistorySessionId, targetSid))
       );
       const effectiveHistorySessionIdForRead = historySessionIdIsRuntimeFallback ? pinnedProviderSessionIdForHistory || void 0 : historySessionId;
       const history = supportsNative ? readCliProviderNativeHistory(agentStr, {
@@ -35825,17 +35937,21 @@ 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) || effectiveHistorySessionIdForRead;
-      if (typeof history?.providerSessionId === "string" && history.providerSessionId.trim()) {
+      const historyLookupIsWorkspace = lookup === "workspace";
+      const historyOwnerConfirmed = agentStr === "antigravity-cli" && history?.ownerConfirmed === true;
+      const historyOwnerConfirmedUuid = historyOwnerConfirmed && typeof historyProviderSessionId === "string" && historyProviderSessionId.trim() ? historyProviderSessionId.trim() : "";
+      if (typeof history?.providerSessionId === "string" && history.providerSessionId.trim() && (!historyLookupIsWorkspace || !agentStr || agentStr !== "antigravity-cli" || historyOwnerConfirmed)) {
         recordBoundProviderSessionId(h, effectiveReadSessionId(h, targetSid), history.providerSessionId.trim());
       }
-      const mappingSessionId = effectiveHistorySessionIdForRead;
-      const safeMapping = supportsNative ? hasSafeNativeHistoryMapping({
-        historySessionId: lookup === "workspace" ? void 0 : mappingSessionId,
-        providerSessionId: lookup === "workspace" ? void 0 : historyProviderSessionId,
+      const mappingSessionId = historyOwnerConfirmedUuid || effectiveHistorySessionIdForRead;
+      const antigravityWorkspaceLatestUnconfirmed = agentStr === "antigravity-cli" && historyLookupIsWorkspace && !historyOwnerConfirmedUuid;
+      const safeMapping = supportsNative && !antigravityWorkspaceLatestUnconfirmed ? hasSafeNativeHistoryMapping({
+        historySessionId: historyOwnerConfirmedUuid || (lookup === "workspace" ? void 0 : mappingSessionId),
+        providerSessionId: historyOwnerConfirmedUuid || (lookup === "workspace" ? void 0 : historyProviderSessionId),
         workspace,
         nativeMessages: historyMessages
       }) : false;
-      const trustedExactNativeIdentity = lookup !== "workspace" && Boolean(mappingSessionId) && Boolean(historyProviderSessionId) && mappingSessionId === historyProviderSessionId;
+      const trustedExactNativeIdentity = (lookup !== "workspace" || Boolean(historyOwnerConfirmedUuid)) && Boolean(mappingSessionId) && Boolean(historyProviderSessionId) && mappingSessionId === historyProviderSessionId;
       const machineSessionKey = String(
         args?.targetSessionId || historyProviderSessionId || historySessionId || h.currentSession?.sessionId || ""
       );
@@ -39416,7 +39532,13 @@ function toHostedCliRuntimeDescriptor(record) {
     cliType,
     workspace,
     cliArgs: Array.isArray(record.meta?.cliArgs) ? record.meta.cliArgs : [],
-    providerSessionId: typeof record.meta?.providerSessionId === "string" ? String(record.meta.providerSessionId) : void 0
+    providerSessionId: typeof record.meta?.providerSessionId === "string" ? String(record.meta.providerSessionId) : void 0,
+    // Real spawn time (PAST timestamp) of the underlying runtime — startedAt is
+    // stamped on markStarted; fall back to createdAt (record creation). Threaded
+    // through so an attach restores the native-history session-floor to the
+    // runtime's actual birth instead of collapsing spawnedAtMs to 0 (which broke
+    // the antigravity per-session birth-floor for co-located MAGI runtimes).
+    startedAtMs: typeof record.startedAt === "number" && record.startedAt > 0 ? record.startedAt : typeof record.createdAt === "number" && record.createdAt > 0 ? record.createdAt : void 0
   };
 }
 function getWriteConflictOwnerClientId(error) {
@@ -48601,6 +48723,11 @@ var DEFAULT_COORDINATOR_DELEGATED_ENV_UNSETS = [
 function hasCliArg(args, flag) {
   return args.some((arg) => arg === flag || arg.startsWith(`${flag}=`));
 }
+function resolveHostedSpawnedAtMs(attachExisting, attachStartedAtMs, nowMs) {
+  if (!attachExisting) return nowMs;
+  if (typeof attachStartedAtMs === "number" && attachStartedAtMs > 0) return attachStartedAtMs;
+  return 0;
+}
 function hasConfigOverride(args, key2) {
   for (let index = 0; index < args.length; index += 1) {
     const arg = args[index];
@@ -48929,15 +49056,30 @@ var DaemonCliManager = class {
         workspace: resolvedDir,
         // attachExisting === true means we're restoring an already-spawned
         // hosted runtime after a daemon restart, not starting a fresh PTY.
-        // The real spawn time is in the past and we don't have it on the
-        // restored descriptor; pinning spawnedAtMs to Date.now() in that
-        // case would push the native-history session-floor cutoff past
-        // every existing transcript file, so the agy/hermes/claude reader
-        // would return null even though the transcript on disk is fresh.
-        // 0 disables the floor for this session — recent_window_ms in the
-        // spec still bounds how far back we look. Fresh launches still
-        // get a proper floor so prior-session leak protection holds.
-        spawnedAtMs: attachExisting ? 0 : Date.now()
+        //
+        // NEVER use Date.now() for the attach case: the real spawn time is in
+        // the PAST, and pinning the floor to now would push the native-history
+        // session-floor cutoff past every existing transcript file, so the
+        // agy/hermes/claude reader would return null even though the transcript
+        // on disk is fresh (the ANTIGRAVITY-FINAL-MESSAGE-TAIL-GAP regression).
+        //
+        // But collapsing to 0 for EVERY attach is also wrong: with the mesh
+        // coordinator + MAGI replicas all running as hosted runtimes sharing one
+        // workspace and attached with attachExisting=true, spawnedAtMs=0 disables
+        // the per-session native-history birth-floor for all of them. Without a
+        // floor, resolveAntigravityPath takes the floor-less newest-by-mtime
+        // branch (ownerConfirmed:false) and a replica's read can claim the
+        // coordinator's OWN conversation, which then reads as claimedByOther —
+        // regressing the coordinator chat to the pty-parser (user-only) path.
+        //
+        // So when the session-host record's REAL startedAt (a PAST timestamp) is
+        // recoverable, use it: the floor lands at the runtime's actual birth, the
+        // transcript is still found, AND each session's floor isolates its own
+        // conversation. Fall back to 0 ONLY when startedAt is unrecoverable (the
+        // genuine post-restart-unknown case) — that preserves the tail-gap
+        // protection. Fresh launches still get Date.now() so prior-session leak
+        // protection holds.
+        spawnedAtMs: resolveHostedSpawnedAtMs(attachExisting, options?.attachStartedAtMs, Date.now())
       });
     } catch (spawnErr) {
       LOG.error("CLI", `[${cliType}] Spawn failed: ${spawnErr?.message}`);
@@ -49300,7 +49442,13 @@ Run 'adhdev doctor' for detailed diagnostics.`
           true,
           {
             providerSessionId: sessionBinding.providerSessionId,
-            launchMode: "manual"
+            launchMode: "manual",
+            // Thread the runtime's REAL past spawn time so the attach restores
+            // the per-session native-history birth-floor instead of collapsing
+            // to spawnedAtMs:0 (which disabled the antigravity per-session floor
+            // and let MAGI replicas claim the coordinator's own conversation).
+            // Undefined → registerCliInstance keeps the 0 fallback.
+            attachStartedAtMs: record.startedAtMs
           }
         );
         restoredBindings.add(bindingKey);
@@ -51431,8 +51579,10 @@ function createNativeHistoryDispatcher(reader) {
     const requestedProviderSid = input.providerSessionId || "";
     const sessionStartedAtMs = typeof input.sessionStartedAtMs === "number" ? input.sessionStartedAtMs : typeof input.args?.sessionStartedAtMs === "number" ? input.args.sessionStartedAtMs : 0;
     const instanceId = typeof input.instanceId === "string" ? input.instanceId : typeof input.args?.instanceId === "string" ? input.args.instanceId : "";
-    const sourcePath = resolveSourcePath(reader, workspace, sessionId, sessionStartedAtMs, instanceId);
+    const resolved = resolveSourcePath(reader, workspace, sessionId, sessionStartedAtMs, instanceId);
+    const sourcePath = resolved?.path || null;
     if (!sourcePath) return null;
+    const ownerConfirmed = reader === "antigravity-cli" ? resolved?.ownerConfirmed === true : void 0;
     if (input.forceRefresh === true || input.args?.forceRefresh === true) {
       try {
         fs26.statSync(sourcePath);
@@ -51462,20 +51612,27 @@ function createNativeHistoryDispatcher(reader) {
       providerSessionId: resolvedProviderSessionId,
       sourcePath: session.sourcePath,
       sourceMtimeMs: session.sourceMtimeMs,
-      nativeHistoryCoverage: session.nativeHistoryCoverage || "full"
+      nativeHistoryCoverage: session.nativeHistoryCoverage || "full",
+      ownerConfirmed
     };
   };
 }
 function resolveSourcePath(reader, workspace, sessionId, sessionStartedAtMs, instanceId) {
   switch (reader) {
-    case "claude-cli":
-      return resolveClaudePath(workspace, sessionId);
-    case "codex-cli":
-      return resolveCodexPath(workspace, sessionId, sessionStartedAtMs);
+    case "claude-cli": {
+      const p = resolveClaudePath(workspace, sessionId);
+      return p ? { path: p } : null;
+    }
+    case "codex-cli": {
+      const p = resolveCodexPath(workspace, sessionId, sessionStartedAtMs);
+      return p ? { path: p } : null;
+    }
     case "antigravity-cli":
       return resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instanceId);
-    case "hermes-cli":
-      return resolveHermesPath(workspace, sessionId);
+    case "hermes-cli": {
+      const p = resolveHermesPath(workspace, sessionId);
+      return p ? { path: p } : null;
+    }
   }
 }
 function resolveClaudePath(workspace, sessionId) {
@@ -51607,7 +51764,7 @@ function resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instan
     const dbPath = path34.join(agyRoot, "conversations", `${sessionId}.db`);
     if (fs26.existsSync(dbPath)) {
       if (owner) claimAntigravityConversation(sessionId, owner);
-      return dbPath;
+      return { path: dbPath, ownerConfirmed: true };
     }
   }
   const brainRoot2 = path34.join(agyRoot, "brain");
@@ -51622,6 +51779,7 @@ function resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instan
       return { uuid: e.name, p, mtime: safeMtime(p), birth: safeBirthtime(p) };
     }).filter((e) => e.mtime >= cutoff);
     let ordered = [];
+    const brainOwnerConfirmed = sessionStartedAtMs > 0;
     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));
@@ -51632,7 +51790,7 @@ function resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instan
       const t = nonEmptyBrain(e.uuid, e.p);
       if (t) {
         if (owner) claimAntigravityConversation(e.uuid, owner);
-        return t;
+        return { path: t, ownerConfirmed: brainOwnerConfirmed };
       }
     }
   }
@@ -51640,7 +51798,7 @@ function resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instan
   const picked = pickUnboundConversationDb(convRoot, sessionStartedAtMs, owner);
   if (picked) {
     if (owner) claimAntigravityConversation(picked.uuid, owner);
-    return picked.path;
+    return { path: picked.path, ownerConfirmed: picked.ownerConfirmed };
   }
   return null;
 }
@@ -51671,10 +51829,10 @@ function pickUnboundConversationDb(convRoot, sessionFloorMs, owner) {
     const own = candidates.filter((c) => (c.birth > 0 ? c.birth : c.mtime) >= floor);
     if (own.length === 0) return null;
     own.sort((a, b) => (a.birth || a.mtime) - (b.birth || b.mtime));
-    return { path: own[0].path, uuid: own[0].uuid };
+    return { path: own[0].path, uuid: own[0].uuid, ownerConfirmed: true };
   }
   candidates.sort((a, b) => b.mtime - a.mtime);
-  return { path: candidates[0].path, uuid: candidates[0].uuid };
+  return { path: candidates[0].path, uuid: candidates[0].uuid, ownerConfirmed: false };
 }
 function spawnAwareCutoff(sessionStartedAtMs) {
   const recency = Date.now() - RECENT_WINDOW_MS;
@@ -69697,6 +69855,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   detectCLIs,
   detectClaudeAskUserQuestionPromptFromJson,
   detectIDEs,
+  detectNewlySettledCompletedSessions,
   drainPendingMeshCoordinatorEvents,
   enqueueTask,
   ensureSessionHostReady,