@cortexkit/opencode-magic-context 0.36.0 → 0.36.1

package/src/shared/conflict-fixer.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { parse, stringify } from "comment-json";
+import { parse } from "comment-json";
 
 import {
     type ConflictResult,
@@ -9,6 +9,7 @@ import {
     extractPluginName,
     matchesPackageName,
 } from "./conflict-detector";
+import { appendJsoncArrayValues, removeJsoncArrayEntries, setJsoncValue } from "./jsonc-edit";
 import { getOpenCodeConfigPaths } from "./opencode-config-dir";
 
 type JsonObject = Record<string, unknown>;
@@ -39,21 +40,27 @@ function asStringArray(value: unknown): string[] {
         : [];
 }
 
-function readConfig(filePath: string): JsonObject | null {
+interface JsonConfigDocument {
+    config: JsonObject;
+    text: string;
+}
+
+function readConfig(filePath: string): JsonConfigDocument | null {
     if (!existsSync(filePath)) {
         return null;
     }
 
     try {
-        const parsed = parse(readFileSync(filePath, "utf-8"));
-        return isRecord(parsed) ? parsed : null;
+        const text = readFileSync(filePath, "utf-8");
+        const parsed = parse(text);
+        return isRecord(parsed) ? { config: parsed, text } : null;
     } catch {
         return null;
     }
 }
 
-function writeConfig(filePath: string, config: JsonObject): void {
-    writeFileSync(filePath, `${stringify(config, null, 2)}\n`);
+function writeConfig(filePath: string, text: string): void {
+    writeFileSync(filePath, text);
 }
 
 function resolveUserOpenCodeConfigPath(): string {
@@ -130,26 +137,28 @@ function isUnifiedOmoPath(configPath: string): boolean {
     return basename === "omo.jsonc" || basename === "omo.json";
 }
 
-/**
- * Get or create the `[opencode]` block inside a unified omo.json(c) config.
- * Returns the block itself so callers can read/write `disabled_hooks` on it.
- */
-function getOrCreateOmoV2Block(config: JsonObject): JsonObject {
-    const block = config["[opencode]"];
-    if (isRecord(block)) {
-        return block;
+function disableCompactionFlags(
+    text: string,
+    config: JsonObject,
+): { text: string; changed: boolean } {
+    if (!isRecord(config.compaction)) {
+        return {
+            text: setJsoncValue(text, ["compaction"], { auto: false, prune: false }),
+            changed: true,
+        };
     }
-    const newBlock: JsonObject = {};
-    config["[opencode]"] = newBlock;
-    return newBlock;
-}
 
-function filterDcpPluginEntries(entries: unknown[]): { plugins: unknown[]; removed: boolean } {
-    const plugins = entries.filter((entry) => {
-        const name = extractPluginName(entry);
-        return name ? !matchesPackageName(name, DCP_PACKAGE_NAMES) : true;
-    });
-    return { plugins, removed: plugins.length !== entries.length };
+    let updated = text;
+    let changed = false;
+    if (config.compaction.auto !== false) {
+        updated = setJsoncValue(updated, ["compaction", "auto"], false);
+        changed = true;
+    }
+    if (config.compaction.prune !== false) {
+        updated = setJsoncValue(updated, ["compaction", "prune"], false);
+        changed = true;
+    }
+    return { text: updated, changed };
 }
 
 /**
@@ -190,44 +199,37 @@ export function fixConflicts(
 
     if (repairCompaction || conflicts.dcpPlugin) {
         for (const configPath of collectOpenCodeConfigPaths(directory)) {
-            const config = readConfig(configPath);
-            if (!config) {
+            const document = readConfig(configPath);
+            if (!document) {
                 continue;
             }
 
+            let text = document.text;
             let changed = false;
 
             if (repairCompaction) {
-                const compaction = isRecord(config.compaction) ? config.compaction : {};
-
-                if (compaction.auto !== false) {
-                    compaction.auto = false;
-                    changed = true;
-                    updatedCompaction = true;
-                }
-
-                if (compaction.prune !== false) {
-                    compaction.prune = false;
+                const result = disableCompactionFlags(text, document.config);
+                if (result.changed) {
+                    text = result.text;
                     changed = true;
                     updatedCompaction = true;
                 }
-
-                config.compaction = compaction;
             }
 
             if (conflicts.dcpPlugin) {
-                const plugins = Array.isArray(config.plugin) ? config.plugin : [];
-                const filtered = filterDcpPluginEntries(plugins);
-
-                if (filtered.removed) {
-                    config.plugin = filtered.plugins;
+                const result = removeJsoncArrayEntries(text, ["plugin"], (entry) => {
+                    const name = extractPluginName(entry);
+                    return name ? matchesPackageName(name, DCP_PACKAGE_NAMES) : false;
+                });
+                if (result.removed) {
+                    text = result.text;
                     changed = true;
                     removedDcpPlugin = true;
                 }
             }
 
             if (changed) {
-                writeConfig(configPath, config);
+                writeConfig(configPath, text);
             }
         }
     }
@@ -249,36 +251,30 @@ export function fixConflicts(
         }
 
         for (const configPath of collectOmoConfigPaths(directory)) {
-            const config = readConfig(configPath);
-            if (!config) {
+            const document = readConfig(configPath);
+            if (!document) {
                 continue;
             }
 
-            // Unified paths nest hooks under the [opencode] block; legacy paths use top-level
-            const target = isUnifiedOmoPath(configPath) ? getOrCreateOmoV2Block(config) : config;
-
+            const unifiedPath = isUnifiedOmoPath(configPath);
+            const target =
+                unifiedPath && isRecord(document.config["[opencode]"])
+                    ? document.config["[opencode]"]
+                    : unifiedPath
+                      ? {}
+                      : document.config;
             const disabledHooks = new Set(asStringArray(target.disabled_hooks));
-            let changed = false;
-
-            for (const hook of hooksToDisable) {
-                if (!disabledHooks.has(hook)) {
-                    disabledHooks.add(hook);
-                    changed = true;
-                    disabledOmoHooks = true;
-                }
-            }
-
-            if (changed) {
-                target.disabled_hooks = [
-                    ...CONFLICTING_OMO_HOOKS.filter((hook) => disabledHooks.has(hook)),
-                    ...[...disabledHooks].filter(
-                        (hook) =>
-                            !CONFLICTING_OMO_HOOKS.includes(
-                                hook as (typeof CONFLICTING_OMO_HOOKS)[number],
-                            ),
-                    ),
-                ];
-                writeConfig(configPath, config);
+            const hooksToAdd = CONFLICTING_OMO_HOOKS.filter(
+                (hook) => hooksToDisable.has(hook) && !disabledHooks.has(hook),
+            );
+
+            if (hooksToAdd.length > 0) {
+                const path = unifiedPath ? ["[opencode]", "disabled_hooks"] : ["disabled_hooks"];
+                const text = Array.isArray(target.disabled_hooks)
+                    ? appendJsoncArrayValues(document.text, path, hooksToAdd)
+                    : setJsoncValue(document.text, path, hooksToAdd);
+                writeConfig(configPath, text);
+                disabledOmoHooks = true;
             }
         }
     }

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);
+    });
+});

package/src/shared/jsonc-parser.ts

@@ -106,9 +106,61 @@ function stripTrailingCommas(content: string): string {
     return result;
 }
 
-export function parseJsonc<T = unknown>(content: string): T {
+const PROTOTYPE_POLLUTION_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+
+export function isPrototypePollutionKey(key: string): boolean {
+    return PROTOTYPE_POLLUTION_KEYS.has(key);
+}
+
+export interface ParsedJsonSanitizerOptions {
+    onRejectedKey?: (path: readonly (string | number)[]) => void;
+}
+
+/**
+ * Copy parsed JSON into fresh own-property-only containers while rejecting keys
+ * that can alter an object's prototype during a later merge. Rebuilding objects
+ * also removes an already-polluted prototype produced by third-party parsers.
+ */
+export function sanitizeParsedJson<T>(
+    value: T,
+    options: ParsedJsonSanitizerOptions = {},
+    path: readonly (string | number)[] = [],
+): T {
+    if (Array.isArray(value)) {
+        return value.map((entry, index) =>
+            sanitizeParsedJson(entry, options, [...path, index]),
+        ) as T;
+    }
+    if (value === null || typeof value !== "object") return value;
+
+    const source = value as Record<string, unknown>;
+    const sourcePrototype = Object.getPrototypeOf(source);
+    if (sourcePrototype !== null && sourcePrototype !== Object.prototype) {
+        options.onRejectedKey?.([...path, "__proto__"]);
+    }
+
+    const sanitized: Record<string, unknown> = {};
+    for (const key of Object.keys(source)) {
+        if (isPrototypePollutionKey(key)) {
+            options.onRejectedKey?.([...path, key]);
+            continue;
+        }
+        Object.defineProperty(sanitized, key, {
+            value: sanitizeParsedJson(source[key], options, [...path, key]),
+            enumerable: true,
+            configurable: true,
+            writable: true,
+        });
+    }
+    return sanitized as T;
+}
+
+export function parseJsonc<T = unknown>(
+    content: string,
+    options: ParsedJsonSanitizerOptions = {},
+): T {
     const normalized = stripTrailingCommas(stripJsonComments(content));
-    return JSON.parse(normalized) as T;
+    return sanitizeParsedJson(JSON.parse(normalized) as T, options);
 }
 
 export function readJsoncFile<T = unknown>(filePath: string): T | null {