@retaw106/mmc-oc 2.3.0 → 2.4.0

package/dist/v2/store-reader.d.ts

@@ -110,17 +110,43 @@ interface ReaderConnection {
 }
 /** Boot-scoped read-only handles. Each lease still closes in the caller's finally block.
  * Statements, not results, are cached: WAL updates are visible on the next query.
- * A replaced/missing file cannot reuse the old inode, and disposal releases all handles. */
+ * A replaced/missing file cannot reuse the old inode, and disposal releases all handles.
+ *
+ * Work that opens readers over a long time (a hidden run polls the store for its whole
+ * lifetime) takes a `hold()`. Closing the pool while a hold is outstanding only marks it
+ * closing: readers can still be opened, and the pool closes when the last hold is
+ * released. Without that, disposing the plugin instance mid-run made the run's next poll
+ * fail with "Store reader pool is closed". */
 export declare class V2StoreReaderPool {
     private readonly capacity;
     private readonly connections;
     private closed;
+    private closing;
+    private holds;
+    private readonly idleWaiters;
     constructor(capacity?: number);
     open(path: string): V2StoreReader;
     acquire(path: string): ReaderConnection;
     release(connection: ReaderConnection): void;
     private retire;
+    /**
+     * Keep the pool open until the returned release is called. Refused once the pool is
+     * closing or closed, so a close always finishes once the existing holders are done.
+     */
+    hold(): () => void;
+    /** True once every handle is closed and no further reader can be opened. */
+    isClosed(): boolean;
+    /** Number of outstanding holds. */
+    holdCount(): number;
+    /** Close now when nothing holds the pool; otherwise close after the last hold is released. */
     close(): void;
+    /**
+     * `close()`, then wait at most `timeoutMs` for the pool to actually close. Resolves
+     * true when it closed within the wait. On false the pool is still closing and will
+     * close when its last hold is released; the caller is not kept waiting for that.
+     */
+    closeWhenIdle(timeoutMs: number): Promise<boolean>;
+    private finishClose;
 }
 /** Opens an existing store read-only; missing/corrupt stores propagate errors, never an empty history. */
 export declare class V2StoreReader {

package/dist/v2/store-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store-reader.d.ts","sourceRoot":"","sources":["../../src/v2/store-reader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"store-reader.d.ts","sourceRoot":"","sources":["../../src/v2/store-reader.ts"],"names":[],"mappings":"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"}

package/dist/web/main.js

@@ -446,7 +446,10 @@ var init_logger = __esm(() => {
 });
 
 // src/shared/sqlite.ts
-import { AsyncLocalStorage } from "node:async_hooks";
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
+function inRootAsyncContext(operation) {
+  return resourceRoot.runInAsyncScope(operation);
+}
 function registerSlowWriteReporter(reporter) {
   reportSlowPrivilegedWrite = reporter;
 }
@@ -597,7 +600,7 @@ function installTransactionRouting(db, readonly) {
         return endWriterTransaction(db, () => nativeExec(sql), sql);
       if (!/^\s*(?:SELECT|EXPLAIN|PRAGMA|COMMIT|END|ROLLBACK|SAVEPOINT|RELEASE)\b/i.test(sql)) {
         try {
-          return withAutocommitTimeout(db, () => nativeExec(sql));
+          return withAutocommitTimeout(db, () => nativeExec(sql), false);
         } finally {
           if (mayChangeTagIdentity(sql))
             tagIdentityWriteGeneration += 1;
@@ -839,29 +842,48 @@ function foregroundWaitLease() {
   const lease = transformPassScope.getStore();
   return lease?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? lease : undefined;
 }
-function withAutocommitTimeout(db, operation) {
+function withAutocommitTimeout(db, operation, singleStatement = true) {
   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 {
+      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}`);
     if (elapsed >= SLOW_WRITER_LOG_MS)
@@ -935,8 +957,9 @@ function isInTransaction(db) {
   const candidate = db;
   return candidate.inTransaction === true || candidate.isTransaction === true;
 }
-var reportSlowPrivilegedWrite, sqliteDiagnosticSink, sqliteDiagnosticHost = () => "unknown", bunSpec, nodeSpec, SqliteRuntimeUnavailableError, detectedRuntime, isBun, sqliteModule, DatabaseImpl, trackedSqliteConnections, nextSqliteConnectionSequence = 1, TAG_COLUMNS_OUTSIDE_IDENTITY, tagIdentityWriteGeneration = 0, TrackedDatabase, Database, statementOwners, FIRST_PRUNE_AT = 256, privilegeDepth, transformPassScope, admissionScope, backgroundWriterScope, SqliteAcquisitionBusyError, SHORT_BUSY_TIMEOUT_MS = 25, SLOW_WRITER_LOG_MS = 100, WRITER_TRANSACTION_END, writerAcquisitionScope, openWriterTransactions, indexCoordinationKey, indexCoordinationHeap, indexCoordinationBuffer, indexCoordinationState;
+var resourceRoot, reportSlowPrivilegedWrite, sqliteDiagnosticSink, sqliteDiagnosticHost = () => "unknown", bunSpec, nodeSpec, SqliteRuntimeUnavailableError, detectedRuntime, isBun, sqliteModule, DatabaseImpl, trackedSqliteConnections, nextSqliteConnectionSequence = 1, TAG_COLUMNS_OUTSIDE_IDENTITY, tagIdentityWriteGeneration = 0, TrackedDatabase, Database, statementOwners, FIRST_PRUNE_AT = 256, privilegeDepth, transformPassScope, admissionScope, backgroundWriterScope, SqliteAcquisitionBusyError, SHORT_BUSY_TIMEOUT_MS = 25, SLOW_WRITER_LOG_MS = 100, WRITER_TRANSACTION_END, writerAcquisitionScope, openWriterTransactions, indexCoordinationKey, indexCoordinationHeap, indexCoordinationBuffer, indexCoordinationState;
 var init_sqlite = __esm(async () => {
+  resourceRoot = new AsyncResource("magic-context:root");
   bunSpec = "bun:" + "sqlite";
   nodeSpec = "node:" + "sqlite";
   SqliteRuntimeUnavailableError = class SqliteRuntimeUnavailableError extends Error {
@@ -970,7 +993,7 @@ var init_sqlite = __esm(async () => {
   ]);
   TrackedDatabase = new Proxy(DatabaseImpl, {
     construct(target, args) {
-      const db = Reflect.construct(target, args, target);
+      const db = inRootAsyncContext(() => Reflect.construct(target, args, target));
       return trackSqliteConnection(db, args[0], args[1]);
     }
   });
@@ -5150,6 +5173,7 @@ var AGENT_STEP_CAPS = {
   [MEMORY_MAINTAINER_A_AGENT]: MEMORY_MAINTAINER_A_STEP_CAP,
   [HIDDEN_HISTORIAN_AGENT]: HISTORIAN_STEP_CAP
 };
+var DISPOSED_CHILDREN_KEY = Symbol.for("magic-context.v2.disposed-hidden-children");
 
 // src/v2/hidden-child-record.ts
 var HIDDEN_CHILD_ROLE_TITLES = {

package/dist/{wrapup-orchestrator-bmybc5p5.js → wrapup-orchestrator-b2gswatj.js}

@@ -21,11 +21,11 @@ import {
   getActiveCompartmentRun,
   markActiveCompartmentRunPublished,
   registerActiveCompartmentRun
-} from "./index-kw21z5pe.js";
-import"./index-czba8tw3.js";
+} from "./index-kahkxcqw.js";
+import"./index-dwh99z66.js";
 import"./index-x37vg474.js";
-import"./index-z2w1eq3y.js";
-import"./index-18yrysyj.js";
+import"./index-48e9znrc.js";
+import"./index-ykq24x1n.js";
 import {
   pushNotification2
 } from "./index-jdxxq8cz.js";
@@ -33,11 +33,11 @@ import"./index-5ty9rnbx.js";
 import"./index-kmbme1v1.js";
 import {
   sendStatusNotification2
-} from "./index-a5mw0xp3.js";
+} from "./index-r7s7d350.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-3gj1ak4c.js";
+} from "./index-27ddyx39.js";
 import"./index-yjv8dpht.js";
 
 // src/hooks/magic-context/wrapup-orchestrator.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retaw106/mmc-oc",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "type": "module",
   "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",

package/src/config/latch-permanence-guard.test.ts

@@ -153,6 +153,10 @@ const KNOWN_SLOTS: Record<string, KnownSlot> = {
         classification: "DIAGNOSTIC",
         reason: "Most-recent diagnostic: every open attempt clears or overwrites it.",
     },
+    "packages/pi-plugin/src/index.ts:loggedPiMaintenanceModelMissing": {
+        classification: "PUBLICATION",
+        reason: "Once-per-process log dedup only (plan 18): the unconfigured-maintenance diagnosis is logged once to avoid per-pass spam. It gates no behavior — buildPiMaintenanceOptions re-evaluates the model chain on every call.",
+    },
     "packages/plugin/src/shared/models-dev-cache.ts:apiCache": {
         classification: "PUBLICATION",
         reason: "Publishes last-known-good model metadata, not a failure verdict; refresh writes a later successful value.",

package/src/config/project-security.test.ts

@@ -268,6 +268,23 @@ describe("stripUnsafeProjectConfigFields", () => {
         expect(warnings.some((w) => w.includes("maintenance"))).toBe(true);
     });
 
+    it("plan 18: strips a project-injected maintenance model chain (no model hijack)", () => {
+        const raw: Record<string, unknown> = {
+            maintenance: {
+                enabled: true,
+                model: "attacker/spender",
+                fallback_models: ["attacker/backup"],
+            },
+        };
+        const warnings = stripUnsafeProjectConfigFields(raw);
+
+        // The whole-group strip removes the model fields with everything
+        // else: a cloned repo cannot redirect the user's maintenance runs
+        // onto its own (possibly billable) models.
+        expect(raw.maintenance).toBeUndefined();
+        expect(warnings.some((w) => w.includes("maintenance"))).toBe(true);
+    });
+
     it("is a no-op for a clean project config", () => {
         const raw: Record<string, unknown> = { dreamer: { model: "x" }, memory: { enabled: true } };
         const warnings = stripUnsafeProjectConfigFields(raw);

package/src/config/schema/magic-context.test.ts

@@ -135,6 +135,7 @@ describe("MagicContextConfigSchema", () => {
                 },
                 maintenance: {
                     enabled: true,
+                    fallback_models: [],
                     budgets: {
                         inputTokens: 400_000,
                         outputTokens: 32_000,
@@ -159,6 +160,55 @@ describe("MagicContextConfigSchema", () => {
             expect(result).toEqual(input);
         });
 
+        it("parses both maintenance model spellings and distinguishes absent from empty fallbacks", () => {
+            const stringForm = MagicContextConfigSchema.parse({
+                maintenance: { enabled: true, model: "openai/gpt-6-luna" },
+            }).maintenance;
+            expect(stringForm.model).toBe("openai/gpt-6-luna");
+            expect(stringForm.fallback_models).toBeUndefined();
+            expect(
+                MagicContextConfigSchema.parse({
+                    maintenance: { fallback_models: [] },
+                }).maintenance.fallback_models,
+            ).toEqual([]);
+
+            const objectForm = MagicContextConfigSchema.parse({
+                maintenance: {
+                    enabled: true,
+                    model: { model: "xiaomi/mimo-v2.6-flash", variant: "high" },
+                    fallback_models: ["openai/gpt-6-luna", { model: "p/l", thinking_level: "off" }],
+                },
+            }).maintenance;
+            // Object entries keep both harness qualifiers verbatim — the
+            // active harness reads its own, no cross-harness mapping.
+            expect(objectForm.model).toEqual({
+                model: "xiaomi/mimo-v2.6-flash",
+                variant: "high",
+            });
+            expect(objectForm.fallback_models).toEqual([
+                "openai/gpt-6-luna",
+                { model: "p/l", thinking_level: "off" },
+            ]);
+        });
+
+        it("plan 18: rejects blank maintenance model references at parse time (no silent executor flow)", () => {
+            expect(
+                MagicContextConfigSchema.safeParse({
+                    maintenance: { enabled: true, model: "   " },
+                }).success,
+            ).toBe(false);
+            expect(
+                MagicContextConfigSchema.safeParse({
+                    maintenance: { enabled: true, model: { model: "" } },
+                }).success,
+            ).toBe(false);
+            expect(
+                MagicContextConfigSchema.safeParse({
+                    maintenance: { enabled: true, fallback_models: ["ok/one", "  "] },
+                }).success,
+            ).toBe(false);
+        });
+
         it("accepts a boolean storage permission policy and rejects non-booleans", () => {
             expect(
                 MagicContextConfigSchema.parse({

package/src/config/schema/magic-context.ts

@@ -135,6 +135,23 @@ const HistorianModelEntryObjectSchema = z
 export const HistorianModelEntrySchema = z.union([z.string(), HistorianModelEntryObjectSchema]);
 export type HistorianModelEntry = z.infer<typeof HistorianModelEntrySchema>;
 
+/**
+ * A maintenance model entry (plan 18): the same string/object shape as a
+ * historian model entry, but blank references are REJECTED at parse time —
+ * a blank primary must surface as a config diagnostic, never silently flow
+ * into the hidden executor or get corrected to some other model.
+ */
+const MaintenanceModelEntrySchema = HistorianModelEntrySchema.superRefine((entry, ctx) => {
+    const model = typeof entry === "string" ? entry : entry.model;
+    if (typeof model !== "string" || model.trim().length === 0) {
+        ctx.addIssue({
+            code: "custom",
+            message:
+                "maintenance model entries must be non-empty: a bare provider/model string or { model, variant?, thinking_level? }",
+        });
+    }
+});
+
 /**
  * A profile may select models but must not alter execution policy. It uses the
  * same flat historian model-resolution fields; execution metadata is not
@@ -400,6 +417,13 @@ export interface MagicContextConfig {
      */
     maintenance: {
         enabled: boolean;
+        /**
+         * Primary maintenance model entry. When absent, inherit historian
+         * model configuration; never inherit the main-session model.
+         */
+        model?: HistorianModelEntry;
+        /** Ordered fallbacks; absent inherits historian fallbacks only with an inherited primary. */
+        fallback_models?: HistorianModelEntry[];
         /** Per-run four-dimensional budget (decision 9; provisional, calibrated in P3/P4). */
         budgets: {
             inputTokens: number;
@@ -800,6 +824,15 @@ export const MagicContextConfigSchema = z.object({
                 .describe(
                     "Enable the automatic memory-maintenance task (default: true). USER-LEVEL ONLY — the whole maintenance group is stripped from project-tier config.",
                 ),
+            model: MaintenanceModelEntrySchema.optional().describe(
+                "Primary maintenance model entry: a bare provider/model string or { model, variant? (OpenCode), thinking_level? (Pi) }. USER-LEVEL ONLY. When absent, inherit historian model configuration. If neither has a primary, automatic passes skip and manual runs refuse. The main-session model is never inherited.",
+            ),
+            fallback_models: z
+                .array(MaintenanceModelEntrySchema)
+                .optional()
+                .describe(
+                    "Ordered fallback maintenance model entries, tried after CALL failures only. When absent and the primary is inherited, inherit historian fallbacks; explicit [] disables fallbacks. Illegal manifests, permission refusals, and exhausted budgets never switch models.",
+                ),
             budgets: z
                 .object({
                     inputTokens: z
@@ -922,7 +955,7 @@ export const MagicContextConfigSchema = z.object({
             anomalyThreshold: { absoluteRows: 10, poolFraction: 0.25 },
         })
         .describe(
-            "Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: the whole group is stripped from project-tier config so a cloned repository cannot raise budgets, relax cooldowns, or loosen the anomaly guard.",
+            "Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: project-tier config cannot pick maintenance models or change run controls. An absent model inherits historian model configuration, never the session model.",
         ),
 });
 

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

@@ -361,8 +361,12 @@ async function abortChildRun(client: Client, sessionId: string): Promise<void> {
  * Everything else (auth errors, ProviderModelNotFoundError without suggestion,
  * rate limits, transient network failures, etc.) is considered retryable on a
  * different model.
+ * Exported as the shared fallback-switch classifier (plan 18): the
+ * memory-maintenance attempt loop reuses this exact predicate so "which
+ * failures may switch models" has ONE definition across historian and
+ * maintainer call sites.
  */
-function isNonRetryable(error: unknown, externalSignal?: AbortSignal): boolean {
+export function isNonRetryable(error: unknown, externalSignal?: AbortSignal): boolean {
     if (
         externalSignal?.aborted ||
         (error instanceof HiddenCompletionRefusal && error.terminal) ||

package/src/shared/prompt-surface-runtime.ts

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import { readFileSync, statSync } from "node:fs";
 import { dirname, isAbsolute, resolve } from "node:path";
 
@@ -59,6 +60,17 @@ export function promptSurfaceHashMaterial(
         : `${systemContent}\n\0magic-context-prompt-surface:${preset}`;
 }
 
+/**
+ * Hash system text after the caller resolves guidance and freezes host date lines.
+ * Keep the legacy MD5 hex encoding so existing cached heads retain their identity.
+ */
+export function systemPromptFingerprint(
+    systemContent: string,
+    preset: PromptSurfacePreset = "full",
+): string {
+    return createHash("md5").update(promptSurfaceHashMaterial(systemContent, preset)).digest("hex");
+}
+
 const PROMPT_SURFACE_TOOL_ID_SET = new Set<string>(ACTIVE_TOOL_IDS);
 
 export interface PromptSurfaceGuidanceSelection {

package/src/shared/reclaim-distance.test.ts

@@ -0,0 +1,111 @@
+import { describe, expect, it } from "bun:test";
+import {
+    farBehindToolBookmark,
+    isReclaimUserTurn,
+    type ReclaimDistanceEntry,
+} from "./reclaim-distance";
+
+const output = (tag: number, tokens = 1000): ReclaimDistanceEntry => ({
+    toolOutputTag: tag,
+    tokens,
+});
+const turn = (): ReclaimDistanceEntry => ({ userTurn: true, tokens: 10 });
+
+describe("reclaim distance", () => {
+    it("repeated rebuilds cannot age the current task", () => {
+        const entries = [turn(), ...Array.from({ length: 28 }, (_, i) => output(i + 1))];
+        for (const count of [2, 3, 5]) {
+            let bookmark = 0;
+            for (let pass = 0; pass < count + 1; pass++) {
+                expect(bookmark).toBe(0);
+                bookmark = Math.max(bookmark, farBehindToolBookmark(entries, 200_000));
+            }
+        }
+    });
+
+    it("three newer user turns establish a bookmark, not two", () => {
+        const entries = [turn(), output(1), turn(), output(2), turn()];
+        expect(farBehindToolBookmark(entries, 200_000)).toBe(0);
+        expect(farBehindToolBookmark([...entries, turn()], 200_000)).toBe(1);
+    });
+
+    it("single-turn tool loop ages at exactly a quarter of the usable window", () => {
+        const entries = [turn(), output(1), output(2, 49_999)];
+        expect(farBehindToolBookmark(entries, 200_000)).toBe(0);
+        expect(farBehindToolBookmark([...entries, { tokens: 1 }], 200_000)).toBe(1);
+        expect(farBehindToolBookmark([turn(), output(1, 100_000)], 200_000)).toBe(0);
+    });
+
+    it("multipart outputs never age from their own trailing chunks", () => {
+        expect(farBehindToolBookmark([output(1), output(1, 60_000)], 200_000)).toBe(0);
+    });
+
+    it("unknown windows disable only token distance", () => {
+        expect(farBehindToolBookmark([output(1), output(2, 99_999)], 0)).toBe(0);
+        expect(farBehindToolBookmark([output(1), turn(), turn(), turn()], 0)).toBe(1);
+    });
+
+    it("excludes synthetic host wakes, MC reminders, heads and result carriers", () => {
+        expect(
+            isReclaimUserTurn({
+                role: "user",
+                parts: [
+                    {
+                        kind: "text",
+                        synthetic: true,
+                        text: "<system-reminder>Background task finished.</system-reminder>",
+                    },
+                ],
+            }),
+        ).toBe(false);
+        expect(
+            isReclaimUserTurn({
+                role: "user",
+                parts: [
+                    {
+                        kind: "text",
+                        text: "<system-reminder>Your next step: call ctx_reduce on the outputs you've already used (5).</system-reminder>",
+                    },
+                ],
+            }),
+        ).toBe(false);
+        expect(
+            isReclaimUserTurn({
+                role: "user",
+                syntheticHead: true,
+                parts: [{ kind: "text", text: "history" }],
+            }),
+        ).toBe(false);
+        expect(
+            isReclaimUserTurn({ role: "user", parts: [{ kind: "tool_result", text: "output" }] }),
+        ).toBe(false);
+        expect(
+            isReclaimUserTurn({
+                role: "user",
+                parts: [
+                    { kind: "tool_result", text: "output" },
+                    { kind: "text", text: "continue" },
+                ],
+            }),
+        ).toBe(true);
+    });
+
+    it("counts an authored part even after synthetic or ignored parts", () => {
+        for (const provenance of [{ synthetic: true }, { ignored: true }]) {
+            expect(
+                isReclaimUserTurn({ role: "user", parts: [{ kind: "image", ...provenance }] }),
+            ).toBe(false);
+            expect(
+                isReclaimUserTurn({
+                    role: "user",
+                    parts: [{ kind: "text", text: "notice", ...provenance }, { kind: "image" }],
+                }),
+            ).toBe(true);
+        }
+    });
+
+    it("a young lower-tag result holds back distant higher tags", () => {
+        expect(farBehindToolBookmark([output(2), output(3, 50_000), output(1)], 200_000)).toBe(0);
+        expect(farBehindToolBookmark([output(1), output(3, 50_000), output(2)], 200_000)).toBe(1);
+    });
+});

package/src/shared/reclaim-distance.ts

@@ -0,0 +1,91 @@
+export const RECLAIM_DISTANCE_USER_TURNS = 3;
+export const RECLAIM_DISTANCE_WINDOW_FRACTION = 0.25;
+
+export interface ReclaimDistanceEntry {
+    /** Local content tokens, excluding Magic Context's history and reduction/note reminders. */
+    tokens: number;
+    /** One event per authored user-role message, after any folded tool results. */
+    userTurn?: boolean;
+    /** Durable identifier of the tool invocation whose result ends at this entry. */
+    toolOutputTag?: number;
+}
+
+/** Only authored content starts a user turn; host control notices do not. */
+export function isReclaimUserTurn(args: {
+    role?: string;
+    syntheticHead?: boolean;
+    synthetic?: boolean;
+    ignored?: boolean;
+    parts: readonly { kind: string; text?: string; synthetic?: boolean; ignored?: boolean }[];
+}): boolean {
+    return (
+        args.role === "user" &&
+        !args.syntheticHead &&
+        !args.synthetic &&
+        !args.ignored &&
+        args.parts.some((part) => {
+            if (part.synthetic || part.ignored) return false;
+            if (part.kind !== "text" && part.kind !== "image" && part.kind !== "file") return false;
+            if (part.kind !== "text") return true;
+            return stripReclaimMcText(part.text ?? "").trim().length > 0;
+        })
+    );
+}
+
+/** Remove Magic Context's reduction/note reminders, not generic host wake notices. */
+export function stripReclaimMcText(text: string): string {
+    return text
+        .replace(/^§\d+§\s*/, "")
+        .replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, (reminder) =>
+            /^(?:Your next step: call ctx_reduce on the outputs you've already used|Still unstamped:|Housekeeping: .* are reclaimable\. Stamp each output with ctx_reduce|.* are reclaimable\. Make a ctx_reduce pass now|.* are still unstamped\. Call ctx_reduce now)/.test(
+                reminder.slice("<system-reminder>".length).trimStart(),
+            )
+                ? ""
+                : reminder,
+        )
+        .replace(/<instruction name="deferred_notes">[\s\S]*?<\/instruction>/g, "");
+}
+
+/**
+ * A free cache rebuild is not evidence that the model has moved on. An output
+ * is far behind only after three newer user turns or a quarter-window of newer
+ * content. Return a prefix of qualifying tags; callers drop against the PREVIOUS
+ * durable bookmark before advancing it, so distance must survive two rebuilds.
+ */
+export function farBehindToolBookmark(
+    entries: readonly ReclaimDistanceEntry[],
+    usableWindow: number,
+): number {
+    let newerTurns = 0;
+    let newerTokens = 0;
+    const farTags: number[] = [];
+    let firstYoungTag = Infinity;
+    const seenOutputs = new Set<number>();
+    const tokenDistance =
+        usableWindow > 0 && Number.isFinite(usableWindow)
+            ? usableWindow * RECLAIM_DISTANCE_WINDOW_FRACTION
+            : Infinity;
+    for (let index = entries.length - 1; index >= 0; index--) {
+        const entry = entries[index];
+        if (!entry) continue;
+        const tag = entry.toolOutputTag;
+        // Multi-part outputs are positioned at their last result, not their call
+        // or first chunk: an output must never count its own remaining payload.
+        if (tag !== undefined && !seenOutputs.has(tag)) {
+            seenOutputs.add(tag);
+            if (newerTurns >= RECLAIM_DISTANCE_USER_TURNS || newerTokens >= tokenDistance) {
+                farTags.push(tag);
+            } else {
+                firstYoungTag = Math.min(firstYoungTag, tag);
+            }
+        }
+        if (entry.userTurn) newerTurns++;
+        if (Number.isFinite(entry.tokens) && entry.tokens > 0) newerTokens += entry.tokens;
+    }
+    // Tags follow call order, not result arrival. A late lower-tag sibling must
+    // hold the prefix even when a higher-tag result is already distant.
+    return farTags.reduce(
+        (bookmark, tag) => (tag < firstYoungTag ? Math.max(bookmark, tag) : bookmark),
+        0,
+    );
+}