@cortexkit/opencode-magic-context 0.49.11 → 0.49.13

package/src/shared/data-path.ts

@@ -1,4 +1,12 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import {
+    existsSync,
+    lstatSync,
+    mkdirSync,
+    readFileSync,
+    readlinkSync,
+    realpathSync,
+    writeFileSync,
+} from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { getHarness, type HarnessId } from "./harness";
@@ -253,6 +261,54 @@ export function getMagicContextStorageDir(): string {
     return getMagicContextStorageResolution().path;
 }
 
+function canonicalizeStoragePath(value: string, seen = new Set<string>()): string {
+    const absolute = path.resolve(value);
+    if (seen.has(absolute)) return absolute;
+    seen.add(absolute);
+
+    try {
+        return realpathSync.native(absolute);
+    } catch {
+        try {
+            if (lstatSync(absolute).isSymbolicLink()) {
+                const target = readlinkSync(absolute);
+                const resolvedTarget = path.isAbsolute(target)
+                    ? target
+                    : path.resolve(path.dirname(absolute), target);
+                return canonicalizeStoragePath(resolvedTarget, seen);
+            }
+        } catch {
+            // The path may not exist yet; resolve the nearest existing parent below.
+        }
+
+        const parent = path.dirname(absolute);
+        if (parent === absolute) return absolute;
+        const resolvedParent = canonicalizeStoragePath(parent, seen);
+        return path.resolve(resolvedParent, path.basename(absolute));
+    }
+}
+
+/** Whether the resolved store is outside the default CortexKit backup directory. */
+export function isMagicContextStorageOutsideEngram(
+    storageDir = getMagicContextStorageDir(),
+    backupDir = path.join(os.homedir(), ".local", "share", "cortexkit", "magic-context"),
+): boolean {
+    const resolvedStorageDir = canonicalizeStoragePath(storageDir);
+    const resolvedBackupDir = canonicalizeStoragePath(backupDir);
+    const relative = path.relative(resolvedBackupDir, resolvedStorageDir);
+    return path.isAbsolute(relative) || relative === ".." || relative.startsWith(`..${path.sep}`);
+}
+
+const STORAGE_BACKUP_WARNING_CHECKED = Symbol.for("magic-context.storage-backup-warning-checked");
+
+/** Claim the process-wide startup check so multiple host entries log at most once. */
+export function claimStorageBackupWarningCheck(): boolean {
+    const processState = globalThis as unknown as { [key: symbol]: boolean | undefined };
+    if (processState[STORAGE_BACKUP_WARNING_CHECKED]) return false;
+    processState[STORAGE_BACKUP_WARNING_CHECKED] = true;
+    return true;
+}
+
 let testBackstopStorageDir: string | null = null;
 let testBackstopWarned = false;
 

package/src/shared/model-suggestion-retry.test.ts

@@ -40,6 +40,18 @@ function createArgs(model?: { providerID: string; modelID: string }) {
 }
 
 describe("promptSyncWithModelSuggestionRetry", () => {
+    test("synchronous prompt completion retains await semantics with cancellation", async () => {
+        const prompt = mock(() => undefined);
+        const abort = mock(async () => ({}));
+
+        await promptSyncWithModelSuggestionRetry(createClient(prompt, abort), createArgs(), {
+            signal: new AbortController().signal,
+        });
+
+        expect(prompt).toHaveBeenCalledTimes(1);
+        expect(abort).not.toHaveBeenCalled();
+    });
+
     test("primary succeeds, no fallback iteration", async () => {
         const prompt = mock(async () => ({}));
         const client = createClient(prompt);
@@ -799,3 +811,25 @@ test("DeepSeek unsupported-model 400 preserves provider status and message rathe
     expect((caught as Error).message).not.toContain("no output");
     expect(getPromptFailureDetail(caught)).toMatchObject({ failureClass: "provider_error" });
 });
+
+test("timeout rejects an uncooperative carrier and aborts its child", async () => {
+    const abort = mock(async () => ({}));
+    const client = createClient(
+        mock(() => new Promise(() => {})),
+        abort,
+    );
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    try {
+        await expect(
+            Promise.race([
+                promptSyncWithModelSuggestionRetry(client, createArgs(), { timeoutMs: 10 }),
+                new Promise((_, reject) => {
+                    timer = setTimeout(() => reject(new Error("carrier remained stuck")), 200);
+                }),
+            ]),
+        ).rejects.toThrow("prompt timed out after 10ms");
+        expect(abort).toHaveBeenCalledTimes(1);
+    } finally {
+        clearTimeout(timer);
+    }
+});

package/src/shared/model-suggestion-retry.ts

@@ -248,6 +248,23 @@ function externalAbortMessage(signal: AbortSignal): string {
     return `prompt aborted by external signal${reason instanceof Error && /^lease_(?:lost|expired):/.test(reason.message) ? `: ${reason.message}` : ""}`;
 }
 
+/** A carrier may ignore cancellation; stop waiting without trusting it to reject. */
+export function raceWithSignal<T>(work: Promise<T>, signal?: AbortSignal): Promise<T> {
+    // Match await's handling of synchronous completion as well as promises.
+    work = Promise.resolve(work);
+    if (!signal) return work;
+    return new Promise<T>((resolve, reject) => {
+        const abort = () => reject(new Error(externalAbortMessage(signal)));
+        if (signal.aborted) {
+            work.catch(() => {});
+            abort();
+            return;
+        }
+        signal.addEventListener("abort", abort, { once: true });
+        work.then(resolve, reject).finally(() => signal.removeEventListener("abort", abort));
+    });
+}
+
 async function promptWithTimeout(
     client: Client,
     args: PromptArgs,
@@ -273,10 +290,13 @@ async function promptWithTimeout(
 
     try {
         const request = { ...args, signal: controller.signal };
-        if (transport) await transport(request);
+        if (transport) await raceWithSignal(transport(request), controller.signal);
         else {
             if (!client) throw new Error("Hidden completion transport is unavailable");
-            await client.session.prompt(request as Parameters<typeof client.session.prompt>[0]);
+            await raceWithSignal<unknown>(
+                client.session.prompt(request as Parameters<typeof client.session.prompt>[0]),
+                controller.signal,
+            );
         }
     } catch (error) {
         if (signal?.aborted) {
@@ -676,7 +696,7 @@ async function attemptAndValidate<TOutput, TValidated>(
 
     let output: TOutput;
     try {
-        output = await options.fetchOutput(args, attempt);
+        output = await raceWithSignal(options.fetchOutput(args, attempt), options.signal);
     } catch (error) {
         throw {
             error,

package/src/shared/prompt-async-transport.test.ts

@@ -202,7 +202,7 @@ describe("dreamer budget on an async child", () => {
             },
             readChildTokenBudget: (id: string) => {
                 expect(id).toBe("ses-child");
-                expect(ready).toBe(true);
+                if (!ready) return undefined;
                 return { spent: 58, finalizeFired: true };
             },
         };

package/src/shared/prompt-async-transport.ts

@@ -130,9 +130,22 @@ export function createPromptAsyncTransport(
         if (!readChildTokenBudget || !session?.prompt) return undefined;
         return Object.assign(
             async (request: PromptArgs) => {
-                await session.prompt?.(request);
-                const state = readChildTokenBudget(childSessionId);
-                if (state) options.onBudgetUpdate?.({ ...state, sessionId: childSessionId });
+                const previous = readChildTokenBudget(childSessionId);
+                const remaining =
+                    options.tokenBudget === undefined
+                        ? undefined
+                        : options.tokenBudget - (previous?.spent ?? 0);
+                if ((remaining !== undefined && remaining <= 0) || previous?.finalizeFired)
+                    throw new DreamTokenBudgetExceeded(childSessionId, previous?.spent ?? 0);
+                try {
+                    await session.prompt?.({
+                        ...request,
+                        ...(remaining === undefined ? {} : { tokenBudget: remaining }),
+                    });
+                } finally {
+                    const state = readChildTokenBudget(childSessionId);
+                    if (state) options.onBudgetUpdate?.({ ...state, sessionId: childSessionId });
+                }
             },
             { childSessionId },
         );

package/dist/embedding-backfill-fjbfh1dt.js

@@ -1,21 +0,0 @@
-import {
-  ensureMemoryEmbeddings2
-} from "./index-4ccdr7yw.js";
-import"./index-se1w3v2m.js";
-import"./index-9159kk15.js";
-import"./index-4dhv7mqz.js";
-import"./index-qt1qqasc.js";
-import"./index-bmwfzz28.js";
-import"./index-kvw6xew3.js";
-import"./index-0jz47061.js";
-import"./index-mp2kghkv.js";
-import"./index-w28y7d0z.js";
-import"./index-150zz6fh.js";
-import"./index-gjvjh960.js";
-import"./index-wafzvyhg.js";
-import"./index-mvvephtj.js";
-import"./index-0sahzkwr.js";
-import"./index-pavzsdc6.js";
-export {
-  ensureMemoryEmbeddings2 as ensureMemoryEmbeddings
-};

package/dist/recomp-orchestrator-67k45s0b.js

@@ -1,60 +0,0 @@
-import {
-  isRecompFailure2,
-  isRecompSkip2,
-  extractRecompReason2,
-  setRecompStarting2,
-  setRecompNote2,
-  setRecompTerminal2,
-  buildRecompDeps2,
-  runManagedRecomp2
-} from "./index-g40wgxxt.js";
-import"./index-z7avx6rw.js";
-import"./index-s178h9z8.js";
-import"./index-yhrrx7qa.js";
-import"./index-0j6crjgh.js";
-import"./index-sd3egckz.js";
-import"./index-4ccdr7yw.js";
-import"./index-n78avt2p.js";
-import"./index-se1w3v2m.js";
-import"./index-9159kk15.js";
-import"./index-4dhv7mqz.js";
-import"./index-jw4gbfkv.js";
-import"./index-0abg88h2.js";
-import"./index-qt1qqasc.js";
-import"./index-x8a7jmkh.js";
-import"./index-a4b0gbyg.js";
-import"./index-bmwfzz28.js";
-import"./index-kvw6xew3.js";
-import"./index-xztdf9t7.js";
-import"./index-a865mj02.js";
-import"./index-fb3zxn06.js";
-import"./index-fr0wbhdn.js";
-import"./index-0jz47061.js";
-import"./index-mp2kghkv.js";
-import"./index-q28hsbpg.js";
-import"./index-qr1mkc2y.js";
-import"./index-f8cn4xqa.js";
-import"./index-1zx87sdm.js";
-import"./index-bzp9s8z2.js";
-import"./index-angx1s0k.js";
-import"./index-v0p37hm2.js";
-import"./index-w28y7d0z.js";
-import"./index-9jvab89d.js";
-import"./index-g7jkrz0x.js";
-import"./index-58e3y90n.js";
-import"./index-150zz6fh.js";
-import"./index-gjvjh960.js";
-import"./index-wafzvyhg.js";
-import"./index-mvvephtj.js";
-import"./index-0sahzkwr.js";
-import"./index-pavzsdc6.js";
-export {
-  buildRecompDeps2 as buildRecompDeps,
-  extractRecompReason2 as extractRecompReason,
-  isRecompFailure2 as isRecompFailure,
-  isRecompSkip2 as isRecompSkip,
-  runManagedRecomp2 as runManagedRecomp,
-  setRecompNote2 as setRecompNote,
-  setRecompStarting2 as setRecompStarting,
-  setRecompTerminal2 as setRecompTerminal
-};

package/dist/v2/embedding-backfill-xcw3t6hp.js

@@ -1,20 +0,0 @@
-import {
-  ensureMemoryEmbeddings2
-} from "./server-rxcq4t50.js";
-import"./server-sg68np13.js";
-import"./server-ewqshbs8.js";
-import"./server-4dhv7mqz.js";
-import"./server-qt1qqasc.js";
-import"./server-83d71zab.js";
-import"./server-988cqjme.js";
-import"./server-njnx39q2.js";
-import"./server-63ha7f0f.js";
-import"./server-jc8v585p.js";
-import"./server-7dv9wt9r.js";
-import"./server-s6jqh8bj.js";
-import"./server-wafzvyhg.js";
-import"./server-9e5r8y60.js";
-import"./server-pavzsdc6.js";
-export {
-  ensureMemoryEmbeddings2 as ensureMemoryEmbeddings
-};

package/dist/v2/recomp-orchestrator-n0pq36f0.js

@@ -1,59 +0,0 @@
-import {
-  isRecompFailure2,
-  isRecompSkip2,
-  extractRecompReason2,
-  setRecompStarting2,
-  setRecompNote2,
-  setRecompTerminal2,
-  buildRecompDeps2,
-  runManagedRecomp2
-} from "./server-7fvmt15t.js";
-import"./server-npm52h2q.js";
-import"./server-kn7skz9r.js";
-import"./server-d3f4g62c.js";
-import"./server-rxcq4t50.js";
-import"./server-n78avt2p.js";
-import"./server-sg68np13.js";
-import"./server-ewqshbs8.js";
-import"./server-4dhv7mqz.js";
-import"./server-hn9fb3v0.js";
-import"./server-h3wc20sv.js";
-import"./server-qt1qqasc.js";
-import"./server-ckrb5rm8.js";
-import"./server-5x7kmyz8.js";
-import"./server-nveratm5.js";
-import"./server-x8a7jmkh.js";
-import"./server-83d71zab.js";
-import"./server-988cqjme.js";
-import"./server-erfp0xb6.js";
-import"./server-fb3zxn06.js";
-import"./server-f27he3j1.js";
-import"./server-fr0wbhdn.js";
-import"./server-njnx39q2.js";
-import"./server-63ha7f0f.js";
-import"./server-cxsr0ng6.js";
-import"./server-wkhfyzpg.js";
-import"./server-kmapq3v0.js";
-import"./server-1zx87sdm.js";
-import"./server-d6t16r89.js";
-import"./server-bx59ezg6.js";
-import"./server-51779zs2.js";
-import"./server-jc8v585p.js";
-import"./server-xqf2d2mg.js";
-import"./server-89fcbe37.js";
-import"./server-2ra6pwf3.js";
-import"./server-7dv9wt9r.js";
-import"./server-s6jqh8bj.js";
-import"./server-wafzvyhg.js";
-import"./server-9e5r8y60.js";
-import"./server-pavzsdc6.js";
-export {
-  buildRecompDeps2 as buildRecompDeps,
-  extractRecompReason2 as extractRecompReason,
-  isRecompFailure2 as isRecompFailure,
-  isRecompSkip2 as isRecompSkip,
-  runManagedRecomp2 as runManagedRecomp,
-  setRecompNote2 as setRecompNote,
-  setRecompStarting2 as setRecompStarting,
-  setRecompTerminal2 as setRecompTerminal
-};

package/dist/wrapup-orchestrator-jqapepw0.js

@@ -1,47 +0,0 @@
-import {
-  runManagedWrapup2
-} from "./index-q3qck7j2.js";
-import"./index-g40wgxxt.js";
-import"./index-z7avx6rw.js";
-import"./index-s178h9z8.js";
-import"./index-yhrrx7qa.js";
-import"./index-0j6crjgh.js";
-import"./index-sd3egckz.js";
-import"./index-4ccdr7yw.js";
-import"./index-n78avt2p.js";
-import"./index-se1w3v2m.js";
-import"./index-9159kk15.js";
-import"./index-4dhv7mqz.js";
-import"./index-jw4gbfkv.js";
-import"./index-0abg88h2.js";
-import"./index-qt1qqasc.js";
-import"./index-x8a7jmkh.js";
-import"./index-a4b0gbyg.js";
-import"./index-bmwfzz28.js";
-import"./index-kvw6xew3.js";
-import"./index-xztdf9t7.js";
-import"./index-a865mj02.js";
-import"./index-fb3zxn06.js";
-import"./index-fr0wbhdn.js";
-import"./index-0jz47061.js";
-import"./index-mp2kghkv.js";
-import"./index-q28hsbpg.js";
-import"./index-qr1mkc2y.js";
-import"./index-f8cn4xqa.js";
-import"./index-1zx87sdm.js";
-import"./index-bzp9s8z2.js";
-import"./index-angx1s0k.js";
-import"./index-v0p37hm2.js";
-import"./index-w28y7d0z.js";
-import"./index-9jvab89d.js";
-import"./index-g7jkrz0x.js";
-import"./index-58e3y90n.js";
-import"./index-150zz6fh.js";
-import"./index-gjvjh960.js";
-import"./index-wafzvyhg.js";
-import"./index-mvvephtj.js";
-import"./index-0sahzkwr.js";
-import"./index-pavzsdc6.js";
-export {
-  runManagedWrapup2 as runManagedWrapup
-};