mini-coder 0.5.3 → 0.5.5

package/README.md

@@ -59,32 +59,34 @@ Plugins can add more tools, but the core stays intentionally small.
 
 ## Commands
 
-| Command      | Description                                                            |
-| ------------ | ---------------------------------------------------------------------- |
-| `/model`     | Switch models. Persists as the global default.                         |
-| `/session`   | List and resume sessions scoped to the current working directory.      |
-| `/new`       | Start a fresh session and reset cumulative usage counters.             |
-| `/fork`      | Copy the conversation into a new session and continue independently.   |
-| `/undo`      | Remove the last conversational turn (does not revert file changes).    |
-| `/reasoning` | Toggle thinking visibility. Persisted and restored on launch.          |
-| `/verbose`   | Toggle verbose shell rendering plus edit previews/errors in the log.   |
-| `/login`     | Interactive OAuth login for supported providers.                       |
-| `/logout`    | Clear saved OAuth credentials for a logged-in provider.                |
-| `/effort`    | Set reasoning effort: low, medium, high, or xhigh.                     |
-| `/help`      | List commands, loaded AGENTS.md files, discovered skills, and plugins. |
+| Command      | Description                                                                                            |
+| ------------ | ------------------------------------------------------------------------------------------------------ |
+| `/model`     | Switch models and save the choice as the global default.                                               |
+| `/session`   | Open the session picker for the current working directory.                                             |
+| `/new`       | Start a fresh session and reset the running token and cost totals.                                     |
+| `/fork`      | Fork the current chat into a new session, keep the original, and add a UI-only `Forked session.` note. |
+| `/undo`      | Remove the last conversational turn without touching filesystem changes.                               |
+| `/reasoning` | Show or hide model thinking. The setting is saved and restored on launch.                              |
+| `/verbose`   | Expand shell output plus edit previews and edit errors in the conversation log.                        |
+| `/login`     | Sign in with a supported OAuth provider.                                                               |
+| `/logout`    | Remove saved OAuth credentials for a logged-in provider.                                               |
+| `/effort`    | Choose low, medium, high, or xhigh reasoning effort.                                                   |
+| `/help`      | Show commands, current toggles, loaded AGENTS.md files, skills, and plugins.                           |
 
 ## Key bindings
 
-| Key           | Action                                            |
-| ------------- | ------------------------------------------------- |
-| `Enter`       | Submit message                                    |
-| `Shift+Enter` | Insert newline                                    |
-| `Escape`      | Interrupt current turn, preserve partial response |
-| `Tab`         | File path autocomplete (or command filter on `/`) |
-| `Ctrl+R`      | Search global raw input history                   |
-| `Ctrl+C`      | Graceful exit                                     |
-| `Ctrl+D`      | Graceful exit (EOF, when input is empty)          |
-| `:q`          | Graceful exit                                     |
+| Key           | Action                                                                                                     |
+| ------------- | ---------------------------------------------------------------------------------------------------------- |
+| `Enter`       | Submit message                                                                                             |
+| `Shift+Enter` | Insert newline                                                                                             |
+| `Escape`      | Dismiss the overlay without changing the draft; otherwise interrupt the running turn; otherwise do nothing |
+| `Tab`         | Autocomplete a path, or open the command picker when the draft starts with `/`                             |
+| `Ctrl+R`      | Search global raw input history                                                                            |
+| `Ctrl+C`      | Graceful exit                                                                                              |
+| `Ctrl+D`      | Graceful exit when the input is empty                                                                      |
+| `:q`          | Graceful exit                                                                                              |
+| `Ctrl+Z`      | Suspend the process                                                                                        |
+| Mouse wheel   | Scroll conversation history                                                                                |
 
 ## Headless one-shot mode
 
@@ -95,10 +97,12 @@ $ mc -p "summarize this repo"
 $ printf '%s\n' 'fix the failing tests' | mc
 ```
 
-- Enabled when `-p/--prompt` is provided or when stdin/stdout is not a TTY.
-- Reuses the same input parsing rules as the interactive UI for plain text, `/skill:name`, and standalone image paths.
-- Streams newline-delimited JSON events to stdout.
-- Interactive slash commands such as `/model` and `/help` are not available in headless mode.
+- Starts when `-p/--prompt` is provided or when stdin or stdout is not a TTY.
+- If stdout is redirected but stdin is still interactive, pass `-p`; headless mode will not fall back to an interactive prompt.
+- Uses the same parser as the TUI for plain text, `/skill:name`, and standalone image paths.
+- Writes raw NDJSON events to stdout for text deltas, tool activity, final messages, and `done` / `error` / `aborted` outcomes.
+- Headless runs still persist like normal sessions and show up in `/session` history for that working directory.
+- Interactive slash commands such as `/model`, `/session`, and `/help` are not available in headless mode.
 
 ## Docs
 

package/bun.lock

@@ -5,9 +5,9 @@
     "": {
       "name": "mini-coder",
       "dependencies": {
-        "@cel-tui/components": "^0.6.2",
-        "@cel-tui/core": "^0.6.2",
-        "@cel-tui/types": "^0.6.2",
+        "@cel-tui/components": "0.7.2",
+        "@cel-tui/core": "0.7.2",
+        "@cel-tui/types": "0.7.2",
         "@mariozechner/pi-ai": "^0.66.1",
       },
       "devDependencies": {
@@ -108,11 +108,11 @@
 
     "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.4.11", "", { "os": "win32", "cpu": "x64" }, "sha512-A8D3JM/00C2KQgUV3oj8Ba15EHEYwebAGCy5Sf9GAjr5Y3+kJIYOiESoqRDeuRZueuMdCsbLZIUqmPhpYXJE9A=="],
 
-    "@cel-tui/components": ["@cel-tui/components@0.6.2", "", { "dependencies": { "@cel-tui/core": "0.6.2", "@cel-tui/types": "0.6.2", "lextide": "^0.1.0", "yoctomarkdown": "^0.1.0" }, "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-FYR7lX3/gPAyEkfMuyVapdxfO0e9OIw4lmdIUF2Tw7QszkpV4MAkEoB3G2oUY6UZyxJCSCKLBPvLzwu5uxaDgw=="],
+    "@cel-tui/components": ["@cel-tui/components@0.7.2", "", { "dependencies": { "@cel-tui/core": "0.7.2", "@cel-tui/types": "0.7.2", "lextide": "^0.2.1", "yoctomarkdown": "^0.1.0" }, "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-RHq7G/lS6A733l534cSStQp+cJECkxZZWrLghbPHwGBsSeDdJ2MkrQm+02roh6EH/N40ZAYjQqplq8acRrnFFQ=="],
 
-    "@cel-tui/core": ["@cel-tui/core@0.6.2", "", { "dependencies": { "@cel-tui/types": "0.6.2", "get-east-asian-width": "^1.5.0" }, "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-KJQdDMPbwLE211Hvn75jUKEvHiKTtQ7iVGJiiOpG+s4DjhnpySBXWO0hReMxe5NR2NPls7wmze1dBZ8/MXqVXA=="],
+    "@cel-tui/core": ["@cel-tui/core@0.7.2", "", { "dependencies": { "@cel-tui/types": "0.7.2", "get-east-asian-width": "^1.5.0" }, "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-Y5qdI9Zoa77Olq/LD+vqf3j0hyCRJYkkTkIdUfQplSDSUJS5NM+VSnxcQ8RCUNmrIsHeLmmAPHYsBsS1WMWk1w=="],
 
-    "@cel-tui/types": ["@cel-tui/types@0.6.2", "", { "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-JsJdo20KmgtC67QlG/ZrZyGi0xNJBKd3G6kM/yN/6/hk8a86P+1k1jqtSUjcZ4E9x1v9IXqPk6QelU7kLyOV1A=="],
+    "@cel-tui/types": ["@cel-tui/types@0.7.2", "", { "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-XEmYkGqtBMOXI/DKLopv5OL7d5/8ybkj1OpJO4weWPyx4Y6VY9pYFaj8zYhVaFSQZcB23/yoA+DPYi0kOgoZhQ=="],
 
     "@google/genai": ["@google/genai@1.48.0", "", { "dependencies": { "google-auth-library": "^10.3.0", "p-retry": "^4.6.2", "protobufjs": "^7.5.4", "ws": "^8.18.0" }, "peerDependencies": { "@modelcontextprotocol/sdk": "^1.25.2" }, "optionalPeers": ["@modelcontextprotocol/sdk"] }, "sha512-plonYK4ML2PrxsRD9SeqmFt76eREWkQdPCglOA6aYDzL1AAbE+7PUnT54SvpWGfws13L0AZEqGSpL7+1IPnTxQ=="],
 
@@ -342,7 +342,7 @@
 
     "lefthook-windows-x64": ["lefthook-windows-x64@2.1.5", "", { "os": "win32", "cpu": "x64" }, "sha512-yiAh8qxml6uqy10jDxOdN9fOQpyLxBFY1fgCEAhn7sVJYmJKRhjqSBwZX6LG5MQjzr29KStrIdw7TR3lf3rT7Q=="],
 
-    "lextide": ["lextide@0.1.0", "", {}, "sha512-i1fx9SzultDOIgVtFt/vBOeyFaGYCNLT6OcdqOLRfWL9p6aTQsq8JQ+8LpJ4T7znWNjfjLqUU6dK5g2kXhSq3A=="],
+    "lextide": ["lextide@0.2.1", "", {}, "sha512-fP7liS0LoNJz2EF6G7+K21yvB58bJEjaTrsDcPi4Qv7xZynB9NzjY44N6tFK6SJaECHIUqF2kcWbWQ84hPfmlg=="],
 
     "long": ["long@5.3.2", "", {}, "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA=="],
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini-coder",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "A small, fast CLI coding agent",
   "module": "src/index.ts",
   "type": "module",
@@ -18,9 +18,9 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@cel-tui/components": "^0.6.2",
-    "@cel-tui/core": "^0.6.2",
-    "@cel-tui/types": "^0.6.2",
+    "@cel-tui/components": "^0.7.2",
+    "@cel-tui/core": "^0.7.2",
+    "@cel-tui/types": "^0.7.2",
     "@mariozechner/pi-ai": "^0.66.1"
   },
   "devDependencies": {

package/src/index.ts

@@ -47,6 +47,7 @@ import {
 } from "./prompt.ts";
 import {
   appendMessage,
+  computeContextTokens,
   computeStats,
   createSession,
   filterModelMessages,
@@ -526,6 +527,8 @@ export interface AppState {
   messages: ReturnType<typeof loadMessages>;
   /** Cumulative session input/output/cost stats for the status bar. */
   stats: SessionStats;
+  /** Estimated model-visible context tokens for the next request. */
+  contextTokens: number;
   /** Discovered AGENTS.md files. */
   agentsMd: AgentsMdFile[];
   /** Discovered skills. */
@@ -610,6 +613,7 @@ export async function init(): Promise<AppState> {
   const effort = startup.effort;
   const messages: ReturnType<typeof loadMessages> = [];
   const stats = computeStats(messages);
+  const contextTokens = computeContextTokens(messages);
   const promptContext = await loadPromptContext(filterModelMessages(messages), {
     cwd,
   });
@@ -621,6 +625,7 @@ export async function init(): Promise<AppState> {
     effort,
     messages,
     stats,
+    contextTokens,
     agentsMd: promptContext.agentsMd,
     skills: promptContext.skills,
     plugins: promptContext.plugins,

package/src/prompt.ts

@@ -225,6 +225,7 @@ Workflow: **inspect with shell → mutate with edit → verify with shell**.
 
 - Think first: before any tool call, decide all files and information you need.
 - Early in the task, look for acceptance criteria in tests, verifier scripts, eval scripts, examples, and expected-output files. Do not rely on the task text alone when machine-checkable criteria are available.
+- Before relying on a binary, interpreter, or CLI helper you have not yet confirmed, probe availability with focused checks such as \`command -v <tool>\`, \`<tool> --version\`, or \`python3 -m pip --version\`, then adapt to what is actually installed.
 - Batch reads: if you need multiple files, read them together in parallel rather than one at a time.
 - Only make sequential calls when a later call genuinely depends on an earlier result.
 
@@ -233,13 +234,15 @@ Workflow: **inspect with shell → mutate with edit → verify with shell**.
 - Be concise. Friendly coding teammate tone.
 - After making changes: lead with a quick explanation of what changed and why, then suggest logical next steps if any.
 - Don't dump large file contents you've written — reference file paths.
-- When suggesting multiple options, use numbered lists so the user can reply with a number.
+- When discussing multiple options, use numbered lists so the user can reply with a number without turning it into a questionnaire.
 - If asked for a review, focus on bugs, risks, regressions, and missing tests. Findings first, ordered by severity.
 
 # Persistence
 
 - Carry work through to completion within the current turn. Don't stop at analysis or partial fixes.
 - Once the contract is clear, create the required artifact early, then iterate and improve it. Do not spend most of the turn exploring.
+- Run the narrowest verifier or test as soon as there is a plausible first implementation or artifact. Do not delay the first verification run until the end.
+- When verification is down to a small number of failures, stop broad exploration and focus only on the remaining failing assertions or exact contract gaps until the last detail passes.
 - If you encounter an error, diagnose and fix it rather than reporting it and stopping.
 - Before concluding, run the smallest targeted verification that checks the exact contract: required files exist, names and signatures match, outputs are in the required format, and no forbidden extra artifacts were left behind.
 - Avoid excessive looping: if you're re-reading or re-editing the same files without progress, stop and ask the user.`;

package/src/session.ts

@@ -107,7 +107,7 @@ export interface UiMessage {
 }
 
 /** Any message persisted in session history. */
-type PersistedMessage = Message | UiMessage;
+export type PersistedMessage = Message | UiMessage;
 
 /** Options for creating a new session. */
 interface CreateSessionOpts {
@@ -160,6 +160,8 @@ const EMPTY_ASSISTANT_USAGE: AssistantMessage["usage"] = {
   },
 };
 
+const SQLITE_BUSY_TIMEOUT_MS = 1_000;
+
 /** Row shape returned by `SELECT * FROM prompt_history`. */
 type PromptHistoryRow = {
   id: number;
@@ -253,6 +255,7 @@ CREATE INDEX IF NOT EXISTS idx_prompt_history_created_at ON prompt_history(creat
 export function openDatabase(path: string): Database {
   const db = new Database(path);
   db.run("PRAGMA journal_mode = WAL");
+  db.run(`PRAGMA busy_timeout = ${SQLITE_BUSY_TIMEOUT_MS}`);
   db.run("PRAGMA foreign_keys = ON");
   db.exec(SCHEMA);
   return db;
@@ -709,6 +712,31 @@ export function getAssistantUsage(
   };
 }
 
+function runInImmediateTransaction<T>(db: Database, callback: () => T): T {
+  if (db.inTransaction) {
+    return callback();
+  }
+
+  db.run("BEGIN IMMEDIATE");
+  try {
+    const result = callback();
+    db.run("COMMIT");
+    return result;
+  } catch (error) {
+    if (db.inTransaction) {
+      try {
+        db.run("ROLLBACK");
+      } catch (rollbackError) {
+        throw new AggregateError(
+          [error, rollbackError],
+          "Failed to roll back SQLite transaction",
+        );
+      }
+    }
+    throw error;
+  }
+}
+
 /**
  * Append a UI-only message to a session's history.
  *
@@ -790,25 +818,27 @@ export function appendMessage(
   message: PersistedMessage,
   turn?: number,
 ): number | null {
-  const now = Date.now();
-
-  let effectiveTurn: number | null;
-  if (isUiMessage(message)) {
-    effectiveTurn = null;
-  } else if (turn !== undefined) {
-    effectiveTurn = turn;
-  } else {
-    const row = db.query<MaxTurnRow, [string]>(SQL.maxTurn).get(sessionId);
-    effectiveTurn = (row?.max_turn ?? 0) + 1;
-  }
+  return runInImmediateTransaction(db, () => {
+    const now = Date.now();
+
+    let effectiveTurn: number | null;
+    if (isUiMessage(message)) {
+      effectiveTurn = null;
+    } else if (turn !== undefined) {
+      effectiveTurn = turn;
+    } else {
+      const row = db.query<MaxTurnRow, [string]>(SQL.maxTurn).get(sessionId);
+      effectiveTurn = (row?.max_turn ?? 0) + 1;
+    }
 
-  db.run(
-    "INSERT INTO messages (session_id, turn, data, created_at) VALUES (?, ?, ?, ?)",
-    [sessionId, effectiveTurn, JSON.stringify(message), now],
-  );
-  db.run("UPDATE sessions SET updated_at = ? WHERE id = ?", [now, sessionId]);
+    db.run(
+      "INSERT INTO messages (session_id, turn, data, created_at) VALUES (?, ?, ?, ?)",
+      [sessionId, effectiveTurn, JSON.stringify(message), now],
+    );
+    db.run("UPDATE sessions SET updated_at = ? WHERE id = ?", [now, sessionId]);
 
-  return effectiveTurn;
+    return effectiveTurn;
+  });
 }
 
 /**
@@ -1041,3 +1071,153 @@ export function computeStats(
 
   return stats;
 }
+
+// ---------------------------------------------------------------------------
+// Context estimation
+// ---------------------------------------------------------------------------
+
+/** Conservative fixed estimate for an image block's token footprint. */
+const ESTIMATED_IMAGE_TOKENS = 1_200;
+
+/** Calculate context tokens from assistant usage, falling back when `totalTokens` is zero. */
+function calculateUsageTokens(usage: AssistantMessage["usage"]): number {
+  return (
+    usage.totalTokens ||
+    usage.input + usage.output + usage.cacheRead + usage.cacheWrite
+  );
+}
+
+/** Estimate token usage from a character count using a conservative chars/4 heuristic. */
+function estimateCharacterTokens(charCount: number): number {
+  return Math.ceil(charCount / 4);
+}
+
+type UserMultipartContent = Exclude<
+  Extract<Message, { role: "user" }>["content"],
+  string
+>;
+type TextOrImageContentBlock =
+  | UserMultipartContent[number]
+  | Extract<Message, { role: "toolResult" }>["content"][number];
+
+function estimateTextOrImageContentTokens(
+  content: readonly TextOrImageContentBlock[],
+): number {
+  let chars = 0;
+  let imageTokens = 0;
+
+  for (const block of content) {
+    if (block.type === "text") {
+      chars += block.text.length;
+      continue;
+    }
+    if (block.type === "image") {
+      imageTokens += ESTIMATED_IMAGE_TOKENS;
+    }
+  }
+
+  return estimateCharacterTokens(chars) + imageTokens;
+}
+
+function estimateUserMessageTokens(
+  message: Extract<Message, { role: "user" }>,
+): number {
+  if (typeof message.content === "string") {
+    return estimateCharacterTokens(message.content.length);
+  }
+  return estimateTextOrImageContentTokens(message.content);
+}
+
+function estimateAssistantBlockCharacters(
+  block: Extract<Message, { role: "assistant" }>["content"][number],
+): number {
+  if (block.type === "text") {
+    return block.text.length;
+  }
+  if (block.type === "thinking") {
+    return block.thinking.length;
+  }
+  return block.name.length + JSON.stringify(block.arguments).length;
+}
+
+function estimateAssistantMessageTokens(
+  message: Extract<Message, { role: "assistant" }>,
+): number {
+  const chars = message.content.reduce((total, block) => {
+    return total + estimateAssistantBlockCharacters(block);
+  }, 0);
+  return estimateCharacterTokens(chars);
+}
+
+function estimateToolResultMessageTokens(
+  message: Extract<Message, { role: "toolResult" }>,
+): number {
+  return estimateTextOrImageContentTokens(message.content);
+}
+
+/** Estimate token usage for a model-visible message. */
+function estimateMessageTokens(message: Message): number {
+  switch (message.role) {
+    case "user":
+      return estimateUserMessageTokens(message);
+    case "assistant":
+      return estimateAssistantMessageTokens(message);
+    case "toolResult":
+      return estimateToolResultMessageTokens(message);
+  }
+}
+
+/**
+ * Fold one persisted message into the running context estimate for the next request.
+ *
+ * Assistant messages with valid usage anchor the full model-visible context for
+ * that point in the transcript, so they replace the running estimate. All other
+ * model-visible messages are added incrementally using the same conservative
+ * estimation logic used before the first valid assistant usage appears.
+ *
+ * @param contextTokens - Running estimate before this message.
+ * @param message - Persisted message to fold into the estimate.
+ * @returns Updated context-token estimate.
+ */
+export function addMessageToContextTokens(
+  contextTokens: number,
+  message: PersistedMessage,
+): number {
+  if (message.role === "ui") {
+    return contextTokens;
+  }
+
+  const usage = getAssistantUsage(message);
+  if (
+    message.role === "assistant" &&
+    usage &&
+    message.stopReason !== "aborted" &&
+    message.stopReason !== "error"
+  ) {
+    return calculateUsageTokens(usage);
+  }
+
+  return contextTokens + estimateMessageTokens(message);
+}
+
+/**
+ * Estimate the current model-visible context size for the next request.
+ *
+ * Recomputed on session-load boundaries and maintained incrementally during an
+ * active turn so render-time status-bar updates do not need to rescan the full
+ * message history.
+ *
+ * @param messages - Full persisted session history.
+ * @returns Estimated context tokens visible to the next model request.
+ */
+export function computeContextTokens(
+  messages: readonly PersistedMessage[],
+): number {
+  let contextTokens = 0;
+
+  for (const message of messages) {
+    contextTokens = addMessageToContextTokens(contextTokens, message);
+  }
+
+  return contextTokens;
+}

package/src/submit.ts

@@ -19,6 +19,7 @@ import {
 } from "./index.ts";
 import { parseInput } from "./input.ts";
 import {
+  addMessageToContextTokens,
   addMessageToStats,
   appendMessage,
   appendPromptHistory,
@@ -212,9 +213,17 @@ function handleAgentEvent(event: AgentEvent, state: AppState): void {
     case "assistant_message":
       state.messages.push(event.message);
       state.stats = addMessageToStats(state.stats, event.message);
+      state.contextTokens = addMessageToContextTokens(
+        state.contextTokens,
+        event.message,
+      );
       break;
     case "tool_result":
       state.messages.push(event.message);
+      state.contextTokens = addMessageToContextTokens(
+        state.contextTokens,
+        event.message,
+      );
       break;
     case "text_delta":
     case "thinking_delta":
@@ -277,6 +286,10 @@ export async function submitResolvedInput(
 
   const turn = appendMessage(state.db, session.id, userMessage);
   state.messages.push(userMessage);
+  state.contextTokens = addMessageToContextTokens(
+    state.contextTokens,
+    userMessage,
+  );
   hooks?.onUserMessage?.(state);
 
   state.git = await loadGitState(state.cwd);

package/src/ui/commands.test.ts

@@ -8,6 +8,7 @@ import type { AppState } from "../index.ts";
 import { COMMANDS } from "../input.ts";
 import {
   appendPromptHistory,
+  computeContextTokens,
   createSession,
   openDatabase,
 } from "../session.ts";
@@ -75,6 +76,7 @@ function createTestState(): AppState {
     effort: "medium",
     messages: [],
     stats: { totalInput: 0, totalOutput: 0, totalCost: 0 },
+    contextTokens: 0,
     agentsMd: [],
     skills: [],
     plugins: [],
@@ -377,6 +379,7 @@ describe("ui/commands", () => {
         totalOutput: 0,
         totalCost: 0,
       });
+      expect(state.contextTokens).toBe(computeContextTokens(state.messages));
     } finally {
       state.db.close();
     }
@@ -436,6 +439,7 @@ describe("ui/commands", () => {
       { role: "ui", kind: "info", content: "old", timestamp: 1 },
     ];
     state.stats = { totalInput: 10, totalOutput: 20, totalCost: 0.5 };
+    state.contextTokens = 123;
 
     try {
       expect(controller.handleCommand("new", state)).toBe(true);
@@ -449,6 +453,7 @@ describe("ui/commands", () => {
         totalOutput: 0,
         totalCost: 0,
       });
+      expect(state.contextTokens).toBe(0);
       expect(state.agentsMd).toEqual([
         { path: "/tmp/reloaded/AGENTS.md", content: "Reloaded context" },
       ]);

package/src/ui/commands.ts

@@ -19,6 +19,7 @@ import type { AppState } from "../index.ts";
 import { getAvailableModels, saveOAuthCredentials } from "../index.ts";
 import { COMMANDS } from "../input.ts";
 import {
+  computeContextTokens,
   computeStats,
   forkSession,
   listPromptHistory,
@@ -387,6 +388,7 @@ export function createCommandController(
             state.session = picked;
             state.messages = loadMessages(state.db, picked.id);
             state.stats = computeStats(state.messages);
+            state.contextTokens = computeContextTokens(state.messages);
             runtime.scrollConversationToBottom();
           }
         }
@@ -402,6 +404,7 @@ export function createCommandController(
     state.session = null;
     state.messages = [];
     state.stats = { totalInput: 0, totalOutput: 0, totalCost: 0 };
+    state.contextTokens = 0;
     await runtime.reloadPromptContext(state);
     runtime.scrollConversationToBottom();
     runtime.render();
@@ -415,6 +418,7 @@ export function createCommandController(
     state.session = forked;
     state.messages = loadMessages(state.db, forked.id);
     state.stats = computeStats(state.messages);
+    state.contextTokens = computeContextTokens(state.messages);
     runtime.appendInfoMessage("Forked session.", state);
   };
 
@@ -434,6 +438,7 @@ export function createCommandController(
     if (removed) {
       state.messages = loadMessages(state.db, state.session.id);
       state.stats = computeStats(state.messages);
+      state.contextTokens = computeContextTokens(state.messages);
       runtime.scrollConversationToBottom();
       runtime.render();
     }