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

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/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 ? "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);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -32034,10 +32034,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 +32053,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 +32066,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 +32082,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 +32115,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),
@@ -35043,7 +35050,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 +35310,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,
@@ -35455,6 +35464,9 @@ async function handleReadChat(h, args) {
             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 : void 0,
             pinnedProviderSessionId: getBoundProviderSessionIdPin(targetSessionId),
             // Last-resort only when no pin was ever recorded for this
             // session; the downstream workspace-overlap safety gate
@@ -35504,7 +35516,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 +35739,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 +45410,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") {