@retaw106/mmc-oc 2.0.0 → 2.1.0

package/dist/{wrapup-orchestrator-wgb2nd19.js → wrapup-orchestrator-x9xamts2.js}

@@ -21,11 +21,11 @@ import {
   getActiveCompartmentRun,
   markActiveCompartmentRunPublished,
   registerActiveCompartmentRun
-} from "./index-bdt9my9y.js";
-import"./index-fg34g6a5.js";
+} from "./index-wtb9hzk6.js";
+import"./index-1j34a56j.js";
 import"./index-x37vg474.js";
-import"./index-1mjhzqq7.js";
-import"./index-977gxfz0.js";
+import"./index-dr0gepzw.js";
+import"./index-ramz5kkm.js";
 import {
   pushNotification2
 } from "./index-jdxxq8cz.js";
@@ -33,11 +33,11 @@ import"./index-5cep2r9n.js";
 import"./index-53g38ggt.js";
 import {
   sendStatusNotification2
-} from "./index-5pg0acf7.js";
+} from "./index-amycb7b1.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-xt7y10x6.js";
+} from "./index-n0vnzz6h.js";
 import"./index-33gprt9g.js";
 
 // src/hooks/magic-context/wrapup-orchestrator.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retaw106/mmc-oc",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "type": "module",
   "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",

package/src/config/live-run-config.ts

@@ -11,6 +11,14 @@ export function sampleLiveConfig<T extends MagicContextConfig>(boot: T, fresh: T
         const parts = path.split(".");
         let value: unknown = fresh;
         for (const part of parts) value = (value as Record<string, unknown> | undefined)?.[part];
+        if (value === undefined) {
+            // An unset live path must not create its parent objects. An empty `omp`
+            // block, for example, shadows the `pi` block it would otherwise fall back
+            // to, and the historian and dreamer lose their configured model. Only
+            // clear a leaf the boot config actually has, so removing a key live works.
+            removeLeaf(result, parts);
+            continue;
+        }
         let target = result;
         for (const part of parts.slice(0, -1)) {
             const child = target[part];
@@ -27,6 +35,26 @@ export function sampleLiveConfig<T extends MagicContextConfig>(boot: T, fresh: T
     return result as T;
 }
 
+function removeLeaf(root: Record<string, unknown>, parts: string[]): void {
+    const parents = parts.slice(0, -1);
+    let node: Record<string, unknown> = root;
+    for (const part of parents) {
+        const child = node[part];
+        if (!child || typeof child !== "object" || Array.isArray(child)) return;
+        node = child as Record<string, unknown>;
+    }
+    const leaf = parts.at(-1);
+    if (leaf === undefined || !Object.hasOwn(node, leaf)) return;
+    // Copy the parent chain before deleting so the boot config object is never mutated.
+    let target = root;
+    for (const part of parents) {
+        const copy = { ...(target[part] as Record<string, unknown>) };
+        target[part] = copy;
+        target = copy;
+    }
+    delete target[leaf];
+}
+
 export function changedLiveKeys(previous: MagicContextConfig, next: MagicContextConfig): string[] {
     const at = (config: MagicContextConfig, path: string): unknown =>
         path

package/src/shared/harness.ts

@@ -20,7 +20,7 @@
  * boot-time constant per plugin instance. Cross-harness leakage is a
  * correctness bug, not a feature.
  */
-export type HarnessId = "opencode" | "opencode2" | "pi";
+export type HarnessId = "opencode" | "opencode2" | "pi" | "omp";
 
 let currentHarness: HarnessId = "opencode";
 let harnessLocked = false;

package/src/shared/historian-tool-defaults.json

@@ -1,12 +1,12 @@
 {
   "todowrite": "Todos (${input.todos.count}): ${input.todos.each(\"${status}: ${content}\")}",
   "question": "Asked user: ${input.questions[*].question.join(\" / \")} → ${output}",
-  "task": "Task ${input.subagent_type}: ${input.prompt} → ${output.truncate(200)}",
-  "ask": "Asked: ${input.question.truncate(250)} [options: ${input.options.join(\" / \")}] ${input.resolution} → ${output.truncate(300)}",
-  "peer_send": "PM to ${input.agent}${input.agent_id}: ${input.message.truncate(400)}",
-  "board": "Board ${input.verb}: ${input.ops.each(\"${op} ${item}${lane.title} ${state}${lane.status}${props.text} ${lane.items[*].text}\")}",
-  "room": "Room ${input.action} ${input.room_id}: ${input.text.truncate(400)}",
-  "work": "Work ${input.action} ${input.id}: ${input.prompt_file}${input.prompt.truncate(200)}${input.notes.truncate(200)} → ${output.truncate(160)}",
+  "task": "Task ${input.subagent_type}: ${input.prompt.truncate(600)} → ${output.truncate(200)}",
+  "ask": "Asked: ${input.question} [options: ${input.options.join(\" / \")}] ${input.text}${input.resolution} → ${output.truncate(300)}",
+  "peer_send": "PM ${input.recipient}: ${input.message}",
+  "board": "Board ${input.verb}${input.board_lane}: ${input.ops.each(\"${op} ${lane_label} ${item}${props.text}${lane.items} ${state}${props.state}${lane.status}${id}${title}\")}",
+  "room": "Room ${input.action} ${input.room_label}: ${input.room_detail}",
+  "work": "Work ${input.action} ${input.title}${input.id}: ${input.prompt.truncate(600)}${input.notes.truncate(600)} → ${output.truncate(160)}",
   "knowhow": "Looked up how-to: ${input.query}${input.id}",
   "mmc_note": "Note ${input.action} ${input.note_ids}: ${input.content} → ${output.truncate(160)}",
   "mmc_memory": "Memory ${input.action} ${input.category} ${input.ids}: ${input.content} → ${output.truncate(160)}"

package/src/shared/historian-tool-expansions.ts

@@ -1,18 +1,75 @@
 import defaults from "./historian-tool-defaults.json";
+import previewDefaults from "./historian-tool-preview-defaults.json";
 import { renderToolTemplate, type ToolExpansionMap } from "./historian-tool-template";
 
 export { defaults as DEFAULT_TOOL_EXPANSIONS };
-export function expandToolPart(part: unknown, overrides?: ToolExpansionMap): string | null {
+
+// Room actions, private-message addresses and board lanes have multiple input
+// shapes. Derive readable labels only for built-ins; configured template overrides
+// keep the unmodified tool input.
+function builtinInput(tool: string, input: unknown): unknown {
+    if (!input || typeof input !== "object") return input;
+    const i = input as Record<string, unknown>;
+    if (tool === "peer_send") {
+        const external = i.external as Record<string, unknown> | undefined;
+        const recipient = i.reply_to_pmid
+            ? `reply to ${i.reply_to_pmid}`
+            : i.agent || i.agent_id
+              ? `to ${i.agent || i.agent_id}`
+              : external?.session_id || i.session_id
+                ? `to session ${external?.session_id || i.session_id}`
+                : "to unknown recipient";
+        return { ...i, recipient };
+    }
+    if (tool === "room") {
+        return {
+            ...i,
+            room_label: i.room_id || i.title,
+            room_detail:
+                i.action === "create" || i.action === "invite"
+                    ? `invitees: ${renderToolTemplate("${input.invitees}", i)}`
+                    : i.text,
+        };
+    }
+    if (tool === "board") {
+        return {
+            ...i,
+            board_lane: i.lane ? ` ${i.lane}` : "",
+            ops: Array.isArray(i.ops)
+                ? i.ops.map((op) =>
+                      op && typeof op === "object"
+                          ? {
+                                ...op,
+                                lane_label:
+                                    typeof op.lane === "string"
+                                        ? op.lane
+                                        : op.lane?.title || op.lane?.id,
+                            }
+                          : op,
+                  )
+                : i.ops,
+        };
+    }
+    return input;
+}
+
+export function expandToolPart(
+    part: unknown,
+    overrides?: ToolExpansionMap,
+    legacyPreview = false,
+): string | null {
     if (!part || typeof part !== "object") return null;
     const p = part as Record<string, unknown>;
     if (p.type !== "tool" || typeof p.tool !== "string") return null;
-    const template =
-        overrides && Object.hasOwn(overrides, p.tool)
-            ? overrides[p.tool]
-            : Object.hasOwn(defaults, p.tool)
-              ? defaults[p.tool as keyof typeof defaults]
-              : undefined;
+    const builtinDefaults = legacyPreview ? previewDefaults : defaults;
+    const overridden = overrides && Object.hasOwn(overrides, p.tool);
+    const template = overridden
+        ? overrides[p.tool]
+        : Object.hasOwn(builtinDefaults, p.tool)
+          ? builtinDefaults[p.tool as keyof typeof defaults]
+          : undefined;
     if (typeof template !== "string") return null;
     const state = p.state as Record<string, unknown> | undefined;
-    return renderToolTemplate(template, state?.input, state?.output ?? state?.error);
+    const input = overridden || legacyPreview ? state?.input : builtinInput(p.tool, state?.input);
+    return renderToolTemplate(template, input, state?.output ?? state?.error, legacyPreview);
 }

package/src/shared/historian-tool-preview-defaults.json

@@ -0,0 +1,13 @@
+{
+  "todowrite": "Todos (${input.todos.count}): ${input.todos.each(\"${status}: ${content}\")}",
+  "question": "Asked user: ${input.questions[*].question.join(\" / \")} → ${output}",
+  "task": "Task ${input.subagent_type}: ${input.prompt} → ${output.truncate(200)}",
+  "ask": "Asked: ${input.question.truncate(250)} [options: ${input.options.join(\" / \")}] ${input.resolution} → ${output.truncate(300)}",
+  "peer_send": "PM to ${input.agent}${input.agent_id}: ${input.message.truncate(400)}",
+  "board": "Board ${input.verb}: ${input.ops.each(\"${op} ${item}${lane.title} ${state}${lane.status}${props.text} ${lane.items[*].text}\")}",
+  "room": "Room ${input.action} ${input.room_id}: ${input.text.truncate(400)}",
+  "work": "Work ${input.action} ${input.id}: ${input.prompt_file}${input.prompt.truncate(200)}${input.notes.truncate(200)} → ${output.truncate(160)}",
+  "knowhow": "Looked up how-to: ${input.query}${input.id}",
+  "mmc_note": "Note ${input.action} ${input.note_ids}: ${input.content} → ${output.truncate(160)}",
+  "mmc_memory": "Memory ${input.action} ${input.category} ${input.ids}: ${input.content} → ${output.truncate(160)}"
+}

package/src/shared/historian-tool-template.ts

@@ -1,4 +1,4 @@
-/** A deliberately non-executable language for readable, bounded historian tool lines. */
+/** A deliberately non-executable language for readable historian tool lines. */
 export type ToolExpansionMap = Record<string, string | false>;
 type Step = { field: string } | { index: number } | { project: string };
 type Expression = {
@@ -6,7 +6,7 @@ type Expression = {
     each?: Template;
     join?: string;
     count?: boolean;
-    cap: number;
+    cap?: number;
 };
 type Template = Array<string | Expression>;
 
@@ -78,7 +78,7 @@ class Parser {
                 if (this.source[this.pos] === "(") return this.error();
             } else break;
         }
-        const expression: Expression = { steps, cap: 300 };
+        const expression: Expression = { steps };
         if (this.take(".each(")) {
             if (relative) return this.error();
             expression.each = parseTemplate(this.quoted(), true);
@@ -145,9 +145,24 @@ function compiled(source: string): Template | null {
 function oneLine(value: string): string {
     return value.replace(/[\r\n\u2028\u2029]+/g, " ");
 }
-function truncate(value: string, cap: number): string {
+function truncate(value: string, cap?: number, legacyPreview = false): string {
     const chars = Array.from(oneLine(value));
-    return chars.length > cap ? `${chars.slice(0, cap).join("")}…` : chars.join("");
+    if (cap === undefined || chars.length <= cap) return chars.join("");
+    if (legacyPreview) return `${chars.slice(0, cap).join("")}…`;
+    // Explicit caps stop after sentence-ending punctuation so a cut is not
+    // mistaken for an intact tool message. If no sentence fits, show only the marker.
+    let end = 0;
+    for (let i = 0; i < Math.min(cap, chars.length); i++) {
+        if (!".!?。！？".includes(chars[i])) continue;
+        let next = i + 1;
+        while (next < chars.length && "\"'”’)]".includes(chars[next])) next++;
+        if (
+            next <= cap &&
+            ("。！？".includes(chars[i]) || next === chars.length || /[ \t]/.test(chars[next]))
+        )
+            end = next;
+    }
+    return `${end ? `${chars.slice(0, end).join("")} ` : ""}[… ${chars.length - end} more characters]`;
 }
 function scalar(value: unknown): string {
     if (value === undefined) return "";
@@ -174,10 +189,11 @@ function field(value: unknown, key: string): unknown {
         ? (value as Record<string, unknown>)[key]
         : undefined;
 }
-function render(nodes: Template, root: unknown): string {
+function render(nodes: Template, root: unknown, legacyPreview: boolean): string {
     return nodes
         .map((node) => {
             if (typeof node === "string") return node;
+            const cap = node.cap ?? (legacyPreview ? 300 : undefined);
             let value = root;
             let list = false;
             for (const step of node.steps) {
@@ -196,18 +212,31 @@ function render(nodes: Template, root: unknown): string {
                 }
             }
             if (node.count)
-                return truncate(Array.isArray(value) ? String(value.length) : "", node.cap);
+                return truncate(
+                    Array.isArray(value) ? String(value.length) : "",
+                    cap,
+                    legacyPreview,
+                );
             if (node.each || list || node.join !== undefined) {
                 if (!Array.isArray(value)) return "";
                 const elements = value
-                    .slice(0, 10)
+                    .slice(0, legacyPreview ? 10 : undefined)
                     .map((item) =>
-                        truncate(node.each ? render(node.each, item) : scalar(item), 300),
+                        truncate(
+                            node.each ? render(node.each, item, legacyPreview) : scalar(item),
+                            legacyPreview ? 300 : undefined,
+                            legacyPreview,
+                        ),
                     );
-                if (value.length > 10) elements.push(`… +${value.length - 10} more`);
-                return truncate(elements.join(node.join ?? (node.each ? "; " : ", ")), node.cap);
+                if (legacyPreview && value.length > 10)
+                    elements.push(`… +${value.length - 10} more`);
+                return truncate(
+                    elements.join(node.join ?? (node.each ? "; " : ", ")),
+                    cap,
+                    legacyPreview,
+                );
             }
-            return truncate(scalar(value), node.cap);
+            return truncate(scalar(value), cap, legacyPreview);
         })
         .join("");
 }
@@ -216,6 +245,7 @@ export function renderToolTemplate(
     source: string,
     input: unknown,
     output?: unknown,
+    legacyPreview = false,
 ): string | null {
     const nodes = compiled(source);
     if (!nodes) return null;
@@ -241,8 +271,12 @@ export function renderToolTemplate(
         !node.each &&
         !node.count &&
         node.join === undefined
-            ? truncate(text ?? "", node.cap)
+            ? truncate(text ?? "", node.cap ?? (legacyPreview ? 300 : undefined), legacyPreview)
             : node,
     );
-    return truncate(render(bareOutputNodes, root), 1000);
+    return truncate(
+        render(bareOutputNodes, root, legacyPreview),
+        legacyPreview ? 1000 : undefined,
+        legacyPreview,
+    );
 }

package/src/shared/model-resolution.ts

@@ -1,4 +1,4 @@
-export type ModelHarness = "opencode" | "pi";
+export type ModelHarness = "opencode" | "pi" | "omp";
 
 export interface ResolvedModelEntry {
     /** Canonical provider/model reference used for identity and model selection. */

package/src/shared/sqlite-acquisition-routing.test.ts

@@ -4,6 +4,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import {
     Database,
+    SqliteAcquisitionBusyError,
     withAsyncPrivilegedWriter,
     withPrivilegedWriter,
     withSqliteTransformPass,
@@ -11,6 +12,23 @@ import {
 import { startSqliteWriteLocker } from "./sqlite-write-locker-test-support";
 import { createTestTempDirFromPath } from "./test-temp-dir";
 
+test("async writer never retries callback acquisition errors after work began", async () => {
+    const db = new Database(":memory:");
+    db.exec("CREATE TABLE context_privilege_state(id INTEGER PRIMARY KEY, enabled INTEGER)");
+    let calls = 0;
+    try {
+        await expect(
+            withAsyncPrivilegedWriter(db, () => {
+                calls++;
+                throw new SqliteAcquisitionBusyError(new Error("nested BEGIN"));
+            }),
+        ).rejects.toThrow("acquisition remained busy");
+        expect(calls).toBe(1);
+    } finally {
+        db.close();
+    }
+});
+
 for (const mode of ["default", "immediate", "exclusive", "literal"] as const) {
     test(`shared SQLite retries ${mode} acquisition before running any writes`, async () => {
         const dir = createTestTempDirFromPath(join(tmpdir(), "mc-routed-acquisition-"));

package/src/shared/sqlite.ts

@@ -245,6 +245,7 @@ function installTransactionRouting(db: BetterSqlite3.Database, readonly: boolean
         configurable: true,
         writable: true,
         value: (sql: string) => {
+            if (/^\s*(?:COMMIT|END)\b/i.test(sql)) assertTransformWrite();
             if (/^\s*BEGIN\s+(?:IMMEDIATE|EXCLUSIVE)(?:\s+TRANSACTION)?\s*;?\s*$/i.test(sql)) {
                 // A transaction that ended without passing through exec (for
                 // example an automatic rollback) must not be timed as this one.
@@ -556,6 +557,33 @@ interface StatementOwner {
 const statementOwners = new WeakMap<Database, StatementOwner>();
 const FIRST_PRUNE_AT = 256;
 
+/**
+ * Bun's default close (`sqlite3_close_v2`) only releases the native connection
+ * once every statement created by prepare() is finalized. The close override
+ * in ownPreparedStatement can finalize only statements that are still
+ * reachable. Once the garbage collector
+ * has marked a one-shot statement dead, its weak reference is already cleared,
+ * but the statement is finalized only when its memory is later swept. Until
+ * then the closed connection keeps the database, WAL and shared-memory files
+ * open, for an unbounded time.
+ *
+ * `close(true)` finalizes every outstanding statement, reachable or not, and
+ * releases the connection immediately. When the caller did not ask for errors
+ * and that close fails, fall back to the caller's own close so a teardown path
+ * never starts throwing; the fallback can defer the release as before.
+ */
+function closeReleasingStatements(
+    close: (...args: unknown[]) => unknown,
+    args: unknown[],
+): unknown {
+    if (args[0] === true) return close(true);
+    try {
+        return close(true);
+    } catch {
+        return close(...args);
+    }
+}
+
 function ownPreparedStatement(db: Database, statement: Statement): Statement {
     const finalizable = statement as FinalizableStatement;
     // Node finalizes its statements on close and exposes no finalize() method.
@@ -579,7 +607,7 @@ function ownPreparedStatement(db: Database, statement: Statement): Statement {
                     }
                 }
                 references.clear();
-                const result = close(...args);
+                const result = closeReleasingStatements(close, args);
                 if (failure) throw failure;
                 return result;
             },
@@ -617,7 +645,12 @@ export function prepareCachedStatement(db: Database, sql: string): Statement {
 
 const privilegeDepth = new WeakMap<Database, number>();
 const transformPassScope = new AsyncLocalStorage<
-    { active: boolean; remainingWaitMs: number } | undefined
+    | {
+          active: boolean;
+          remainingWaitMs: number;
+          guard?: { assert(): void; remainingMs(): number };
+      }
+    | undefined
 >();
 const admissionScope = new AsyncLocalStorage<boolean>();
 const backgroundWriterScope = new AsyncLocalStorage<boolean>();
@@ -655,6 +688,17 @@ export function withoutSqliteTransformPass<T>(operation: () => T): T {
     return transformPassScope.run(undefined, operation);
 }
 
+/** Attach the adapter's existing generation/cancellation/deadline guard to writes. */
+export function guardSqliteTransformPass(guard: { assert(): void; remainingMs(): number }): void {
+    const lease = transformPassScope.getStore();
+    if (lease) lease.guard = guard;
+}
+
+/** Check the attached generation/cancellation/deadline guard before SQL or cache publication. */
+export function assertTransformWrite(): void {
+    if (!backgroundWriterScope.getStore()) transformPassScope.getStore()?.guard?.assert();
+}
+
 /** Bun names SQLite codes; node:sqlite exposes the numeric (possibly extended) errcode. */
 export function isTransientSqliteError(error: unknown): boolean {
     if (!error || typeof error !== "object") return false;
@@ -698,6 +742,7 @@ interface WriterAcquisition {
     startedAt: number;
     attempts: number;
     claimed: boolean;
+    remainingMs?: () => number;
 }
 
 /** A write transaction whose BEGIN went through `acquireShort` and has not ended yet. */
@@ -724,6 +769,7 @@ function foregroundWaitLease() {
  * native API cannot separate lock waiting from statement execution. Exhaustion
  * switches to zero-wait acquisition, not a refusal when the writer is free. */
 function withAutocommitTimeout<T>(db: Database, operation: () => T): T {
+    assertTransformWrite();
     const lease = foregroundWaitLease();
     if (isInTransaction(db) || (!lease && !backgroundWriterScope.getStore())) return operation();
     const previous = pragmaNumber(db, "busy_timeout");
@@ -749,6 +795,7 @@ function withAutocommitTimeout<T>(db: Database, operation: () => T): T {
 
 /** The connection is never handed back to another caller with a shortened timeout. */
 function acquireShort(db: Database, acquire: () => unknown, site: string): void {
+    assertTransformWrite();
     const started = performance.now();
     const previous = pragmaNumber(db, "busy_timeout");
     const outer = writerAcquisitionScope.getStore();
@@ -763,7 +810,12 @@ function acquireShort(db: Database, acquire: () => unknown, site: string): void
         // stays short. An ordinary BEGIN inside a transform pass cannot yield;
         // give that single attempt enough time for a brief writer to finish.
         const lease = foregroundWaitLease();
-        const timeout = lease ? Math.floor(lease.remainingWaitMs) : SHORT_BUSY_TIMEOUT_MS;
+        const timeout = Math.floor(
+            Math.min(
+                lease ? lease.remainingWaitMs : SHORT_BUSY_TIMEOUT_MS,
+                owner?.remainingMs?.() ?? lease?.guard?.remainingMs() ?? Infinity,
+            ),
+        );
         db.exec(`PRAGMA busy_timeout=${timeout}`);
         acquire();
         acquiredAt = performance.now();
@@ -871,11 +923,28 @@ export async function beginSqliteWriterAsync(db: Database, site: string): Promis
 }
 
 /** Retry admission before any turn work, yielding between short lock attempts. */
-export async function withAsyncPrivilegedWriter<T>(db: Database, operation: () => T): Promise<T> {
+export async function withAsyncPrivilegedWriter<T>(
+    db: Database,
+    operation: () => T,
+    options: {
+        signal?: AbortSignal;
+        beforeRetry?: (error: SqliteAcquisitionBusyError) => void;
+        jitter?: boolean;
+        budgetMs?: number;
+        assertCurrentPass?: () => void;
+    } = {},
+): Promise<T> {
     const started = performance.now();
+    const budgetMs = Math.max(
+        0,
+        Math.min(FOREGROUND_ACQUISITION_BUDGET_MS, options.budgetMs ?? Infinity),
+    );
     let attempts = 0;
     for (;;) {
+        options.signal?.throwIfAborted();
+        options.assertCurrentPass?.();
         attempts++;
+        let entered = false;
         try {
             const acquisition: WriterAcquisition = {
                 site: "privileged_writer",
@@ -883,35 +952,51 @@ export async function withAsyncPrivilegedWriter<T>(db: Database, operation: () =
                 startedAt: started,
                 attempts,
                 claimed: false,
+                remainingMs: () => Math.max(0, budgetMs - (performance.now() - started)),
             };
             // The acquisition and hold of this transaction are reported when it
             // commits or rolls back (see endWriterTransaction).
             return admissionScope.run(true, () =>
                 withSqliteTransformPass(() =>
                     writerAcquisitionScope.run(acquisition, () =>
-                        withPrivilegedWriter(db, operation),
+                        withPrivilegedWriter(db, () => {
+                            entered = true;
+                            return operation();
+                        }),
                     ),
                 ),
             );
         } catch (error) {
             // A callback failure can occur after writes; only retry a failed BEGIN.
-            if (!(error instanceof SqliteAcquisitionBusyError)) throw error;
+            if (entered || !(error instanceof SqliteAcquisitionBusyError)) throw error;
+            // Adapters may serve a validated saved request instead of waiting.
+            // This runs only after a failed BEGIN, never after callback writes.
+            options.beforeRetry?.(error);
             const elapsed = performance.now() - started;
-            if (elapsed >= FOREGROUND_ACQUISITION_BUDGET_MS) {
+            if (elapsed >= budgetMs) {
                 reportSqliteDiagnostic(
                     `sqlite writer site=privileged_writer lane=foreground acquire_ms=${Math.round(elapsed)} attempts=${attempts} outcome=busy`,
                 );
                 throw error;
             }
-            await new Promise<void>((resolve) =>
-                setTimeout(
-                    resolve,
-                    Math.min(
-                        attempts === 1 ? 500 : 1000,
-                        FOREGROUND_ACQUISITION_BUDGET_MS - elapsed,
-                    ),
-                ),
+            const backoff = attempts === 1 ? 500 : 1000;
+            const delay = Math.min(
+                options.jitter ? backoff * (0.8 + Math.random() * 0.4) : backoff,
+                budgetMs - elapsed,
             );
+            await new Promise<void>((resolve, reject) => {
+                const abort = () => {
+                    clearTimeout(timer);
+                    options.signal?.removeEventListener("abort", abort);
+                    reject(options.signal?.reason ?? new Error("Writer wait aborted"));
+                };
+                const timer = setTimeout(() => {
+                    options.signal?.removeEventListener("abort", abort);
+                    resolve();
+                }, delay);
+                options.signal?.addEventListener("abort", abort, { once: true });
+                if (options.signal?.aborted) abort();
+            });
         }
     }
 }

package/src/shared/write-transaction-attribution.test.ts

@@ -70,7 +70,7 @@ const fencedSources: Array<{ path: string; sites: string[]; reporterCalls?: stri
     },
     {
         path: "packages/pi-plugin/src/context-handler.ts",
-        sites: ["pi_compaction_queue"],
+        sites: ["pi_fallback_adoption"],
     },
 ];
 
@@ -116,7 +116,7 @@ const newlyCoveredSites = [
     "pi_materialize_cache",
     "pi_soft_refresh_cache",
     "pi_historian_publish",
-    "pi_compaction_queue",
+    "pi_fallback_adoption",
     "user_memory_candidate_insert",
 ] as const;