@cortexkit/opencode-magic-context 0.15.0 → 0.15.1

package/dist/plugin/rpc-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-handlers.d.ts","sourceRoot":"","sources":["../../src/plugin/rpc-handlers.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAKzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAIlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAsclE;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,qBAAqB,EAChC,IAAI,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;CACtC,GACF,IAAI,CAqGN"}
+{"version":3,"file":"rpc-handlers.d.ts","sourceRoot":"","sources":["../../src/plugin/rpc-handlers.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAMzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAIlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AA0elE;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,qBAAqB,EAChC,IAAI,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;CACtC,GACF,IAAI,CA4GN"}

package/dist/shared/data-path.d.ts

@@ -1,3 +1,15 @@
 export declare function getDataDir(): string;
 export declare function getOpenCodeStorageDir(): string;
+/**
+ * Resolve OpenCode's cache base directory.
+ *
+ * OpenCode uses the `xdg-basedir` package, which — on every platform, including
+ * Windows — falls back to `<homedir>/.cache` when `XDG_CACHE_HOME` is unset.
+ * A previous Windows-specific branch that resolved to `%LOCALAPPDATA%` did not
+ * match OpenCode's own resolution and caused `doctor --force` to target a
+ * non-existent directory, leaving the real cache at `C:\Users\<user>\.cache`
+ * untouched.
+ */
+export declare function getCacheDir(): string;
+export declare function getOpenCodeCacheDir(): string;
 //# sourceMappingURL=data-path.d.ts.map

package/dist/shared/data-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-path.d.ts","sourceRoot":"","sources":["../../src/shared/data-path.ts"],"names":[],"mappings":"AAGA,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C"}
+{"version":3,"file":"data-path.d.ts","sourceRoot":"","sources":["../../src/shared/data-path.ts"],"names":[],"mappings":"AAGA,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C"}

package/dist/shared/models-dev-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models-dev-cache.d.ts","sourceRoot":"","sources":["../../src/shared/models-dev-cache.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAQH,UAAU,kBAAkB;IACxB,MAAM,EAAE;QACJ,SAAS,EAAE,MAAM,OAAO,CAAC;YAAE,IAAI,CAAC,EAAE;gBAAE,SAAS,CAAC,EAAE,OAAO,CAAA;aAAE,CAAA;SAAE,CAAC,CAAC;KAChE,CAAC;CACL;AA2ND;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkDzF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAchG;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CACxC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAkBpB;AAED,4CAA4C;AAC5C,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C;AAED,oDAAoD;AACpD,wBAAgB,sBAAsB,IAAI;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACrB,CAOA"}
+{"version":3,"file":"models-dev-cache.d.ts","sourceRoot":"","sources":["../../src/shared/models-dev-cache.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AASH,UAAU,kBAAkB;IACxB,MAAM,EAAE;QACJ,SAAS,EAAE,MAAM,OAAO,CAAC;YAAE,IAAI,CAAC,EAAE;gBAAE,SAAS,CAAC,EAAE,OAAO,CAAA;aAAE,CAAA;SAAE,CAAC,CAAC;KAChE,CAAC;CACL;AAqND;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkDzF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAchG;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CACxC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAkBpB;AAED,4CAA4C;AAC5C,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C;AAED,oDAAoD;AACpD,wBAAgB,sBAAsB,IAAI;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACrB,CAOA"}

package/dist/shared/rpc-types.d.ts

@@ -35,13 +35,23 @@ export interface SidebarSnapshot {
      */
     toolCallTokens: number;
     /**
-     * Token estimate of tool schemas OpenCode sends alongside in the request
-     * `tools` parameter (bash, edit, grep, MCP servers, ctx_* tools, etc.).
-     * Computed as inputTokens − systemPromptTokens − messagesBlock −
-     * toolCallTokens and clamped to ≥ 0. Display layer shows this as
-     * "Tool Definitions". Includes tokenizer imprecision residual.
+     * Measured token cost of tool schemas (description + JSON-schema
+     * parameters) OpenCode sends in the request `tools` parameter. Populated
+     * by the `tool.definition` plugin hook, keyed by
+     * `{providerID, modelID, agentName}`. Zero until the first turn after
+     * plugin startup measures the current agent's tool set. Display layer
+     * shows this as "Tool Definitions".
      */
     toolDefinitionTokens: number;
+    /**
+     * Residual catch-all: provider-side wrapping not captured elsewhere —
+     * the JSON envelope around the `tools` array, tool-choice fields,
+     * provider-specific cache-control markers, tokenizer imprecision, etc.
+     * Computed as `inputTokens − systemPromptTokens − messagesBlock −
+     * toolCallTokens − toolDefinitionTokens` and clamped to ≥ 0. Display
+     * layer shows this as "Overhead".
+     */
+    overheadTokens: number;
 }
 export interface StatusDetail extends SidebarSnapshot {
     tagCounter: number;

package/dist/shared/rpc-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-types.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,eAAe;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;;;OAIG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;;OAMG;IACH,oBAAoB,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxD,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,oBAAoB,EAAE,YAAY,GAAG,QAAQ,CAAC;IAC9C;;;OAGG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB"}
+{"version":3,"file":"rpc-types.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,eAAe;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;;;OAIG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;;;OAOG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAC7B;;;;;;;OAOG;IACH,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxD,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,oBAAoB,EAAE,YAAY,GAAG,QAAQ,CAAC;IAC9C;;;OAGG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB"}

package/dist/tui/data/context-db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-db.d.ts","sourceRoot":"","sources":["../../../src/tui/data/context-db.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA0B,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpG,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AAS9C,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGrD;AAED,+BAA+B;AAC/B,wBAAgB,QAAQ,IAAI,IAAI,CAG/B;AA2BD,sDAAsD;AACtD,wBAAsB,mBAAmB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC,CAc1B;AAED,wDAAwD;AACxD,wBAAsB,gBAAgB,CAClC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CA4CvB;AAED,qCAAqC;AACrC,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ5E;AAED,6CAA6C;AAC7C,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQvE;AAED,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,yDAAyD;AACzD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAchE"}
+{"version":3,"file":"context-db.d.ts","sourceRoot":"","sources":["../../../src/tui/data/context-db.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA0B,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpG,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AAS9C,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGrD;AAED,+BAA+B;AAC/B,wBAAgB,QAAQ,IAAI,IAAI,CAG/B;AA4BD,sDAAsD;AACtD,wBAAsB,mBAAmB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC,CAc1B;AAED,wDAAwD;AACxD,wBAAsB,gBAAgB,CAClC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CA4CvB;AAED,qCAAqC;AACrC,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ5E;AAED,6CAA6C;AAC7C,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQvE;AAED,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,yDAAyD;AACzD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAchE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/opencode-magic-context",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "type": "module",
   "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",

package/src/shared/data-path.test.ts

@@ -0,0 +1,69 @@
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import * as os from "node:os";
+import * as path from "node:path";
+import { getCacheDir, getDataDir, getOpenCodeCacheDir, getOpenCodeStorageDir } from "./data-path";
+
+const savedEnv = {
+    XDG_CACHE_HOME: process.env.XDG_CACHE_HOME,
+    XDG_DATA_HOME: process.env.XDG_DATA_HOME,
+    LOCALAPPDATA: process.env.LOCALAPPDATA,
+};
+
+describe("data-path", () => {
+    beforeEach(() => {
+        process.env.XDG_CACHE_HOME = undefined;
+        process.env.XDG_DATA_HOME = undefined;
+        process.env.LOCALAPPDATA = undefined;
+        // Bun's env handling: explicit delete for unset
+        delete process.env.XDG_CACHE_HOME;
+        delete process.env.XDG_DATA_HOME;
+        delete process.env.LOCALAPPDATA;
+    });
+
+    afterEach(() => {
+        if (savedEnv.XDG_CACHE_HOME !== undefined)
+            process.env.XDG_CACHE_HOME = savedEnv.XDG_CACHE_HOME;
+        if (savedEnv.XDG_DATA_HOME !== undefined)
+            process.env.XDG_DATA_HOME = savedEnv.XDG_DATA_HOME;
+        if (savedEnv.LOCALAPPDATA !== undefined) process.env.LOCALAPPDATA = savedEnv.LOCALAPPDATA;
+    });
+
+    test("getCacheDir falls back to <homedir>/.cache when XDG_CACHE_HOME is unset (all platforms)", () => {
+        // Matches OpenCode's xdg-basedir behavior on every platform, including
+        // Windows. A previous bug mapped Windows to %LOCALAPPDATA% and caused
+        // doctor --force to target a non-existent cache directory.
+        expect(getCacheDir()).toBe(path.join(os.homedir(), ".cache"));
+    });
+
+    test("getCacheDir honors XDG_CACHE_HOME when set", () => {
+        process.env.XDG_CACHE_HOME = "/tmp/custom-cache";
+        expect(getCacheDir()).toBe("/tmp/custom-cache");
+    });
+
+    test("getCacheDir ignores LOCALAPPDATA on Windows (must match OpenCode's xdg-basedir)", () => {
+        // Even with LOCALAPPDATA set, cache must go to ~/.cache to match
+        // OpenCode's own resolution. Otherwise doctor --force clears the
+        // wrong directory on Windows.
+        process.env.LOCALAPPDATA = "C:\\Users\\Test\\AppData\\Local";
+        expect(getCacheDir()).toBe(path.join(os.homedir(), ".cache"));
+    });
+
+    test("getOpenCodeCacheDir appends 'opencode' to the cache base", () => {
+        expect(getOpenCodeCacheDir()).toBe(path.join(os.homedir(), ".cache", "opencode"));
+    });
+
+    test("getOpenCodeCacheDir with XDG_CACHE_HOME set", () => {
+        process.env.XDG_CACHE_HOME = "/tmp/custom-cache";
+        expect(getOpenCodeCacheDir()).toBe(path.join("/tmp/custom-cache", "opencode"));
+    });
+
+    test("getDataDir falls back to <homedir>/.local/share when XDG_DATA_HOME is unset", () => {
+        expect(getDataDir()).toBe(path.join(os.homedir(), ".local", "share"));
+    });
+
+    test("getOpenCodeStorageDir composes correctly", () => {
+        expect(getOpenCodeStorageDir()).toBe(
+            path.join(os.homedir(), ".local", "share", "opencode", "storage"),
+        );
+    });
+});

package/src/shared/data-path.ts

@@ -8,3 +8,21 @@ export function getDataDir(): string {
 export function getOpenCodeStorageDir(): string {
     return path.join(getDataDir(), "opencode", "storage");
 }
+
+/**
+ * Resolve OpenCode's cache base directory.
+ *
+ * OpenCode uses the `xdg-basedir` package, which — on every platform, including
+ * Windows — falls back to `<homedir>/.cache` when `XDG_CACHE_HOME` is unset.
+ * A previous Windows-specific branch that resolved to `%LOCALAPPDATA%` did not
+ * match OpenCode's own resolution and caused `doctor --force` to target a
+ * non-existent directory, leaving the real cache at `C:\Users\<user>\.cache`
+ * untouched.
+ */
+export function getCacheDir(): string {
+    return process.env.XDG_CACHE_HOME ?? path.join(os.homedir(), ".cache");
+}
+
+export function getOpenCodeCacheDir(): string {
+    return path.join(getCacheDir(), "opencode");
+}

package/src/shared/models-dev-cache.ts

@@ -24,6 +24,7 @@ import { createHash } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir, platform } from "node:os";
 import { join } from "node:path";
+import { getCacheDir } from "./data-path";
 import { sessionLog } from "./logger";
 
 interface OpencodeClientLike {
@@ -59,16 +60,10 @@ function getModelsJsonPath(): string {
     const explicit = process.env.OPENCODE_MODELS_PATH?.trim();
     if (explicit) return explicit;
 
-    const xdgCache = process.env.XDG_CACHE_HOME;
-    const os = platform();
-    let cacheBase: string;
-    if (xdgCache) {
-        cacheBase = xdgCache;
-    } else if (os === "win32") {
-        cacheBase = process.env.LOCALAPPDATA ?? join(homedir(), "AppData", "Local");
-    } else {
-        cacheBase = join(homedir(), ".cache");
-    }
+    // OpenCode uses `xdg-basedir`, which falls back to `<homedir>/.cache` on
+    // every platform (including Windows) when XDG_CACHE_HOME is unset. See
+    // shared/data-path.ts#getCacheDir for the shared helper.
+    const cacheBase = getCacheDir();
 
     // 2. Custom models source → hashed filename (matches OpenCode).
     //    source === "https://models.dev" ? "models.json" : `models-${Hash.fast(source)}.json`

package/src/shared/rpc-types.ts

@@ -36,13 +36,23 @@ export interface SidebarSnapshot {
      */
     toolCallTokens: number;
     /**
-     * Token estimate of tool schemas OpenCode sends alongside in the request
-     * `tools` parameter (bash, edit, grep, MCP servers, ctx_* tools, etc.).
-     * Computed as inputTokens − systemPromptTokens − messagesBlock −
-     * toolCallTokens and clamped to ≥ 0. Display layer shows this as
-     * "Tool Definitions". Includes tokenizer imprecision residual.
+     * Measured token cost of tool schemas (description + JSON-schema
+     * parameters) OpenCode sends in the request `tools` parameter. Populated
+     * by the `tool.definition` plugin hook, keyed by
+     * `{providerID, modelID, agentName}`. Zero until the first turn after
+     * plugin startup measures the current agent's tool set. Display layer
+     * shows this as "Tool Definitions".
      */
     toolDefinitionTokens: number;
+    /**
+     * Residual catch-all: provider-side wrapping not captured elsewhere —
+     * the JSON envelope around the `tools` array, tool-choice fields,
+     * provider-specific cache-control markers, tokenizer imprecision, etc.
+     * Computed as `inputTokens − systemPromptTokens − messagesBlock −
+     * toolCallTokens − toolDefinitionTokens` and clamped to ≥ 0. Display
+     * layer shows this as "Overhead".
+     */
+    overheadTokens: number;
 }
 
 export interface StatusDetail extends SidebarSnapshot {

package/src/tui/data/context-db.ts

@@ -51,6 +51,7 @@ const EMPTY_SNAPSHOT: SidebarSnapshot = {
     conversationTokens: 0,
     toolCallTokens: 0,
     toolDefinitionTokens: 0,
+    overheadTokens: 0,
 };
 
 /** Fetch sidebar snapshot from the server via RPC. */

package/src/tui/index.tsx

@@ -207,12 +207,19 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
 
     const elapsed = () => (s().lastResponseTime > 0 ? Date.now() - s().lastResponseTime : 0)
 
-    // Token breakdown segments — same colors as sidebar
+    // Token breakdown segments — same colors as sidebar. Kept in sync with
+    // slots/sidebar-content.tsx so the status dialog and sidebar read identically.
     const COLORS = {
+        // Cool / structured — injected by the plugin into message[0]
         system: "#c084fc",
         compartments: "#60a5fa",
         facts: "#fbbf24",
         memories: "#34d399",
+        // Warm / user-facing — chat and tool traffic
+        conversation: "#f87171",
+        toolCalls: "#fb923c",
+        toolDefs: "#f472b6",
+        overhead: "#9ca3af",
     }
 
     const breakdownSegments = () => {
@@ -245,11 +252,13 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
             })
 
         if (d.conversationTokens > 0)
-            segs.push({ label: "Conversation", tokens: d.conversationTokens, color: t().textMuted })
+            segs.push({ label: "Conversation", tokens: d.conversationTokens, color: COLORS.conversation })
         if (d.toolCallTokens > 0)
-            segs.push({ label: "Tool Calls", tokens: d.toolCallTokens, color: "#6b7280" })
+            segs.push({ label: "Tool Calls", tokens: d.toolCallTokens, color: COLORS.toolCalls })
         if (d.toolDefinitionTokens > 0)
-            segs.push({ label: "Tool Defs + Overhead", tokens: d.toolDefinitionTokens, color: "#9ca3af" })
+            segs.push({ label: "Tool Defs", tokens: d.toolDefinitionTokens, color: COLORS.toolDefs })
+        if (d.overheadTokens > 0)
+            segs.push({ label: "Overhead", tokens: d.overheadTokens, color: COLORS.overhead })
 
         return { segs, total }
     }

package/src/tui/slots/sidebar-content.tsx

@@ -23,11 +23,17 @@ function relativeTime(ms: number): string {
 
 // Token breakdown segment colors (hardcoded hex values)
 const COLORS = {
-    system: "#c084fc",    // Purple-ish
-    compartments: "#60a5fa", // Blue-ish
-    facts: "#fbbf24",     // Yellow/orange
-    memories: "#34d399",  // Green
-    conversation: "#9ca3af", // Gray (will use theme.textMuted)
+    // Cool / structured — injected by the plugin into message[0]
+    system: "#c084fc", // Purple
+    compartments: "#60a5fa", // Blue
+    facts: "#fbbf24", // Yellow/orange
+    memories: "#34d399", // Green
+    // Warm / user-facing — regular chat and tool traffic. Grouped visually
+    // by hue family so the user reads them as a related block.
+    conversation: "#f87171", // Red
+    toolCalls: "#fb923c", // Orange
+    toolDefs: "#f472b6", // Pink
+    overhead: "#9ca3af", // Gray — catch-all residual
 }
 
 interface TokenSegment {
@@ -95,7 +101,7 @@ const TokenBreakdown = (props: {
             result.push({
                 key: "conv",
                 tokens: s.conversationTokens,
-                color: props.theme.textMuted,
+                color: COLORS.conversation,
                 label: "Conversation",
             })
         }
@@ -106,19 +112,35 @@ const TokenBreakdown = (props: {
             result.push({
                 key: "tool-calls",
                 tokens: s.toolCallTokens,
-                color: "#6b7280",
+                color: COLORS.toolCalls,
                 label: "Tool Calls",
             })
         }
 
-        // Tool Definitions = tool schemas sent separately by OpenCode
-        // (residual: inputTokens - system - messagesBlock - toolCalls)
+        // Tool Definitions = measured description + JSON-schema parameters for
+        // each tool OpenCode sends in the `tools` request parameter, populated
+        // by the `tool.definition` plugin hook keyed by {provider, model, agent}.
+        // Zero until the first turn measures the active agent's tool set.
         if (s.toolDefinitionTokens > 0) {
             result.push({
                 key: "tool-defs",
                 tokens: s.toolDefinitionTokens,
-                color: COLORS.conversation,
-                label: "Tool Defs + Overhead",
+                color: COLORS.toolDefs,
+                label: "Tool Defs",
+            })
+        }
+
+        // Overhead = residual between input tokens and everything measured above.
+        // Captures provider-side JSON wrapping around the tools array,
+        // tool_choice/cache-control markers, and tokenizer imprecision. Before
+        // the first turn's tool.definition measurement lands, the real tool
+        // schema cost also shows up here.
+        if (s.overheadTokens > 0) {
+            result.push({
+                key: "overhead",
+                tokens: s.overheadTokens,
+                color: COLORS.overhead,
+                label: "Overhead",
             })
         }