pi-spark 0.20.0 → 0.21.1

package/LICENSE.md

@@ -0,0 +1,9 @@
+# MIT License
+
+Copyright (c) 2026-present Zilong Liang
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -69,13 +69,19 @@ pi-spark generates a short recap of the current session after it goes idle, or o
 
 ### Title
 
-pi-spark names the session automatically after the first exchange, so it's easy to find later in the session selector.
+pi-spark names the session automatically after the first completed turn, so it's easy to find later in the session selector.
 
-- After the first message is sent and the agent replies, pi-spark generates a short title from the conversation and sets it as the session name.
+- Once the agent completes its first response and any tool calls from that turn, pi-spark generates a short title from the conversation and sets it as the session name.
 - Generation is silent: nothing is shown in the UI, and the usage is recorded in a session entry like the recap.
 - Sessions that already have a name are left untouched.
 - The title generation can use its own model, configured separately from your working model.
 
+### Scrolling write previews
+
+Long, streaming `write` tool calls keep their latest lines visible instead of pinning the preview to the beginning. The omitted-line count appears above the preview, while `ctrl+o` still expands the full content.
+
+https://github.com/user-attachments/assets/b7bb77c1-c188-46a2-aba9-6487bdf58fa0
+
 ## Configuration
 
 pi-spark reads config from `~/.pi/agent/spark.json` and from the current project's `.pi/spark.json`. Project config overrides matching global fields.
@@ -126,7 +132,8 @@ All fields are optional. Each top-level feature runs with the defaults below unl
 | `fullscreen` | `{}` | Clears the screen and scrollback on start and exit, and pins the editor and footer to the bottom. |
 | `presets` | `{ [name]: Preset }` | Defines named model presets, keyed by name. |
 | `recap` | `RecapConfig` | Generates a session recap when idle or on demand. |
-| `title` | `TitleConfig` | Names the session automatically after the first exchange. |
+| `title` | `TitleConfig` | Names the session automatically after the first completed turn. |
+| `write` | `{}` | Keeps the latest lines of streaming `write` tool calls visible. |
 
 #### `CreditsConfig`
 
@@ -149,7 +156,7 @@ All supported providers are enabled by default. Set a provider to `false` to dis
 
 #### `EditorConfig`
 
-The `spinner` field is optional and defaults to `tildes`.
+The `spinner` field is optional and defaults to `tildes`. `thinkingLevelIndicator` is also optional and defaults to `border`.
 
 | Field | Value | Description |
 | --- | --- | --- |
@@ -157,6 +164,8 @@ The `spinner` field is optional and defaults to `tildes`.
 |  | `lights` | `○, ●` |
 |  | `tildes` (default) | `∼, ≈, ≋, ≈, ∼` |
 |  | `pulse` | `·, •, ●, •, ·` |
+| `thinkingLevelIndicator` | `border` (default) | Uses the thinking-level color for the editor border. |
+|  | `model` | Uses the thinking-level color for the model name and the dim color for the editor border. |
 
 #### `FooterConfig`
 
@@ -213,3 +222,18 @@ For example, to disable the customized footer:
   "footer": false
 }
 ```
+
+## Themes
+
+pi-spark ships with two custom themes inspired by [GitHub's VS Code themes](https://github.com/primer/github-vscode-theme):
+
+- [`github-light-default`](themes/github-light-default.json)
+- [`github-dark-default`](themes/github-dark-default.json)
+
+Select either theme in `/settings`, or configure automatic switching between them:
+
+```json
+{
+  "theme": "github-light-default/github-dark-default"
+}
+```

package/docs/reverse-engineering-fireworks-credits.md

@@ -89,7 +89,7 @@ The amount is `units + nanos / 1e9` (the standard `google.type.Money` encoding),
 The provider lives in [`src/features/credits/providers/fireworks.ts`](../src/features/credits/providers/fireworks.ts) and follows the same `CreditsProvider` contract as the HTTP-based providers; only the transport differs.
 
 - **Transport.** A single, reused `@grpc/grpc-js` client dials `gateway.fireworks.ai:443` over TLS. The service is declared in [`fireworks.proto`](../src/features/credits/providers/fireworks.proto) — the minimal slice needed, loaded at runtime with `@grpc/proto-loader`. The `.proto` is resolved relative to the module via `import.meta.url`, so it ships and loads from the package directory.
-- **Auth.** Each call sends `x-api-key: <key>` in gRPC metadata. The key comes from Pi's `modelRegistry.getApiKeyForProvider("fireworks")` (env `FIREWORKS_API_KEY`), handled by the manager.
+- **Auth.** Each call sends `x-api-key: <key>` in gRPC metadata. The manager resolves provider authentication through Pi's `modelRegistry.getProviderAuth("fireworks")`. For Fireworks, Pi returns the API key sourced from `FIREWORKS_API_KEY`.
 - **Account resolution.** `ListAccounts` is called once and the resolved `accounts/<id>` is cached per API key, so steady-state refreshes are a single `GetBalance` round trip.
 - **Cancellation.** The shared `AbortSignal` cancels the in-flight gRPC call, and a defensive deadline bounds each request.
 - **Result.** `Money` is converted to a dollar amount and returned as `{ type: "balance", remaining }`, which the status line renders like any other balance provider.

package/index.ts

@@ -6,6 +6,7 @@ import { registerFullscreen } from "./src/features/fullscreen";
 import { registerPresets } from "./src/features/presets";
 import { registerRecap } from "./src/features/recap";
 import { registerTitle } from "./src/features/title";
+import { registerWrite } from "./src/features/write";
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
@@ -26,4 +27,5 @@ export default function (pi: ExtensionAPI) {
   registerPresets(pi);
   registerRecap(pi);
   registerTitle(pi);
+  registerWrite(pi);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-spark",
-  "version": "0.20.0",
+  "version": "0.21.1",
   "description": "Pi package that polishes your daily experience.",
   "keywords": [
     "pi-coding-agent",
@@ -15,6 +15,7 @@
   "files": [
     "index.ts",
     "src",
+    "themes",
     "assets",
     "docs",
     "README.md",
@@ -24,6 +25,9 @@
     "extensions": [
       "./index.ts"
     ],
+    "themes": [
+      "./themes"
+    ],
     "image": "https://raw.githubusercontent.com/zlliang/pi-spark/main/assets/cover.png"
   },
   "scripts": {
@@ -33,22 +37,23 @@
     "@grpc/grpc-js": "^1.14.4",
     "@grpc/proto-loader": "^0.8.1",
     "defu": "^6.1.7",
+    "ky": "^2.0.2",
     "parse-duration": "^2.1.8",
     "pretty-ms": "^9.3.0",
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@earendil-works/pi-agent-core": ">=0.80.8",
-    "@earendil-works/pi-ai": ">=0.80.8",
-    "@earendil-works/pi-coding-agent": ">=0.80.8",
-    "@earendil-works/pi-tui": ">=0.80.8",
+    "@earendil-works/pi-agent-core": ">=0.81.0",
+    "@earendil-works/pi-ai": ">=0.81.0",
+    "@earendil-works/pi-coding-agent": ">=0.81.0",
+    "@earendil-works/pi-tui": ">=0.81.0",
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-agent-core": ">=0.80.8",
-    "@earendil-works/pi-ai": ">=0.80.8",
-    "@earendil-works/pi-coding-agent": ">=0.80.8",
-    "@earendil-works/pi-tui": ">=0.80.8",
+    "@earendil-works/pi-agent-core": ">=0.81.0",
+    "@earendil-works/pi-ai": ">=0.81.0",
+    "@earendil-works/pi-coding-agent": ">=0.81.0",
+    "@earendil-works/pi-tui": ">=0.81.0",
     "@types/node": "*",
     "typebox": "*",
     "typescript": "^7.0.2"

package/src/config/schema.ts

@@ -7,6 +7,7 @@ import { fullscreenConfigSchema } from "../features/fullscreen/config";
 import { presetsConfigSchema } from "../features/presets/config";
 import { recapConfigSchema } from "../features/recap/config";
 import { titleConfigSchema } from "../features/title/config";
+import { writeConfigSchema } from "../features/write/config";
 
 /**
  * Raw option shape for each feature. The enable/disable/default policy lives in `loadConfig`:
@@ -21,6 +22,7 @@ export const featureSchemas = {
   presets: presetsConfigSchema,
   recap: recapConfigSchema,
   title: titleConfigSchema,
+  write: writeConfigSchema,
 } as const;
 
 /** Resolved config for every feature; `false` means the feature is disabled. */

package/src/features/credits/index.ts

@@ -18,7 +18,7 @@ export function registerCredits(pi: ExtensionAPI): void {
 
   pi.on("session_start", (_event, ctx) => {
     const config = loadConfig(ctx).credits;
-    if (!ctx.hasUI || !config) return;
+    if (ctx.mode !== "tui" || !config) return;
 
     const providers = getEnabledProviders(config);
     if (providers.length === 0) return;

package/src/features/credits/manager.ts

@@ -1,3 +1,4 @@
+import { getAuthToken } from "../../utils/auth";
 import { findProvider } from "./providers";
 import { renderCredits, renderError } from "./status";
 
@@ -5,7 +6,6 @@ import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { CreditsProvider } from "./types";
 
 const STATUS_KEY = "credits";
-const REQUEST_TIMEOUT_MS = 30_000;
 
 export class CreditsManager {
   private inflight: AbortController | undefined = undefined;
@@ -48,15 +48,14 @@ export class CreditsManager {
 
   private async fetch(ctx: ExtensionContext, provider: CreditsProvider, signal: AbortSignal): Promise<void> {
     try {
-      const apiKey = await ctx.modelRegistry.getApiKeyForProvider(provider.id);
+      const token = await getAuthToken(ctx.modelRegistry, provider.id);
       if (signal.aborted) return;
-      if (!apiKey) {
+      if (!token) {
         ctx.ui.setStatus(STATUS_KEY, undefined);
         return;
       }
 
-      const signals = AbortSignal.any([AbortSignal.timeout(REQUEST_TIMEOUT_MS), signal]);
-      const credits = await provider.fetch(apiKey, signals);
+      const credits = await provider.fetch(token, signal);
 
       // The active model may have changed while the request was in flight.
       if (ctx.model?.provider !== provider.id) return;

package/src/features/credits/providers/deepseek.ts

@@ -1,4 +1,5 @@
 import { convertToUSD, toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsProvider } from "../types";
 
@@ -19,15 +20,7 @@ export const deepseekProvider: CreditsProvider = {
   label: "DeepSeek",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers: Record<string, string> = {
-      Accept: "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    };
-
-    const response = await fetch(URL, { headers, signal });
-    if (!response.ok) throw new Error("request failed");
-
-    const payload = (await response.json()) as DeepSeekBalanceResponse;
+    const payload = await withAuth(http, apiKey).get(URL, { signal }).json<DeepSeekBalanceResponse>();
     const balance = payload.balance_infos?.find((entry) => entry.currency === "USD") ?? payload.balance_infos?.[0];
     const remaining = await convertToUSD(toNumber(balance?.total_balance), balance?.currency, signal);
 

package/src/features/credits/providers/kimi-code.ts

@@ -1,4 +1,5 @@
 import { toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsLane, CreditsProvider } from "../types";
 
@@ -82,15 +83,7 @@ export const kimiCodeProvider: CreditsProvider = {
   label: "Kimi Code",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers: Record<string, string> = {
-      Accept: "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    };
-
-    const response = await fetch(URL, { headers, signal });
-    if (!response.ok) throw new Error("request failed");
-
-    const payload = (await response.json()) as KimiCodeUsageResponse;
+    const payload = await withAuth(http, apiKey).get(URL, { signal }).json<KimiCodeUsageResponse>();
     const lanes: CreditsLane[] = [];
 
     payload.limits?.forEach((item) => {

package/src/features/credits/providers/moonshot.ts

@@ -1,4 +1,5 @@
 import { convertToUSD, toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsProvider } from "../types";
 
@@ -19,15 +20,7 @@ function createMoonshotProvider(id: "moonshotai" | "moonshotai-cn", host: string
     label: "Moonshot",
 
     async fetch(apiKey, signal): Promise<Credits> {
-      const headers: Record<string, string> = {
-        Accept: "application/json",
-        Authorization: `Bearer ${apiKey}`,
-      };
-
-      const response = await fetch(`https://${host}/v1/users/me/balance`, { headers, signal });
-      if (!response.ok) throw new Error("request failed");
-
-      const payload = (await response.json()) as MoonshotBalanceResponse;
+      const payload = await withAuth(http, apiKey).get(`https://${host}/v1/users/me/balance`, { signal }).json<MoonshotBalanceResponse>();
       const remaining = await convertToUSD(toNumber(payload.data?.available_balance), currency, signal);
 
       return { type: "balance", remaining };

package/src/features/credits/providers/openai-codex.ts

@@ -3,9 +3,12 @@ import { readStoredCredential } from "@earendil-works/pi-coding-agent";
 import prettyMilliseconds from "pretty-ms";
 
 import { confirmCodexReset, formatAvailableResets, showCodexResetLoader, showCodexResetSelector } from "./openai-codex-panel";
+import { getAuthToken } from "../../../utils/auth";
 import { toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { KyInstance } from "ky";
 import type { CodexResetPanelData } from "./openai-codex-panel";
 import type { Credits, CreditsLane, CreditsProvider, RefreshCredits } from "../types";
 
@@ -14,7 +17,6 @@ const BASE_URL = "https://chatgpt.com/backend-api";
 const USAGE_PATH = "/wham/usage";
 const RESET_CREDITS_PATH = "/wham/rate-limit-reset-credits";
 const CONSUME_RESET_PATH = "/wham/rate-limit-reset-credits/consume";
-const REQUEST_TIMEOUT_MS = 30_000;
 
 interface CodexUsageResponse {
   rate_limit?: {
@@ -50,14 +52,13 @@ interface ConsumeResetResponse {
 }
 
 async function runCodexReset(ctx: ExtensionContext, refresh: RefreshCredits): Promise<void> {
-  const apiKey = await ctx.modelRegistry.getApiKeyForProvider(PROVIDER);
-  if (!apiKey) return;
+  const token = await getAuthToken(ctx.modelRegistry, PROVIDER);
+  if (!token) return;
 
-  const headers = buildHeaders(apiKey);
+  const client = createClient(token);
 
   const credit = await showCodexResetSelector(ctx, async (signal) => {
-    const requestSignal = AbortSignal.any([signal, AbortSignal.timeout(REQUEST_TIMEOUT_MS)]);
-    const [usage, details] = await Promise.all([fetchUsage(headers, requestSignal), fetchResetCredits(headers, requestSignal)]);
+    const [usage, details] = await Promise.all([fetchUsage(client, signal), fetchResetCredits(client, signal)]);
 
     return {
       ...details,
@@ -66,63 +67,42 @@ async function runCodexReset(ctx: ExtensionContext, refresh: RefreshCredits): Pr
   });
   if (!credit || !(await confirmCodexReset(ctx, credit))) return;
 
-  await redeemReset(ctx, headers, credit, refresh);
+  await redeemReset(ctx, client, credit, refresh);
 }
 
-async function redeemReset(ctx: ExtensionContext, headers: Record<string, string>, credit: BankedRateLimitReset, refresh: RefreshCredits): Promise<void> {
+async function redeemReset(ctx: ExtensionContext, client: KyInstance, credit: BankedRateLimitReset, refresh: RefreshCredits): Promise<void> {
   await showCodexResetLoader(ctx, async () => {
-    const response = await consumeReset(headers, uuidv7(), credit.id);
+    const response = await consumeReset(client, uuidv7(), credit.id);
     if (response.code === "nothing_to_reset") throw new Error("No Codex rate-limit window currently needs a reset");
     if (response.code === "no_credit") throw new Error("No Codex resets are available");
   }).finally(() => refresh(ctx));
 }
 
-function buildHeaders(apiKey: string): Record<string, string> {
-  const headers: Record<string, string> = {
-    Accept: "application/json",
-    Authorization: `Bearer ${apiKey}`,
-  };
-
+function createClient(apiKey: string): KyInstance {
+  const client = withAuth(http, apiKey);
   const credential = readStoredCredential(PROVIDER);
   const accountId = credential?.type === "oauth" ? credential.accountId : undefined;
-  if (typeof accountId === "string" && accountId.length > 0) headers["ChatGPT-Account-ID"] = accountId;
-
-  return headers;
-}
-
-async function requestJson<T>(path: string, headers: Record<string, string>, signal: AbortSignal, init: RequestInit = {}): Promise<T> {
-  const requestHeaders = new Headers(headers);
-  new Headers(init.headers).forEach((value, key) => requestHeaders.set(key, value));
-
-  const response = await fetch(`${BASE_URL}${path}`, {
-    ...init,
-    headers: requestHeaders,
-    signal,
-  });
-  if (!response.ok) throw new Error(`Codex backend returned ${response.status}`);
 
-  return (await response.json()) as T;
+  return typeof accountId === "string" && accountId.length > 0
+    ? client.extend({ headers: { "ChatGPT-Account-ID": accountId } })
+    : client;
 }
 
-async function fetchUsage(headers: Record<string, string>, signal: AbortSignal): Promise<CodexUsageResponse> {
-  return requestJson<CodexUsageResponse>(USAGE_PATH, headers, signal);
+async function fetchUsage(client: KyInstance, signal: AbortSignal): Promise<CodexUsageResponse> {
+  return client.get(`${BASE_URL}${USAGE_PATH}`, { signal }).json<CodexUsageResponse>();
 }
 
-async function fetchResetCredits(headers: Record<string, string>, signal: AbortSignal): Promise<RateLimitResetCreditsResponse> {
-  return requestJson<RateLimitResetCreditsResponse>(RESET_CREDITS_PATH, headers, signal);
+async function fetchResetCredits(client: KyInstance, signal: AbortSignal): Promise<RateLimitResetCreditsResponse> {
+  return client.get(`${BASE_URL}${RESET_CREDITS_PATH}`, { signal }).json<RateLimitResetCreditsResponse>();
 }
 
-async function consumeReset(headers: Record<string, string>, redeemRequestId: string, creditId: string): Promise<ConsumeResetResponse> {
-  return requestJson<ConsumeResetResponse>(
-    CONSUME_RESET_PATH,
-    headers,
-    AbortSignal.timeout(REQUEST_TIMEOUT_MS),
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ redeem_request_id: redeemRequestId, credit_id: creditId }),
+async function consumeReset(client: KyInstance, redeemRequestId: string, creditId: string): Promise<ConsumeResetResponse> {
+  return client.post(`${BASE_URL}${CONSUME_RESET_PATH}`, {
+    json: {
+      redeem_request_id: redeemRequestId,
+      credit_id: creditId
     },
-  );
+  }).json<ConsumeResetResponse>();
 }
 
 function toCredits(usage: CodexUsageResponse, suffix?: string): Credits {
@@ -153,8 +133,8 @@ export const openaiCodexProvider: CreditsProvider = {
   label: "Codex",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers = buildHeaders(apiKey);
-    const usage = await fetchUsage(headers, signal);
+    const client = createClient(apiKey);
+    const usage = await fetchUsage(client, signal);
     const availableCount = usage.rate_limit_reset_credits?.available_count ?? 0;
     const suffix = availableCount > 0 ? `(${formatAvailableResets(availableCount)})` : undefined;
 

package/src/features/credits/providers/openrouter.ts

@@ -1,4 +1,5 @@
 import { toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsProvider } from "../types";
 
@@ -17,15 +18,7 @@ export const openrouterProvider: CreditsProvider = {
   label: "OpenRouter",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers: Record<string, string> = {
-      Accept: "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    };
-
-    const response = await fetch(URL, { headers, signal });
-    if (!response.ok) throw new Error("request failed");
-
-    const payload = (await response.json()) as OpenRouterCreditsResponse;
+    const payload = await withAuth(http, apiKey).get(URL, { signal }).json<OpenRouterCreditsResponse>();
     const totalCredits = toNumber(payload.data?.total_credits);
     const totalUsage = toNumber(payload.data?.total_usage);
     const remaining = typeof totalCredits === "number" && typeof totalUsage === "number" ? totalCredits - totalUsage : undefined;

package/src/features/credits/providers/vercel-ai-gateway.ts

@@ -1,4 +1,5 @@
 import { toNumber } from "../../../utils/format";
+import { http, withAuth } from "../../../utils/http";
 
 import type { Credits, CreditsProvider } from "../types";
 
@@ -14,15 +15,7 @@ export const vercelAiGatewayProvider: CreditsProvider = {
   label: "Vercel",
 
   async fetch(apiKey, signal): Promise<Credits> {
-    const headers: Record<string, string> = {
-      Accept: "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    };
-
-    const response = await fetch(URL, { headers, signal });
-    if (!response.ok) throw new Error("request failed");
-
-    const payload = (await response.json()) as VercelCreditsResponse;
+    const payload = await withAuth(http, apiKey).get(URL, { signal }).json<VercelCreditsResponse>();
     const remaining = toNumber(payload.balance);
 
     return { type: "balance", remaining };

package/src/features/editor/config.ts

@@ -1,9 +1,12 @@
 import * as z from "zod";
 
 const spinnerPresetSchema = z.enum(["dots", "lights", "tildes", "pulse"]);
+const thinkingLevelIndicatorSchema = z.enum(["border", "model"]);
 
 export type SpinnerPreset = z.infer<typeof spinnerPresetSchema>;
+export type ThinkingLevelIndicator = z.infer<typeof thinkingLevelIndicatorSchema>;
 
 export const editorConfigSchema = z.object({
   spinner: spinnerPresetSchema.optional(),
+  thinkingLevelIndicator: thinkingLevelIndicatorSchema.optional(),
 });

package/src/features/editor/index.ts

@@ -9,16 +9,18 @@ import { formatModel } from "../../utils/format";
 import type { ExtensionAPI, ExtensionContext, KeybindingsManager } from "@earendil-works/pi-coding-agent";
 import type { TUI, EditorTheme } from "@earendil-works/pi-tui";
 import type { EventCollector } from "../../events";
+import type { ThinkingLevelIndicator } from "./config";
 
 class Editor extends CustomEditor {
   private pi: ExtensionAPI;
   private ctx: ExtensionContext;
 
   private spinner: Spinner;
+  private thinkingLevelIndicator: ThinkingLevelIndicator;
   private workingMessage: string | undefined;
   private slots: { modelBefore: string | undefined };
 
-  constructor(pi: ExtensionAPI, ctx: ExtensionContext, tui: TUI, theme: EditorTheme, keybindings: KeybindingsManager, spinner: Spinner = new Spinner()) {
+  constructor(pi: ExtensionAPI, ctx: ExtensionContext, tui: TUI, theme: EditorTheme, keybindings: KeybindingsManager, spinner: Spinner = new Spinner(), thinkingLevelIndicator: ThinkingLevelIndicator = "border") {
     super(tui, theme, keybindings);
 
     this.pi = pi;
@@ -26,6 +28,7 @@ class Editor extends CustomEditor {
 
     this.spinner = spinner;
     this.spinner.setTUI(tui);
+    this.thinkingLevelIndicator = thinkingLevelIndicator;
     this.workingMessage = undefined;
     this.slots = { modelBefore: undefined };
   }
@@ -41,6 +44,12 @@ class Editor extends CustomEditor {
   }
 
   render(width: number): string[] {
+    // Pi reapplies the thinking-level border color when the level changes. Use the dim color here
+    // while preserving Bash mode's dedicated border color.
+    if (this.thinkingLevelIndicator === "model" && !this.getText().trimStart().startsWith("!")) {
+      this.borderColor = (text) => this.ctx.ui.theme.fg("dim", text);
+    }
+
     const lines = super.render(width);
     if (lines.length === 0) return lines;
 
@@ -77,8 +86,16 @@ class Editor extends CustomEditor {
 
     const modelBeforeText = this.slots.modelBefore;
     const modelText = formatModel(this.ctx.model?.provider, this.ctx.model?.id, this.pi.getThinkingLevel());
+    const coloredModelText = this.thinkingLevelIndicator === "model" ? this.withThinkingLevelColor(modelText) : theme.fg("dim", modelText);
+
+    return [modelBeforeText ? theme.fg("dim", modelBeforeText) : undefined, coloredModelText].filter(Boolean).join(theme.fg("dim", " · "));
+  }
+
+  private withThinkingLevelColor(text: string): string {
+    const theme = this.ctx.ui.theme;
+    const thinkingLevel = this.pi.getThinkingLevel();
 
-    return theme.fg("dim", [modelBeforeText, modelText].filter(Boolean).join(" · "));
+    return theme.getThinkingBorderColor(thinkingLevel)(text);
   }
 }
 
@@ -89,13 +106,13 @@ export function registerEditor(pi: ExtensionAPI, events: EventCollector): void {
 
   pi.on("session_start", (_event, ctx) => {
     const config = loadConfig(ctx).editor;
-    if (!ctx.hasUI || !config) return;
+    if (ctx.mode !== "tui" || !config) return;
 
     spinner = new Spinner(config.spinner);
 
     ctx.ui.setWorkingVisible(false);
     ctx.ui.setEditorComponent((tui, theme, keybindings) => {
-      editor = new Editor(pi, ctx, tui, theme, keybindings, spinner);
+      editor = new Editor(pi, ctx, tui, theme, keybindings, spinner, config.thinkingLevelIndicator);
 
       events.on(PRESET_CHANGE, (data) => {
         const payload = parsePresetChange(data);

package/src/features/footer/index.ts

@@ -75,7 +75,7 @@ class FooterComponent implements Component {
   }
 
   private getStyledCostText(): string {
-    const totalCost = this.ctx.sessionManager.getBranch().reduce((acc, entry) => acc + (getEntryUsage(entry)?.cost.total ?? 0), 0);
+    const totalCost = this.ctx.sessionManager.getEntries().reduce((acc, entry) => acc + (getEntryUsage(entry)?.cost.total ?? 0), 0);
 
     // Hide cost below half a cent, since it would render as $0.00.
     if (totalCost < 0.005) return "";
@@ -100,7 +100,7 @@ class FooterComponent implements Component {
 export function registerFooter(pi: ExtensionAPI): void {
   pi.on("session_start", (_event, ctx) => {
     const config = loadConfig(ctx).footer;
-    if (!ctx.hasUI || !config) return;
+    if (ctx.mode !== "tui" || !config) return;
 
     ctx.ui.setFooter((_tui, theme, footerData) => new FooterComponent(ctx, theme, footerData, config.statusPosition));
   });