@retaw106/mmc-oc 2.3.0 → 2.5.0

package/src/shared/system-directive.ts

@@ -5,5 +5,23 @@ export function isSystemDirective(text: string): boolean {
 }
 
 export function removeSystemReminders(text: string): string {
-    return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
+    return removeNestedBlocks(text, ["system-reminder"]).trim();
+}
+
+/** Remove matching tagged regions, including nested regions and regions with no closing tag. */
+export function removeNestedBlocks(text: string, names: readonly string[]): string {
+    const tags = new RegExp(`<(/?)(${names.join("|")})(?:\\s[^<>]*?)?\\s*(/?)>`, "gi");
+    const stack: string[] = [];
+    let end = 0;
+    let result = "";
+    for (const match of text.matchAll(tags)) {
+        if (stack.length === 0) result += text.slice(end, match.index);
+        const name = match[2].toLowerCase();
+        if (match[1]) {
+            if (stack[stack.length - 1] === name) stack.pop();
+        } else if (!match[3]) stack.push(name);
+        end = match.index + match[0].length;
+    }
+    if (stack.length === 0) result += text.slice(end);
+    return result;
 }

package/src/shared/tag-transcript.ts

@@ -835,12 +835,17 @@ class ConversationEndGuard {
         }
     }
 
-    wouldStrand(occurrences: readonly ToolOccurrence[]): boolean {
+    wouldStrand(
+        occurrences: readonly ToolOccurrence[],
+        plannedRemovals?: ReadonlySet<unknown>,
+    ): boolean {
         const end = this.end;
         if (!end || !occurrences.some((occ) => occ.message === end)) return false;
         const leaving = new Set(occurrences.map((occ) => partKey(occ.part)));
         const survives = (part: TranscriptPart) =>
-            !leaving.has(partKey(part)) && !this.removed.has(partKey(part));
+            !leaving.has(partKey(part)) &&
+            !this.removed.has(partKey(part)) &&
+            !plannedRemovals?.has(partKey(part));
         return end.info.role === "assistant"
             ? !end.parts.some((part) => part.kind === "tool_result" && survives(part))
             : !end.parts.some((part) => partHasContent(part) && survives(part));
@@ -1379,8 +1384,11 @@ function buildAggregateTarget(
             }
             return null;
         },
-        wouldStrandConversationEnd(): boolean {
-            return conversationEnd?.wouldStrand(occurrences) ?? false;
+        wouldStrandConversationEnd(plannedRemovals): boolean {
+            return conversationEnd?.wouldStrand(occurrences, plannedRemovals) ?? false;
+        },
+        notePlannedRemoval(plannedRemovals): void {
+            for (const occ of occurrences) plannedRemovals.add(partKey(occ.part));
         },
         editMarker(): "truncated" | "absent" {
             // Edit-marker: preserve the tool_use input's filePath + a region
@@ -1443,6 +1451,10 @@ function buildTextTarget(
     return {
         mutationParts: [{ message: { info: message.info, parts: [] }, part }],
         textPrefix,
+        canSetContent(content): boolean {
+            const current = part.getText();
+            return typeof current === "string" && current !== content;
+        },
         setContent(content: string): boolean {
             return part.setText(content);
         },

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

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

@@ -0,0 +1,217 @@
+import { jsonHashSink } from "./stable-json";
+
+const MAX_MEMO_BYTES = 64 * 1024 * 1024;
+const MAX_MEMO_ENTRIES = 10_000;
+
+/**
+ * A bounded, process-local memo for individual parts and selected tool fields.
+ * Detached snapshots catch in-place host edits; reference equality alone cannot.
+ * Key collisions between sessions only evict entries, never imply equality.
+ */
+export class TailHygieneJsonMemo {
+    private entries = new Map<string, { snapshot: unknown; result: string; bytes: number }>();
+    private bytes = 0;
+    private passText = new WeakMap<object, string>();
+    private passHash = new WeakMap<object, string>();
+
+    beginPass(): void {
+        this.passText = new WeakMap();
+        this.passHash = new WeakMap();
+    }
+
+    get(key: string, value: unknown, compute: () => string, fingerprint = false): string {
+        const pass = fingerprint ? this.passHash : this.passText;
+        const object = value !== null && typeof value === "object" ? value : undefined;
+        const local = object ? pass.get(object) : undefined;
+        if (local !== undefined) return local;
+        const previous = this.entries.get(key);
+        if (previous && sameJson(previous.snapshot, value)) {
+            if (object) pass.set(object, previous.result);
+            return previous.result;
+        }
+        const result = compute();
+        if (previous) {
+            this.bytes -= previous.bytes;
+            this.entries.delete(key);
+        }
+        try {
+            const copy = copyJson(value);
+            const bytes = copy.bytes + (key.length + result.length) * 2;
+            if (bytes <= MAX_MEMO_BYTES) {
+                this.entries.set(key, { snapshot: copy.value, result, bytes });
+                this.bytes += bytes;
+                if (object) pass.set(object, result);
+            }
+        } catch {
+            // Accessors and exotic objects retain their original serialization behavior.
+        }
+        while (this.bytes > MAX_MEMO_BYTES || this.entries.size > MAX_MEMO_ENTRIES) {
+            const oldest = this.entries.entries().next().value;
+            if (!oldest) break;
+            this.bytes -= oldest[1].bytes;
+            this.entries.delete(oldest[0]);
+        }
+        return result;
+    }
+}
+
+function copyJson(value: unknown): { value: unknown; bytes: number } {
+    const seen = new Map<object, unknown>();
+    let bytes = 0;
+    const copy = (current: unknown): unknown => {
+        bytes += 16;
+        if (typeof current === "string") bytes += current.length * 2;
+        if (bytes > MAX_MEMO_BYTES) throw new Error("memo capacity");
+        if (current === null || typeof current !== "object") {
+            if (["function", "symbol", "bigint"].includes(typeof current))
+                throw new Error("exotic");
+            return current;
+        }
+        if (seen.has(current)) return seen.get(current);
+        const prototype = Object.getPrototypeOf(current);
+        if (!Array.isArray(current) && prototype !== Object.prototype && prototype !== null)
+            throw new Error("exotic");
+        const result = Array.isArray(current)
+            ? new Array(current.length)
+            : Object.create(prototype);
+        seen.set(current, result);
+        for (const key of Object.keys(current)) {
+            const descriptor = Object.getOwnPropertyDescriptor(current, key);
+            if (!descriptor || !("value" in descriptor)) throw new Error("accessor");
+            bytes += key.length * 2 + 16;
+            if (key === "__proto__") {
+                Object.defineProperty(result, key, {
+                    value: copy(descriptor.value),
+                    enumerable: true,
+                    writable: true,
+                    configurable: true,
+                });
+            } else result[key] = copy(descriptor.value);
+        }
+        return result;
+    };
+    return { value: copy(value), bytes };
+}
+
+function sameJson(before: unknown, after: unknown): boolean {
+    const forward = new Map<object, object>();
+    const reverse = new Set<object>();
+    const same = (left: unknown, right: unknown): boolean => {
+        if (
+            left === null ||
+            right === null ||
+            typeof left !== "object" ||
+            typeof right !== "object"
+        )
+            return Object.is(left, right);
+        if (forward.has(left)) return forward.get(left) === right;
+        if (reverse.has(right) || Object.getPrototypeOf(left) !== Object.getPrototypeOf(right))
+            return false;
+        forward.set(left, right);
+        reverse.add(right);
+        if (Array.isArray(left) && (!Array.isArray(right) || left.length !== right.length))
+            return false;
+        const keys = Object.keys(left);
+        const otherKeys = Object.keys(right);
+        if (keys.length !== otherKeys.length) return false;
+        for (let index = 0; index < keys.length; index++) {
+            const key = keys[index];
+            // Pi sorts with localeCompare, which can tie distinct Unicode spellings.
+            // Preserve insertion order too, because a tied sort keeps that order.
+            if (key !== otherKeys[index]) return false;
+            const descriptor = Object.getOwnPropertyDescriptor(right, key);
+            if (
+                !descriptor ||
+                !("value" in descriptor) ||
+                !same((left as Record<string, unknown>)[key], descriptor.value)
+            )
+                return false;
+        }
+        return true;
+    };
+    return same(before, after);
+}
+
+/**
+ * Fingerprint excluded Pi content without retaining its whole JSON string.
+ * Match Pi's native JSON replacer: localeCompare key order, omitted undefined
+ * object fields, null array holes, and a marker for repeated non-array objects.
+ * Unsupported objects and array cycles use the original serializer; serialization
+ * errors produce the fingerprint of an empty string, as they did before.
+ */
+export function piJsonHash(value: unknown, fallback: () => string): string {
+    const sink = jsonHashSink("excluded\0");
+    try {
+        const seen = new Set<object>();
+        const arrays = new Set<object>();
+        const write = (current: unknown): void => {
+            if (current === null || typeof current !== "object") {
+                if (["function", "symbol", "bigint"].includes(typeof current))
+                    throw new Error("exotic");
+                sink.write(JSON.stringify(current) ?? "");
+            } else if (Array.isArray(current)) {
+                if (
+                    Object.getPrototypeOf(current) !== Array.prototype ||
+                    Object.hasOwn(current, "toJSON")
+                )
+                    throw new Error("exotic array");
+                if (arrays.has(current)) throw new Error("array cycle");
+                arrays.add(current);
+                sink.write("[");
+                for (let index = 0; index < current.length; index++) {
+                    if (index) sink.write(",");
+                    const descriptor = Object.getOwnPropertyDescriptor(current, index);
+                    if (descriptor && !("value" in descriptor)) throw new Error("accessor");
+                    if (!descriptor && index in current) throw new Error("inherited array element");
+                    write(descriptor?.value === undefined ? null : descriptor.value);
+                }
+                sink.write("]");
+                arrays.delete(current);
+            } else if (seen.has(current)) {
+                sink.write('"[Circular]"');
+            } else {
+                const prototype = Object.getPrototypeOf(current);
+                if (prototype !== Object.prototype && prototype !== null) throw new Error("exotic");
+                seen.add(current);
+                const entries = Object.keys(current).map((key): [string, unknown] => {
+                    const descriptor = Object.getOwnPropertyDescriptor(current, key);
+                    if (!descriptor || !("value" in descriptor)) throw new Error("accessor");
+                    return [key, descriptor.value];
+                });
+                const sorted = Object.fromEntries(entries.sort(([a], [b]) => a.localeCompare(b)));
+                if (
+                    entries.length <= 16 &&
+                    entries.every(
+                        ([key, child]) =>
+                            key.length <= 4096 &&
+                            (child === null ||
+                                child === undefined ||
+                                typeof child === "number" ||
+                                typeof child === "boolean" ||
+                                (typeof child === "string" && child.length <= 4096)),
+                    )
+                ) {
+                    sink.write(JSON.stringify(sorted));
+                    return;
+                }
+                sink.write("{");
+                let first = true;
+                for (const [key, child] of Object.entries(sorted)) {
+                    if (child === undefined) continue;
+                    if (!first) sink.write(",");
+                    first = false;
+                    sink.write(JSON.stringify(key));
+                    sink.write(":");
+                    write(child);
+                }
+                sink.write("}");
+            }
+        };
+        write(value);
+        return sink.digest();
+    } catch {
+        const failed = jsonHashSink("excluded\0");
+        failed.write(fallback());
+        return failed.digest();
+    }
+}

package/src/shared/user-facing-codes.ts

@@ -18,8 +18,8 @@ export const USER_FACING_FAILURES = {
     history_boundary_unresolved: {
         code: "MC-H04",
         sentence:
-            "This request was not sent: the message that marks where this session's history summary ends is missing from the OpenCode store, and without it the request is larger than the model's context window.",
-        action: "Run /mmc-recomp to rebuild the history summary.",
+            "This request was not sent: Magic Context could not safely place the history summary boundary in the loaded conversation, and the untrimmed request is larger than the model's context window.",
+        action: "Reopen this session in its current project directory, then run /mmc-recomp to rebuild the history summary. A model with a larger context window can also help.",
     },
     history_over_window_unmanaged: {
         code: "MC-H06",

package/dist/model-resolution-wazv26n0.js

@@ -1,6 +0,0 @@
-import {
-  resolveHistorianModel2
-} from "./index-z2g20msd.js";
-export {
-  resolveHistorianModel2 as resolveHistorianModel
-};