@cortexkit/opencode-magic-context 0.49.7 → 0.49.9

package/src/shared/sqlite-foreground-wait.test.ts

@@ -1,4 +1,4 @@
-import { expect, test } from "bun:test";
+import { expect, spyOn, test } from "bun:test";
 import { rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -113,6 +113,220 @@ for (const holdMs of [1000, 2500]) {
     }, 30_000);
 }
 
+for (const holdMs of [1000, 2500]) {
+    test(`slow uncontended SQL preserves admission for a ${holdMs}ms autocommit lock`, async () => {
+        const { db, path, close } = fixture();
+        let locker: SqliteWriteLocker | undefined;
+        let served = false;
+        let refusals = 0;
+        const output = {
+            messages: [
+                {
+                    info: { id: "u", sessionID: "slow", role: "user" },
+                    parts: [{ type: "text", text: "raw" }],
+                },
+            ],
+        };
+        const handler = createMessagesTransformHandler({
+            onStorageBusyRefusal: async () => {
+                refusals++;
+            },
+            magicContext: {
+                "experimental.chat.messages.transform": async (_input, result) => {
+                    // Spend three seconds inside successful SQL, not between writes.
+                    // Recursive work keeps this independent of CPU speed and UDF APIs.
+                    const cte =
+                        "WITH RECURSIVE n(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM n WHERE x<1000000)";
+                    const slowWrite = db.prepare(
+                        `${cte} INSERT INTO result SELECT sum(x) FROM n RETURNING value`,
+                    );
+                    const slowRead = db.prepare(`${cte} SELECT sum(x) FROM n`);
+                    const started = performance.now();
+                    do {
+                        slowWrite.all();
+                        slowRead.all();
+                    } while (performance.now() - started < 3000);
+                    locker = await startSqliteWriteLocker(path, holdMs);
+                    db.prepare("INSERT INTO result VALUES ('managed')").run();
+                    (result.messages[0].parts[0] as { text: string }).text = "managed";
+                },
+            },
+        });
+        try {
+            const pass = handler({}, output as Parameters<typeof handler>[1]).then(() => {
+                served = true;
+            });
+            if (holdMs === 1000) {
+                await pass;
+                expect(served).toBe(true);
+                expect(refusals).toBe(0);
+                expect(output.messages[0].parts[0].text).toBe("managed");
+            } else {
+                await expect(pass).rejects.toBeInstanceOf(StorageBusyRefusalError);
+                expect(served).toBe(false);
+                expect(refusals).toBe(1);
+                expect(output.messages[0].parts[0].text).toBe("raw");
+            }
+            expect(
+                db.prepare("SELECT count(*) AS n FROM result WHERE value = 'managed'").get(),
+            ).toEqual({ n: holdMs === 1000 ? 1 : 0 });
+        } finally {
+            if (locker) expect(await locker.exited).toBe(0);
+            close();
+        }
+    }, 30_000);
+}
+
+test("BUSY autocommit probes do not double-apply INSERT OR IGNORE, UPSERT or RETURNING", async () => {
+    const { db, path, close } = fixture();
+    db.exec(
+        "CREATE TABLE counter(id INTEGER PRIMARY KEY, n INTEGER); INSERT INTO counter VALUES (1, 0)",
+    );
+    const forms = [
+        ["INSERT OR IGNORE INTO counter VALUES (2, 1)", "run"],
+        ["INSERT INTO counter VALUES (1, 1) ON CONFLICT(id) DO UPDATE SET n = n + 1", "run"],
+        ["UPDATE counter SET n = n + 1 WHERE id = 1 RETURNING n", "get"],
+        [
+            "INSERT INTO counter VALUES (1, 1) ON CONFLICT(id) DO UPDATE SET n = n + 1 RETURNING n",
+            "all",
+        ],
+    ] as const;
+    try {
+        for (const [sql, method] of forms) {
+            const blocker = new Database(path);
+            blocker.exec("BEGIN IMMEDIATE");
+            db.exec("PRAGMA busy_timeout=0");
+            const before = db.prepare("SELECT * FROM counter ORDER BY id").all();
+            try {
+                expect(() => db.prepare(sql)[method]()).toThrow("locked");
+                expect(db.prepare("SELECT * FROM counter ORDER BY id").all()).toEqual(before);
+                expect(db.inTransaction).toBe(false);
+            } finally {
+                blocker.exec("ROLLBACK");
+                blocker.close();
+            }
+            const locker = await startSqliteWriteLocker(path, 100);
+            try {
+                await withSqliteTransformPass(() => db.prepare(sql)[method]());
+            } finally {
+                expect(await locker.exited).toBe(0);
+            }
+        }
+        expect(db.prepare("SELECT * FROM counter ORDER BY id").all()).toEqual([
+            { id: 1, n: 3 },
+            { id: 2, n: 1 },
+        ]);
+    } finally {
+        close();
+    }
+}, 30_000);
+
+test("many contended autocommit writes share at most two seconds of lock waiting", async () => {
+    const { db, path, close } = fixture();
+    const blocker = new Database(path);
+    blocker.exec("BEGIN IMMEDIATE");
+    const timeouts: number[] = [];
+    const nativeExec = db.exec.bind(db);
+    const exec = spyOn(db, "exec").mockImplementation((sql) => {
+        const timeout = /^PRAGMA busy_timeout=(\d+)$/.exec(sql);
+        if (timeout) timeouts.push(Number(timeout[1]));
+        return nativeExec(sql);
+    });
+    try {
+        await withSqliteTransformPass(() => {
+            // Use real BUSY failures but a controlled accounting clock: each
+            // retry costs 400ms regardless of runner scheduling. The deadline
+            // keeps the real waits short without hiding lease exhaustion.
+            guardSqliteTransformPass({ assert() {}, remainingMs: () => 10 });
+            let now = 0;
+            const clock = spyOn(performance, "now").mockImplementation(() => (now += 400));
+            try {
+                for (let i = 0; i < 8; i++) {
+                    expect(() => db.prepare("INSERT INTO result VALUES ('one')").run()).toThrow(
+                        SqliteAcquisitionBusyError,
+                    );
+                }
+            } finally {
+                clock.mockRestore();
+            }
+            // Five charged retries exhaust 2000ms. All later retries must have
+            // zero timeout even though the deadline still offers another 10ms.
+            expect(timeouts).toEqual([
+                ...Array.from({ length: 5 }, () => [0, 10, 5000]).flat(),
+                ...Array.from({ length: 3 }, () => [0, 0, 5000]).flat(),
+            ]);
+            blocker.exec("ROLLBACK");
+            db.prepare("INSERT INTO result VALUES ('uncontended')").run();
+        });
+        expect(db.prepare("SELECT * FROM result").all()).toEqual([{ value: "uncontended" }]);
+    } finally {
+        exec.mockRestore();
+        if (blocker.inTransaction) blocker.exec("ROLLBACK");
+        blocker.close();
+        close();
+    }
+}, 30_000);
+
+test("an exec script charges its single attempt without a zero-wait probe", () => {
+    const { db, path, close } = fixture();
+    const blocker = new Database(path);
+    const timeouts: number[] = [];
+    const nativeExec = db.exec.bind(db);
+    const exec = spyOn(db, "exec").mockImplementation((sql) => {
+        const timeout = /^PRAGMA busy_timeout=(\d+)$/.exec(sql);
+        if (timeout) timeouts.push(Number(timeout[1]));
+        return nativeExec(sql);
+    });
+    try {
+        withSqliteTransformPass(() => {
+            let now = 0;
+            const clock = spyOn(performance, "now").mockImplementation(() => (now += 2500));
+            try {
+                db.exec(
+                    "INSERT INTO result VALUES ('prefix'); INSERT INTO result VALUES ('suffix')",
+                );
+            } finally {
+                clock.mockRestore();
+            }
+            blocker.exec("BEGIN IMMEDIATE");
+            expect(() => db.prepare("INSERT INTO result VALUES ('blocked')").run()).toThrow(
+                SqliteAcquisitionBusyError,
+            );
+        });
+        expect(timeouts).toEqual([2000, 5000, 0, 0, 5000]);
+        expect(db.prepare("SELECT * FROM result").all()).toEqual([
+            { value: "prefix" },
+            { value: "suffix" },
+        ]);
+    } finally {
+        exec.mockRestore();
+        if (blocker.inTransaction) blocker.exec("ROLLBACK");
+        blocker.close();
+        close();
+    }
+});
+
+test("an explicit transaction keeps its timeout and never probes or retries", () => {
+    const { db, path, close } = fixture();
+    const other = new Database(path);
+    db.exec("PRAGMA busy_timeout=0; BEGIN; SELECT * FROM result");
+    other.exec("INSERT INTO result VALUES ('other')");
+    const exec = spyOn(db, "exec");
+    try {
+        withSqliteTransformPass(() => {
+            expect(() => db.prepare("INSERT INTO result VALUES ('stale')").run()).toThrow("locked");
+        });
+        expect(exec).not.toHaveBeenCalled();
+        expect(db.inTransaction).toBe(true);
+        expect(db.prepare("PRAGMA busy_timeout").get()).toEqual({ timeout: 0 });
+    } finally {
+        exec.mockRestore();
+        if (db.inTransaction) db.exec("ROLLBACK");
+        other.close();
+        close();
+    }
+});
+
 for (const mode of ["BEGIN", "autocommit"]) {
     test(`foreground ${mode} wait is capped by the pass deadline`, () => {
         const { db, path, close } = fixture();
@@ -138,3 +352,41 @@ for (const mode of ["BEGIN", "autocommit"]) {
         }
     });
 }
+
+test("an autocommit exec script never replays a committed prefix after BUSY", () => {
+    const main = fixture();
+    const auxiliary = fixture();
+    const free = fixture();
+    try {
+        main.db.prepare("ATTACH DATABASE ? AS aux").run(auxiliary.path);
+        main.db.prepare("ATTACH DATABASE ? AS free").run(free.path);
+        auxiliary.db.exec("BEGIN IMMEDIATE");
+        withSqliteTransformPass(() => {
+            guardSqliteTransformPass({ assert() {}, remainingMs: () => 100 });
+            expect(() =>
+                main.db.exec(
+                    "INSERT INTO main.result VALUES ('prefix'); INSERT INTO aux.result VALUES ('blocked')",
+                ),
+            ).toThrow(SqliteAcquisitionBusyError);
+            expect(() =>
+                main.db.exec(
+                    "CREATE TABLE applied_once(id); INSERT INTO aux.result VALUES ('blocked')",
+                ),
+            ).toThrow(SqliteAcquisitionBusyError);
+            expect(() =>
+                main.db.exec(
+                    "CREATE TABLE free.applied_once(id); INSERT INTO aux.result VALUES ('blocked')",
+                ),
+            ).toThrow(SqliteAcquisitionBusyError);
+        });
+        expect(main.db.prepare("SELECT * FROM main.result").all()).toEqual([{ value: "prefix" }]);
+        expect(
+            main.db.prepare("SELECT name FROM sqlite_schema WHERE name='applied_once'").all(),
+        ).toHaveLength(1);
+    } finally {
+        auxiliary.db.exec("ROLLBACK");
+        auxiliary.close();
+        main.close();
+        free.close();
+    }
+});

package/src/shared/sqlite.ts

@@ -39,7 +39,7 @@
  * `run()` → {changes,lastInsertRowid}) is identical and was verified directly.
  */
 
-import { AsyncLocalStorage } from "node:async_hooks";
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
 import { statSync } from "node:fs";
 
 // Type import only — runtime is loaded dynamically below. @types/better-sqlite3
@@ -48,6 +48,16 @@ import { statSync } from "node:fs";
 // node:sqlite at runtime (both expose prepare/run/get/all/exec/close).
 import type BetterSqlite3 from "better-sqlite3";
 
+// Capture the root before creating request-local AsyncLocalStorage scopes.
+// Shared workers and timers must not inherit callbacks that reject stale
+// database writes: those callbacks can retain an obsolete request's inputs.
+const resourceRoot = new AsyncResource("magic-context:root");
+
+/** Create host-owned resources without inheriting request-local state. */
+export function inRootAsyncContext<T>(operation: () => T): T {
+    return resourceRoot.runInAsyncScope(operation);
+}
+
 /**
  * Slow-write reporting is injected rather than imported: this module is also
  * executed directly by Node (the `node:sqlite` smoke in CI, Pi, Desktop), and
@@ -420,7 +430,9 @@ function installTransactionRouting(db: BetterSqlite3.Database, readonly: boolean
                 !/^\s*(?:SELECT|EXPLAIN|PRAGMA|COMMIT|END|ROLLBACK|SAVEPOINT|RELEASE)\b/i.test(sql)
             ) {
                 try {
-                    return withAutocommitTimeout(db, () => nativeExec(sql));
+                    // exec can commit a script prefix before BUSY. Run it once;
+                    // only prepared statements are safe to probe and retry.
+                    return withAutocommitTimeout(db, () => nativeExec(sql), false);
                 } finally {
                     if (mayChangeTagIdentity(sql)) tagIdentityWriteGeneration += 1;
                 }
@@ -587,7 +599,9 @@ function trackSqliteConnection(
 
 const TrackedDatabase = new Proxy(DatabaseImpl, {
     construct(target, args) {
-        const db = Reflect.construct(target, args, target) as BetterSqlite3.Database;
+        const db = inRootAsyncContext(
+            () => Reflect.construct(target, args, target) as BetterSqlite3.Database,
+        );
         return trackSqliteConnection(db, args[0], args[1]);
     },
 }) as typeof BetterSqlite3;
@@ -1000,33 +1014,60 @@ function foregroundWaitLease() {
         : undefined;
 }
 
-/** Bound implicit writer admission too, including prepared INSERT OR IGNORE and
- * writes with RETURNING. Charge successful execution time conservatively: the
- * 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 {
+/** Probe a prepared statement's writer lock without charging uncontended work
+ * against the foreground lock-wait budget. An exec script may commit some of
+ * its statements before failing, so it cannot be retried without duplicating
+ * writes; conservatively charge its single attempt's full execution time. */
+function withAutocommitTimeout<T>(db: Database, operation: () => T, singleStatement = true): T {
     assertTransformWrite();
     const lease = foregroundWaitLease();
     if (isInTransaction(db)) return operation();
     const scoped = lease || backgroundWriterScope.getStore();
     const previous = scoped ? pragmaNumber(db, "busy_timeout") : null;
-    if (scoped)
-        db.exec(
-            `PRAGMA busy_timeout=${lease ? Math.floor(Math.min(lease.remainingWaitMs, lease.guard?.remainingMs() ?? Infinity)) : SHORT_BUSY_TIMEOUT_MS}`,
-        );
     const started = performance.now();
     let completed = false;
-    try {
+    const execute = () => {
         const result = operation();
         completed = true;
         return result;
+    };
+    try {
+        if (!scoped) return execute();
+        if (singleStatement) {
+            db.exec("PRAGMA busy_timeout=0");
+            try {
+                return execute();
+            } catch (error) {
+                if (!isTransientSqliteError(error) || isInTransaction(db)) throw error;
+            }
+            assertTransformWrite();
+        }
+        const timeout = Math.floor(
+            Math.min(
+                lease?.remainingWaitMs ?? SHORT_BUSY_TIMEOUT_MS,
+                lease?.guard?.remainingMs() ?? Infinity,
+            ),
+        );
+        db.exec(`PRAGMA busy_timeout=${timeout}`);
+        const waitStarted = performance.now();
+        try {
+            return execute();
+        } finally {
+            // Deduct the prepared statement's contended retry or the exec
+            // script's execution from the remaining foreground wait budget;
+            // the native API cannot separate lock waiting from execution.
+            if (lease)
+                lease.remainingWaitMs = Math.max(
+                    0,
+                    lease.remainingWaitMs - (performance.now() - waitStarted),
+                );
+        }
     } catch (error) {
         if (lease && isTransientSqliteError(error))
             throw new SqliteAcquisitionBusyError(error, "autocommit");
         throw error;
     } finally {
         const elapsed = performance.now() - started;
-        if (lease) lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - elapsed);
         if (previous !== null) db.exec(`PRAGMA busy_timeout=${previous}`);
         // Native autocommit does not expose the instant its lock was acquired.
         // Label the upper bound so a waiting statement is not blamed as a holder.

package/src/shared/stable-json.ts

@@ -22,33 +22,33 @@ export function stableStringify(value: unknown, seen = new WeakSet<object>()): s
     // value's text once per enclosing level, so a large value N levels deep cost
     // N copies of itself.
     const pieces: string[] = [];
-    writeStable(value, seen, pieces);
+    writeStable(value, seen, (piece) => pieces.push(piece));
     return pieces.join("");
 }
 
-function writeStable(value: unknown, seen: WeakSet<object>, pieces: string[]): void {
+function writeStable(value: unknown, seen: WeakSet<object>, write: (piece: string) => void): void {
     if (value === undefined) {
-        pieces.push("undefined");
+        write("undefined");
         return;
     }
     if (value === null || typeof value !== "object") {
-        pieces.push(JSON.stringify(value) ?? String(value));
+        write(JSON.stringify(value) ?? String(value));
         return;
     }
     // Any object met a second time, shared or cyclic, is written as "[Circular]".
     if (seen.has(value)) {
-        pieces.push('"[Circular]"');
+        write('"[Circular]"');
         return;
     }
     seen.add(value);
     if (Array.isArray(value)) {
-        pieces.push("[");
+        write("[");
         for (let index = 0; index < value.length; index += 1) {
-            if (index > 0) pieces.push(",");
+            if (index > 0) write(",");
             // A hole writes nothing between its commas, as joining a mapped array did.
-            if (index in value) writeStable(value[index], seen, pieces);
+            if (index in value) writeStable(value[index], seen, write);
         }
-        pieces.push("]");
+        write("]");
         return;
     }
     // Code-point sort (NOT localeCompare). Stable across runtimes/locales.
@@ -57,11 +57,53 @@ function writeStable(value: unknown, seen: WeakSet<object>, pieces: string[]): v
         if (a > b) return 1;
         return 0;
     });
-    pieces.push("{");
+    // Native JSON can emit a small scalar-only object in one operation. Larger
+    // containers still stream; undefined and integer keys need the writer's
+    // non-native spelling/order. Bound chunks so hashing never builds a large JSON string.
+    if (
+        entries.length > 0 &&
+        entries.length <= 16 &&
+        entries.every(
+            ([key, child]) =>
+                key.length <= 4096 &&
+                !/^(0|[1-9]\d*)$/.test(key) &&
+                (child === null ||
+                    typeof child === "number" ||
+                    typeof child === "boolean" ||
+                    (typeof child === "string" && child.length <= 4096)),
+        )
+    ) {
+        write(JSON.stringify(Object.fromEntries(entries)));
+        return;
+    }
+    write("{");
     entries.forEach(([key, child], index) => {
-        if (index > 0) pieces.push(",");
-        pieces.push(JSON.stringify(key), ":");
-        writeStable(child, seen, pieces);
+        if (index > 0) write(",");
+        write(JSON.stringify(key));
+        write(":");
+        writeStable(child, seen, write);
     });
-    pieces.push("}");
+    write("}");
+}
+
+/** The existing UTF-16 FNV fingerprint, without retaining the serialized JSON. */
+export function stableStringifyHash(value: unknown, prefix = ""): string {
+    const sink = jsonHashSink(prefix);
+    writeStable(value, new WeakSet(), sink.write);
+    return sink.digest();
+}
+
+/** Hash the same code units as the content memo, including lone surrogates. */
+export function jsonHashSink(prefix = ""): {
+    write: (piece: string) => void;
+    digest: () => string;
+} {
+    let hash = 0x811c9dc5;
+    const write = (piece: string): void => {
+        for (let index = 0; index < piece.length; index++) {
+            hash = Math.imul(hash ^ piece.charCodeAt(index), 0x01000193);
+        }
+    };
+    write(prefix);
+    return { write, digest: () => (hash >>> 0).toString(16).padStart(8, "0") };
 }

package/src/shared/tail-hygiene-json.test.ts

@@ -0,0 +1,117 @@
+import { expect, test } from "bun:test";
+import { jsonHashSink, stableStringify, stableStringifyHash } from "./stable-json";
+import { piJsonHash, TailHygieneJsonMemo } from "./tail-hygiene-json";
+
+function hash(text: string): string {
+    const sink = jsonHashSink("excluded\0");
+    sink.write(text);
+    return sink.digest();
+}
+
+function piStringify(value: unknown): string {
+    const seen = new Set<object>();
+    try {
+        return (
+            JSON.stringify(value, (_key, current) => {
+                if (!current || typeof current !== "object" || Array.isArray(current))
+                    return current;
+                if (seen.has(current)) return "[Circular]";
+                seen.add(current);
+                return Object.fromEntries(
+                    Object.entries(current).sort(([a], [b]) => a.localeCompare(b)),
+                );
+            }) ?? ""
+        );
+    } catch {
+        return "";
+    }
+}
+
+test("streamed excluded fingerprints equal both original serializers on randomized values", () => {
+    let state = 704;
+    const random = (n: number): number => {
+        state = (Math.imul(state, 1664525) + 1013904223) | 0;
+        return (state >>> 0) % n;
+    };
+    const leaves = [
+        undefined,
+        null,
+        -0,
+        NaN,
+        Infinity,
+        1e-7,
+        1e23,
+        false,
+        "\ud800",
+        "é😀\n\u2028",
+        '"\\',
+    ];
+    const generate = (depth: number): unknown => {
+        if (!depth || random(3) === 0) return leaves[random(leaves.length)];
+        if (random(2)) {
+            const array = new Array(4);
+            array[0] = generate(depth - 1);
+            array[2] = undefined;
+            array[3] = generate(depth - 1);
+            return array;
+        }
+        const value: Record<string, unknown> = {};
+        const keys = ["10", "2", "Z", "ä", "a", "e\u0301", "é"];
+        for (let i = 0; i < 4; i++) value[keys[random(keys.length)]] = generate(depth - 1);
+        if (random(5) === 0) value.self = value;
+        return value;
+    };
+    const shared = { a: undefined, z: "shared" };
+    const cycle: unknown[] = [];
+    cycle.push(cycle);
+    const samples: unknown[] = [
+        cycle,
+        { a: shared, b: shared },
+        1n,
+        new Date(0),
+        { toJSON: () => "date" },
+    ];
+    for (let i = 0; i < 2_000; i++) samples.push(generate(4));
+    for (const value of samples) {
+        try {
+            const expected = stableStringify(value);
+            expect(stableStringifyHash(value, "excluded\0")).toBe(hash(expected));
+        } catch {
+            expect(() => stableStringifyHash(value, "excluded\0")).toThrow();
+        }
+        expect(piJsonHash(value, () => piStringify(value))).toBe(hash(piStringify(value)));
+    }
+    console.log(`excluded fingerprint differential: ${samples.length} values per serializer`);
+});
+
+test("part memo catches in-place edits, alias changes, key order and accessor values", () => {
+    const memo = new TailHygieneJsonMemo();
+    let calls = 0;
+    const get = (value: unknown): string => {
+        memo.beginPass();
+        return memo.get("part", value, () => {
+            calls++;
+            return stableStringify(value);
+        });
+    };
+    const shared = { value: "first" };
+    const value = { a: shared, b: shared };
+    expect(get(value)).toBe(get(structuredClone(value)));
+    expect(calls).toBe(1);
+    shared.value = "other";
+    expect(get(value)).toContain("other");
+    expect(calls).toBe(2);
+    value.b = { value: "other" };
+    expect(get(value)).not.toContain("Circular");
+    expect(calls).toBe(3);
+    expect(get({ b: value.b, a: value.a })).toBe(get(value));
+    expect(calls).toBe(5);
+    let changing = 0;
+    const accessor = {
+        get value() {
+            return ++changing;
+        },
+    };
+    expect(get(accessor)).not.toBe(get(accessor));
+    expect(calls).toBe(7);
+});