lsd-pi 1.3.6 → 1.3.9

package/README.md

@@ -365,6 +365,88 @@ LSD discovers and connects to MCP servers configured in:
 
 Use `/configs` inside a session to scan for MCP servers from other AI tools (Claude Code, Cursor, Copilot, etc.) and import them.
 
+### Adding MCP servers to LSD config
+
+LSD supports two transport types: **stdio** (launch a local process) and **HTTP** (connect to a running server).
+
+#### Stdio server (local process)
+
+Add to `.mcp.json` or `.lsd/mcp.json`:
+
+```json
+{
+  "mcpServers": {
+    "my-server": {
+      "type": "stdio",
+      "command": "/absolute/path/to/executable",
+      "args": ["arg1", "arg2"],
+      "env": {
+        "API_KEY": "your-key",
+        "DEBUG": "true"
+      }
+    }
+  }
+}
+```
+
+If the server is installed as an npm package:
+
+```json
+{
+  "mcpServers": {
+    "my-server": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["@my-org/mcp-server"],
+      "env": {
+        "API_KEY": "sk-..."
+      }
+    }
+  }
+}
+```
+
+#### HTTP server (remote connection)
+
+For MCP servers already running on a network endpoint:
+
+```json
+{
+  "mcpServers": {
+    "remote-server": {
+      "type": "http",
+      "url": "http://localhost:8080/mcp",
+      "headers": {
+        "Authorization": "Bearer ${MCP_TOKEN}"
+      }
+    }
+  }
+}
+```
+
+Environment variables in `headers` and `env` are resolved at startup (use `${VAR_NAME}` syntax).
+
+#### File placement
+
+- **`.mcp.json`** — repo-shared configuration (commit to git)
+- **`.lsd/mcp.json`** — local-only configuration (git-ignored, not shared)
+
+If both files exist, server names are merged and the first definition found wins.
+
+#### Managing MCP servers
+
+Use the `/mcp` slash command inside a session:
+
+| Command | Description |
+|---------|-------------|
+| `/mcp list` | List all configured servers and their status |
+| `/mcp inspect <server>` | Connect and show available tools for a server |
+| `/mcp enable <server>` | Enable a server |
+| `/mcp disable <server>` | Disable a server |
+| `/mcp reload` | Reload config and reconnect enabled servers |
+
+MCP servers connect lazily — `/mcp inspect` or the first tool call triggers the connection.
+
 ---
 
 ## Sessions

package/dist/cli.js

@@ -17,6 +17,7 @@ import { getProjectSessionsDir } from './project-sessions.js';
 import { markStartup, printStartupTimings } from './startup-timings.js';
 import { bootstrapRtk, GSD_RTK_DISABLED_ENV } from './rtk.js';
 import { loadEffectivePreferences } from './shared-preferences.js';
+import { createLsdSettingsManager } from './lsd-settings-manager.js';
 // ---------------------------------------------------------------------------
 // V8 compile cache — Node 22+ can cache compiled bytecode across runs,
 // eliminating repeated parse/compile overhead for unchanged modules.
@@ -270,7 +271,7 @@ const { resolveModelsJsonPath } = await import('./models-resolver.js');
 const modelsJsonPath = resolveModelsJsonPath();
 const modelRegistry = new ModelRegistry(authStorage, modelsJsonPath);
 markStartup('ModelRegistry');
-const settingsManager = SettingsManager.create(agentDir);
+const settingsManager = createLsdSettingsManager(process.cwd(), agentDir);
 markStartup('SettingsManager.create');
 if (cliFlags.noSandbox) {
     process.env.PI_NO_SANDBOX = '1';

package/dist/lsd-settings-manager.d.ts

@@ -0,0 +1,2 @@
+import { SettingsManager } from '@gsd/pi-coding-agent';
+export declare function createLsdSettingsManager(cwd?: string, agentDir?: string): SettingsManager;

package/dist/lsd-settings-manager.js

@@ -0,0 +1,5 @@
+import { SettingsManager } from '@gsd/pi-coding-agent';
+import { agentDir as defaultAgentDir } from './app-paths.js';
+export function createLsdSettingsManager(cwd = process.cwd(), agentDir = defaultAgentDir) {
+    return SettingsManager.create(cwd, agentDir);
+}

package/dist/resource-loader.js

@@ -127,6 +127,25 @@ function collectFileEntries(dir, root, out) {
         }
     }
 }
+function hasMissingResourceEntries(srcDir, destDir) {
+    if (!existsSync(srcDir))
+        return false;
+    if (!existsSync(destDir))
+        return true;
+    for (const entry of readdirSync(srcDir, { withFileTypes: true })) {
+        const srcPath = join(srcDir, entry.name);
+        const destPath = join(destDir, entry.name);
+        if (!existsSync(destPath))
+            return true;
+        if (entry.isDirectory() && hasMissingResourceEntries(srcPath, destPath))
+            return true;
+    }
+    return false;
+}
+function hasMissingManagedResources(agentDir) {
+    return hasMissingResourceEntries(bundledExtensionsDir, join(agentDir, 'extensions'))
+        || hasMissingResourceEntries(join(resourcesDir, 'agents'), join(agentDir, 'agents'));
+}
 export function getNewerManagedResourceVersion(agentDir, currentVersion) {
     const managedVersion = readManagedResourceVersion(agentDir);
     if (!managedVersion) {
@@ -192,8 +211,18 @@ function syncResourceDir(srcDir, destDir) {
         for (const entry of readdirSync(srcDir, { withFileTypes: true })) {
             if (entry.isDirectory()) {
                 const target = join(destDir, entry.name);
-                if (existsSync(target))
-                    rmSync(target, { recursive: true, force: true });
+                if (existsSync(target)) {
+                    try {
+                        rmSync(target, { recursive: true, force: true });
+                    }
+                    catch {
+                        // Retry once — macOS can create .DS_Store mid-deletion causing ENOTEMPTY
+                        try {
+                            rmSync(target, { recursive: true, force: true });
+                        }
+                        catch { /* non-fatal */ }
+                    }
+                }
             }
         }
         try {
@@ -386,7 +415,8 @@ export function initResources(agentDir) {
         // Version matches — check content fingerprint for same-version staleness.
         const currentHash = computeResourceFingerprint();
         const hasStaleExtensionFiles = hasStaleCompiledExtensionSiblings(join(agentDir, 'extensions'));
-        if (manifest.contentHash && manifest.contentHash === currentHash && !hasStaleExtensionFiles) {
+        const hasMissingResources = hasMissingManagedResources(agentDir);
+        if (manifest.contentHash && manifest.contentHash === currentHash && !hasStaleExtensionFiles && !hasMissingResources) {
             return;
         }
     }

package/dist/resources/extensions/cache-timer/index.js

@@ -18,6 +18,7 @@ const IS_MEMORY_MAINTENANCE_WORKER = process.env.LSD_MEMORY_EXTRACT === "1" || p
 const IS_CACHE_TIMER_FORCED_OFF = process.env.LSD_DISABLE_CACHE_TIMER === "1" || process.env.GSD_DISABLE_CACHE_TIMER === "1";
 // ANSI color codes for timer display
 const ANSI_RESET = "\x1b[0m";
+const ANSI_GREEN = "\x1b[32m";
 const ANSI_YELLOW = "\x1b[33m";
 const ANSI_RED = "\x1b[31m";
 function getSettingsPath() {
@@ -63,8 +64,8 @@ function formatElapsed(ms) {
         // 5–10 minutes: yellow
         return `${ANSI_YELLOW}⏱ ${time}${ANSI_RESET}`;
     }
-    // Under 5 minutes: plain (inherits footer dim styling)
-    return `⏱ ${time}`;
+    // Under 5 minutes: green
+    return `${ANSI_GREEN}⏱ ${time}${ANSI_RESET}`;
 }
 export default function cacheTimerExtension(pi) {
     if (IS_MEMORY_MAINTENANCE_WORKER || IS_CACHE_TIMER_FORCED_OFF) {

package/dist/resources/extensions/mcp-client/index.js

@@ -23,6 +23,7 @@ import { basename, dirname, join } from "node:path";
 const connections = new Map();
 let configCache = null;
 const toolCache = new Map();
+let warmupPromise = null;
 const MCP_STATE_PATH = join(process.cwd(), ".lsd", "mcp-state.json");
 function normalizeServerName(name) {
     return name.trim().toLowerCase();
@@ -205,6 +206,46 @@ async function getOrConnect(name, signal) {
     connections.set(config.name, { client, transport });
     return client;
 }
+async function warmupEnabledServers() {
+    if (warmupPromise)
+        return warmupPromise;
+    warmupPromise = (async () => {
+        const enabledServers = readConfigs().filter((server) => server.enabled);
+        if (enabledServers.length === 0)
+            return [];
+        const results = await Promise.allSettled(enabledServers.map(async (server) => {
+            const client = await getOrConnect(server.name);
+            const result = await client.listTools(undefined, { timeout: 30000 });
+            const tools = (result.tools ?? []).map((tool) => ({
+                name: tool.name,
+                description: tool.description ?? "",
+                inputSchema: tool.inputSchema,
+            }));
+            toolCache.set(server.name, tools);
+            return {
+                name: server.name,
+                status: "connected",
+                toolCount: tools.length,
+            };
+        }));
+        return results.map((result, index) => {
+            if (result.status === "fulfilled") {
+                return result.value;
+            }
+            return {
+                name: enabledServers[index]?.name ?? `server-${index + 1}`,
+                status: "error",
+                error: result.reason instanceof Error ? result.reason.message : String(result.reason),
+            };
+        });
+    })();
+    try {
+        return await warmupPromise;
+    }
+    finally {
+        warmupPromise = null;
+    }
+}
 async function closeAll() {
     const closing = Array.from(connections.entries()).map(async ([name, conn]) => {
         try {
@@ -219,6 +260,7 @@ async function closeAll() {
     toolCache.clear();
 }
 async function reloadMcpState() {
+    warmupPromise = null;
     await closeAll();
     configCache = null;
 }
@@ -331,6 +373,13 @@ async function handleMcpCommand(args, ctx) {
             const action = enabled ? "enabled" : "disabled";
             const changeText = result.changed ? action : `already ${action}`;
             ctx.ui.notify(`MCP server ${result.canonicalName} ${changeText}.`, "info");
+            if (enabled) {
+                const warmupResults = await warmupEnabledServers();
+                const warmupResult = warmupResults.find((entry) => entry.name === result.canonicalName);
+                if (warmupResult?.status === "error") {
+                    ctx.ui.notify(`Failed to connect ${result.canonicalName}: ${warmupResult.error}`, "error");
+                }
+            }
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -341,7 +390,12 @@ async function handleMcpCommand(args, ctx) {
     if (subcommand === "reload") {
         await reloadMcpState();
         const servers = readConfigs();
-        ctx.ui.notify(`Reloaded MCP config — ${servers.length} server(s) available.`, "info");
+        const warmupResults = await warmupEnabledServers();
+        const failed = warmupResults.filter((entry) => entry.status === "error");
+        const summary = failed.length > 0
+            ? `Reloaded MCP config — ${servers.length} server(s) available, ${failed.length} failed to connect.`
+            : `Reloaded MCP config — ${servers.length} server(s) available.`;
+        ctx.ui.notify(summary, failed.length > 0 ? "warning" : "info");
         return;
     }
     if (subcommand === "help") {
@@ -598,15 +652,29 @@ export default function (pi) {
     // ── Lifecycle ─────────────────────────────────────────────────────────────
     pi.on("session_start", async (_event, ctx) => {
         const servers = readConfigs();
+        const enabledServers = servers.filter((server) => server.enabled);
         if (servers.length > 0) {
-            ctx.ui.notify(`MCP client ready — ${servers.filter((server) => server.enabled).length}/${servers.length} server(s) enabled`, "info");
+            ctx.ui.notify(`MCP client ready — ${enabledServers.length}/${servers.length} server(s) enabled`, "info");
         }
+        if (enabledServers.length === 0)
+            return;
+        void warmupEnabledServers().then((results) => {
+            const failed = results.filter((entry) => entry.status === "error");
+            if (failed.length > 0) {
+                const failureSummary = failed.map((entry) => `${entry.name}: ${entry.error}`).join("; ");
+                ctx.ui.notify(`MCP autoconnect partial failure — ${failureSummary}`, "warning");
+            }
+        }).catch((error) => {
+            const message = error instanceof Error ? error.message : String(error);
+            ctx.ui.notify(`MCP autoconnect failed: ${message}`, "warning");
+        });
     });
     pi.on("session_shutdown", async () => {
+        warmupPromise = null;
         await closeAll();
     });
     pi.on("session_switch", async () => {
-        await closeAll();
-        configCache = null;
+        await reloadMcpState();
+        void warmupEnabledServers();
     });
 }

package/dist/resources/extensions/slash-commands/plan.js

@@ -155,7 +155,7 @@ function readAutoSwitchPlanModelSetting() {
             return false;
         const raw = readFileSync(settingsPath, "utf-8");
         const parsed = JSON.parse(raw);
-        return parsed.autoSwitchPlanModel === true;
+        return parsed.planModeAutoSwitchModel === true;
     }
     catch {
         return false;
@@ -332,10 +332,10 @@ function scheduleNewSession(pi, ctx) {
     pi.executeSlashCommand("/plan-execute-new-session");
 }
 async function approvePlan(pi, ctx, permissionMode, executeWithSubagent = false) {
-    const reasoningModel = parseQualifiedModelRef(readPlanModeReasoningModel());
-    if (reasoningModel) {
-        await setModelIfNeeded(pi, ctx, reasoningModel);
-    }
+    // Do NOT switch to reasoning model during execution.
+    // The reasoning model is only for plan-mode investigation, not execution.
+    // If a coding model is configured and we're using a subagent, the explicit
+    // model="<planModeCodingModel>" in the kickoff message will handle it.
     state = {
         ...state,
         targetPermissionMode: permissionMode,

package/dist/resources/extensions/usage/index.js

@@ -231,6 +231,7 @@ function collectUsage(sessionFiles, startMs, endMs, scope, groupBy) {
         let projectLabel = basename(file);
         let headerResolved = false;
         let currentModel = "";
+        let lastUserTimestamp = 0;
         const raw = readFileSync(file, "utf-8");
         for (const line of raw.split("\n")) {
             if (!line.trim())
@@ -282,6 +283,8 @@ function collectUsage(sessionFiles, startMs, endMs, scope, groupBy) {
                     cacheWrite: 0,
                     total: 0,
                     cost: 0,
+                    totalDurationMs: 0,
+                    totalOutputForSpeed: 0,
                 };
                 existing.messages += 1;
                 existing.input += input;
@@ -290,11 +293,25 @@ function collectUsage(sessionFiles, startMs, endMs, scope, groupBy) {
                 existing.cacheWrite += cacheWrite;
                 existing.total += total;
                 existing.cost += cost;
+                // Track tok/sec: use preceding user message timestamp
+                if (output > 0 && lastUserTimestamp > 0) {
+                    const durationMs = timestamp - lastUserTimestamp;
+                    if (durationMs > 0) {
+                        existing.totalDurationMs += durationMs;
+                        existing.totalOutputForSpeed += output;
+                    }
+                }
                 rows.set(key, existing);
             }
             else if (message.role === "user") {
                 const timestamp = Number(message.timestamp ?? 0);
-                if (!timestamp || timestamp < startMs || timestamp >= endMs)
+                if (!timestamp)
+                    continue;
+                // Always track last user timestamp for tok/sec calculation,
+                // even if this user message is outside the time range
+                // (the assistant response may still be within range).
+                lastUserTimestamp = timestamp;
+                if (timestamp < startMs || timestamp >= endMs)
                     continue;
                 matchedUserPrompts++;
                 const model = currentModel;
@@ -311,6 +328,8 @@ function collectUsage(sessionFiles, startMs, endMs, scope, groupBy) {
                     cacheWrite: 0,
                     total: 0,
                     cost: 0,
+                    totalDurationMs: 0,
+                    totalOutputForSpeed: 0,
                 };
                 existing.userPrompts += 1;
                 userPromptRows.set(key, existing);
@@ -342,8 +361,10 @@ function collectUsage(sessionFiles, startMs, endMs, scope, groupBy) {
         acc.cacheWrite += row.cacheWrite;
         acc.total += row.total;
         acc.cost += row.cost;
+        acc.totalDurationMs += row.totalDurationMs;
+        acc.totalOutputForSpeed += row.totalOutputForSpeed;
         return acc;
-    }, { messages: 0, userPrompts: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0, cost: 0 });
+    }, { messages: 0, userPrompts: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0, cost: 0, totalDurationMs: 0, totalOutputForSpeed: 0 });
     return {
         label: "",
         scope,
@@ -355,6 +376,11 @@ function collectUsage(sessionFiles, startMs, endMs, scope, groupBy) {
         totals,
     };
 }
+function formatSpeed(totalDurationMs, totalOutputForSpeed) {
+    if (totalDurationMs <= 0)
+        return "—";
+    return Math.round(totalOutputForSpeed / (totalDurationMs / 1000)).toLocaleString();
+}
 function renderTable(report) {
     const firstColumnHeader = report.groupBy === "project"
         ? "project"
@@ -371,7 +397,9 @@ function renderTable(report) {
         write: formatInt(row.cacheWrite),
         total: formatInt(row.total),
         cost: formatCost(row.cost),
+        speed: formatSpeed(row.totalDurationMs, row.totalOutputForSpeed),
     }));
+    const totalsSpeed = formatSpeed(report.totals.totalDurationMs, report.totals.totalOutputForSpeed);
     const widths = {
         label: Math.max(firstColumnHeader.length, ...displayRows.map((row) => row.label.length), 5),
         userPrompts: Math.max(11, ...displayRows.map((row) => row.userPrompts.length), String(report.totals.userPrompts).length),
@@ -382,6 +410,7 @@ function renderTable(report) {
         write: Math.max(5, ...displayRows.map((row) => row.write.length), formatInt(report.totals.cacheWrite).length),
         total: Math.max(5, ...displayRows.map((row) => row.total.length), formatInt(report.totals.total).length),
         cost: Math.max(7, ...displayRows.map((row) => row.cost.length), formatCost(report.totals.cost).length),
+        speed: Math.max(5, ...displayRows.map((row) => row.speed.length), totalsSpeed.length),
     };
     const header = [
         firstColumnHeader.padEnd(widths.label),
@@ -393,6 +422,7 @@ function renderTable(report) {
         "write".padStart(widths.write),
         "total".padStart(widths.total),
         "cost".padStart(widths.cost),
+        "tok/s".padStart(widths.speed),
     ].join("  ");
     const divider = "-".repeat(header.length);
     const body = displayRows.map((row) => [
@@ -405,6 +435,7 @@ function renderTable(report) {
         row.write.padStart(widths.write),
         row.total.padStart(widths.total),
         row.cost.padStart(widths.cost),
+        row.speed.padStart(widths.speed),
     ].join("  "));
     const totalsLine = [
         "TOTAL".padEnd(widths.label),
@@ -416,6 +447,7 @@ function renderTable(report) {
         formatInt(report.totals.cacheWrite).padStart(widths.write),
         formatInt(report.totals.total).padStart(widths.total),
         formatCost(report.totals.cost).padStart(widths.cost),
+        totalsSpeed.padStart(widths.speed),
     ].join("  ");
     return [header, divider, ...body, divider, totalsLine].join("\n");
 }

package/dist/resources/extensions/voice/index.js

@@ -275,6 +275,7 @@ export default function (pi) {
             activationMode,
             editorText: ctx.ui.getEditorText(),
             holdToTalkSupported: isKittyProtocolActive(),
+            isEditorFocused: ctx.ui.isEditorFocused(),
             onUnsupported: () => {
                 if (holdToTalkUnsupportedNotified)
                     return;

package/dist/resources/extensions/voice/push-to-talk.js

@@ -2,6 +2,8 @@ import { isKeyRelease, Key, matchesKey } from "@gsd/pi-tui";
 export function handlePushToTalkInput(data, state) {
     if (!matchesKey(data, Key.space))
         return undefined;
+    if (!state.isEditorFocused)
+        return undefined;
     if (isKeyRelease(data)) {
         if (state.activationMode === "push-to-talk") {
             void Promise.resolve(state.stopVoice());

package/dist/welcome-screen.js

@@ -59,8 +59,8 @@ export function printWelcomeScreen(opts) {
     // Keep welcome colors anchored to the active CLI theme accent so the banner
     // feels native regardless of custom themes.
     const ACCENT = accentHex();
-    const LOGO_EDGE = chalk.white;
-    const LOGO_CENTER = chalk.whiteBright;
+    const LOGO_EDGE = chalk.hex(mixHex(ACCENT, '#000000', 0.35));
+    const LOGO_CENTER = chalk.hex(mixHex(ACCENT, '#ffffff', 0.2));
     const TITLE_BASE = chalk.bold;
     const TITLE_MARK = chalk.hex(mixHex(ACCENT, '#ffffff', 0.35)).bold;
     const VERSION = chalk.dim;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lsd-pi",
-  "version": "1.3.6",
+  "version": "1.3.9",
   "description": "LSD — Looks Sort of Done coding agent",
   "license": "MIT",
   "repository": {

package/packages/pi-coding-agent/dist/core/agent-session.context-usage.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=agent-session.context-usage.test.d.ts.map

package/packages/pi-coding-agent/dist/core/agent-session.context-usage.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-session.context-usage.test.d.ts","sourceRoot":"","sources":["../../src/core/agent-session.context-usage.test.ts"],"names":[],"mappings":""}

package/packages/pi-coding-agent/dist/core/agent-session.context-usage.test.js

@@ -0,0 +1,72 @@
+import { describe, it, mock } from "node:test";
+import assert from "node:assert/strict";
+import { AgentSession } from "./agent-session.js";
+describe("AgentSession context usage caching", () => {
+    it("memoizes getContextUsage until context changes", () => {
+        let branchCalls = 0;
+        const messages = [
+            { role: "user", content: "hello" },
+            {
+                role: "assistant",
+                content: [{ type: "text", text: "hi" }],
+                usage: { input: 120, output: 30, cacheRead: 0, cacheWrite: 0, cost: { total: 0 } },
+                stopReason: "end_turn",
+                provider: "test",
+                model: "fast-model",
+            },
+        ];
+        const fakeSession = {
+            model: { provider: "test", id: "fast-model", contextWindow: 1000 },
+            messages,
+            sessionManager: {
+                getBranch: () => {
+                    branchCalls += 1;
+                    return [];
+                },
+            },
+            _contextUsageRevision: 0,
+            _contextUsageCache: undefined,
+        };
+        const first = AgentSession.prototype.getContextUsage.call(fakeSession);
+        const second = AgentSession.prototype.getContextUsage.call(fakeSession);
+        assert.equal(branchCalls, 1);
+        assert.strictEqual(second, first);
+        messages.push({ role: "user", content: "follow up" });
+        AgentSession.prototype["_invalidateContextUsageCache"].call(fakeSession);
+        const third = AgentSession.prototype.getContextUsage.call(fakeSession);
+        assert.equal(branchCalls, 2);
+        assert.notStrictEqual(third, first);
+        assert.ok((third?.tokens ?? 0) > (first?.tokens ?? 0));
+    });
+    it("clears cached context usage before emitting session events", () => {
+        const listener = mock.fn(() => { });
+        const fakeSession = {
+            _contextUsageRevision: 3,
+            _contextUsageCache: {
+                revision: 3,
+                modelKey: "test/model:1000",
+                usage: { tokens: 123, contextWindow: 1000, percent: 12.3 },
+            },
+            _eventListeners: [listener],
+            _invalidateContextUsageCache: AgentSession.prototype["_invalidateContextUsageCache"],
+        };
+        AgentSession.prototype["_emit"].call(fakeSession, { type: "session_state_changed", reason: "set_model" });
+        assert.equal(fakeSession._contextUsageRevision, 4);
+        assert.equal(fakeSession._contextUsageCache, undefined);
+        assert.equal(listener.mock.callCount(), 1);
+    });
+    it("invalidates cached context usage for immediate bash history writes", () => {
+        const invalidate = mock.fn(() => { });
+        const appendMessage = mock.fn(() => { });
+        const fakeSession = {
+            isStreaming: false,
+            agent: { appendMessage },
+            sessionManager: { appendMessage },
+            _invalidateContextUsageCache: invalidate,
+        };
+        AgentSession.prototype.recordBashResult.call(fakeSession, "pwd", { output: "/tmp", exitCode: 0, cancelled: false, truncated: false, fullOutputPath: undefined, sandboxed: false });
+        assert.equal(invalidate.mock.callCount(), 1);
+        assert.equal(appendMessage.mock.callCount(), 2);
+    });
+});
+//# sourceMappingURL=agent-session.context-usage.test.js.map

package/packages/pi-coding-agent/dist/core/agent-session.context-usage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-session.context-usage.test.js","sourceRoot":"","sources":["../../src/core/agent-session.context-usage.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe, it, mock } from \"node:test\";\nimport assert from \"node:assert/strict\";\nimport { AgentSession } from \"./agent-session.js\";\n\ndescribe(\"AgentSession context usage caching\", () => {\n    it(\"memoizes getContextUsage until context changes\", () => {\n        let branchCalls = 0;\n        const messages = [\n            { role: \"user\", content: \"hello\" },\n            {\n                role: \"assistant\",\n                content: [{ type: \"text\", text: \"hi\" }],\n                usage: { input: 120, output: 30, cacheRead: 0, cacheWrite: 0, cost: { total: 0 } },\n                stopReason: \"end_turn\",\n                provider: \"test\",\n                model: \"fast-model\",\n            },\n        ] as any[];\n\n        const fakeSession = {\n            model: { provider: \"test\", id: \"fast-model\", contextWindow: 1000 },\n            messages,\n            sessionManager: {\n                getBranch: () => {\n                    branchCalls += 1;\n                    return [];\n                },\n            },\n            _contextUsageRevision: 0,\n            _contextUsageCache: undefined,\n        } as any;\n\n        const first = AgentSession.prototype.getContextUsage.call(fakeSession);\n        const second = AgentSession.prototype.getContextUsage.call(fakeSession);\n\n        assert.equal(branchCalls, 1);\n        assert.strictEqual(second, first);\n\n        messages.push({ role: \"user\", content: \"follow up\" } as any);\n        AgentSession.prototype[\"_invalidateContextUsageCache\"].call(fakeSession);\n        const third = AgentSession.prototype.getContextUsage.call(fakeSession);\n\n        assert.equal(branchCalls, 2);\n        assert.notStrictEqual(third, first);\n        assert.ok((third?.tokens ?? 0) > (first?.tokens ?? 0));\n    });\n\n    it(\"clears cached context usage before emitting session events\", () => {\n        const listener = mock.fn(() => { });\n        const fakeSession = {\n            _contextUsageRevision: 3,\n            _contextUsageCache: {\n                revision: 3,\n                modelKey: \"test/model:1000\",\n                usage: { tokens: 123, contextWindow: 1000, percent: 12.3 },\n            },\n            _eventListeners: [listener],\n            _invalidateContextUsageCache: AgentSession.prototype[\"_invalidateContextUsageCache\"],\n        } as any;\n\n        AgentSession.prototype[\"_emit\"].call(fakeSession, { type: \"session_state_changed\", reason: \"set_model\" });\n\n        assert.equal(fakeSession._contextUsageRevision, 4);\n        assert.equal(fakeSession._contextUsageCache, undefined);\n        assert.equal(listener.mock.callCount(), 1);\n    });\n\n    it(\"invalidates cached context usage for immediate bash history writes\", () => {\n        const invalidate = mock.fn(() => { });\n        const appendMessage = mock.fn(() => { });\n        const fakeSession = {\n            isStreaming: false,\n            agent: { appendMessage },\n            sessionManager: { appendMessage },\n            _invalidateContextUsageCache: invalidate,\n        } as any;\n\n        AgentSession.prototype.recordBashResult.call(\n            fakeSession,\n            \"pwd\",\n            { output: \"/tmp\", exitCode: 0, cancelled: false, truncated: false, fullOutputPath: undefined, sandboxed: false },\n        );\n\n        assert.equal(invalidate.mock.callCount(), 1);\n        assert.equal(appendMessage.mock.callCount(), 2);\n    });\n});\n"]}

package/packages/pi-coding-agent/dist/core/agent-session.d.ts

@@ -179,6 +179,9 @@ export declare class AgentSession {
     private _cumulativeToolCalls;
     /** Cost of the most recent assistant response (for per-prompt display). */
     private _lastTurnCost;
+    /** Incremented whenever context-affecting state changes. */
+    private _contextUsageRevision;
+    private _contextUsageCache;
     private _bashAbortController;
     private _pendingBashMessages;
     private _extensionRunner;
@@ -211,6 +214,7 @@ export declare class AgentSession {
     /** Fallback resolver for cross-provider fallback */
     get fallbackResolver(): FallbackResolver;
     get sandboxManager(): SandboxManager | undefined;
+    private _invalidateContextUsageCache;
     /** Emit an event to all listeners */
     private _emit;
     private _emitSessionStateChanged;