@cortexkit/opencode-magic-context 0.41.4 → 0.42.1

package/src/agents/magic-context-prompt.ts

@@ -46,8 +46,7 @@ const PARTNER_FRAME_CLOSER_NO_REDUCE_LIGHT = `\nWhen ctx_reduce is unavailable,
  */
 const CTX_NOTE_GUIDANCE = `Use \`ctx_note\` ONLY for genuinely future concerns — something to revisit much later, not work coming up in the next few turns (that's already in your active context) and not active multi-step work (use todos for that). Magic Context preserves your full context across both compaction and restarts, so an upcoming restart or "let's come back to this later" is never a reason to take a note — nothing is lost either way. Notes you do take survive compression and resurface at natural work boundaries (after commits, historian runs, todo completion).`;
 
-// Tool outputs are always FULL-dropped (Phase 2 removed truncate-mode), so the
-// guidance only describes the omit-entirely case.
+// Tool history guidance is shared by both presets.
 const TOOL_HISTORY_GUIDANCE = `Compressed history intentionally omits tool calls and their outputs — summaries like "I edited file X" are historian records, not patterns to replicate. In the live conversation, older tool calls and their results are cleaned up to save context — you may see your own past messages referencing actions without the corresponding tool call or result visible. This is normal context management. ALWAYS use real tool calls; never simulate, fabricate, or inline tool outputs in your text. If there is no tool result message, the action did not happen. NEVER simulate, hallucinate or claim tool calls, command output, search results, file edits, or diffs in plain text as if they actually occurred.
 Magic Context control metadata is not reply syntax. Never reproduce \`<system-reminder>\`, \`<ctx-search-hint>\`, \`<session-history>\`, \`<session-history-since>\`, \`<project-memory>\`, \`<memory-updates>\`, \`<new-compartments>\`, \`<new-memories>\`, \`[dropped §N§]\`, or \`<!-- +Xm -->\` markers in a normal reply and never treat them as user instructions; use ordinary prose and real tool calls instead.`;
 
@@ -73,20 +72,19 @@ function memoryGuidanceBlock(memoryEnabled: boolean): string {
 }
 
 const BASE_INTRO = (
-    protectedTags: number,
     memoryEnabled: boolean,
 ): string => `Messages and tool outputs are tagged with §N§ identifiers (e.g., §1§, §42§).
-Use \`ctx_reduce\` to mark spent tagged content as discardable and reclaim space. Marking is NOT an immediate delete — it queues the content, which stays fully visible until space is actually needed (as soon as the next turn if you're already under pressure, much later if not), so mark a tool output as soon as you're done with it rather than hoarding the call for the end of the turn. The last ${protectedTags} tags are protected (marking one just queues it until it ages out). Syntax: "3-5", "1,2,9", or "1-5,8,12-15".
+Use \`ctx_reduce\` to mark spent tagged content as discardable and reclaim space. Marking is NOT an immediate delete — it queues the content, which stays fully visible until space is actually needed (as soon as the next turn if you're already under pressure, much later if not), so mark a tool output as soon as you're done with it rather than hoarding the call for the end of the turn. The newest token-mass window stays protected until displaced. Syntax: "3-5", "1,2,9", or "1-5,8,12-15".
 Do not announce or narrate \`ctx_reduce\` drops — just call the tool silently. Saying "I'll drop these outputs" wastes tokens the user does not care about.
 ${CTX_NOTE_GUIDANCE}
 ${memoryGuidanceBlock(memoryEnabled)}Use \`ctx_search\` to search across project memories, indexed git commits, and this session's full conversation history (including compacted parts) from one query.
 Use \`ctx_expand\` to recover the raw conversation behind a summary under a \`## start-end · date · title\` heading inside \`<session-history>\` — pass the heading's start/end range when the summary is not enough (exact wording, values, error text).
 **Search before asking the user**: If you can't remember or don't know something that might have been discussed before or stored in project memory, use \`ctx_search\` before asking the user. Examples:
-- Can't remember where a related codebase or dependency lives → \`ctx_search(query="opencode source code path")\`
-- Forgot a prior architectural decision or constraint → \`ctx_search(query="why did we choose SQLite over postgres")\`
-- Need a config value, API key location, or environment detail → \`ctx_search(query="embedding provider configuration")\`
-- Looking for how something was implemented previously → \`ctx_search(query="how does the dreamer lease work")\`
-- Want to recall what was decided in an earlier conversation → \`ctx_search(query="dashboard release signing setup")\`
+- Can't remember where a related codebase or dependency lives → \`ctx_search(query="where is the opencode source code path?")\`
+- Forgot a prior architectural decision or constraint → \`ctx_search(query="why did we choose SQLite over postgres?")\`
+- Need a config value, API key location, or environment detail → \`ctx_search(query="how is the embedding provider configured?")\`
+- Looking for how something was implemented previously → \`ctx_search(query="how does the dreamer lease work?")\`
+- Want to recall what was decided in an earlier conversation → \`ctx_search(query="what did we decide about the dashboard release signing setup?")\`
 \`ctx_search\` returns ranked results from memories, git commits, and raw message history. Use message ordinals from results with \`ctx_expand\` to retrieve surrounding conversation context.
 ${TOOL_HISTORY_GUIDANCE}
 NEVER drop large ranges blindly (e.g., "1-50"). Review each tag before deciding.
@@ -104,21 +102,20 @@ const BASE_INTRO_NO_REDUCE = (memoryEnabled: boolean): string => `${CTX_NOTE_GUI
 ${memoryGuidanceBlock(memoryEnabled)}Use \`ctx_search\` to search across project memories, indexed git commits, and this session's full conversation history (including compacted parts) from one query.
 Use \`ctx_expand\` to recover the raw conversation behind a summary under a \`## start-end · date · title\` heading inside \`<session-history>\` — pass the heading's start/end range when the summary is not enough (exact wording, values, error text).
 **Search before asking the user**: If you can't remember or don't know something that might have been discussed before or stored in project memory, use \`ctx_search\` before asking the user. Examples:
-- Can't remember where a related codebase or dependency lives → \`ctx_search(query="opencode source code path")\`
-- Forgot a prior architectural decision or constraint → \`ctx_search(query="why did we choose SQLite over postgres")\`
-- Need a config value, API key location, or environment detail → \`ctx_search(query="embedding provider configuration")\`
-- Looking for how something was implemented previously → \`ctx_search(query="how does the dreamer lease work")\`
-- Want to recall what was decided in an earlier conversation → \`ctx_search(query="dashboard release signing setup")\`
+- Can't remember where a related codebase or dependency lives → \`ctx_search(query="where is the opencode source code path?")\`
+- Forgot a prior architectural decision or constraint → \`ctx_search(query="why did we choose SQLite over postgres?")\`
+- Need a config value, API key location, or environment detail → \`ctx_search(query="how is the embedding provider configured?")\`
+- Looking for how something was implemented previously → \`ctx_search(query="how does the dreamer lease work?")\`
+- Want to recall what was decided in an earlier conversation → \`ctx_search(query="what did we decide about the dashboard release signing setup?")\`
 \`ctx_search\` returns ranked results from memories, git commits, and raw message history. Use message ordinals from results with \`ctx_expand\` to retrieve surrounding conversation context.
 ${TOOL_HISTORY_GUIDANCE}`;
 
 const LIGHT_SEARCH_RECOVERY = `Use ctx_search before asking the user about prior project context; it searches memories, commits, and compacted conversation. When a session-history summary lacks exact wording, values, errors, or reasoning, call ctx_expand with its heading range instead of guessing.`;
 
 const BASE_INTRO_LIGHT = (
-    protectedTags: number,
     memoryEnabled: boolean,
 ): string => `In primary sessions with ctx_reduce, the system tags messages and tool outputs as §N§ (for example §1§ and §42§); never imitate these prefixes in replies because only injected tag numbers are valid ctx_reduce handles.
-In primary sessions, NEVER narrate ctx_reduce; call it silently after extracting a spent output because it marks content discardable and QUEUES release rather than deleting immediately. The last ${protectedTags} tags stay protected until they age out. Use drop grammar "3-5", "1,2,9", or "1-5,8,12-15".
+In primary sessions, NEVER narrate ctx_reduce; call it silently after extracting a spent output because it marks content discardable and QUEUES release rather than deleting immediately. The newest token-mass window stays protected until displaced. Use drop grammar "3-5", "1,2,9", or "1-5,8,12-15".
 ${CTX_NOTE_GUIDANCE}
 ${memoryGuidanceBlock(memoryEnabled)}${LIGHT_SEARCH_RECOVERY}
 ${TOOL_HISTORY_GUIDANCE}
@@ -159,16 +156,14 @@ const TEMPORAL_AWARENESS_GUIDANCE = `\n**Temporal awareness**: User messages may
  * ctx_reduce mechanics. The `## Magic Context` marker is still present for
  * injection idempotency (system-prompt-hash.ts gates on it).
  */
-const SUBAGENT_REDUCE_INTRO = (
-    protectedTags: number,
-): string => `Messages and tool outputs are tagged with §N§ identifiers (e.g., §1§, §42§).
-Use \`ctx_reduce\` to drop tool outputs you have already finished with, keeping your working context lean. Syntax: "3-5", "1,2,9", or "1-5,8,12-15". The last ${protectedTags} tags are protected.
+const SUBAGENT_REDUCE_INTRO =
+    (): string => `Messages and tool outputs are tagged with §N§ identifiers (e.g., §1§, §42§).
+Use \`ctx_reduce\` to drop tool outputs you have already finished with, keeping your working context lean. Syntax: "3-5", "1,2,9", or "1-5,8,12-15". The newest token-mass window stays protected.
 Drop silently — do not narrate it. NEVER drop large ranges blindly (e.g., "1-50"); review each tag first. Do not drop user or assistant text messages — only large tool outputs are worth dropping.
 Older tool calls may show \`[dropped §N§]\` sentinels; that is normal context management, not a pattern to copy. ALWAYS make fresh real tool calls when you need data again; never fabricate or inline tool output.`;
 
-const SUBAGENT_REDUCE_INTRO_LIGHT = (
-    protectedTags: number,
-): string => `In bounded subagent sessions, the system tags messages and tool outputs as §N§; use only those IDs in ctx_reduce drop ranges such as "3-5", "1,2,9", or "1-5,8,12-15". The last ${protectedTags} tags stay protected.
+const SUBAGENT_REDUCE_INTRO_LIGHT =
+    (): string => `In bounded subagent sessions, the system tags messages and tool outputs as §N§; use only those IDs in ctx_reduce drop ranges such as "3-5", "1,2,9", or "1-5,8,12-15". Tags in the newest token-mass window stay protected.
 When dropping, do it silently and NEVER choose a large range before reviewing every tag; drop only finished large tool outputs, never user or assistant messages.
 If older calls show [dropped §N§], never copy that system sentinel because it is not reply syntax; make a fresh real tool call and never fabricate or inline output.`;
 
@@ -176,7 +171,7 @@ const CAVEMAN_COMPRESSION_WARNING = `\n**BEWARE**: History compression is on; ol
 
 export function buildMagicContextSection(
     _agent: string | null,
-    protectedTags: number,
+    _legacyProtectionCount: number,
     ctxReduceCallable = true,
     dreamerEnabled = false,
     temporalAwarenessEnabled = false,
@@ -194,10 +189,7 @@ export function buildMagicContextSection(
     // when ctx_reduce is off the subagent gets no §N§ prefix, so describing the
     // tag system would be noise.
     if (subagentMode) {
-        const intro =
-            preset === "light"
-                ? SUBAGENT_REDUCE_INTRO_LIGHT(protectedTags)
-                : SUBAGENT_REDUCE_INTRO(protectedTags);
+        const intro = preset === "light" ? SUBAGENT_REDUCE_INTRO_LIGHT() : SUBAGENT_REDUCE_INTRO();
         return `## Magic Context\n\n${intro}`;
     }
     const smartNoteGuidance = dreamerEnabled
@@ -227,7 +219,7 @@ export function buildMagicContextSection(
         return `## Magic Context\n\n${LONG_TERM_PARTNER_FRAME}\n${PARTNER_FRAME_CLOSER_NO_REDUCE}\n\n${BASE_INTRO_NO_REDUCE(memoryEnabled)}${smartNoteGuidance}${temporalGuidance}${cavemanWarning}${languageGuidance}`;
     }
     if (preset === "light") {
-        return `## Magic Context\n\n${LONG_TERM_PARTNER_FRAME}\n${PARTNER_FRAME_CLOSER_REDUCE_LIGHT}\n\n${BASE_INTRO_LIGHT(protectedTags, memoryEnabled)}${smartNoteGuidance}${temporalGuidance}${cavemanWarning}${languageGuidance}`;
+        return `## Magic Context\n\n${LONG_TERM_PARTNER_FRAME}\n${PARTNER_FRAME_CLOSER_REDUCE_LIGHT}\n\n${BASE_INTRO_LIGHT(memoryEnabled)}${smartNoteGuidance}${temporalGuidance}${cavemanWarning}${languageGuidance}`;
     }
-    return `## Magic Context\n\n${LONG_TERM_PARTNER_FRAME}\n${PARTNER_FRAME_CLOSER_REDUCE}\n\n${BASE_INTRO(protectedTags, memoryEnabled)}${smartNoteGuidance}${temporalGuidance}${cavemanWarning}\n${GENERIC_SECTION}\n\nPrefer many small targeted operations over one large blanket operation, and keep the working set tidy as routine maintenance.${languageGuidance}`;
+    return `## Magic Context\n\n${LONG_TERM_PARTNER_FRAME}\n${PARTNER_FRAME_CLOSER_REDUCE}\n\n${BASE_INTRO(memoryEnabled)}${smartNoteGuidance}${temporalGuidance}${cavemanWarning}\n${GENERIC_SECTION}\n\nPrefer many small targeted operations over one large blanket operation, and keep the working set tidy as routine maintenance.${languageGuidance}`;
 }

package/src/agents/permissions.test.ts

@@ -4,7 +4,6 @@ import {
     applyDisallowedTools,
     buildAllowOnlyPermission,
     HISTORIAN_ALLOWED_TOOLS,
-    SIDEKICK_ALLOWED_TOOLS,
 } from "./permissions";
 
 describe("buildAllowOnlyPermission", () => {
@@ -34,7 +33,7 @@ describe("buildAllowOnlyPermission", () => {
 
     it("never accidentally allows `task`, `bash`, or `edit` unless explicitly listed", () => {
         // The whole point of this helper is preventing historian / dreamer /
-        // sidekick from inheriting the primary-agent surface. Lock that in.
+        // hidden agents from inheriting the primary-agent surface. Lock that in.
         const perm = buildAllowOnlyPermission(["read"]);
         expect(perm.task).toBeUndefined();
         expect(perm.bash).toBeUndefined();
@@ -174,36 +173,6 @@ describe("DREAMER_DOCS_ALLOWED_TOOLS (maintain-docs)", () => {
     });
 });
 
-describe("SIDEKICK_ALLOWED_TOOLS", () => {
-    it("includes ctx_search but not ctx_memory for retrieval", () => {
-        // Sidekick is the /ctx-aug memory retriever. It searches memories without
-        // receiving the mutation-capable ctx_memory tool.
-        expect(SIDEKICK_ALLOWED_TOOLS).toContain("ctx_search");
-        expect(SIDEKICK_ALLOWED_TOOLS).not.toContain("ctx_memory");
-    });
-
-    it("includes `aft_outline` and `aft_zoom` for lightweight structural context", () => {
-        // Sidekick can pull file outline / symbol body when the user's
-        // prompt references a specific file or symbol, without dragging
-        // in whole files.
-        expect(SIDEKICK_ALLOWED_TOOLS).toContain("aft_outline");
-        expect(SIDEKICK_ALLOWED_TOOLS).toContain("aft_zoom");
-    });
-
-    it("does NOT include `read` (use aft_outline/aft_zoom for navigation instead)", () => {
-        // Sidekick should pull symbol-scoped views, not arbitrary file
-        // contents. If it needs full source it can use aft_zoom on a
-        // specific symbol.
-        expect(SIDEKICK_ALLOWED_TOOLS).not.toContain("read");
-    });
-
-    it("does NOT include `task` or any edit / bash / web tool", () => {
-        for (const denied of ["task", "bash", "edit", "write", "webfetch", "websearch"]) {
-            expect(SIDEKICK_ALLOWED_TOOLS).not.toContain(denied);
-        }
-    });
-});
-
 describe("integration: full hidden-agent permission shape", () => {
     it("historian permission object: `*` denied + read + aft_outline + aft_zoom + aft_search allowed", () => {
         const perm = buildAllowOnlyPermission(HISTORIAN_ALLOWED_TOOLS);
@@ -239,14 +208,4 @@ describe("integration: full hidden-agent permission shape", () => {
             aft_search: "allow",
         });
     });
-
-    it("sidekick permission object: `*` denied + read-only retrieval/navigation allowed", () => {
-        const perm = buildAllowOnlyPermission(SIDEKICK_ALLOWED_TOOLS);
-        expect(perm).toEqual({
-            "*": "deny",
-            ctx_search: "allow",
-            aft_outline: "allow",
-            aft_zoom: "allow",
-        });
-    });
 });

package/src/agents/permissions.ts

@@ -5,7 +5,7 @@ import { log } from "../shared/logger";
  *
  * # Why this exists
  *
- * Hidden agents (`historian`, `historian-editor`, `dreamer`, `sidekick`) are
+ * Hidden agents (`historian`, `historian-editor`, `dreamer`) are
  * registered with `mode: "primary"` and `hidden: true`: primary mode keeps
  * them out of OpenCode's general Task candidate list, while hidden keeps them
  * out of the UI picker. Those flags do NOT restrict which tools the spawned
@@ -63,13 +63,6 @@ import { log } from "../shared/logger";
  *     dreamer task variants. `task` / `edit` / `write` / `webfetch` /
  *     `websearch` remain denied — dreamer must not spawn subagents
  *     or commit changes.
- *
- *   - **sidekick**: `ctx_search`, plus the read-only AFT
- *     navigation tools `aft_outline` and `aft_zoom`. Sidekick's job
- *     is augmenting user prompts via memory retrieval — see
- *     `features/magic-context/sidekick/agent.ts`. AFT navigation lets
- *     it pull symbol-scoped structural context for prompts that
- *     reference a specific file or symbol.
  */
 
 /**
@@ -242,20 +235,6 @@ export function applyDisallowedTools(
 // read/write/bash, no memory) — both in `dreamer.ts` alongside the other
 // per-task allow-lists (mapper/classifier/etc).
 
-/**
- * Tools the sidekick agent needs. Sidekick is a read-only memory
- * retriever for `/ctx-aug` — it queries the project's memory store
- * through `ctx_search` only. Keep `ctx_memory` out of this list because
- * its OpenCode tool definition is mutation-capable for primary agents.
- *
- * Also allow `aft_outline` and `aft_zoom` so sidekick can pull
- * lightweight structural context about a file or symbol when the
- * user's prompt references it directly — token-efficient navigation
- * without dragging in whole files.
- *
- * Still denied: spawning subagents, edits, bash, web fetches.
- */
-
 export const DREAMER_RETROSPECTIVE_ALLOWED_TOOLS = ["ctx_search"] as const;
 
 /**
@@ -280,5 +259,3 @@ export const DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS = [
  * performed only when the compiled check runs through the host capability API.
  */
 export const SMART_NOTE_COMPILER_ALLOWED_TOOLS = [] as const;
-
-export const SIDEKICK_ALLOWED_TOOLS = ["ctx_search", "aft_outline", "aft_zoom"] as const;

package/src/config/agent-disable.ts

@@ -12,10 +12,6 @@ export function isDreamerRunnable(config: { dreamer?: { disable?: boolean } | nu
     return !!config.dreamer && config.dreamer.disable !== true;
 }
 
-export function isSidekickRunnable(config: { sidekick?: { disable?: boolean } | null }): boolean {
-    return !!config.sidekick && config.sidekick.disable !== true;
-}
-
 export function isHistorianRunnable(config: { historian?: { disable?: boolean } | null }): boolean {
     return config.historian?.disable !== true;
 }
@@ -43,7 +39,7 @@ function clonePlainObject(value: unknown): Record<string, unknown> | undefined {
 
 function migrateLegacyEnabledForAgent(args: {
     patched: Record<string, unknown>;
-    agentName: "dreamer" | "sidekick" | "historian";
+    agentName: "dreamer" | "historian";
     warnings: string[];
 }): void {
     const agent = clonePlainObject(args.patched[args.agentName]);
@@ -61,33 +57,21 @@ function migrateLegacyEnabledForAgent(args: {
         return;
     }
 
-    if (args.agentName === "dreamer") {
-        if (disable !== true && enabled === false) {
-            agent.disable = true;
-            args.warnings.push(
-                'Migrated "dreamer.enabled=false" → "dreamer.disable=true" in-memory (run doctor to persist). This now also disables manual /ctx-dream; for manual-only remove disable and set schedule="".',
-            );
-        }
-        // enabled=true is a no-op alias for the new default (disable=false); strip silently.
-        args.patched.dreamer = agent;
-        return;
-    }
-
     if (disable !== true && enabled === false) {
         agent.disable = true;
         args.warnings.push(
-            'Migrated "sidekick.enabled=false" → "sidekick.disable=true" in-memory (run doctor to persist).',
+            'Migrated "dreamer.enabled=false" → "dreamer.disable=true" in-memory (run doctor to persist). This now also disables manual /ctx-dream; for manual-only remove disable and set schedule="".',
         );
     }
-    // enabled=true is a no-op alias for the new default; strip silently.
-    args.patched.sidekick = agent;
+    // enabled=true is a no-op alias for the new default (disable=false); strip silently.
+    args.patched.dreamer = agent;
 }
 
 export function migrateLegacyAgentEnabledInMemory(
     rawConfig: Record<string, unknown>,
     warnings: string[],
 ): Record<string, unknown> {
-    const shouldPatch = ["dreamer", "sidekick", "historian"].some((key) => {
+    const shouldPatch = ["dreamer", "historian"].some((key) => {
         const agent = rawConfig[key];
         return (
             typeof agent === "object" &&
@@ -100,7 +84,6 @@ export function migrateLegacyAgentEnabledInMemory(
 
     const patched: Record<string, unknown> = { ...rawConfig };
     migrateLegacyEnabledForAgent({ patched, agentName: "dreamer", warnings });
-    migrateLegacyEnabledForAgent({ patched, agentName: "sidekick", warnings });
     migrateLegacyEnabledForAgent({ patched, agentName: "historian", warnings });
     return patched;
 }

package/src/config/index.test.ts

@@ -3,8 +3,10 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
+import { resolveEpochFloorForPass } from "../features/magic-context/storage-meta-persisted";
 import { buildOpenCodeConfigWarningBanner } from "../shared/config-warning-surface";
 import { resolveHistorianModel } from "../shared/model-resolution";
+import { Database } from "../shared/sqlite";
 import { createTestTempDir } from "../shared/test-temp-dir";
 import {
     getWindowOverlay,
@@ -13,6 +15,8 @@ import {
 } from "../shared/window-geometry";
 import { loadPluginConfig, loadPluginConfigDetailed } from "./index";
 import { resolveConfigProfile } from "./profiles";
+import { getProtectedTokensTierOverrides } from "./project-security";
+import { REMOVED_AGENT_CONFIG_WARNING } from "./removed-agent-config";
 import { DEFAULT_LOCAL_EMBEDDING_MODEL } from "./schema/magic-context";
 import { RUST_COMPACTION_OFF_WARNING } from "./transform-mode";
 
@@ -211,7 +215,7 @@ describe("loadPluginConfig — parse failure diagnostics", () => {
 
     it("keeps file parse and invalid-leaf warning classes distinct", () => {
         const parseResult = loadWithUserConfig('\\{\n  "cache_ttl": "1h"\n}');
-        const leafResult = loadWithUserConfig('{"protected_tags":"bogus"}');
+        const leafResult = loadWithUserConfig('{"protected_tokens":"bogus"}');
 
         expect(parseResult.configWarningDetails?.[0]?.warningClass).toBe("file-parse");
         expect(
@@ -747,18 +751,26 @@ describe("loadPluginConfig — legacy agent enabled migration", () => {
         expect(warnings).not.toContain("dreamer.enabled");
     });
 
-    it("migrates sidekick.enabled=false (loud) and removes sidekick.enabled=true (silent)", () => {
-        const disabled = loadWithUserConfig(JSON.stringify({ sidekick: { enabled: false } }));
-        expect(disabled.sidekick?.disable).toBe(true);
-        expect(disabled.configWarnings?.join("\n")).toContain(
-            'Migrated "sidekick.enabled=false" → "sidekick.disable=true" in-memory (run doctor to persist).',
+    it("ignores the removed agent block with one warning", () => {
+        const removedKey = ["side", "kick"].join("");
+        const result = loadWithUserConfig(
+            JSON.stringify({
+                profile: "work",
+                [removedKey]: { enabled: false, model: "example/model" },
+                profiles: {
+                    work: {
+                        [removedKey]: { model: "example/profile-model" },
+                        historian: { opencode: { model: "example/historian" } },
+                    },
+                },
+            }),
         );
 
-        const enabled = loadWithUserConfig(JSON.stringify({ sidekick: { enabled: true } }));
-        expect(enabled.sidekick?.disable).toBeUndefined();
-        expect("enabled" in (enabled.sidekick as Record<string, unknown>)).toBe(false);
-        const enabledWarnings = enabled.configWarnings?.join("\n") ?? "";
-        expect(enabledWarnings).not.toContain("sidekick.enabled");
+        expect(removedKey in result).toBe(false);
+        expect(result.historian?.opencode?.model).toBe("example/historian");
+        expect(result.configWarnings?.filter((warning) => warning.includes(removedKey))).toEqual([
+            `[config] ${REMOVED_AGENT_CONFIG_WARNING}`,
+        ]);
     });
 
     it("removes invalid historian.enabled and applies conflict rules", () => {
@@ -766,13 +778,11 @@ describe("loadPluginConfig — legacy agent enabled migration", () => {
             JSON.stringify({
                 historian: { enabled: false },
                 dreamer: { enabled: false, disable: false },
-                sidekick: { enabled: true, disable: true },
             }),
         );
 
         expect(result.historian).toEqual({ two_pass: false, disallowed_tools: [] });
         expect(result.dreamer?.disable).toBe(true);
-        expect(result.sidekick?.disable).toBe(true);
         expect(result.configWarnings?.join("\n")).toContain(
             'Removed invalid "historian.enabled" in-memory (run doctor to persist).',
         );
@@ -944,6 +954,109 @@ describe("loadPluginConfig — user-only settings", () => {
 });
 
 describe("loadPluginConfig — project compaction trust boundary", () => {
+    it("keeps protected_tokens scalar-only at both tiers and preserves the user scalar on an invalid project leaf", () => {
+        const vectors = [
+            {
+                name: "user scalar",
+                user: { protected_tokens: 20_000 },
+                project: {},
+                expected: 20_000,
+                warns: false,
+            },
+            {
+                name: "user object",
+                user: { protected_tokens: { default: 20_000 } },
+                project: {},
+                expected: undefined,
+                warns: true,
+            },
+            {
+                name: "project scalar",
+                user: {},
+                project: { protected_tokens: 20_000 },
+                expected: 20_000,
+                warns: false,
+            },
+            {
+                name: "project object",
+                user: {},
+                project: { protected_tokens: { default: 20_000 } },
+                expected: undefined,
+                warns: true,
+            },
+            {
+                name: "invalid project object over user scalar",
+                user: { protected_tokens: 25_000 },
+                project: { protected_tokens: { default: 30_000 } },
+                expected: 25_000,
+                warns: true,
+            },
+        ] as const;
+
+        for (const vector of vectors) {
+            const result = loadWithUserAndProjectConfig(
+                JSON.stringify(vector.user),
+                JSON.stringify(vector.project),
+            );
+            expect(result.protected_tokens, vector.name).toBe(vector.expected);
+            const warned = (result.configWarnings ?? []).some((warning) =>
+                warning.includes("protected_tokens"),
+            );
+            expect(warned, vector.name).toBe(vector.warns);
+        }
+    });
+
+    it("rejects a project protected_tokens floor below the derived floor once geometry is known", () => {
+        const result = loadWithUserAndProjectConfig(
+            JSON.stringify({}),
+            JSON.stringify({ protected_tokens: 4_000 }),
+        );
+        const db = new Database(":memory:");
+        db.exec(`
+            CREATE TABLE session_meta (
+                session_id TEXT PRIMARY KEY,
+                harness TEXT NOT NULL DEFAULT 'opencode',
+                last_response_time INTEGER NOT NULL DEFAULT 0,
+                cache_ttl TEXT NOT NULL DEFAULT '5m',
+                counter INTEGER NOT NULL DEFAULT 0,
+                last_nudge_tokens INTEGER NOT NULL DEFAULT 0,
+                last_nudge_band TEXT NOT NULL DEFAULT '',
+                last_transform_error TEXT NOT NULL DEFAULT '',
+                is_subagent INTEGER NOT NULL DEFAULT 0,
+                last_context_percentage REAL NOT NULL DEFAULT 0,
+                last_input_tokens INTEGER NOT NULL DEFAULT 0,
+                observed_safe_input_tokens INTEGER NOT NULL DEFAULT 0,
+                cache_alert_sent INTEGER NOT NULL DEFAULT 0,
+                times_execute_threshold_reached INTEGER NOT NULL DEFAULT 0,
+                compartment_in_progress INTEGER NOT NULL DEFAULT 0,
+                system_prompt_hash TEXT NOT NULL DEFAULT '',
+                cleared_reasoning_through_tag INTEGER NOT NULL DEFAULT 0,
+                protected_tokens_effective INTEGER,
+                protected_tokens_pre_snapshot TEXT
+            )
+        `);
+        const warnings: string[] = [];
+        const tierOverrides = getProtectedTokensTierOverrides(result);
+
+        const resolved = resolveEpochFloorForPass(db, "loader-derived-floor", {
+            tierOverrides,
+            usableSoft: 200_000,
+            isCacheBustingPass: true,
+            onRejectedProjectOverride: (warning) => warnings.push(warning),
+        });
+        resolveEpochFloorForPass(db, "loader-derived-floor-next", {
+            tierOverrides,
+            usableSoft: 200_000,
+            isCacheBustingPass: true,
+            onRejectedProjectOverride: (warning) => warnings.push(warning),
+        });
+
+        expect(resolved.floor).toBe(16_000);
+        expect(warnings).toHaveLength(1);
+        expect(warnings[0]).toContain("protected_tokens=4000");
+        db.close();
+    });
+
     it("ignores a lower project execute_threshold_percentage with a warning", () => {
         const result = loadWithUserAndProjectConfig(
             JSON.stringify({ execute_threshold_percentage: 60 }),
@@ -1176,7 +1289,6 @@ describe("loadPluginConfig — user-owned model profiles", () => {
                                 ],
                             },
                         },
-                        sidekick: { model: "anthropic/work-sidekick" },
                     },
                     personal: {
                         historian: { opencode: { model: "anthropic/personal-historian" } },
@@ -1200,7 +1312,6 @@ describe("loadPluginConfig — user-owned model profiles", () => {
         expect(result.dreamer?.opencode?.fallback_models).toEqual([
             { model: "openai/work-dreamer-fallback", variant: "medium" },
         ]);
-        expect(result.sidekick?.model).toBe("anthropic/work-sidekick");
     });
 
     it("uses project selection over user selection and falls back to the base on an unknown name", () => {

package/src/config/index.ts

@@ -25,12 +25,14 @@ import { migrateDreamerV2 } from "./migrate-dreamer-v2";
 import { migrateLegacyExperimental } from "./migrate-experimental";
 import { resolveConfigProfile } from "./profiles";
 import {
+    attachProtectedTokensTierOverrides,
     constrainProjectThresholdOverrides,
     dropInheritedEmbeddingKeyOnRedirect,
     stripUnsafeProjectConfigFields,
 } from "./project-security";
 import { pruneNestedConfigLeaf } from "./prune-config-leaf";
 import { loadRawConfigFile } from "./raw-loader";
+import { stripRemovedAgentConfig } from "./removed-agent-config";
 import { type MagicContextConfig, MagicContextConfigSchema } from "./schema/magic-context";
 import { resolveTransformMode } from "./transform-mode";
 import { substituteConfigVariables } from "./variable";
@@ -319,14 +321,39 @@ function redactConfigValue(value: unknown): string {
     return typeof value;
 }
 
-function parsePluginConfig(
+let warnedProtectedTagsDeprecation = false;
+
+export function resetProtectedTagsDeprecationWarningForTest(): void {
+    warnedProtectedTagsDeprecation = false;
+}
+
+export function warnProtectedTagsDeprecationOnce(): void {
+    if (!warnedProtectedTagsDeprecation) {
+        warnedProtectedTagsDeprecation = true;
+        console.warn(
+            "[magic-context] protected_tags is deprecated and ignored; use protected_tokens instead.",
+        );
+    }
+}
+
+export function parsePluginConfig(
     rawConfig: Record<string, unknown>,
     recoveredTopLevelKeys: string[] = [],
 ): MagicContextPluginConfig & { configWarnings?: string[] } {
     // Pre-Zod shim: reshape legacy experimental.* graduated keys so the user's
     // opt-in/out state survives upgrades even when they never run `doctor`.
     const preMigrationWarnings: string[] = [];
-    const migratedExperimental = migrateLegacyExperimental(rawConfig, preMigrationWarnings);
+    const configWithoutRemovedAgent = stripRemovedAgentConfig(rawConfig, preMigrationWarnings);
+    if (Object.hasOwn(rawConfig, "protected_tags")) {
+        warnProtectedTagsDeprecationOnce();
+        preMigrationWarnings.push(
+            "protected_tags is deprecated and ignored; use protected_tokens instead.",
+        );
+    }
+    const migratedExperimental = migrateLegacyExperimental(
+        configWithoutRemovedAgent,
+        preMigrationWarnings,
+    );
     // Dreamer v2: convert the legacy v1 dreamer shape (window schedule, tasks
     // array, user_memories/pin_key_files blocks) into the per-task `tasks` record.
     // Runs AFTER migrate-experimental so experimental.user_memories (already
@@ -397,7 +424,7 @@ function parsePluginConfig(
     const patched: Record<string, unknown> = { ...rawConfig };
     for (const key of errorPaths) {
         recoveredTopLevelKeys.push(key);
-        const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";
+        const isAgentConfig = key === "historian" || key === "dreamer";
 
         // For object-valued keys (including agent harness blocks), prune only invalid
         // nested leaves and keep valid siblings, so one bad field does not remove
@@ -610,6 +637,8 @@ export function loadPluginConfigDetailed(directory: string): LoadResultDetailed
               : null;
 
     const allWarnings: string[] = [];
+    const removedConfigWarnings: string[] = [];
+    const userRaw = stripRemovedAgentConfig(userLoaded?.config ?? {}, removedConfigWarnings);
 
     if (userLegacyFallback.source) {
         allWarnings.push(
@@ -638,18 +667,20 @@ export function loadPluginConfigDetailed(directory: string): LoadResultDetailed
     let projectRaw: Record<string, unknown> = {};
     if (projectLoaded) {
         allWarnings.push(...projectLoaded.warnings.map((w) => `[project config] ${w}`));
-        projectRaw = { ...projectLoaded.config };
+        projectRaw = stripRemovedAgentConfig(projectLoaded.config, removedConfigWarnings);
         for (const warning of stripUnsafeProjectConfigFields(projectRaw)) {
             allWarnings.push(`[project config] ${warning}`);
         }
     }
 
+    allWarnings.push(...removedConfigWarnings.map((warning) => `[config] ${warning}`));
+
     // Resolve profiles at the single user→project merge choke point. The profile
     // definition is parsed from the trusted user tier, then its validated model
     // overlay is merged before the untrusted project config. The raw selector is
     // consumed here; only the resolved name remains as status metadata.
     const profileResolution = resolveConfigProfile({
-        userRaw: userLoaded?.config ?? {},
+        userRaw,
         projectRaw,
     });
     allWarnings.push(...profileResolution.warnings.map((warning) => `[config] ${warning}`));
@@ -684,6 +715,10 @@ export function loadPluginConfigDetailed(directory: string): LoadResultDetailed
     const recoveredTopLevelKeys: string[] = [];
     const cacheTtlConfigured = Object.hasOwn(mergedRaw, "cache_ttl");
     const config = parsePluginConfig(mergedRaw, recoveredTopLevelKeys);
+    attachProtectedTokensTierOverrides(config, {
+        trustedUser: trustedBaseConfig.protected_tokens,
+        project: projectLoaded ? profileResolution.projectBase.protected_tokens : undefined,
+    });
     if (profileResolution.activeProfile) config.profile = profileResolution.activeProfile;
     setOutputReserveConfig(config.output_reserve);
     setWindowOverlayPath(config.models?.window_overlay_path);
@@ -700,7 +735,7 @@ export function loadPluginConfigDetailed(directory: string): LoadResultDetailed
 
     const resolvedTransformMode = resolveTransformMode({
         configured: config.transform_mode,
-        userTierHasSubc: hasUserTierSubcConfig(userLoaded?.config),
+        userTierHasSubc: hasUserTierSubcConfig(userRaw),
         compactionEnabled: isCompactionEnabled(config),
     });
     config.transform_mode = resolvedTransformMode.mode;

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

@@ -126,6 +126,10 @@ const KNOWN_SLOTS: Record<string, KnownSlot> = {
         classification: "VERDICT",
         reason: "Saved: the promise has a 60-second TTL, including rejections, and discovery is retried after expiry.",
     },
+    "packages/plugin/src/shared/opencode-db-path.ts:lastReadFailure": {
+        classification: "DIAGNOSTIC",
+        reason: "Most-recent OpenCode DB read diagnostic: a successful open clears it, and path discovery re-probes after disappearance.",
+    },
     "packages/plugin/src/shared/models-dev-cache.ts:authRewarmDone": {
         classification: "VERDICT",
         reason: "Saved: refreshModelLimitsAfterAuthOnce resets the latch when its warm fails.",