@cortexkit/opencode-magic-context 0.49.23 → 0.49.25

package/README.md

@@ -368,32 +368,6 @@ bun run format      # Format (Biome)
 
 Dream execution requires a live OpenCode server (the dreamer creates ephemeral child sessions). Use `/ctx-dream` inside OpenCode for on-demand maintenance.
 
-### Mutation catalogue
-
-A passing safety test proves little until it has been seen to fail. [`mutations.toml`](mutations.toml) is the checked-in catalogue: each row deliberately breaks one guard in production code and names the test that must fail because of it, so a guard cannot quietly stop guarding. A row earns its place by guarding a silent, costly failure: a prompt-cache bust, a refusal that must fail closed, a wire contract, crash safety, data loss, file permissions. Every exactly-once guard (a lease, a compare-and-set clear) has at least one row through the real production path. Style and cosmetics do not get rows.
-
-The pinned [`ck-mutate`](https://github.com/cortexkit/commons/tree/7d08e73722fa3e79bbcc2607753978ab768f1c6b/crates/cortexkit-mutate) runner replays it from a clean tree: it checks that each named test passes, applies the break, requires the test to fail, and restores the source byte for byte.
-
-```sh
-cargo install --locked --git https://github.com/cortexkit/commons --rev 7d08e73722fa3e79bbcc2607753978ab768f1c6b cortexkit-mutate
-bun install --frozen-lockfile
-ck-mutate check                       # anchors match exactly once; cargo test names exist
-ck-mutate run --all                   # every row (slow: the Rust rows rebuild mc-module)
-ck-mutate run --diff origin/master    # only the rows a change touches
-ck-mutate run --only ts-schema-fence-refuses-newer-database
-```
-
-Every row must report CAUGHT. [`mutations.yml`](.github/workflows/mutations.yml) replays the rows a pull request (or a `train/**` push) touches, the full catalogue on every push to master, and the full catalogue with `--broad` nightly. Never `git checkout` a file while a replay runs: it removes the mutation and fakes a survivor.
-
-To add a row:
-
-1. Pick the production line that *is* the guard and copy `old` from the file, never from memory. Make `new` the smallest edit that removes the protection (`if (false)`, `return true`, a dropped condition), not an edit that breaks compilation.
-2. Find the test that should catch it. Apply the edit by hand, run that test file, and confirm the test goes red for the guarded reason, then restore the file. If nothing goes red, that is a finding: add the missing test first, in its own commit.
-3. Add the row. Bun tests are `command` rows: copy an existing row and set `expect_red` to the anchored `-t` regex of the full test name (describe names and test name joined by spaces, regex metacharacters escaped, each space written `\s`). Rust tests in mc-module are `command` rows running `cargo test --lib -- --exact`; small Rust targets are `cargo` rows with `only = true`. Add `expect_message` (a substring, or `/regex/`) whenever the test could also fail for an unrelated reason.
-4. Run `ck-mutate check`, then `ck-mutate run --only <id>`, and commit the row only once it reports CAUGHT.
-
-A row that stops being caught is a finding to fix, not a row to delete.
-
 ---
 
 ### Cache-bust sentinel

package/dist/agents/permissions.d.ts

@@ -75,9 +75,14 @@ export declare function buildAllowOnlyPermission(allowedTools: readonly string[]
  * OpenCode accepts either a whole-permission action or a pattern map for
  * `permission.task`; its visibility evaluator uses the last matching rule.
  * Normalize the whole-permission form, retain unrelated user rules, then append
- * our exact agent-id denies. When the ambient task policy has a wildcard deny,
- * re-emit that wildcard after the named denies so the Task tool is hidden rather
- * than shown as a callable-but-refused tool.
+ * our exact agent-id denies. When the ambient task policy is a wildcard deny
+ * whose only companions are our own appended agent-id denies, re-emit that
+ * wildcard after the named denies so the Task tool is hidden rather than shown
+ * as a callable-but-refused tool. When the wildcard deny sits next to any of
+ * the agent's own rules (the deny-by-default-with-exceptions shape), keep the
+ * agent's own ordering untouched: OpenCode resolves with the last matching
+ * rule, so moving the wildcard to the end there would override every named
+ * allow and empty the Task tool (#777).
  */
 export declare function denyTaskRoutingToAgents(permission: unknown, internalAgentIds: readonly string[]): Record<string, unknown>;
 /**

package/dist/agents/permissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/agents/permissions.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AAEH;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACpC,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAC3C,UAAU,CAAC,EAAE,MAAM,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAoBlC;AAYD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,OAAO,EACnB,gBAAgB,EAAE,SAAS,MAAM,EAAE,GACpC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgCzB;AAgBD;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CACzC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACrD,gBAAgB,EAAE,SAAS,MAAM,EAAE,GACpC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAczC;AAED,wFAAwF;AACxF,eAAO,MAAM,uBAAuB,aAAc,CAAC;AAEnD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,UAAU,EAAE,SAAS,MAAM,EAAE,GAC9B,SAAS,MAAM,EAAE,CAGnB;AAQD,eAAO,MAAM,mCAAmC,yBAA0B,CAAC;AAE3E;;;;;GAKG;AACH,eAAO,MAAM,yCAAyC,0FAQ5C,CAAC;AAEX;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,aAAc,CAAC"}
+{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/agents/permissions.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AAEH;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACpC,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAC3C,UAAU,CAAC,EAAE,MAAM,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAoBlC;AAYD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,OAAO,EACnB,gBAAgB,EAAE,SAAS,MAAM,EAAE,GACpC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2CzB;AAgBD;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CACzC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACrD,gBAAgB,EAAE,SAAS,MAAM,EAAE,GACpC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAczC;AAED,wFAAwF;AACxF,eAAO,MAAM,uBAAuB,aAAc,CAAC;AAEnD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,UAAU,EAAE,SAAS,MAAM,EAAE,GAC9B,SAAS,MAAM,EAAE,CAGnB;AAQD,eAAO,MAAM,mCAAmC,yBAA0B,CAAC;AAE3E;;;;;GAKG;AACH,eAAO,MAAM,yCAAyC,0FAQ5C,CAAC;AAEX;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,aAAc,CAAC"}

package/dist/auto-search-worker.js

@@ -24,12 +24,12 @@ var [
   { Database, registerSqliteDiagnosticSink },
   { log }
 ] = await Promise.all([
-  import("./embedding-backfill-dtke6tck.js"),
+  import("./embedding-backfill-vddgmem3.js"),
   import("./embedding-cache-mgyr73ef.js"),
   import("./storage-memory-e6a7mb0k.js"),
-  import("./project-embedding-registry-hn529988.js"),
-  import("./search-hea079d7.js"),
-  import("./compartment-chunk-embedding-he60aaa2.js"),
+  import("./project-embedding-registry-rstzmb60.js"),
+  import("./search-84zfqeky.js"),
+  import("./compartment-chunk-embedding-eypvn607.js"),
   import("./embedding-activity-g1dhes6g.js"),
   import("./harness-e4avh192.js"),
   import("./sqlite-zdgm52sv.js"),

package/dist/chunk-embedding-write-worker.js

@@ -16,14 +16,14 @@ import"./index-g2q4htwp.js";
 import"./index-h7tgn49j.js";
 import"./index-wfybj1dw.js";
 import"./index-v0p37hm2.js";
-import"./index-jfem3dgz.js";
-import"./index-x6cbrv9h.js";
+import"./index-7tdtpqrg.js";
+import"./index-szf8r0ba.js";
 import {
   replaceCompartmentChunkEmbeddings2,
   recordChunkEmbedBackoff2,
   loadUnembeddedSessionChunkCandidates2,
   countUnembeddedSessionCompartments2
-} from "./index-m32esgmj.js";
+} from "./index-3d5wnkq7.js";
 import {
   recordSessionProjectIdentity,
   acquireGitSweepLease,
@@ -35,12 +35,12 @@ import"./index-c7phnbvk.js";
 import {
   LATEST_SUPPORTED_VERSION,
   enforceSchemaFence
-} from "./index-a9zvn5fe.js";
+} from "./index-q7ywt6xt.js";
 import"./index-9q1g3c5q.js";
 import"./index-x9k3mqrf.js";
 import"./index-fr0wbhdn.js";
 import"./index-58e3y90n.js";
-import"./index-j76ah6d7.js";
+import"./index-cfaet9cg.js";
 import"./index-t5pck3ss.js";
 
 // src/features/magic-context/chunk-embedding-write-worker.ts

package/dist/{compartment-chunk-embedding-he60aaa2.js → compartment-chunk-embedding-eypvn607.js}

@@ -24,10 +24,10 @@ import {
   countSessionCompartmentEmbedCoverage2,
   countSessionCompartmentEmbedCoveragePolite2,
   countUnembeddedSessionCompartmentsPolite2
-} from "./index-m32esgmj.js";
+} from "./index-3d5wnkq7.js";
 import"./index-wfybj1dw.js";
-import"./index-x6cbrv9h.js";
-import"./index-jfem3dgz.js";
+import"./index-szf8r0ba.js";
+import"./index-7tdtpqrg.js";
 import"./index-v0p37hm2.js";
 import"./index-t5pck3ss.js";
 import"./index-b88dwwrh.js";

package/dist/{conflict-warning-hook-2r32hyx6.js → conflict-warning-hook-a27bhggg.js}

@@ -4,15 +4,15 @@ import {
   cleanupConflictWarnings2,
   sendSchemaFenceWarning2,
   sendStartupAnnouncement2
-} from "./index-1gtfne2c.js";
+} from "./index-2haxh8h3.js";
 import"./index-4pnsgvfk.js";
 import"./index-sd3egckz.js";
-import"./index-66eby7hx.js";
+import"./index-jcr6pe7z.js";
 import"./index-qt1qqasc.js";
-import"./index-ksq50rg0.js";
+import"./index-c9zrgcnt.js";
 import"./index-rrv26qjz.js";
 import"./index-58e3y90n.js";
-import"./index-jfem3dgz.js";
+import"./index-7tdtpqrg.js";
 import"./index-v0p37hm2.js";
 import"./index-gzy5w8ya.js";
 import"./index-h7tgn49j.js";

package/dist/{context-j7hp43a0.js → context-keb00be8.js}

@@ -59,7 +59,7 @@ import {
   rebaseSessionCoordinatesAsync,
   resolveOpenCodeProtectedTailBoundary,
   getActiveCompartmentRun
-} from "./index-y76rhsnr.js";
+} from "./index-0s8454t2.js";
 import"./index-sd3egckz.js";
 import {
   getHarness2
@@ -151,7 +151,7 @@ import {
   applyJsonSchemaParameterDescriptions,
   MagicContextRpcServer,
   subagentTemperature
-} from "./index-11gzxvf4.js";
+} from "./index-y6xpzjzr.js";
 import {
   resolveHistorianModel2
 } from "./index-5kym00ag.js";
@@ -166,7 +166,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./index-a9zvn5fe.js";
+} from "./index-q7ywt6xt.js";
 import {
   setHomeProjectPermission,
   resolveProjectIdentityForSession,
@@ -174,14 +174,13 @@ import {
 } from "./index-kq5w68dp.js";
 import"./index-c7phnbvk.js";
 import {
-  BoundedSessionMap,
   advanceSessionActivity,
   backfillSessionActivity,
   gaDatabasePath,
   RAW_MESSAGE_TYPES,
   V2StoreReaderPool,
   V2StoreReader
-} from "./index-mnnkgq0q.js";
+} from "./index-awcftgmx.js";
 import"./index-v0p37hm2.js";
 import {
   inRootAsyncContext2,
@@ -191,7 +190,7 @@ import {
   withAsyncPrivilegedWriter2
 } from "./index-gzy5w8ya.js";
 import"./index-cpjk5jd2.js";
-import"./index-jfem3dgz.js";
+import"./index-7tdtpqrg.js";
 import"./index-58e3y90n.js";
 import"./index-1zx87sdm.js";
 import {
@@ -208,7 +207,7 @@ import {
   estimateTokens
 } from "./index-b88dwwrh.js";
 import"./index-x9k3mqrf.js";
-import"./index-ksq50rg0.js";
+import"./index-c9zrgcnt.js";
 import {
   needsBlockedRead,
   markHostUnservedRow,
@@ -244,28 +243,29 @@ import {
   cleanUserText2,
   readRawSessionMessageIdOrdinalsForRange2,
   readRawSessionMessageOrdinalById2
-} from "./index-mnhcdfxg.js";
+} from "./index-yrrsp47d.js";
 import {
-  getCurrentToolSetHash,
-  recordToolDefinition
-} from "./index-j76ah6d7.js";
-import"./index-x6cbrv9h.js";
+  BoundedSessionMap,
+  recordToolDefinitionSet,
+  getCurrentToolSetHash
+} from "./index-cfaet9cg.js";
+import"./index-szf8r0ba.js";
 import"./index-wfybj1dw.js";
 import {
   deleteChunkEmbedBackoffForSession2
-} from "./index-m32esgmj.js";
+} from "./index-3d5wnkq7.js";
 import {
   invalidateAutoEmbedSession,
   clearEmbedSessionState,
   retainProjectEmbedding2
-} from "./index-zy67whjr.js";
+} from "./index-z05n7702.js";
 import"./index-fr0wbhdn.js";
 import"./index-9q1g3c5q.js";
 import"./index-fb3zxn06.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode
-} from "./index-3svaejkh.js";
+} from "./index-z928hmnp.js";
 import {
   createTagger,
   cavemanWordRulesForLanguage,
@@ -274,29 +274,29 @@ import {
   EmergencyFailClosedError,
   DegradedPassRefusalError,
   isSyntheticHeadMessage2
-} from "./index-1kbznkft.js";
+} from "./index-axjgxeww.js";
 import"./index-qgh1qwjj.js";
 import"./index-qt1qqasc.js";
 import"./index-kfyb3k6n.js";
 import"./index-4dhv7mqz.js";
 import"./index-51rdvtkz.js";
-import"./index-rxqr723x.js";
+import"./index-t6j3qxnd.js";
 import"./index-jjvbk92s.js";
 import {
   pushNotification2,
   isTuiConnected2
 } from "./index-x8a7jmkh.js";
 import"./index-rrv26qjz.js";
-import"./index-66eby7hx.js";
-import"./index-syaazvy2.js";
-import"./index-ffzhwfzy.js";
+import"./index-jcr6pe7z.js";
+import"./index-n18sch77.js";
+import"./index-zzrzjnx5.js";
 import"./index-gp3kcpc4.js";
 import {
   detectConflicts
 } from "./index-4pnsgvfk.js";
 import"./index-fmsr7v69.js";
 import"./index-kaqs6h31.js";
-import"./index-j32jj2t8.js";
+import"./index-bhyksfyy.js";
 import {
   isDreamerRunnable,
   isSmartNoteSurfaceAvailable,
@@ -4985,12 +4985,18 @@ function applyV2PromptSurfaceTools(draft, runtime, config, smartNotesEnabled = t
 function recordV2ToolDefinitions(draft) {
   if (!draft.tools)
     return;
+  const tools = [];
   for (const [id, tool] of Object.entries(draft.tools)) {
     if (!tool)
       continue;
     recordToolParameters(id, tool.input);
-    recordToolDefinition(draft.model.providerID, draft.model.id, draft.agent, id, typeof tool.description === "string" ? tool.description : "", tool.input);
+    tools.push({
+      id,
+      description: typeof tool.description === "string" ? tool.description : "",
+      parameters: tool.input
+    });
   }
+  recordToolDefinitionSet(draft.model.providerID, draft.model.id, draft.agent, tools, draft.sessionID);
 }
 async function applyV2SystemPrompt(systemPrompt, draft) {
   resolveCtxReduceAvailabilityFromMessages(draft.sessionID, draft.messages.map((message) => ({
@@ -5643,7 +5649,7 @@ async function registerContext(context) {
       projectDirectory: directory,
       hardSignals: {
         systemHash: state.systemPromptHash ?? "",
-        toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent),
+        toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent, draft.sessionID),
         modelKey: `${draft.model.providerID}/${draft.model.id}`,
         cacheExpired: false,
         lastResponseTime: state.lastResponseTime
@@ -6031,7 +6037,7 @@ async function registerContext(context) {
           const model = liveModels.get(sessionId);
           if (!model)
             return "";
-          return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId));
+          return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId), sessionId);
         },
         channel1StateBySession: channel1,
         historyRefreshSessions,

package/dist/{embedding-backfill-dtke6tck.js → embedding-backfill-vddgmem3.js}

@@ -1,17 +1,17 @@
 import {
   ensureMemoryEmbeddings2
-} from "./index-rxqr723x.js";
-import"./index-zy67whjr.js";
+} from "./index-t6j3qxnd.js";
+import"./index-z05n7702.js";
 import"./index-4dhv7mqz.js";
 import"./index-qt1qqasc.js";
 import"./index-51rdvtkz.js";
 import"./index-nxrsns5x.js";
 import"./index-kfyb3k6n.js";
-import"./index-m32esgmj.js";
+import"./index-3d5wnkq7.js";
 import"./index-wfybj1dw.js";
 import"./index-kq5w68dp.js";
-import"./index-x6cbrv9h.js";
-import"./index-jfem3dgz.js";
+import"./index-szf8r0ba.js";
+import"./index-7tdtpqrg.js";
 import"./index-v0p37hm2.js";
 import"./index-t5pck3ss.js";
 import"./index-b88dwwrh.js";

package/dist/features/magic-context/dreamer/primer-seed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"primer-seed.d.ts","sourceRoot":"","sources":["../../../../src/features/magic-context/dreamer/primer-seed.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAA4B,KAAK,MAAM,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEjG;;0BAE0B;AAC1B,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAE3C,MAAM,WAAW,UAAU;IACvB;mDAC+C;IAC/C,IAAI,EAAE,KAAK,GAAG,aAAa,CAAC;IAC5B,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,gFAAgF;IAChF,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAsED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACvC,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,MAAM,GACf,eAAe,GAAG,SAAS,CAI7B;AAgDD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAMxE;AAED,uGAAuG;AACvG,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAuB5F"}
+{"version":3,"file":"primer-seed.d.ts","sourceRoot":"","sources":["../../../../src/features/magic-context/dreamer/primer-seed.ts"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAA4B,KAAK,MAAM,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEjG;;0BAE0B;AAC1B,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAE3C,MAAM,WAAW,UAAU;IACvB;mDAC+C;IAC/C,IAAI,EAAE,KAAK,GAAG,aAAa,CAAC;IAC5B,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,gFAAgF;IAChF,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AA0ED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACvC,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,MAAM,GACf,eAAe,GAAG,SAAS,CAI7B;AAgDD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAMxE;AAED,uGAAuG;AACvG,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAuB5F"}

package/dist/features/magic-context/tool-definition-tokens.d.ts

@@ -1,89 +1,145 @@
 /**
  * Tool-definition token measurement store.
  *
- * OpenCode's `tool.definition` hook fires once per tool per
- * `ToolRegistry.tools()` call, with `{ toolID }` as input and
- * `{ description, parameters }` as output. Crucially the hook input does NOT
- * carry `sessionID` — the tool set is computed per
- * `{providerID, modelID, agent}` combination, independent of session.
+ * Every provider request carries the definitions of the tools offered on it,
+ * and those definitions take room in the context window. This store measures
+ * them so estimates of a request's size can include them. Each tool's
+ * description + JSON-schema parameters is tokenized with the same Claude
+ * tokenizer used everywhere else in the plugin and stored per tool under a
+ * `${providerID}/${modelID}/${agentName}` route key.
  *
- * We measure each tool's description + JSON-schema parameters, tokenize with
- * the same Claude tokenizer used everywhere else in the plugin, and store
- * per-tool totals keyed by `${providerID}/${modelID}/${agentName}`. Inner map
- * keys on `toolID` so every hook fire idempotently overwrites its own slot
- * (same tool set on each turn → same key → same measured total).
+ * What a total counts: the tools of the current request. A tool the host
+ * stopped offering, or a tool another session was offered, must not add to it
+ * for long, and a tool the request does carry must never be left out. The
+ * totals feed the 95% size refusal and the replay fits as a trusted figure, so
+ * counting too few tools is the dangerous direction; counting a few too many
+ * for a while is the safe one. How the current request's tools are known
+ * depends on the host:
  *
- * Consumers (RPC sidebar/status handlers) look up the active session's
- * measurement via `getMeasuredToolDefinitionTokens(providerID, modelID,
- * agentName)`. Returns `undefined` when the key has never been measured — the
- * caller is expected to fall back to residual math or show zero.
+ * - OpenCode 1 fires its `tool.definition` hook once per tool per
+ *   `ToolRegistry.tools()` call (once per request, all tools at once, before
+ *   the messages transform of that request), with `{ toolID }` as input and
+ *   no session and no "last tool" signal. Calls on one route can run at the
+ *   same time and their fires interleave, so fires cannot be grouped into
+ *   requests. Instead a route's total counts every tool fired within
+ *   `ACTIVITY_WINDOW_MS` of the route's latest fire, measured on the route's
+ *   own activity clock (see `advanceClock`): idle time does not age a tool,
+ *   so an idle route keeps its whole set, and a tool leaves only after the
+ *   route has gone on firing for ten minutes without it.
+ * - OpenCode 2 has no such hook, but each request draft carries its whole tool
+ *   set, so `recordToolDefinitionSet` replaces the route's set with exactly
+ *   that set and remembers it for the draft's session. A read with that
+ *   session id returns that session's own set, even when another session on
+ *   the same route was offered different tools since.
  *
  * Persistence (v9+): measurements are also written to SQLite so that a
- * plugin restart can repopulate the in-memory map without waiting for the
- * next chat.message → tool.definition hook chain. The in-memory Map remains
- * the hot read path; SQLite is a write-through mirror that backs cold starts.
- * If `setDatabase()` hasn't been called yet (cold path before openDatabase
- * completes), `recordToolDefinition` still updates the in-memory map and
- * silently skips persistence — first measurement after init lands both.
+ * plugin restart can show a "Tool Defs" figure before the first request of
+ * the new process. A row is deleted when its tool leaves the route's count,
+ * so the table holds each route's recent set. Rows loaded at startup count as
+ * if fired at load time: until the route's first live fire, and on OpenCode 1
+ * until the route has gone on firing for `ACTIVITY_WINDOW_MS` without them.
+ * The exception is rows an older version of this store wrote: it never
+ * deleted a row, so its rows can hold every tool a route was ever offered
+ * (the overcount reported in GitHub issue 797). Those "legacy" rows count
+ * only until the route's first live fire. Which rows are legacy is told by a
+ * marker in `schema_migrations_meta` (see `WINDOWED_SINCE_KEY`). If
+ * `setDatabase()` hasn't been called yet (cold path before openDatabase
+ * completes), measurements still update the in-memory map and are written
+ * once a database is bound.
  *
  * Hot-path optimization: `tool.definition` fires once per tool per LLM
  * flight (~58 tools × 5–18ms SQLite write = ~1.4s of redundant work per
  * flight on large MC databases). Tool descriptions and parameters almost
- * never change between flights, so we keep a per-key content-fingerprint
- * Map and bail out at the top of `recordToolDefinition` when the new fire
- * carries the same fingerprint as the previous one. This collapses
- * steady-state hook overhead from ~1.4s to <1ms while still re-measuring
- * any tool whose description/schema actually changed (e.g. MCP server
- * restart, OpenCode upgrade). Cached prepared statement avoids repeated
- * `db.prepare()` compile cost on first-flight rebuilds.
+ * never change between flights, so each tool keeps the content fingerprint of
+ * its last measurement and an identical fire only refreshes its last-fire
+ * time, without tokenizing or writing. A tool that left the count keeps its
+ * fingerprint and token count in a small per-route cache, so when it comes
+ * back unchanged it is not tokenized again, and its row is written again only
+ * if it was actually deleted. Any tool whose description or schema actually
+ * changed (e.g. MCP server restart, OpenCode upgrade) is re-measured. Cached
+ * prepared statements avoid repeated `db.prepare()` compile cost.
  */
 import type { Database } from "../../shared/sqlite";
-/**
- * Hash the observed names in the provider tool set for one model/agent route.
- *
- * Tool names alone identify the prefix change this marker explains. Schema
- * fingerprints remain necessary for measurement de-duplication, but including
- * them here would add cost without improving cache-bust attribution. An empty
- * string means the route has not reported any tool definitions, not an empty
- * provider `tools` array.
- */
-export declare function getCurrentToolSetHash(providerID: string, modelID: string, agentName: string | undefined): string;
-/** Hash observed tool IDs and full schemas so usage is reused only for the same definitions. */
-export declare function getToolDefinitionMeasurementSignature(providerID: string, modelID: string, agentName: string | undefined): string | undefined;
 /**
  * Register the database used to persist measurements. Called by
  * openDatabase() after runMigrations() has ensured the
- * `tool_definition_measurements` table exists. Subsequent
- * recordToolDefinition() calls will write through to SQLite.
+ * `tool_definition_measurements` table exists. Subsequent measurements will
+ * write through to SQLite.
  */
 export declare function setDatabase(db: Database): void;
 /**
- * Populate the in-memory measurements map from the
- * `tool_definition_measurements` table. Called once at startup after
- * setDatabase(), before the first sidebar snapshot or status query, so the
- * sidebar's "Tool Defs" segment shows the correct value immediately on
- * restart instead of 0.
+ * Populate the in-memory store from the `tool_definition_measurements` table.
+ * Called once at startup after setDatabase(), before the first sidebar
+ * snapshot or status query, so the sidebar's "Tool Defs" segment shows a
+ * figure immediately on restart instead of 0.
+ *
+ * Loaded rows count as if their tools fired at load time: they stand in for
+ * the route until its first live fire and then, on OpenCode 1, until the
+ * route has gone on firing for the activity window without them. A read in
+ * the middle of the first request after a restart therefore still counts the
+ * stored set. Legacy rows (written before `WINDOWED_SINCE_KEY`, or in a table
+ * without it) can hold every tool a route was ever offered, so they stop
+ * counting at the route's first live fire. Since this process never measured
+ * a loaded row's content, it carries no fingerprint.
  *
  * Idempotent: re-running over the same DB reapplies the same values; the
- * inner-map key (toolID) ensures duplicates overwrite rather than accumulate.
+ * per-route tool key ensures duplicates overwrite rather than accumulate.
+ * Routes already measured in this process are left alone.
  */
 export declare function loadToolDefinitionMeasurements(db: Database): void;
 /**
- * Tokenize a single tool's schema and store it under the given key. Called
- * from the `tool.definition` plugin hook once per tool per flight. Same
- * toolID on a later flight overwrites its slot — the total for the key stays
- * consistent even if descriptions or parameters drift between turns.
+ * OpenCode 1: measure one tool the host is offering on the current request.
+ * Called from the `tool.definition` plugin hook once per tool per flight.
+ * `sessionId` is the session the request is believed to belong to (the hook
+ * carries none); it only records which route that session last flew.
+ */
+export declare function recordToolDefinition(providerID: string, modelID: string, agentName: string | undefined, toolID: string, description: string, parameters: unknown, sessionId?: string): void;
+/**
+ * OpenCode 2: record the exact tool set one request carries. The route's set
+ * becomes exactly `tools` (tools no longer offered are forgotten and their
+ * stored rows deleted), and `sessionId`'s figure becomes this set until its
+ * next request. Unchanged tools are not tokenized or written again.
+ */
+export declare function recordToolDefinitionSet(providerID: string, modelID: string, agentName: string | undefined, tools: Iterable<{
+    id: string;
+    description: string;
+    parameters: unknown;
+}>, sessionId?: string): void;
+/**
+ * Hash the tool names of the current tool set for one model/agent route.
+ *
+ * Tool names alone identify the prefix change this marker explains. Schema
+ * fingerprints remain necessary for measurement de-duplication, but including
+ * them here would add cost without improving cache-bust attribution. An empty
+ * string is returned both before any measurement and for a request that
+ * carried no tools; it does not tell those cases apart.
+ */
+export declare function getCurrentToolSetHash(providerID: string, modelID: string, agentName: string | undefined, sessionId?: string): string;
+/**
+ * Hash the current tool set's IDs and full schemas so provider usage is reused
+ * only for the same definitions. Undefined when a counted tool's content was
+ * not measured in this process.
+ */
+export declare function getToolDefinitionMeasurementSignature(providerID: string, modelID: string, agentName: string | undefined, sessionId?: string): string | undefined;
+/**
+ * Returns the measured tokens of the current tool set for a
+ * `{provider, model, agent}` route, or `undefined` when never measured (e.g.
+ * fresh session before first turn). With `sessionId`, an OpenCode 2 session
+ * whose last request flew this route gets that request's exact set.
  */
-export declare function recordToolDefinition(providerID: string, modelID: string, agentName: string | undefined, toolID: string, description: string, parameters: unknown): void;
+export declare function getMeasuredToolDefinitionTokens(providerID: string, modelID: string, agentName: string | undefined, sessionId?: string): number | undefined;
 /**
- * Returns the summed measured tokens for a `{provider, model, agent}` key,
- * or `undefined` when never measured (e.g. fresh session before first turn).
+ * The tool-definition total of the route `sessionId` last flew: on OpenCode 2
+ * the exact set of that session's last request, on OpenCode 1 the route's
+ * recent-activity total. For a session whose current route has no
+ * measurement yet (for example right after a model switch), this is the best
+ * evidence of the tools it is offered; undefined when the session never had
+ * its tools measured.
  */
-export declare function getLargestMeasuredToolDefinitionTokens(): number | undefined;
-export declare function getMeasuredToolDefinitionTokens(providerID: string, modelID: string, agentName: string | undefined): number | undefined;
+export declare function getSessionToolDefinitionTokens(sessionId: string | undefined): number | undefined;
 /** Test helper: reset the store so suites don't leak measurements. */
 export declare function __resetToolDefinitionMeasurements(): void;
-/** Inspection helper: snapshot the current store (for debug logging/tests). */
+/** Inspection helper: snapshot each route's current set (for debug logging/tests). */
 export declare function getToolDefinitionSnapshot(): Array<{
     key: string;
     totalTokens: number;

package/dist/features/magic-context/tool-definition-tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-definition-tokens.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/tool-definition-tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,qBAAqB,CAAC;AA0C/D;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,GAC9B,MAAM,CAKR;AAED,gGAAgG;AAChG,wBAAgB,qCAAqC,CACjD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,GAC9B,MAAM,GAAG,SAAS,CAQpB;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAK9C;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAkCjE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,OAAO,GACpB,IAAI,CAwEN;AAED;;;GAGG;AACH,wBAAgB,sCAAsC,IAAI,MAAM,GAAG,SAAS,CAQ3E;AAED,wBAAgB,+BAA+B,CAC3C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,GAC9B,MAAM,GAAG,SAAS,CAOpB;AAED,sEAAsE;AACtE,wBAAgB,iCAAiC,IAAI,IAAI,CAKxD;AAED,+EAA+E;AAC/E,wBAAgB,yBAAyB,IAAI,KAAK,CAAC;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CAMD"}
+{"version":3,"file":"tool-definition-tokens.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/tool-definition-tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AAKH,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,qBAAqB,CAAC;AAqd/D;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CA4B9C;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CA0CjE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,OAAO,EACnB,SAAS,CAAC,EAAE,MAAM,GACnB,IAAI,CAgCN;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,QAAQ,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAAC,EACzE,SAAS,CAAC,EAAE,MAAM,GACnB,IAAI,CAiCN;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,SAAS,CAAC,EAAE,MAAM,GACnB,MAAM,CAER;AAED;;;;GAIG;AACH,wBAAgB,qCAAqC,CACjD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,SAAS,CAAC,EAAE,MAAM,GACnB,MAAM,GAAG,SAAS,CAEpB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC3C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,SAAS,CAAC,EAAE,MAAM,GACnB,MAAM,GAAG,SAAS,CAEpB;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAOhG;AAED,sEAAsE;AACtE,wBAAgB,iCAAiC,IAAI,IAAI,CAQxD;AAED,sFAAsF;AACtF,wBAAgB,yBAAyB,IAAI,KAAK,CAAC;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CASD"}

package/dist/hooks/magic-context/ask-answer-notice.d.ts

@@ -0,0 +1,25 @@
+/** One answer the user gave to a parked ask, as rendered by Prefrontal. */
+export interface AskAnswerNotice {
+    /** The question text as Prefrontal rendered it, on one line. */
+    question: string;
+    /** The user's answer, as Prefrontal rendered it, newlines and all. */
+    answer: string;
+}
+/**
+ * The one reminder the historian keeps verbatim: the user's own answer to a
+ * parked ask, rendered by Prefrontal. Returns one entry per answer notice in
+ * delivery order; an empty array for text with no answer notice.
+ */
+export declare function extractAskAnswerNotices(text: string): AskAnswerNotice[];
+/** `U (answered "<question>"): <answer>`, the line the historian reads. */
+export declare function formatAskAnswerNotice(notice: AskAnswerNotice): string;
+/**
+ * One `U (answered "<question>"): <answer>` line per answer notice in `text`, in
+ * delivery order. The chunk readers append these after the user's own words, so a
+ * decision the user made by answering an ask reaches the historian as the user's
+ * line instead of only as the agent's restatement. A text with no answer notice
+ * yields no lines, which leaves every other user message rendered exactly as it
+ * was before this existed.
+ */
+export declare function askAnswerLines(text: string): string[];
+//# sourceMappingURL=ask-answer-notice.d.ts.map

package/dist/hooks/magic-context/ask-answer-notice.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ask-answer-notice.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/ask-answer-notice.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,MAAM,WAAW,eAAe;IAC5B,gEAAgE;IAChE,QAAQ,EAAE,MAAM,CAAC;IACjB,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;CAClB;AAiED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,EAAE,CAOvE;AAED,2EAA2E;AAC3E,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CAErE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAErD"}

package/dist/hooks/magic-context/compartment-runner-incremental.d.ts

@@ -1,5 +1,5 @@
 import type { HiddenCompartmentRunnerDeps } from "./compartment-runner-types";
-export declare function v2NonNarrativeStoredGapRanges(db: HiddenCompartmentRunnerDeps["db"], sessionId: string, compartments: ReadonlyArray<{
+export declare function nonNarrativeStoredGapRanges(db: HiddenCompartmentRunnerDeps["db"], sessionId: string, compartments: ReadonlyArray<{
     startMessage: number;
     endMessage: number;
 }>): Array<{

package/dist/hooks/magic-context/compartment-runner-incremental.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compartment-runner-incremental.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/compartment-runner-incremental.ts"],"names":[],"mappings":"AAuEA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAuE9E,wBAAgB,6BAA6B,CACzC,EAAE,EAAE,2BAA2B,CAAC,IAAI,CAAC,EACrC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,aAAa,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,GAC1E,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAkBvC;AAGD;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,QAAiB,CAAC;AAwBpE,MAAM,WAAW,2BAA2B;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;+EAC+E;AAC/E,wBAAgB,+BAA+B,CAC3C,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,aAAa,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC,EACF,aAAa,GAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAkC,GAC5F,2BAA2B,GAAG,IAAI,CAkBpC;AAED,+DAA+D;AAC/D,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAEhE;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA4uC1F"}
+{"version":3,"file":"compartment-runner-incremental.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/compartment-runner-incremental.ts"],"names":[],"mappings":"AAuEA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AA2E9E,wBAAgB,2BAA2B,CACvC,EAAE,EAAE,2BAA2B,CAAC,IAAI,CAAC,EACrC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,aAAa,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,GAC1E,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAwBvC;AAeD;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,QAAiB,CAAC;AAwBpE,MAAM,WAAW,2BAA2B;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;+EAC+E;AAC/E,wBAAgB,+BAA+B,CAC3C,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,aAAa,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC,EACF,aAAa,GAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAkC,GAC5F,2BAA2B,GAAG,IAAI,CAkBpC;AAED,+DAA+D;AAC/D,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGhE;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAovC1F"}