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

package/dist/providers/cli-provider-instance.d.ts

@@ -287,9 +287,21 @@ export declare class CliProviderInstance implements ProviderInstance {
     private pruneRecentUserInputAcks;
     /**
      * 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).
      */
     private antigravityClaimOwner;
     dispose(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.474",
+  "version": "0.9.82-rc.475",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -47,8 +47,8 @@
   "author": "vilmire",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@adhdev/mesh-shared": "0.9.82-rc.474",
-    "@adhdev/session-host-core": "0.9.82-rc.474",
+    "@adhdev/mesh-shared": "0.9.82-rc.475",
+    "@adhdev/session-host-core": "0.9.82-rc.475",
     "@agentclientprotocol/sdk": "^0.16.1",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",

package/src/commands/chat-commands-read.ts

@@ -1095,6 +1095,13 @@ function readCliProviderNativeHistory(agentStr: string, args: {
     // the downstream hasSafeNativeHistoryMapping workspace-overlap gate. Only the
     // read_chat path opts in, and only with a concrete workspace.
     allowWorkspaceLatestFallback?: boolean;
+    // ADHDev session id of the reading session (== the session registry's
+    // sessionId == the provider instance's instanceId). Threaded to the
+    // native-history dispatcher so antigravity's conversation-claim owner token
+    // is keyed on this stable identity and matches the instance-side token —
+    // without it two concurrent antigravity sessions cross-bind each other's
+    // conversation .db.
+    instanceId?: string;
 }): ReturnType<typeof readProviderChatHistory> & { lookup: 'session' | 'workspace' } {
     const canBindFromLiveSession = !args.historySessionId
         && typeof args.sessionStartedAtMs === 'number'
@@ -1146,6 +1153,7 @@ function readCliProviderNativeHistory(agentStr: string, args: {
         excludeInProgressTurn: args.excludeInProgressTurn,
         sessionStartedAtMs: args.sessionStartedAtMs,
         envOverrides: args.envOverrides,
+        instanceId: args.instanceId,
     });
     const boundProviderSessionId = typeof (sessionHistory as any)?.providerSessionId === 'string'
         ? (sessionHistory as any).providerSessionId.trim()
@@ -1541,6 +1549,7 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
                 scripts: provider?.scripts as any,
                 sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
                 envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+                instanceId: typeof args?.targetSessionId === 'string' ? args.targetSessionId : undefined,
                 pinnedProviderSessionId: getBoundProviderSessionIdPin(args?.targetSessionId),
             })
             : readProviderChatHistory(agentStr, {
@@ -1772,6 +1781,9 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                         excludeInProgressTurn: returnedStatus === 'waiting_approval',
                         sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
                         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 : undefined,
                         pinnedProviderSessionId: getBoundProviderSessionIdPin(targetSessionId),
                         // Last-resort only when no pin was ever recorded for this
                         // session; the downstream workspace-overlap safety gate
@@ -1847,6 +1859,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                         excludeInProgressTurn: returnedStatus === 'waiting_approval',
                         sessionStartedAtMs,
                         envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+                        instanceId: typeof args?.targetSessionId === 'string' ? args.targetSessionId : undefined,
                     });
                     nativeHistoryError = undefined;
                     nativeMessages = nativeHistory && Array.isArray(nativeHistory.messages)
@@ -2145,6 +2158,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     scripts: provider?.scripts as any,
                     sessionStartedAtMs: sessionStartedAtMsFromRegistry(h, args?.targetSessionId),
                     envOverrides: sessionSpawnEnvFromAdapter(h, args?.targetSessionId),
+                    instanceId: typeof args?.targetSessionId === 'string' ? args.targetSessionId : undefined,
                     pinnedProviderSessionId: pinnedProviderSessionIdForHistory,
                     // Last-resort only when no pin was ever recorded AND the
                     // runtime fallback did not resolve a real provider session.

package/src/config/chat-history.ts

@@ -1813,10 +1813,12 @@ function callProviderNativeHistoryRead(
     sessionStartedAtMs?: number,
     envOverrides?: Record<string, string>,
     forceRefresh?: boolean,
+    instanceId?: string,
 ): ProviderNativeHistoryReadResult | null {
     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,
@@ -1831,6 +1833,12 @@ function callProviderNativeHistoryRead(
         // 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 || undefined,
         workspace,
         format: canonicalHistory?.format,
         watchPath: canonicalHistory?.watchPath,
@@ -1838,7 +1846,7 @@ function callProviderNativeHistoryRead(
         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 || undefined, workspace, excludeInProgressTurn: excludeInProgressTurn === true, sessionStartedAtMs, envOverrides, forceRefresh: forceRefresh === true },
     });
     if (!result || typeof result !== 'object') return null;
     const records = normalizeProviderNativeHistoryRecords(agentType, normalizedSessionId, (result as any).messages || (result as any).records);
@@ -1865,11 +1873,12 @@ function buildNativeHistoryReadResult(
     sessionStartedAtMs?: number,
     envOverrides?: Record<string, string>,
     forceRefresh?: boolean,
+    instanceId?: string,
 ): ProviderNativeHistoryReadResult | null {
     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(
@@ -1929,6 +1938,13 @@ export function readProviderChatHistory(
         sessionStartedAtMs?: number;
         envOverrides?: Record<string, string>;
         forceRefresh?: boolean;
+        // Daemon instance id of the reading session (== the session registry's
+        // sessionId). Threaded to the native-history dispatcher so the
+        // antigravity conversation-claim owner token is keyed on this stable
+        // per-session identity — identical to the token the provider instance
+        // derives — instead of a spawn timestamp that differs across sample
+        // sites and silently breaks claim isolation.
+        instanceId?: string;
     } = {},
 ): {
     messages: HistoryMessage[];
@@ -1943,7 +1959,7 @@ export function readProviderChatHistory(
     unavailableReason?: string;
 } {
     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),

package/src/providers/cli-provider-instance.ts

@@ -1089,12 +1089,24 @@ export class CliProviderInstance implements ProviderInstance {
 
     /**
      * 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).
      */
     private antigravityClaimOwner(): string {
-        return antigravityOwnerToken(this.workingDir, this.startedAt);
+        return antigravityOwnerToken(this.workingDir, this.startedAt, this.instanceId);
     }
 
     dispose(): void {