@cortexkit/opencode-magic-context 0.35.1 → 0.36.1

package/src/shared/data-path.test.ts

@@ -20,6 +20,8 @@ const savedEnv = {
     XDG_DATA_HOME: process.env.XDG_DATA_HOME,
     LOCALAPPDATA: process.env.LOCALAPPDATA,
     MAGIC_CONTEXT_LOG_PATH: process.env.MAGIC_CONTEXT_LOG_PATH,
+    MAGIC_CONTEXT_TEST_DATA_DIR: process.env.MAGIC_CONTEXT_TEST_DATA_DIR,
+    NODE_ENV: process.env.NODE_ENV,
 };
 
 describe("data-path", () => {
@@ -36,14 +38,14 @@ describe("data-path", () => {
     });
 
     afterEach(() => {
-        if (savedEnv.XDG_CACHE_HOME !== undefined)
-            process.env.XDG_CACHE_HOME = savedEnv.XDG_CACHE_HOME;
-        if (savedEnv.XDG_DATA_HOME !== undefined)
-            process.env.XDG_DATA_HOME = savedEnv.XDG_DATA_HOME;
-        if (savedEnv.LOCALAPPDATA !== undefined) process.env.LOCALAPPDATA = savedEnv.LOCALAPPDATA;
-        if (savedEnv.MAGIC_CONTEXT_LOG_PATH !== undefined)
-            process.env.MAGIC_CONTEXT_LOG_PATH = savedEnv.MAGIC_CONTEXT_LOG_PATH;
-        else delete process.env.MAGIC_CONTEXT_LOG_PATH;
+        // Restore-or-delete every var this suite touches. Several tests lift a
+        // guard (NODE_ENV, MAGIC_CONTEXT_TEST_DATA_DIR) to assert production
+        // shape, so a restore that skips the unset case would leak state into
+        // the next test and make results order-dependent.
+        for (const [key, value] of Object.entries(savedEnv)) {
+            if (value !== undefined) process.env[key] = value;
+            else delete process.env[key];
+        }
     });
 
     test("getCacheDir falls back to <homedir>/.cache when XDG_CACHE_HOME is unset (all platforms)", () => {
@@ -89,8 +91,62 @@ describe("data-path", () => {
         // Cross-harness shared path: both OpenCode and Pi plugins read/write here,
         // unlike the legacy opencode/storage/plugin/magic-context location which
         // was OpenCode-specific. See ARCHITECTURE_DECISIONS memory for rationale.
+        // Production shape, so both test-isolation guards (the preload's data
+        // dir and the NODE_ENV backstop bun sets for every `bun test`) are
+        // lifted for the duration of this assertion.
+        const savedTestDir = process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
+        const savedNodeEnv = process.env.NODE_ENV;
+        delete process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
+        delete process.env.NODE_ENV;
+        try {
+            expect(getMagicContextStorageDir()).toBe(
+                path.join(os.homedir(), ".local", "share", "cortexkit", "magic-context"),
+            );
+        } finally {
+            if (savedTestDir !== undefined) process.env.MAGIC_CONTEXT_TEST_DATA_DIR = savedTestDir;
+            if (savedNodeEnv !== undefined) process.env.NODE_ENV = savedNodeEnv;
+        }
+    });
+
+    test("getMagicContextStorageDir backstops to a temp dir under NODE_ENV=test with no guard set", () => {
+        // CWD-independent backstop: a `bun test` from a dir whose bunfig has no
+        // `[test] preload` runs every suite with neither guard env var set. The
+        // DB resolver used to own this branch, so direct callers of this helper
+        // (the CLI doctors' own PRAGMA integrity_check) still reached the real
+        // shared DB. Memoized, so repeated calls must agree — openDatabase()
+        // caches by path.
+        const savedTestDir = process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
+        delete process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
+        process.env.NODE_ENV = "test";
+        try {
+            const resolved = getMagicContextStorageDir();
+            expect(resolved).not.toContain(path.join(os.homedir(), ".local", "share"));
+            expect(resolved.endsWith(path.join("cortexkit", "magic-context"))).toBe(true);
+            expect(getMagicContextStorageDir()).toBe(resolved);
+        } finally {
+            if (savedTestDir !== undefined) process.env.MAGIC_CONTEXT_TEST_DATA_DIR = savedTestDir;
+        }
+    });
+
+    test("getMagicContextStorageDir honors MAGIC_CONTEXT_TEST_DATA_DIR when XDG_DATA_HOME is unset", () => {
+        // The hole this closes: a test that deletes XDG_DATA_HOME to exercise
+        // path fallbacks used to resolve to the user's REAL shared storage,
+        // because bun caches os.homedir() and a mutated process.env.HOME cannot
+        // move getDataDir(). Callers that build their own context.db path (the
+        // CLI doctors) then ran integrity checks against production data.
+        process.env.MAGIC_CONTEXT_TEST_DATA_DIR = "/tmp/mc-test-isolation";
         expect(getMagicContextStorageDir()).toBe(
-            path.join(os.homedir(), ".local", "share", "cortexkit", "magic-context"),
+            path.join("/tmp/mc-test-isolation", "cortexkit", "magic-context"),
+        );
+    });
+
+    test("getMagicContextStorageDir prefers XDG_DATA_HOME over MAGIC_CONTEXT_TEST_DATA_DIR", () => {
+        // A test managing its own per-test data home is already controlled, and
+        // several suites depend on that dir being honored.
+        process.env.MAGIC_CONTEXT_TEST_DATA_DIR = "/tmp/mc-test-isolation";
+        process.env.XDG_DATA_HOME = "/tmp/custom-data";
+        expect(getMagicContextStorageDir()).toBe(
+            path.join("/tmp/custom-data", "cortexkit", "magic-context"),
         );
     });
 

package/src/shared/data-path.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, writeFileSync } from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { getHarness, type HarnessId } from "./harness";
@@ -167,11 +167,76 @@ export function getOpenCodeStorageDir(): string {
  *   - Future cross-harness session migration
  *
  * Layout: <XDG_DATA_HOME>/cortexkit/magic-context/
+ *
+ * TEST-ISOLATION GUARD. `openDatabase()` has been guarded in
+ * `resolveDatabasePath()` since the 2026-06-01 (v26) and 2026-06-19 (v41)
+ * incidents, in which unisolated tests migrated the user's REAL shared DB.
+ * Every OTHER caller bypassed that guard — notably the CLI doctors, which
+ * build `join(getMagicContextStorageDir(), "context.db")` themselves and run
+ * `PRAGMA integrity_check` against it. A test that deletes XDG_DATA_HOME to
+ * exercise path fallbacks cannot restore isolation by setting
+ * `process.env.HOME`: bun caches `os.homedir()` at startup, so `getDataDir()`
+ * still resolves to the real home. MAGIC_CONTEXT_TEST_DATA_DIR — set by
+ * `packages/plugin/test-preload.ts`, and restored by any test that touches it
+ * — is honored here, so the preload's "cannot be defeated" guarantee holds for
+ * every caller, not just `openDatabase()`. It is never set in production.
+ *
+ * CWD-INDEPENDENT BACKSTOP. The preload only runs when `bun test`'s CWD has a
+ * bunfig wiring `[test] preload`. A run from a dir WITHOUT that wiring (a
+ * package missing its bunfig, or a brand-new one) executes every *.test.ts with
+ * NO preload, and this resolver would hand back the REAL shared path — which is
+ * how the live DB reached v41. Bun sets NODE_ENV=test for EVERY `bun test`
+ * regardless of CWD, and production never sets it, so that window redirects to
+ * a memoized throwaway dir instead. It lives here rather than in
+ * `resolveDatabasePath()` so direct callers (the CLI doctors' own
+ * `PRAGMA integrity_check`, announcements, the models.dev cache) are covered
+ * too — they never go through the DB resolver.
+ *
+ * XDG_DATA_HOME still wins over both: a test that manages its own data home is
+ * already controlled, and production has no test dir set at all.
  */
 export function getMagicContextStorageDir(): string {
+    if (!process.env.XDG_DATA_HOME) {
+        const testDataDir = process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
+        if (testDataDir) {
+            return path.join(testDataDir, "cortexkit", "magic-context");
+        }
+        if (process.env.NODE_ENV === "test") {
+            return getTestBackstopStorageDir();
+        }
+    }
     return path.join(getDataDir(), "cortexkit", "magic-context");
 }
 
+let testBackstopStorageDir: string | null = null;
+let testBackstopWarned = false;
+
+/**
+ * Memoized per process so repeated calls in the same unisolated test resolve to
+ * the SAME path — `openDatabase()` caches by path, and a fresh temp dir per call
+ * would defeat that cache and hand back different DB handles.
+ */
+function getTestBackstopStorageDir(): string {
+    if (!testBackstopStorageDir) {
+        testBackstopStorageDir = path.join(
+            mkdtempSync(path.join(os.tmpdir(), "mc-test-db-backstop-")),
+            "cortexkit",
+            "magic-context",
+        );
+    }
+    if (!testBackstopWarned) {
+        testBackstopWarned = true;
+        // Deliberately console, not the logger: logger.ts imports this module.
+        console.warn(
+            "[magic-context] TEST BACKSTOP: NODE_ENV=test with no MAGIC_CONTEXT_TEST_DATA_DIR " +
+                `— redirecting storage to a throwaway temp dir (${testBackstopStorageDir}) so no ` +
+                "test can touch the user's real shared database. Wire `[test] preload` in this " +
+                "package's bunfig.toml.",
+        );
+    }
+    return testBackstopStorageDir;
+}
+
 /**
  * Legacy magic-context storage directory used by the OpenCode plugin before the
  * shared cortexkit path. Used only for one-time migration of existing data into

package/src/shared/harness-provider-map.test.ts

@@ -1,5 +1,10 @@
 import { describe, expect, it } from "bun:test";
-import { piModelRefToCanonical, resolveModelRefForPi } from "./harness-provider-map";
+import {
+    ompModelRefToCanonical,
+    piModelRefToCanonical,
+    resolveModelRefForOmp,
+    resolveModelRefForPi,
+} from "./harness-provider-map";
 
 describe("harness-provider-map", () => {
     describe("resolveModelRefForPi (canonical -> Pi, used when spawning)", () => {
@@ -61,3 +66,39 @@ describe("harness-provider-map", () => {
         });
     });
 });
+
+describe("OMP provider boundary", () => {
+    const representativeRefs = [
+        ["openai/gpt-5.5", "openai-codex/gpt-5.5"],
+        ["google/antigravity/gemini-3.5-flash", "google-antigravity/antigravity/gemini-3.5-flash"],
+        ["anthropic/claude-opus-4-8", "anthropic/claude-opus-4-8"],
+        ["@scope/provider/nested/model", "@scope/provider/nested/model"],
+    ] as const;
+
+    it.each(
+        representativeRefs,
+    )("round-trips canonical %s through OMP selector %s", (canonical, omp) => {
+        expect(resolveModelRefForOmp(canonical)).toBe(omp);
+        expect(ompModelRefToCanonical(omp)).toBe(canonical);
+    });
+
+    it("normalizes an already-native OMP selector idempotently", () => {
+        const selector = "openai-codex/team/nested/gpt-5.5";
+        expect(resolveModelRefForOmp(selector)).toBe(selector);
+        expect(resolveModelRefForOmp(ompModelRefToCanonical(selector))).toBe(selector);
+    });
+
+    it("passes through provider ids that collide with Object.prototype members", () => {
+        for (const ref of [
+            "constructor/model",
+            "toString/model",
+            "__proto__/model",
+            "hasOwnProperty/model",
+        ]) {
+            expect(resolveModelRefForOmp(ref)).toBe(ref);
+            expect(ompModelRefToCanonical(ref)).toBe(ref);
+            expect(resolveModelRefForPi(ref)).toBe(ref);
+            expect(piModelRefToCanonical(ref)).toBe(ref);
+        }
+    });
+});

package/src/shared/harness-provider-map.ts

@@ -2,54 +2,66 @@
  * Provider-id translation between the canonical (OpenCode) form stored in the
  * shared magic-context config and Pi's harness-native provider ids.
  *
- * OpenCode and Pi now share ONE config, but a few auth-plugin providers were
- * named differently on each side. The model id AFTER the slash is identical;
- * only the provider prefix differs:
+ * Provider IDs are a harness boundary, not a database identity. Shared config
+ * always stores the canonical OpenCode form. Each non-OpenCode harness owns an
+ * explicit pair of edge transforms:
  *
- *   canonical (OpenCode)   Pi's preferred auth-plugin form
- *   --------------------   ------------------------------
+ *   canonical (OpenCode)   Pi / OMP selector
+ *   --------------------   -----------------
  *   openai/<model>         openai-codex/<model>
  *   google/<model>         google-antigravity/<model>
  *   anthropic/<model>      anthropic/<model> (same; every other provider too)
  *
- * The mapping is intentionally not a one-to-one provider identity. Pi also
- * exposes plain `openai` and `google` providers for direct API keys, while the
- * canonical prefix does not record whether a subscription or API-key backend
- * should win. Pi therefore starts with the preferred auth-plugin form at the
- * spawn boundary and subagent-runner may retry once with the untranslated
- * canonical form when that form reports missing credentials. The runner caches
- * the winning form per provider prefix in memory only; setup writes still use
- * the reverse mapping below so configs remain canonical.
+ * Pi and OMP currently expose the same two subscription-provider aliases, but
+ * their exported functions remain distinct deliberately. A future OMP catalog
+ * rename must not silently change plain-Pi behavior (or vice versa).
  *
- * Canonical = OpenCode: the config always stores the OpenCode form. Pi
- * translates at its edges:
- *   - read:  canonical -> Pi when spawning a configured model (subagent-runner),
- *            with the runtime credential fallback described above.
- *   - write: Pi -> canonical in the Pi setup wizard, so a config written from
- *            the Pi side stays readable by OpenCode.
+ * The mapping is intentionally not a one-to-one provider identity. Both
+ * harnesses also expose plain `openai` and `google` providers for direct API
+ * keys, while the canonical prefix does not record whether a subscription or
+ * API-key backend should win. The runtime starts with the preferred
+ * subscription form and subagent-runner may retry once with the untranslated
+ * canonical form when that form reports missing credentials.
  *
- * OpenCode needs no translation (canonical IS the OpenCode form).
+ * Only the provider prefix before the first slash is translated. Model IDs,
+ * including nested IDs containing more slashes, are preserved byte-for-byte.
+ * Scoped or otherwise unknown provider prefixes are identities.
+ *
+ * OpenCode needs no translation because canonical is its native form.
  */
 
-const CANONICAL_TO_PI_PROVIDER: Record<string, string> = {
+const CANONICAL_TO_PI_PROVIDER: Readonly<Record<string, string>> = {
     openai: "openai-codex",
     google: "google-antigravity",
 };
 
-const PI_TO_CANONICAL_PROVIDER: Record<string, string> = {
+const PI_TO_CANONICAL_PROVIDER: Readonly<Record<string, string>> = {
+    "openai-codex": "openai",
+    "google-antigravity": "google",
+};
+
+const CANONICAL_TO_OMP_PROVIDER: Readonly<Record<string, string>> = {
+    openai: "openai-codex",
+    google: "google-antigravity",
+};
+
+const OMP_TO_CANONICAL_PROVIDER: Readonly<Record<string, string>> = {
     "openai-codex": "openai",
     "google-antigravity": "google",
 };
 
 /** Remap only the provider prefix (text before the first "/"), preserving the
- *  model id verbatim. No "/", empty provider, or unmapped provider -> unchanged. */
-function remapProviderPrefix(ref: string, map: Record<string, string>): string {
+ *  model id verbatim. No "/", empty provider, or unmapped provider -> unchanged.
+ *  Lookups are own-property only, so provider ids that collide with
+ *  `Object.prototype` members (`constructor/model`, `toString/model`) stay
+ *  identities instead of becoming garbage prefixes. */
+function remapProviderPrefix(ref: string, map: Readonly<Record<string, string>>): string {
     if (typeof ref !== "string") return ref;
     const slash = ref.indexOf("/");
     if (slash <= 0) return ref;
     const provider = ref.slice(0, slash);
-    const mapped = map[provider];
-    return mapped ? `${mapped}${ref.slice(slash)}` : ref;
+    if (!Object.hasOwn(map, provider)) return ref;
+    return `${map[provider]}${ref.slice(slash)}`;
 }
 
 /** Pi-native `provider/model` -> canonical (OpenCode). Identity when unmapped.
@@ -64,3 +76,13 @@ export function piModelRefToCanonical(ref: string): string {
 export function resolveModelRefForPi(ref: string): string {
     return remapProviderPrefix(piModelRefToCanonical(ref), CANONICAL_TO_PI_PROVIDER);
 }
+
+/** OMP-native selector -> canonical shared-config model reference. */
+export function ompModelRefToCanonical(ref: string): string {
+    return remapProviderPrefix(ref, OMP_TO_CANONICAL_PROVIDER);
+}
+
+/** Canonical shared-config model reference -> OMP-native selector. */
+export function resolveModelRefForOmp(ref: string): string {
+    return remapProviderPrefix(ompModelRefToCanonical(ref), CANONICAL_TO_OMP_PROVIDER);
+}

package/src/shared/jsonc-edit.ts

@@ -0,0 +1,295 @@
+import {
+    applyEdits,
+    createScanner,
+    findNodeAtLocation,
+    getNodeValue,
+    type JSONPath,
+    modify,
+    type Node,
+    type ParseError,
+    parseTree,
+} from "jsonc-parser";
+
+interface TokenLocation {
+    offset: number;
+    length: number;
+    line: number;
+}
+
+/**
+ * jsonc-parser exposes SyntaxKind as a const enum, which cannot be referenced
+ * from this isolated TypeScript module. Keep the scanner token values local.
+ */
+const TOKEN_COMMA = 5;
+const TOKEN_LINE_COMMENT = 12;
+const TOKEN_BLOCK_COMMENT = 13;
+const TOKEN_EOF = 17;
+
+function parseDocument(text: string): Node {
+    const errors: ParseError[] = [];
+    const root = parseTree(text, errors, { allowTrailingComma: true });
+    if (!root || errors.length > 0) {
+        throw new Error("Cannot edit invalid JSONC");
+    }
+    return root;
+}
+
+function findNode(text: string, path: JSONPath): Node | undefined {
+    return findNodeAtLocation(parseDocument(text), path);
+}
+
+function findComma(text: string, start: number, end: number): TokenLocation | undefined {
+    const scanner = createScanner(text, false);
+    scanner.setPosition(start);
+
+    for (;;) {
+        const kind = scanner.scan();
+        const offset = scanner.getTokenOffset();
+        if (kind === TOKEN_EOF || offset >= end) return undefined;
+        if (kind === TOKEN_COMMA) {
+            return {
+                offset,
+                length: scanner.getTokenLength(),
+                line: scanner.getTokenStartLine(),
+            };
+        }
+    }
+}
+
+function lineStart(text: string, offset: number): number {
+    const previousNewline = text.lastIndexOf("\n", offset - 1);
+    return previousNewline === -1 ? 0 : previousNewline + 1;
+}
+
+function lineEnd(text: string, offset: number): number {
+    const nextNewline = text.indexOf("\n", offset);
+    if (nextNewline === -1) return text.length;
+    return text[nextNewline - 1] === "\r" ? nextNewline - 1 : nextNewline;
+}
+
+function inlineCommentEnd(
+    text: string,
+    start: number,
+    line: number,
+    limit: number,
+): number | undefined {
+    const scanner = createScanner(text, false);
+    scanner.setPosition(start);
+    let end: number | undefined;
+
+    for (;;) {
+        const kind = scanner.scan();
+        const offset = scanner.getTokenOffset();
+        if (kind === TOKEN_EOF || offset >= limit || scanner.getTokenStartLine() !== line) {
+            return end;
+        }
+        if (kind === TOKEN_LINE_COMMENT || kind === TOKEN_BLOCK_COMMENT) {
+            end = offset + scanner.getTokenLength();
+        }
+    }
+}
+
+/**
+ * Keep comments written inline after a preceding separator with that preceding
+ * entry. Comments on a later line belong to the entry that follows the comma.
+ */
+function startAfterPrecedingInlineComments(
+    text: string,
+    comma: TokenLocation,
+    entryOffset: number,
+): number {
+    const commentEnd = inlineCommentEnd(text, comma.offset + comma.length, comma.line, entryOffset);
+    if (commentEnd === undefined) return comma.offset + comma.length;
+
+    const nextNewline = text.indexOf("\n", commentEnd);
+    return nextNewline === -1 ? commentEnd : nextNewline + 1;
+}
+
+/** Remove inline comments following a removed entry's comma with that entry. */
+function endAfterFollowingInlineComments(
+    text: string,
+    comma: TokenLocation,
+    nextEntryOffset: number,
+): number {
+    const commentEnd = inlineCommentEnd(
+        text,
+        comma.offset + comma.length,
+        comma.line,
+        nextEntryOffset,
+    );
+    return commentEnd === undefined ? comma.offset + comma.length : lineEnd(text, commentEnd);
+}
+
+function closingWhitespace(text: string, entryEnd: number, closingBracket: number): string {
+    const trailing = text.slice(entryEnd, closingBracket);
+    const finalNewline = trailing.lastIndexOf("\n");
+    if (finalNewline === -1) return "";
+    const newlineStart = trailing[finalNewline - 1] === "\r" ? finalNewline - 1 : finalNewline;
+    return trailing.slice(newlineStart);
+}
+
+function removeArrayEntry(text: string, array: Node, index: number): string {
+    const entries = array.children ?? [];
+    const entry = entries[index];
+    if (!entry) return text;
+
+    const closingBracket = array.offset + array.length - 1;
+    if (entries.length === 1) {
+        const start = array.offset + 1;
+        const replacement = closingWhitespace(text, entry.offset + entry.length, closingBracket);
+        return text.slice(0, start) + replacement + text.slice(closingBracket);
+    }
+
+    if (index === entries.length - 1) {
+        const previous = entries[index - 1];
+        if (!previous) return text;
+        const comma = findComma(text, previous.offset + previous.length, entry.offset);
+        if (!comma) return text;
+        const replacement = closingWhitespace(text, entry.offset + entry.length, closingBracket);
+        return text.slice(0, comma.offset) + replacement + text.slice(closingBracket);
+    }
+
+    const next = entries[index + 1];
+    if (!next) return text;
+    const followingComma = findComma(text, entry.offset + entry.length, next.offset);
+    if (!followingComma) return text;
+
+    const start =
+        index === 0
+            ? array.offset + 1
+            : (() => {
+                  const previous = entries[index - 1];
+                  if (!previous) return entry.offset;
+                  const precedingComma = findComma(
+                      text,
+                      previous.offset + previous.length,
+                      entry.offset,
+                  );
+                  return precedingComma
+                      ? startAfterPrecedingInlineComments(text, precedingComma, entry.offset)
+                      : entry.offset;
+              })();
+    const end = endAfterFollowingInlineComments(text, followingComma, next.offset);
+
+    return text.slice(0, start) + text.slice(end);
+}
+
+function indentationAt(text: string, offset: number): string {
+    const prefix = text.slice(lineStart(text, offset), offset);
+    return /^[\t ]*$/.test(prefix) ? prefix : "";
+}
+
+function inferIndent(text: string, array: Node): string {
+    const firstEntry = array.children?.[0];
+    if (firstEntry) return indentationAt(text, firstEntry.offset);
+
+    const closingBracket = array.offset + array.length - 1;
+    const closingIndent = indentationAt(text, closingBracket);
+    return `${closingIndent}${closingIndent.includes("\t") ? "\t" : "  "}`;
+}
+
+function appendArrayValue(text: string, array: Node, value: unknown): string {
+    const entries = array.children ?? [];
+    const closingBracket = array.offset + array.length - 1;
+    const serialized = JSON.stringify(value);
+
+    if (entries.length === 0) {
+        if (!text.slice(array.offset, closingBracket).includes("\n")) {
+            return text.slice(0, closingBracket) + serialized + text.slice(closingBracket);
+        }
+
+        const indent = inferIndent(text, array);
+        const closingLineStart = lineStart(text, closingBracket);
+        const eol = text.includes("\r\n") ? "\r\n" : "\n";
+        return (
+            text.slice(0, closingLineStart) +
+            indent +
+            serialized +
+            eol +
+            text.slice(closingLineStart)
+        );
+    }
+
+    const lastEntry = entries.at(-1);
+    if (!lastEntry) return text;
+    const trailingComma = findComma(text, lastEntry.offset + lastEntry.length, closingBracket);
+    const isMultiline = text.slice(array.offset, closingBracket).includes("\n");
+
+    if (!isMultiline) {
+        return (
+            text.slice(0, lastEntry.offset + lastEntry.length) +
+            `,${serialized}` +
+            text.slice(lastEntry.offset + lastEntry.length)
+        );
+    }
+
+    const closingLineStart = lineStart(text, closingBracket);
+    const eol = text.includes("\r\n") ? "\r\n" : "\n";
+    const inserted = `${inferIndent(text, array)}${serialized}${trailingComma ? "," : ""}${eol}`;
+    const withValue = text.slice(0, closingLineStart) + inserted + text.slice(closingLineStart);
+
+    if (trailingComma) return withValue;
+    return (
+        withValue.slice(0, lastEntry.offset + lastEntry.length) +
+        "," +
+        withValue.slice(lastEntry.offset + lastEntry.length)
+    );
+}
+
+/**
+ * Replace one JSONC value without reserializing the rest of the document. New
+ * paths use jsonc-parser's structural edit so the original document remains
+ * untouched outside the inserted property.
+ */
+export function setJsoncValue(text: string, path: JSONPath, value: unknown): string {
+    const node = findNode(text, path);
+    if (node) {
+        if (Object.is(getNodeValue(node), value)) return text;
+        const serialized = JSON.stringify(value);
+        return text.slice(0, node.offset) + serialized + text.slice(node.offset + node.length);
+    }
+
+    return applyEdits(text, modify(text, path, value, {}));
+}
+
+/**
+ * Remove matching array entries while retaining the exact bytes for survivor
+ * comments and surrounding JSONC regions.
+ */
+export function removeJsoncArrayEntries(
+    text: string,
+    path: JSONPath,
+    shouldRemove: (entry: unknown) => boolean,
+): { text: string; removed: boolean } {
+    let nextText = text;
+    let removed = false;
+
+    for (;;) {
+        const array = findNode(nextText, path);
+        if (array?.type !== "array") return { text: nextText, removed };
+        const index = (array.children ?? []).findIndex((entry) =>
+            shouldRemove(getNodeValue(entry)),
+        );
+        if (index === -1) return { text: nextText, removed };
+
+        const updated = removeArrayEntry(nextText, array, index);
+        if (updated === nextText) return { text: nextText, removed };
+        nextText = updated;
+        removed = true;
+    }
+}
+
+/** Append values to an existing JSONC array without reserializing sibling fields. */
+export function appendJsoncArrayValues(text: string, path: JSONPath, values: unknown[]): string {
+    let nextText = text;
+
+    for (const value of values) {
+        const array = findNode(nextText, path);
+        if (array?.type !== "array") {
+            return setJsoncValue(nextText, path, values);
+        }
+        nextText = appendArrayValue(nextText, array, value);
+    }
+
+    return nextText;
+}

package/src/shared/jsonc-parser.test.ts

@@ -0,0 +1,33 @@
+import { describe, expect, it } from "bun:test";
+
+import { parseJsonc } from "./jsonc-parser";
+
+describe("parseJsonc prototype-pollution hardening", () => {
+    it("rejects dangerous keys recursively, including inside arrays", () => {
+        const rejected: string[] = [];
+        const parsed = parseJsonc<Record<string, unknown>>(
+            `{
+                "safe": 1,
+                "constructor": { "hidden": true },
+                "nested": { "prototype": { "hidden": true }, "safe": 2 },
+                "items": [
+                    { "__proto__": { "polluted": true }, "safe": 3 },
+                    { "safe": 4 }
+                ]
+            }`,
+            { onRejectedKey: (path) => rejected.push(path.join(".")) },
+        );
+
+        expect(rejected).toEqual(["constructor", "nested.prototype", "items.0.__proto__"]);
+        expect(Object.hasOwn(parsed, "constructor")).toBe(false);
+
+        const nested = parsed.nested as Record<string, unknown>;
+        expect(nested).toEqual({ safe: 2 });
+        expect(Object.getPrototypeOf(nested)).toBe(Object.prototype);
+
+        const items = parsed.items as Array<Record<string, unknown>>;
+        expect(items).toEqual([{ safe: 3 }, { safe: 4 }]);
+        expect(Object.getPrototypeOf(items[0])).toBe(Object.prototype);
+        expect("polluted" in items[0]).toBe(false);
+    });
+});