@cortexkit/opencode-magic-context 0.42.1 → 0.42.3

package/dist/plugin/dream-timer-module-client.d.ts

@@ -1,7 +1,7 @@
-import type { AuthorityStatus } from "../features/magic-context/context-authority";
+import type { AuthorityModuleClient, AuthorityStatus } from "../features/magic-context/context-authority";
 import type { ClassifyModuleClient } from "../features/magic-context/dreamer/classify";
 import type { RustModeModuleClient } from "../hooks/magic-context/rust-mode-transform";
-export type DreamTimerModuleClient = ClassifyModuleClient & {
+export type DreamTimerModuleClient = ClassifyModuleClient & Pick<AuthorityModuleClient, "mirrorPull"> & {
     authorityStatus?: (args: {
         context_store_uuid: string;
         project: string;

package/dist/plugin/dream-timer-module-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dream-timer-module-client.d.ts","sourceRoot":"","sources":["../../src/plugin/dream-timer-module-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,KAAK,EAER,oBAAoB,EACvB,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG;IACxD,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE;QACrB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC;KAChC,KAAK,OAAO,CAAC;QAAE,SAAS,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CACxD,CAAC;AAEF;;;GAGG;AACH,wBAAgB,4BAA4B,CACxC,YAAY,EAAE,oBAAoB,GAAG,SAAS,GAC/C,sBAAsB,GAAG,SAAS,CAcpC"}
+{"version":3,"file":"dream-timer-module-client.d.ts","sourceRoot":"","sources":["../../src/plugin/dream-timer-module-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,qBAAqB,EACrB,eAAe,EAClB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAER,oBAAoB,EACvB,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GACrD,IAAI,CAAC,qBAAqB,EAAE,YAAY,CAAC,GAAG;IACxC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE;QACrB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC;KAChC,KAAK,OAAO,CAAC;QAAE,SAAS,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CACxD,CAAC;AAEN;;;GAGG;AACH,wBAAgB,4BAA4B,CACxC,YAAY,EAAE,oBAAoB,GAAG,SAAS,GAC/C,sBAAsB,GAAG,SAAS,CAsBpC"}

package/dist/{recomp-orchestrator-m33b3rk9.js → recomp-orchestrator-447vycpt.js}

@@ -3,12 +3,12 @@ import {
   setRecompTerminal2,
   runManagedRecomp2,
   runManagedUpgrade2
-} from "./index-1q9kay7n.js";
+} from "./index-wde5446v.js";
 import"./index-xdtge3y2.js";
-import"./index-jmtjh2d3.js";
+import"./index-sf6x1ga9.js";
 import"./index-sd3egckz.js";
-import"./index-nqgjwfzn.js";
-import"./index-1974jvn3.js";
+import"./index-gynz8qdc.js";
+import"./index-z8552w7e.js";
 import"./index-jdxxq8cz.js";
 import"./index-dkv2dn46.js";
 export {

package/dist/{send-session-notification-1qeqkswb.js → send-session-notification-2mzgd3zf.js}

@@ -5,8 +5,8 @@ import {
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-nqgjwfzn.js";
-import"./index-1974jvn3.js";
+} from "./index-gynz8qdc.js";
+import"./index-z8552w7e.js";
 import"./index-dkv2dn46.js";
 export {
   clearIgnoredMessages2 as clearIgnoredMessages,

package/dist/shared/transcript.d.ts

@@ -150,7 +150,8 @@ export interface TranscriptPart {
     /** Remove one half of a complete tool arc. Callers must remove both halves together. */
     remove?(): boolean;
     /** Refuse structural deletion when the adapter cannot match provider-native identity safely. */
-    canRemove?(): boolean;
+    /** A deferred durable decision vetoes the whole drop, including sentinel fallback. */
+    canRemove?(): boolean | "defer";
     /**
      * Optional: serialized byte size of the part's REAL payload, including
      * non-text content (images, structured data) that `getText()` can't

package/dist/shared/transcript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transcript.d.ts","sourceRoot":"","sources":["../../src/shared/transcript.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AAEH,2EAA2E;AAC3E,MAAM,MAAM,kBAAkB,GACxB,MAAM,GACN,UAAU,GACV,UAAU,GACV,aAAa,GACb,OAAO,GACP,MAAM,GACN,YAAY,GACZ,SAAS,CAAC;AAEhB;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,cAAc;IAC3B,+DAA+D;IAC/D,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAElC;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;;;OAOG;IACH,OAAO,IAAI,MAAM,GAAG,SAAS,CAAC;IAE9B;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAElC;;;;OAIG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAExC;;;;;;;;;;;OAWG;IACH,eAAe,IAAI;QACf,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;KAC3B,CAAC;IAEF;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEhD;;;;;OAKG;IACH,YAAY,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;IAEvD;;;;;;;;;;;;OAYG;IACH,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IAEnD,wFAAwF;IACxF,MAAM,CAAC,IAAI,OAAO,CAAC;IACnB,gGAAgG;IAChG,SAAS,CAAC,IAAI,OAAO,CAAC;IAEtB;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAC9B,8FAA8F;IAC9F,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,IAAI,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAEjE,wEAAwE;IACxE,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;CACpC;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,UAAU;IACvB,4CAA4C;IAC5C,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAE5B;;;;;;;;;;;;;OAaG;IACH,MAAM,IAAI,IAAI,CAAC;CAClB;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,wBAAwB,EAAE,kBAAiC,CAAC"}
+{"version":3,"file":"transcript.d.ts","sourceRoot":"","sources":["../../src/shared/transcript.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AAEH,2EAA2E;AAC3E,MAAM,MAAM,kBAAkB,GACxB,MAAM,GACN,UAAU,GACV,UAAU,GACV,aAAa,GACb,OAAO,GACP,MAAM,GACN,YAAY,GACZ,SAAS,CAAC;AAEhB;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,cAAc;IAC3B,+DAA+D;IAC/D,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAElC;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;;;OAOG;IACH,OAAO,IAAI,MAAM,GAAG,SAAS,CAAC;IAE9B;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAElC;;;;OAIG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAExC;;;;;;;;;;;OAWG;IACH,eAAe,IAAI;QACf,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;KAC3B,CAAC;IAEF;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEhD;;;;;OAKG;IACH,YAAY,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;IAEvD;;;;;;;;;;;;OAYG;IACH,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IAEnD,wFAAwF;IACxF,MAAM,CAAC,IAAI,OAAO,CAAC;IACnB,gGAAgG;IAChG,sFAAsF;IACtF,SAAS,CAAC,IAAI,OAAO,GAAG,OAAO,CAAC;IAEhC;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAC9B,8FAA8F;IAC9F,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,IAAI,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAEjE,wEAAwE;IACxE,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;CACpC;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,UAAU;IACvB,4CAA4C;IAC5C,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAE5B;;;;;;;;;;;;;OAaG;IACH,MAAM,IAAI,IAAI,CAAC;CAClB;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,wBAAwB,EAAE,kBAAiC,CAAC"}

package/dist/{storage-meta-session-e6g0mmec.js → storage-meta-session-fkmfhswa.js}

@@ -6,8 +6,8 @@ import {
   retryPendingSessionCleanups2,
   retryPendingRustSessionCleanupsForProject2,
   clearSession2
-} from "./index-jmtjh2d3.js";
-import"./index-1974jvn3.js";
+} from "./index-sf6x1ga9.js";
+import"./index-z8552w7e.js";
 import"./index-dkv2dn46.js";
 export {
   advanceToolReclaimWatermark2 as advanceToolReclaimWatermark,

package/dist/v2/server.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    id: string;
+    setup(): void;
+};
+export default _default;
+//# sourceMappingURL=server.d.ts.map

package/dist/v2/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/v2/server.ts"],"names":[],"mappings":";;;;AACA,wBAKE"}

package/dist/v2/server.js

@@ -0,0 +1,10 @@
+// src/v2/server.ts
+var server_default = {
+  id: "@cortexkit/opencode-magic-context",
+  setup() {
+    console.info("[magic-context] @cortexkit/opencode-magic-context v2 setup");
+  }
+};
+export {
+  server_default as default
+};

package/dist/v2/store-reader.d.ts

@@ -0,0 +1,63 @@
+/** Source rule: oc-audit-7a31b5c0f7.md:186-202; sanitization follows owner R16.
+ * The real GA CLI 2.0.3 placement probe confirms OPENCODE_DB is honoured.
+ * Isolation must still use private XDG roots, not rely solely on the filename.
+ */
+export declare function sourceDatabaseFilename(channel: string, env?: NodeJS.ProcessEnv): string;
+/** GA data root: aft-playbook-fe8d4871f.md:46-48, with the CLI filename rule. */
+export declare function gaDatabasePath(dataHome: string, channel?: string, env?: NodeJS.ProcessEnv): string;
+export type MessageType = "agent-switched" | "model-switched" | "location-switched" | "user" | "synthetic" | "system" | "skill" | "shell" | "assistant" | "compaction" | "idle";
+export interface MessageData {
+    [key: string]: unknown;
+    content?: Array<Record<string, unknown>>;
+    text?: string;
+    tokens?: {
+        input: number;
+        output: number;
+        reasoning: number;
+        cache: {
+            read: number;
+            write: number;
+        };
+    };
+    time?: {
+        created: number;
+        completed?: number;
+        streamed?: number;
+    };
+}
+export interface IdleData extends MessageData {
+    outcome: "succeeded" | "failed" | "interrupted";
+}
+export interface CompactionData extends MessageData {
+    status: string;
+    summary?: string;
+    recent?: string;
+}
+export interface StoreRow<T extends MessageType = MessageType> {
+    id: string;
+    session_id: string;
+    type: T;
+    seq: number;
+    data: T extends "idle" ? IdleData : T extends "compaction" ? CompactionData : MessageData;
+}
+/** Opens an existing store read-only; missing/corrupt stores propagate errors, never an empty history. */
+export declare class V2StoreReader {
+    private readonly db;
+    constructor(path: string);
+    close(): void;
+    /** Exclusive cursor, ascending seq. IDs are not chronological in the v2 store. */
+    page(sessionID: string, options?: {
+        after?: number;
+        limit?: number;
+        type?: MessageType;
+    }): {
+        rows: StoreRow[];
+        cursor: number | undefined;
+    };
+    latestCompaction(sessionID: string): StoreRow<"compaction"> | undefined;
+    idleRows(sessionID: string, after?: number): StoreRow<"idle">[];
+    /** Include the completed checkpoint itself, matching the host history cut. */
+    window(sessionID: string): StoreRow[];
+    private all;
+}
+//# sourceMappingURL=store-reader.d.ts.map

package/dist/v2/store-reader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"store-reader.d.ts","sourceRoot":"","sources":["../../src/v2/store-reader.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CAClC,OAAO,EAAE,MAAM,EACf,GAAG,GAAE,MAAM,CAAC,UAAwB,GACrC,MAAM,CASR;AAED,iFAAiF;AACjF,wBAAgB,cAAc,CAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,SAAW,EAClB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACrC,MAAM,CAGR;AAGD,MAAM,MAAM,WAAW,GACjB,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,GACnB,MAAM,GACN,WAAW,GACX,QAAQ,GACR,OAAO,GACP,OAAO,GACP,WAAW,GACX,YAAY,GACZ,MAAM,CAAC;AACb,MAAM,WAAW,WAAW;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KAC1C,CAAC;IACF,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACrE;AACD,MAAM,WAAW,QAAS,SAAQ,WAAW;IACzC,OAAO,EAAE,WAAW,GAAG,QAAQ,GAAG,aAAa,CAAC;CACnD;AACD,MAAM,WAAW,cAAe,SAAQ,WAAW;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW;IACzD,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,CAAC,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,CAAC,SAAS,MAAM,GAAG,QAAQ,GAAG,CAAC,SAAS,YAAY,GAAG,cAAc,GAAG,WAAW,CAAC;CAC7F;AAmBD,0GAA0G;AAC1G,qBAAa,aAAa;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAW;gBAClB,IAAI,EAAE,MAAM;IAGxB,KAAK,IAAI,IAAI;IAIb,kFAAkF;IAClF,IAAI,CACA,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,WAAW,CAAA;KAAO,GACrE;QAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;IAoBnD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,SAAS;IAQvE,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,SAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE;IAG3D,8EAA8E;IAC9E,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,EAAE;IAMrC,OAAO,CAAC,GAAG;CASd"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/opencode-magic-context",
-  "version": "0.42.1",
+  "version": "0.42.3",
   "type": "module",
   "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",
@@ -34,7 +34,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsc -p ../retina-local-fs/tsconfig.build.json && bun run build:tui && rm -f dist/index.js dist/transformers-web.js dist/transformers-node-wasm.js dist/*-*.js && bun build src/features/magic-context/memory/transformers-web-entry.ts --outfile dist/transformers-web.js --target browser --format esm --external onnxruntime-web && bun scripts/build-transformers-node-wasm.ts dist && bun build src/index.ts --outdir dist --target node --format esm --splitting --external @opencode-ai/plugin --external onnxruntime-node --external onnxruntime-web --external sharp --external bun:sqlite --external node:sqlite && tsc --emitDeclarationOnly",
+    "build": "tsc -p ../retina-local-fs/tsconfig.build.json && bun run build:tui && rm -f dist/index.js dist/transformers-web.js dist/transformers-node-wasm.js dist/*-*.js && bun build src/features/magic-context/memory/transformers-web-entry.ts --outfile dist/transformers-web.js --target browser --format esm --external onnxruntime-web && bun scripts/build-transformers-node-wasm.ts dist && bun build src/index.ts --outdir dist --target node --format esm --splitting --external @opencode-ai/plugin --external onnxruntime-node --external onnxruntime-web --external sharp --external bun:sqlite --external node:sqlite && bun run build:v2 && tsc --emitDeclarationOnly",
+    "build:v2": "bun build src/v2/server.ts --outfile dist/v2/server.js --target node --format esm --external @opencode/plugin && bun test src/v2/server.test.ts",
     "build:tui": "bun scripts/build-tui.ts",
     "check:tui-compiled": "bun run build:tui && git diff --exit-code -- src/tui-compiled && test -z \"$(git status --porcelain -- src/tui-compiled)\"",
     "check:transformers-node-wasm": "bun scripts/verify-transformers-node-wasm.ts",
@@ -69,6 +70,10 @@
     "sharp": "^0.35.0"
   },
   "devDependencies": {
+    "@opencode/plugin": "2.0.3",
+    "@opencode/cli": "2.0.3",
+    "@opencode/client": "2.0.3",
+    "effect": "4.0.0-rc.112",
     "@ai-sdk/anthropic": "3.0.82",
     "@huggingface/transformers": "^4.1.0",
     "@ai-sdk/openai-compatible": "2.0.41",

package/src/shared/tag-transcript.ts

@@ -1063,13 +1063,20 @@ function buildAggregateTarget(
                 occurrences.some((occ) => occ.kind === "tool_use") &&
                 occurrences.some((occ) => occ.kind === "tool_result");
             if (!complete) return "incomplete";
-            if (
-                !requiresToolArcSkeleton &&
-                occurrences.every((occ) => occ.part.remove && occ.part.canRemove?.() !== false)
-            ) {
-                let removed = false;
-                for (const occ of occurrences) removed = occ.part.remove?.() || removed;
-                return removed ? "removed" : "absent";
+            if (!requiresToolArcSkeleton) {
+                const authorization = occurrences.map((occ) => occ.part.canRemove?.());
+                // A failed durable marker is not permission to substitute a new
+                // skeleton. Keep both halves unchanged and leave the drop queued.
+                if (authorization.includes("defer")) return "incomplete";
+                if (
+                    occurrences.every(
+                        (occ, index) => occ.part.remove && authorization[index] !== false,
+                    )
+                ) {
+                    let removed = false;
+                    for (const occ of occurrences) removed = occ.part.remove?.() || removed;
+                    return removed ? "removed" : "absent";
+                }
             }
             // Adapters without structural removal retain paired sentinels.
             const sentinel = `[dropped \u00a7${tagId}\u00a7]`;

package/src/shared/transcript.ts

@@ -170,7 +170,8 @@ export interface TranscriptPart {
     /** Remove one half of a complete tool arc. Callers must remove both halves together. */
     remove?(): boolean;
     /** Refuse structural deletion when the adapter cannot match provider-native identity safely. */
-    canRemove?(): boolean;
+    /** A deferred durable decision vetoes the whole drop, including sentinel fallback. */
+    canRemove?(): boolean | "defer";
 
     /**
      * Optional: serialized byte size of the part's REAL payload, including