@sema-agent/core 5.0.1 → 5.1.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## 5.1.0 (2026-08-03)
+
+_The second (and final planned) baggage sweep: every remaining compatibility arm, plus a durable memory-key fix with an automatic adoption leg and the protocol table that clears the road for a second tool protocol. Version-line policy (project ruling): the major stays at 5 — breaking changes below are declared loudly here and coordinated with all in-org consumers, but do not mint a new major._
+
+**BREAKING (declared, rides the 5.x line by project ruling)**
+
+0. **The registry closes — every remaining compatibility arm is retired in this release:**
+   - `createDegradingBrain`: ONE form — the ordered `fallbacks` chain (`fallback`+`fallbackModel` retired; a chain-of-one is `fallbacks: [{brain, model}]`). The pair's two-trigger default retires with it: every construction gets the four-class gate; narrow explicitly via `downgradeOn`.
+   - `ToolSearch`: the pre-design/116 `select` ARRAY argument resolves nothing (the CC-canonical `select:A,B,C` string prefix in `query` is the live selection form).
+   - `Skill`: `skill` is REQUIRED (the `{name}` arm retired) — a stale replay bounces as loud, model-correctable invalid-arguments.
+   - `LSP`: the deprecated `symbol` alias for `query` leaves the tool schema (the `LspRequest.symbol` SEAM field is the wire contract, untouched).
+   - `TodoWrite`: `activeForm` is REQUIRED (exactly CC's TodoItem).
+   - `WorkflowScriptStore.resolveName`: ONE return shape — `{script, defaultArgs?}` (the bare-string arm retired).
+   - `sema-tb`: the `--message` argv leg is a usage error (process-list exposure once made a model's pgrep cleanup kill its own agent); use `--objective-file` or stdin.
+   - Anthropic brain: thinking enables ONLY on a valid non-`"off"` `ThinkingLevel` — the legacy-boolean silent 0.5-share enable is gone (out-of-contract value = absence).
+   - Terminal-cause predicates read `errorKind` ONLY — the `errorMessage`-sentinel fallback is deleted; stamping `errorKind` on every cut turn is now a documented Brain obligation.
+   - Read/Edit/Write schemas declare `file_path` only (the durable `path` alias retired; the security-gate readers keep their `path` over-read — that side is fail-closed coverage, not compat).
+   - The legacy prompt composer loses `memoryEnabled`/`consolidationEnabled` (dead in production since design/138 S4; `MEMORY_SAFETY`/`MEMORY_HYGIENE`/`MEMORY_GUIDANCE` stay exported as standalone assets).
+1. **`PermissionResult` loses the legacy `reason` field.** All three arms carry `message` only, and `decisionText` reads `message` only. A TS policy returning `{reason}` compiles red; a JS policy keeps its verdict but its custom text degrades to the per-site generic default. Migrate: `reason:` → `message:`.
+2. **`MemorySpecInput` is ONE form.** The singular `scope` field is removed; `scopes: string[]` is the only spelling. Migrate: `{scope: "x"}` → `{scopes: ["x"]}`. An untyped caller still passing `{scope}` gets "no usable scopes" = memory off for that task.
+3. **The approval folds are STRICT.** `createApprovalPolicy.approve` and the `onAsk` boolean arm approve ONLY on the literal `true`; an out-of-contract truthy (`"yes"`, `1`, …) from an untyped bridge is a fail-closed deny naming the defect. The historical truthy leniency was a fail-open on the security face with no live producer (server bridge verified).
+4. **Grep drops the retired keys (CC alignment).** `max_results` leaves the schema and the wiring — a stale caller's value applies NOTHING (`head_limit` is the one spelling). The `regex` key has no declared arm anywhere.
+
+**Fixed**
+
+- **One repo, one memory (RB-472).** `deriveRepoKey` canonicalizes (realpath) before minting, so a repo reached through a symlink alias and through its physical path no longer splits into two memory partitions. A pre-6.x deployment's legacy-keyed dirs are ADOPTED automatically at mount (one-shot whole-dir rename, concurrent-open race-tolerant). A store that already split is a loud `memory.partition_split` incident with both coordinates — never silently merged. Rename failure = `memory.partition_adopt_failed` disclosure; the mount never fails over adoption.
+
+**Added**
+
+- **Protocol namespace table**: `PROTOCOL_TABLE` / `MCP_NAMESPACE` / `protocolOf` / `ProtocolNamespace` / `ProtocolId` — "which protocol owns this tool name" as a lookup (`MCP_PREFIX` is now the table entry's prefix; a second protocol lands by appending one entry). `ToolOrigin`'s protocol slice derives from `ProtocolId`.
+- **Corrupt-read disclosure seats** (the tolerances stay; the silence goes): `FileSessionPolicyStore`/`FileRosterStore` constructor `onCorruptRead`, `CcFileMailboxStoreOptions.onCorruptRead`, `recordRosterSpawn` optional `onError` (threaded to `onObserverError`, site `roster.recordSpawn`), and the durable-approval continuity read disclosing via `onObserverError` (site `resume.durableApprovalContinuity`). Plain ENOENT never fires any of them.
+
+**Migration one-line table**: `reason:` → `message:` / `{scope}` → `{scopes: [..]}` / approver returns literal `true`·`false`·`"unavailable"`·`{allow}` only / `max_results` → `head_limit`.
+
 ## 5.0.1 (2026-08-02)
 
 _Post-release review patch: the 5.0.0 review wave (five domain reviewers + two independent codex legs) surfaced silent-widening gaps in the new audit surfaces plus wiring/anchoring stragglers. All fixes are loud-direction; no new API._

package/dist/agents/roster-store.d.ts

@@ -42,7 +42,14 @@ export declare class FileRosterStore implements RosterStore {
     private readonly path;
     private readonly maxAgeMs;
     private readonly gc;
-    constructor(path: string, opts?: RosterGcOptions);
+    private readonly onCorruptRead;
+    constructor(path: string, opts?: RosterGcOptions & {
+        onCorruptRead?: (info: {
+            path: string;
+            reason: string;
+        }) => void;
+    });
+    private discloseCorrupt;
     private read;
     private write;
     record(entry: RosterEntry): void;
@@ -50,4 +57,4 @@ export declare class FileRosterStore implements RosterStore {
     list(): RosterEntry[];
     releaseAgent(agentId: string): void;
 }
-export declare function recordRosterSpawn(roster: RosterStore | undefined, entry: RosterEntry): void;
+export declare function recordRosterSpawn(roster: RosterStore | undefined, entry: RosterEntry, onError?: (err: unknown) => void): void;

package/dist/agents/roster-store.js

@@ -76,10 +76,19 @@ export class FileRosterStore {
     path;
     maxAgeMs;
     gc;
+    onCorruptRead;
     constructor(path, opts) {
         this.path = path;
         this.maxAgeMs = opts?.maxAgeMs;
         this.gc = opts;
+        this.onCorruptRead = opts?.onCorruptRead;
+    }
+    discloseCorrupt(reason) {
+        try {
+            this.onCorruptRead?.({ path: this.path, reason });
+        }
+        catch {
+        }
     }
     read(mode) {
         let text;
@@ -89,8 +98,10 @@ export class FileRosterStore {
         catch (e) {
             if (e.code === "ENOENT")
                 return [];
-            if (mode === "lenient")
+            if (mode === "lenient") {
+                this.discloseCorrupt(`read failed (non-ENOENT): ${e.message}`);
                 return [];
+            }
             throw e;
         }
         if (text.trim() === "")
@@ -102,8 +113,10 @@ export class FileRosterStore {
             return raw.entries.filter((e) => typeof e === "object" && e !== null && typeof e.name === "string" && typeof e.agentId === "string" && typeof e.createdAt === "number");
         }
         catch (e) {
-            if (mode === "lenient")
+            if (mode === "lenient") {
+                this.discloseCorrupt(`corrupt roster document: ${e.message}`);
                 return [];
+            }
             throw e;
         }
     }
@@ -127,12 +140,20 @@ export class FileRosterStore {
         this.write(this.read("strict").filter((e) => e.agentId !== agentId));
     }
 }
-export function recordRosterSpawn(roster, entry) {
+export function recordRosterSpawn(roster, entry, onError) {
     if (!roster)
         return;
+    const disclose = (err) => {
+        try {
+            onError?.(err);
+        }
+        catch {
+        }
+    };
     try {
-        void Promise.resolve(roster.record(entry)).catch(() => { });
+        void Promise.resolve(roster.record(entry)).catch(disclose);
     }
-    catch {
+    catch (err) {
+        disclose(err);
     }
 }

package/dist/agents/subagent.js

@@ -1693,7 +1693,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                         }, { priority: "later" }), "subagent.reapTerminalNotify");
                     });
                     if (agentName !== undefined) {
-                        recordRosterSpawn(ctx.roster, { name: agentName, agentId: taskId, sessionId: forkedId, toolUseId: ctx.toolCallId, owner: bgOwner, scope: bgScope, ...((typeof childModel === "string" ? resolveModelDisplayLabel(childModel) : childModel?.id) !== undefined ? { model: typeof childModel === "string" ? childModel : childModel?.id } : {}), ...((ctx.rootSessionId ?? ctx.sessionId) !== undefined ? { rootSessionId: ctx.rootSessionId ?? ctx.sessionId } : {}), ...(sessionScopedBg ? { sessionScoped: true } : {}), createdAt: Date.now() });
+                        recordRosterSpawn(ctx.roster, { name: agentName, agentId: taskId, sessionId: forkedId, toolUseId: ctx.toolCallId, owner: bgOwner, scope: bgScope, ...((typeof childModel === "string" ? resolveModelDisplayLabel(childModel) : childModel?.id) !== undefined ? { model: typeof childModel === "string" ? childModel : childModel?.id } : {}), ...((ctx.rootSessionId ?? ctx.sessionId) !== undefined ? { rootSessionId: ctx.rootSessionId ?? ctx.sessionId } : {}), ...(sessionScopedBg ? { sessionScoped: true } : {}), createdAt: Date.now() }, (err) => opts.onObserverError?.(err, { site: "roster.recordSpawn" }));
                     }
                     const bgSink = ctx.onBackgroundChildEvent;
                     const sinkEmit = (event) => {
@@ -2096,7 +2096,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                     return { isError: true, content: `Sub-agent not started in background: ${e instanceof Error ? e.message : String(e)}${wt ? `\n${wt}` : ""}`, details: { error: "register_failed" } };
                 }
                 if (agentName !== undefined) {
-                    recordRosterSpawn(ctx.roster, { name: agentName, agentId: taskId, toolUseId: ctx.toolCallId, owner: bgOwner, scope: bgScope, ...((typeof childModel === "string" ? resolveModelDisplayLabel(childModel) : childModel?.id) !== undefined ? { model: typeof childModel === "string" ? childModel : childModel?.id } : {}), ...(reviveRow !== undefined ? ((reviveRow.rootSessionId ?? reviveRow.parentSessionId) !== undefined ? { rootSessionId: reviveRow.rootSessionId ?? reviveRow.parentSessionId } : {}) : (ctx.rootSessionId ?? ctx.sessionId) !== undefined ? { rootSessionId: ctx.rootSessionId ?? ctx.sessionId } : {}), ...(sessionScopedBg ? { sessionScoped: true } : {}), createdAt: reviveRow?.spawnedAt ?? Date.now() });
+                    recordRosterSpawn(ctx.roster, { name: agentName, agentId: taskId, toolUseId: ctx.toolCallId, owner: bgOwner, scope: bgScope, ...((typeof childModel === "string" ? resolveModelDisplayLabel(childModel) : childModel?.id) !== undefined ? { model: typeof childModel === "string" ? childModel : childModel?.id } : {}), ...(reviveRow !== undefined ? ((reviveRow.rootSessionId ?? reviveRow.parentSessionId) !== undefined ? { rootSessionId: reviveRow.rootSessionId ?? reviveRow.parentSessionId } : {}) : (ctx.rootSessionId ?? ctx.sessionId) !== undefined ? { rootSessionId: ctx.rootSessionId ?? ctx.sessionId } : {}), ...(sessionScopedBg ? { sessionScoped: true } : {}), createdAt: reviveRow?.spawnedAt ?? Date.now() }, (err) => opts.onObserverError?.(err, { site: "roster.recordSpawn" }));
                 }
                 const bgSink = ctx.onBackgroundChildEvent;
                 const sinkEmit = (event) => {
@@ -2333,7 +2333,12 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                                     resumeConfig.durableApproval = { scope: cp0.scope };
                                 }
                             }
-                            catch {
+                            catch (err) {
+                                try {
+                                    opts.onObserverError?.(err, { site: "resume.durableApprovalContinuity" });
+                                }
+                                catch {
+                                }
                             }
                         }
                         const bgStream = await opts.runner.resumeStream(pr.ticket.token, pr.outcome, resumeConfig, {

package/dist/bin/sema-tb.d.ts

@@ -2,7 +2,6 @@
 import { type Model } from "../index.js";
 interface Args {
     model: string;
-    message: string | undefined;
     objectiveFile: string | undefined;
     jsonl: string | undefined;
 }
@@ -19,7 +18,7 @@ export type InstructionResolution = {
 } | {
     error: string;
 };
-export declare function resolveInstruction(args: Pick<Args, "message" | "objectiveFile">, readInput: (source: string | 0) => string): InstructionResolution;
+export declare function resolveInstruction(args: Pick<Args, "objectiveFile">, readInput: (source: string | 0) => string): InstructionResolution;
 type TbCost = Model["cost"];
 export type TbCostResolution = {
     cost: TbCost;

package/dist/bin/sema-tb.js

@@ -6,11 +6,11 @@ import { positiveIntFromEnv, tbModelInput } from "./tb-env.js";
 import { inferMaxTokensField } from "../brain/openai.js";
 function usage(code = 2) {
     const out = code === 0 ? process.stdout : process.stderr;
-    out.write("Usage: sema-tb --model <provider/model> [--message <instruction> | --objective-file <path>] [--jsonl <path>]\n" +
-        "  Instruction legs: --objective-file <path> (preferred for real task text) | --message <text> (argv)\n" +
+    out.write("Usage: sema-tb --model <provider/model> [--objective-file <path>] [--jsonl <path>]\n" +
+        "  Instruction legs: --objective-file <path> (preferred for real task text) | stdin\n" +
         "  | stdin (default when neither flag is given). Both flags together = usage error.\n" +
         "  WARNING: argv is visible to every process in the sandbox (ps / pgrep -f / /proc/*/cmdline) — long\n" +
-        "  or sensitive instructions should ride --objective-file or stdin, never --message.\n" +
+        "  Instructions ride --objective-file or stdin; the retired --message argv leg is refused (process-list exposure).\n" +
         "Env: <PROVIDER>_API_KEY / <PROVIDER>_BASE_URL, TB_MAX_TURNS, TB_TIMEOUT_SEC, TB_FULLBODY, TB_TODOREMIND, TB_BGTASKS, TB_SUMMARIZE,\n" +
         "     TB_FINALVERIFY, TB_CALLCAP, TB_FINALIZE, TB_REASONING, TB_JSONL, TB_CONTEXT_WINDOW, TB_MAX_OUTPUT_TOKENS, TB_TASKLIST, TB_VISION\n" +
         '     TB_COST="input,output[,cacheRead[,cacheWrite]]" — USD per MTok; explicit pricing override (omitted\n' +
@@ -20,19 +20,19 @@ function usage(code = 2) {
 }
 export function parseArgs(argv, env = process.env) {
     let model;
-    let message;
     let objectiveFile;
     let jsonl;
     for (let i = 0; i < argv.length; i++) {
         const a = argv[i];
-        if (a === "--model" || a === "--message" || a === "--objective-file" || a === "--jsonl") {
+        if (a === "--message") {
+            return { usageError: "--message is retired (argv is visible to every sandbox process — the exposure once made a model's pgrep cleanup kill its own agent). Use --objective-file <path> or pipe the instruction on stdin." };
+        }
+        if (a === "--model" || a === "--objective-file" || a === "--jsonl") {
             const v = argv[++i];
             if (v === undefined)
                 return { usageError: `missing value for ${a}` };
             if (a === "--model")
                 model = v;
-            else if (a === "--message")
-                message = v;
             else if (a === "--objective-file")
                 objectiveFile = v;
             else
@@ -46,28 +46,16 @@ export function parseArgs(argv, env = process.env) {
     if (!model || !model.includes("/")) {
         return { usageError: "--model must be <provider/model> (e.g. deepseek/deepseek-v4-flash)" };
     }
-    return { args: { model, message, objectiveFile, jsonl: jsonl ?? env.TB_JSONL } };
+    return { args: { model, objectiveFile, jsonl: jsonl ?? env.TB_JSONL } };
 }
 export function resolveInstruction(args, readInput) {
-    if (args.message !== undefined && args.objectiveFile !== undefined) {
-        return { error: "--message and --objective-file are mutually exclusive (pick one instruction leg)" };
-    }
-    const leg = args.objectiveFile !== undefined
-        ? `--objective-file ${args.objectiveFile}`
-        : args.message !== undefined
-            ? "--message"
-            : "stdin (no --message/--objective-file)";
+    const leg = args.objectiveFile !== undefined ? `--objective-file ${args.objectiveFile}` : "stdin (no --objective-file)";
     let raw;
-    if (args.message !== undefined) {
-        raw = args.message;
+    try {
+        raw = readInput(args.objectiveFile ?? 0);
     }
-    else {
-        try {
-            raw = readInput(args.objectiveFile ?? 0);
-        }
-        catch (e) {
-            return { error: `cannot read instruction from ${leg}: ${e instanceof Error ? e.message : String(e)}` };
-        }
+    catch (e) {
+        return { error: `cannot read instruction from ${leg}: ${e instanceof Error ? e.message : String(e)}` };
     }
     const instruction = raw.trim();
     if (!instruction)

package/dist/brain/anthropic.js

@@ -253,7 +253,7 @@ export function createAnthropicBrain(config = {}) {
                 if (options?.temperature !== undefined && anthCompat.supportsTemperature !== false) {
                     body.temperature = options.temperature;
                 }
-                if (model.reasoning && options?.reasoning && options.reasoning !== "off") {
+                if (model.reasoning && isThinkingLevel(options?.reasoning) && options.reasoning !== "off") {
                     if (anthCompat.thinkingMode === "adaptive") {
                         body.thinking = { type: "adaptive" };
                     }
@@ -264,8 +264,7 @@ export function createAnthropicBrain(config = {}) {
                             delete body.thinking;
                         }
                         else {
-                            const tierShare = isThinkingLevel(options.reasoning) ? reasoningBudgetShare(options.reasoning) : undefined;
-                            const share = config.thinkingBudgetShare ?? tierShare ?? 0.5;
+                            const share = config.thinkingBudgetShare ?? reasoningBudgetShare(options.reasoning);
                             const { max, budget } = thinkingBudget(body.max_tokens, share, config.thinkingBudgetTokens, hardCap);
                             body.max_tokens = max;
                             body.thinking = { type: "enabled", budget_tokens: budget };

package/dist/brain/degrading.d.ts

@@ -12,18 +12,12 @@ interface DegradingBrainBaseOptions {
     primary: Brain;
     downgradeOn?: DegradeReason[];
 }
-export type DegradingBrainOptions = (DegradingBrainBaseOptions & {
+export type DegradingBrainOptions = DegradingBrainBaseOptions & {
     fallbacks: Array<{
         brain: Brain;
         model: Model;
     }>;
-    fallback?: never;
-    fallbackModel?: never;
-}) | (DegradingBrainBaseOptions & {
-    fallbacks?: never;
-    fallback: Brain;
-    fallbackModel: Model;
-});
+};
 export declare function readDegradation(msg: {
     diagnostics?: AssistantMessageDiagnostic[];
 } | undefined): DegradationInfo | undefined;

package/dist/brain/degrading.js

@@ -115,12 +115,12 @@ export function passthroughStream(brain, model, context, options) {
     return out;
 }
 export function createDegradingBrain(opts) {
-    const triggers = new Set(opts.downgradeOn ?? (opts.fallbacks ? ["rate_limit", "breaker_open", "server_error", "last_resort"] : ["rate_limit", "breaker_open"]));
-    const rawHops = opts.fallbacks ?? (opts.fallback && opts.fallbackModel ? [{ brain: opts.fallback, model: opts.fallbackModel }] : []);
+    const triggers = new Set(opts.downgradeOn ?? ["rate_limit", "breaker_open", "server_error", "last_resort"]);
+    const rawHops = opts.fallbacks ?? [];
     const seenIds = new Set();
     const hops = rawHops.filter((h) => (seenIds.has(h.model.id) ? false : (seenIds.add(h.model.id), true))).slice(0, MAX_CHAIN);
     if (hops.length === 0) {
-        throw new Error("createDegradingBrain: provide `fallbacks` (design/126 chain) or the legacy `fallback`+`fallbackModel` pair");
+        throw new Error("createDegradingBrain: `fallbacks` needs at least one {brain, model} hop (RB-482 #3: the legacy fallback+fallbackModel pair is retired — a chain-of-one is `fallbacks: [{brain, model}]`)");
     }
     const stream = (model, context, options) => {
         if (options?.resilience?.allowDegrade === false) {

package/dist/brain/terminal-cause.js

@@ -1,12 +1,6 @@
-import { DEGENERATE_MESSAGE } from "./repetition.js";
-import { WALLTIME_CUTOFF_MESSAGE } from "./walltime.js";
 export function isDegenerateCutMessage(message) {
-    if (message.errorKind === "degenerate")
-        return true;
-    return message.errorMessage === DEGENERATE_MESSAGE;
+    return message.errorKind === "degenerate";
 }
 export function isWalltimeCutMessage(message) {
-    if (message.errorKind === "walltime_cutoff")
-        return true;
-    return message.errorMessage === WALLTIME_CUTOFF_MESSAGE;
+    return message.errorKind === "walltime_cutoff";
 }

package/dist/core/hooks.js

@@ -177,7 +177,7 @@ export async function runToolGate(input) {
         if (decision.action === "ask" && req.toolName === ASK_USER_QUESTION_TOOL_NAME) {
             decision = {
                 action: "deny",
-                reason: "AskUserQuestion could not be parked for a durable human answer on this path (no checkpoint " +
+                message: "AskUserQuestion could not be parked for a durable human answer on this path (no checkpoint " +
                     "facility, or the suspend failed) and a synchronous permission approver cannot carry an answer — " +
                     "the question was NOT shown to anyone. Proceed with your best judgment and state the assumption " +
                     "you made.",
@@ -211,7 +211,7 @@ export async function runToolGate(input) {
                         }
                         catch (err) {
                             traceHookCrash(input, err, notifier);
-                            editDenied = { action: "deny", reason: preToolUseCrashReason(`the approved edit for "${toolName}"`, err) };
+                            editDenied = { action: "deny", message: preToolUseCrashReason(`the approved edit for "${toolName}"`, err) };
                             denySource = "hook";
                             break;
                         }
@@ -219,7 +219,7 @@ export async function runToolGate(input) {
                             if (hr.additionalContext)
                                 preToolContext.push(hr.additionalContext);
                             if (hr.action === "deny") {
-                                editDenied = { action: "deny", reason: decisionText(hr) ?? `the approved edit for "${toolName}" was blocked by a PreToolUse hook` };
+                                editDenied = { action: "deny", message: decisionText(hr) ?? `the approved edit for "${toolName}" was blocked by a PreToolUse hook` };
                                 denySource = "hook";
                                 break;
                             }
@@ -244,7 +244,7 @@ export async function runToolGate(input) {
                     catch (err) {
                         recheck = {
                             action: "deny",
-                            reason: `policy re-check of the approved edit for "${toolName}" errored: ${err instanceof Error ? err.message : String(err)}`,
+                            message: `policy re-check of the approved edit for "${toolName}" errored: ${err instanceof Error ? err.message : String(err)}`,
                         };
                     }
                     if (recheck.action === "deny") {

package/dist/core/lsp.js

@@ -171,18 +171,17 @@ export function createLspTool(manager, opts = {}) {
             line: Type.Optional(Type.Number({ description: "The line number (1-based, as shown in editors)." })),
             character: Type.Optional(Type.Number({ description: "The character offset (1-based, as shown in editors)." })),
             query: Type.Optional(Type.String({ description: "Symbol query for workspaceSymbol (may be empty to browse broadly)." })),
-            symbol: Type.Optional(Type.String({ description: "Deprecated alias for query." })),
         }),
         effect: "read",
         execute: async (args, ctx) => {
-            const { operation, filePath, line, character, query, symbol } = args;
+            const { operation, filePath, line, character, query } = args;
             if (POSITION_OPS.has(operation) && (line === undefined || character === undefined)) {
                 return errorResult(`Error (LSP): the "${operation}" operation needs both line and character.`);
             }
             if (POSITION_OPS.has(operation) && (!Number.isInteger(line) || line < 1 || !Number.isInteger(character) || character < 1)) {
                 return errorResult(`Error (LSP): line and character are 1-based integers (as shown in editors); got line=${line}, character=${character}.`);
             }
-            const wsQuery = query ?? symbol;
+            const wsQuery = query;
             if (operation === "workspaceSymbol" && wsQuery === undefined) {
                 return errorResult(`Error (LSP): the "workspaceSymbol" operation needs a query.`);
             }

package/dist/core/mcp.d.ts

@@ -56,7 +56,7 @@ export interface McpServerStatus {
     error?: string;
     transportClosed?: boolean;
 }
-export declare const MCP_PREFIX = "mcp__";
+export declare const MCP_PREFIX: string;
 export declare function resolveMcpDeclaredResultSize(meta: Record<string, unknown> | undefined): number | undefined;
 export declare function gateMcpOutput(content: Array<TextContent | ImageContent>, limitTokens?: number): Array<TextContent | ImageContent>;
 export declare function truncateMcpErrorText(s: string): string;

package/dist/core/mcp.js

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { MCP_NAMESPACE } from "./protocol-table.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport, StreamableHTTPError } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
@@ -12,7 +13,7 @@ import { truncateError } from "./tool-errors.js";
 import { delimitUntrusted, inlineUntrusted, sanitizeUntrustedText } from "./untrusted-text.js";
 import { validateJsonSchemaShape } from "./runner/strict-output-schema.js";
 const NAME_SEP = "__";
-export const MCP_PREFIX = "mcp__";
+export const MCP_PREFIX = MCP_NAMESPACE.prefix;
 const MCP_OUTPUT_TOKENS_DEFAULT = 25_000;
 const MCP_CHARS_PER_TOKEN = 4;
 const MCP_META_RESULT_SIZE_CAP = 500_000;

package/dist/core/memory-engine/engine.js

@@ -6,7 +6,7 @@ import { inlineUntrusted } from "../untrusted-text.js";
 import { formatMemoryAge } from "../memory-recall.js";
 import { computeEntryRev, parseEntryFile, serializeEntryFile } from "./frontmatter.js";
 import { DEFAULT_MAX_ENTRY_DEPTH, MEMORY_INDEX_FILENAME, scanEntryFiles } from "./file-backend.js";
-import { QUARANTINE_DIR, SCAN_FUSE_THRESHOLD, quarantineAndTombstone, readIndexRevs, writeIndexRevs, bumpScanFuse, canonicalize, claimRootScope, clearScanFuse, deriveControlPlaneDir, drainMemoryAnnouncements, enqueueMemoryAnnouncement, ensureDirExists, isContainedIn, registerScope, registeredScopes, resolveMemoryEngineRoot, scopeDirFor, } from "./layout.js";
+import { QUARANTINE_DIR, SCAN_FUSE_THRESHOLD, quarantineAndTombstone, readIndexRevs, writeIndexRevs, bumpScanFuse, canonicalize, claimRootScope, clearScanFuse, adoptLegacyRepoDirs, deriveControlPlaneDir, drainMemoryAnnouncements, enqueueMemoryAnnouncement, ensureDirExists, isContainedIn, registerScope, registeredScopes, resolveMemoryEngineRoot, scopeDirFor, } from "./layout.js";
 import { scanMemoryFileName, scanMemoryWrite, scanRemediation } from "./scan.js";
 export const MEMORY_INSTRUCTION_TEMPLATE = `# Memory
 
@@ -61,7 +61,7 @@ export class MemoryEngine {
         this.controlDir =
             typeof backendControl === "string" && backendControl
                 ? backendControl
-                : (opts.controlDir ?? deriveControlPlaneDir(resolveMemoryEngineRoot(), opts.memoryDir));
+                : (opts.controlDir ?? (adoptLegacyRepoDirs(resolveMemoryEngineRoot(), opts.memoryDir), deriveControlPlaneDir(resolveMemoryEngineRoot(), opts.memoryDir)));
         this.now = opts.now ?? Date.now;
         this.perScopeBudgetBytes = opts.perScopeBudgetBytes ?? Number.MAX_SAFE_INTEGER;
         this.perFileBytes = opts.perFileBytes ?? MAX_MEMORY_BYTES;

package/dist/core/memory-engine/file-backend.js

@@ -5,7 +5,7 @@ import { jaccardDistance, termSet } from "../memory-vector.js";
 import { MAX_MEMORY_BYTES } from "../memory.js";
 import { inlineUntrusted } from "../untrusted-text.js";
 import { computeEntryRev, entryFromFile, isValidEntryId, parseEntryFile, serializeEntryFile } from "./frontmatter.js";
-import { ControlPlaneCorruptError, CURSORS_FILE, QUARANTINE_DIR, atomicWriteFileSync, quarantineAndTombstone, claimRootScope, deriveControlPlaneDir, ensureDirExists, enqueueMemoryAnnouncement, registerScope, registeredScopes, resolveMemoryEngineRoot, scopeDirName, writeAllSync, } from "./layout.js";
+import { ControlPlaneCorruptError, CURSORS_FILE, QUARANTINE_DIR, atomicWriteFileSync, quarantineAndTombstone, claimRootScope, adoptLegacyRepoDirs, deriveControlPlaneDir, ensureDirExists, enqueueMemoryAnnouncement, registerScope, registeredScopes, resolveMemoryEngineRoot, scopeDirName, writeAllSync, } from "./layout.js";
 import { scanMemoryFileName, scanMemoryWrite } from "./scan.js";
 export const MEMORY_INDEX_FILENAME = "MEMORY.md";
 export const DEFAULT_MAX_ENTRY_DEPTH = 3;
@@ -78,6 +78,8 @@ export class FileMemoryEngineBackend {
     constructor(dir, opts = {}) {
         this.now = opts.now ?? Date.now;
         this.directoryRoot = dir;
+        if (opts.controlDir === undefined)
+            adoptLegacyRepoDirs(resolveMemoryEngineRoot(), dir);
         this.controlPlaneRoot = opts.controlDir ?? deriveControlPlaneDir(resolveMemoryEngineRoot(), dir);
         ensureDirExists(dir);
         ensureDirExists(this.controlPlaneRoot);

package/dist/core/memory-engine/layout.d.ts

@@ -6,6 +6,9 @@ export declare class ControlPlaneCorruptError extends Error {
     });
 }
 export declare function deriveRepoKey(repoRoot: string): string;
+export declare function adoptLegacyRepoDirs(configRoot: string, repoRoot: string, onIncident?: (err: Error & {
+    code?: string;
+}) => void): void;
 export declare function deriveRepoMemoryDir(configRoot: string, repoRoot: string): string;
 export declare function deriveProjectMemoryDir(configRoot: string, projectId: string): string;
 export declare function deriveProjectControlDir(configRoot: string, projectId: string): string;

package/dist/core/memory-engine/layout.js

@@ -11,8 +11,59 @@ export class ControlPlaneCorruptError extends Error {
     }
 }
 export function deriveRepoKey(repoRoot) {
+    return canonicalize(resolve(repoRoot)).normalize("NFC").replace(/[^A-Za-z0-9]/g, "-");
+}
+function deriveRepoKeyLegacy(repoRoot) {
     return resolve(repoRoot).normalize("NFC").replace(/[^A-Za-z0-9]/g, "-");
 }
+export function adoptLegacyRepoDirs(configRoot, repoRoot, onIncident) {
+    const disclose = (code, message) => {
+        try {
+            const e = new Error(message);
+            e.code = code;
+            onIncident?.(e);
+        }
+        catch {
+        }
+    };
+    try {
+        const newKey = deriveRepoKey(repoRoot);
+        const oldKey = deriveRepoKeyLegacy(repoRoot);
+        if (newKey === oldKey)
+            return;
+        const oldDir = join(configRoot, oldKey);
+        const newDir = join(configRoot, newKey);
+        const exists = (p) => {
+            try {
+                statSync(p);
+                return true;
+            }
+            catch {
+                return false;
+            }
+        };
+        if (!exists(oldDir))
+            return;
+        if (exists(newDir)) {
+            disclose("memory.partition_split", `memory partition split detected for ${repoRoot}: BOTH the legacy alias-keyed dir (${oldDir}) and the canonical dir (${newDir}) exist. ` +
+                `This session uses the canonical dir; the legacy dir is left untouched (never merged — CAS baselines would collide). ` +
+                `If the legacy side holds newer memory, move its rows by hand and remove it.`);
+            return;
+        }
+        try {
+            renameSync(oldDir, newDir);
+        }
+        catch (err) {
+            const code = err.code;
+            if ((code === "ENOENT" || code === "EEXIST" || code === "ENOTEMPTY") && exists(newDir))
+                return;
+            disclose("memory.partition_adopt_failed", `could not adopt the legacy memory partition ${oldDir} → ${newDir} (${code ?? String(err)}): this session proceeds on the canonical dir; ` +
+                `the legacy dir still holds the prior memory — move it by hand.`);
+        }
+    }
+    catch {
+    }
+}
 export function deriveRepoMemoryDir(configRoot, repoRoot) {
     return join(configRoot, deriveRepoKey(repoRoot), "memory");
 }

package/dist/core/memory.d.ts

@@ -91,7 +91,6 @@ export interface NormalizedMemorySpec {
     scopeContract?: "v2";
 }
 export type MemorySpecInput = {
-    scope?: string;
     scopes?: ReadonlyArray<string>;
     writeScope?: string | null;
     enabled?: boolean;

package/dist/core/memory.js

@@ -354,7 +354,7 @@ function mtimeMsOf(ts) {
 export function normalizeMemorySpec(input) {
     if (!input)
         return undefined;
-    const raw = input.scopes && input.scopes.length > 0 ? input.scopes : input.scope !== undefined ? [input.scope] : [];
+    const raw = input.scopes ?? [];
     const scopes = [];
     const seen = new Set();
     for (const s of raw) {

package/dist/core/permission-rules.js

@@ -1,3 +1,4 @@
+import { MCP_NAMESPACE } from "./protocol-table.js";
 export const BASH_GENERIC_PARAMS = new Set(["command", "timeout", "description", "run_in_background"]);
 const DEFAULT_CAPS = {
     maxRules: 256,
@@ -95,7 +96,7 @@ const FILE_TOOL_PARAMS = {
     Write: new Set(["file_path", "path", "content"]),
     NotebookEdit: new Set(["notebook_path", "path", "cell_id", "cell_type", "edit_mode", "new_source"]),
     Grep: new Set([
-        "pattern", "path", "glob", "type", "output_mode", "head_limit", "max_results", "offset",
+        "pattern", "path", "glob", "type", "output_mode", "head_limit", "offset",
         "multiline", "context", "ignore_case", "-i", "-n", "-o", "-A", "-B", "-C",
     ]),
     Glob: new Set(["pattern", "path", "max_results"]),
@@ -142,7 +143,7 @@ function compile(rules, caps, primaryFieldGeneric) {
             }
         }
         const toolName = parsed.toolName;
-        if (toolName.startsWith("mcp__") && (parsed.ruleContent !== undefined || indexOfUnescaped(text, "(") !== -1)) {
+        if (toolName.startsWith(MCP_NAMESPACE.prefix) && (parsed.ruleContent !== undefined || indexOfUnescaped(text, "(") !== -1)) {
             bad(text, "unsupported.mcp_paren", "MCP rules do not support patterns in parentheses (CC parity); use the toolAxes system");
             continue;
         }
@@ -274,18 +275,18 @@ export function createPermissionRulePolicy(rules, opts) {
             const entry = byTool.get(req.toolName);
             if (entry) {
                 if (entry.bare.deny) {
-                    return { action: "deny", reason: ruleMessage("denied", entry.bare.deny.ruleText, entry.bare.deny.source) };
+                    return { action: "deny", message: ruleMessage("denied", entry.bare.deny.ruleText, entry.bare.deny.source) };
                 }
                 const paramDeny = matchParamRules(entry.param.deny, req.args, caps.maxScalarValueChars);
                 if (paramDeny) {
-                    return { action: "deny", reason: ruleMessage("denied", paramDeny.ruleText, paramDeny.source) };
+                    return { action: "deny", message: ruleMessage("denied", paramDeny.ruleText, paramDeny.source) };
                 }
                 if (entry.bare.ask) {
-                    return { action: "ask", reason: ruleMessage("flagged", entry.bare.ask.ruleText, entry.bare.ask.source) };
+                    return { action: "ask", message: ruleMessage("flagged", entry.bare.ask.ruleText, entry.bare.ask.source) };
                 }
                 const paramAsk = matchParamRules(entry.param.ask, req.args, caps.maxScalarValueChars);
                 if (paramAsk) {
-                    return { action: "ask", reason: ruleMessage("flagged", paramAsk.ruleText, paramAsk.source) };
+                    return { action: "ask", message: ruleMessage("flagged", paramAsk.ruleText, paramAsk.source) };
                 }
                 if (entry.bare.allow) {
                     return { action: "allow" };
@@ -293,7 +294,7 @@ export function createPermissionRulePolicy(rules, opts) {
             }
             if (defaultAction === "allow")
                 return { action: "allow" };
-            return { action: defaultAction, reason: `no permission rule matched "${req.toolName}" (default-${defaultAction} rule set)` };
+            return { action: defaultAction, message: `no permission rule matched "${req.toolName}" (default-${defaultAction} rule set)` };
         },
     };
 }

package/dist/core/protocol-table.d.ts

@@ -0,0 +1,14 @@
+export type ProtocolId = "mcp";
+export interface ProtocolNamespace {
+    readonly id: ProtocolId;
+    readonly prefix: string;
+    makeName(peer: string, tool: string): string;
+    parse(name: string): {
+        peer: string;
+        tool: string;
+    } | undefined;
+    displayGroupKey(name: string): string;
+}
+export declare const MCP_NAMESPACE: ProtocolNamespace;
+export declare const PROTOCOL_TABLE: readonly ProtocolNamespace[];
+export declare function protocolOf(name: string): ProtocolNamespace | undefined;