@groeponline/pi-wishcraft 1.23.0 → 1.25.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [1.25.0] - 2026-11-12
+
+### Added
+- **The extension now activates cleanly under `pi --mode rpc`, with a host integration test to keep it that way.** `ctx.hasUI` is `true` in rpc mode, so every TUI-only call used to pass its gate and then die silently — or worse: `ctx.ui.custom()` returns `undefined` in rpc, and the welcome overlay's `.catch` on that `undefined` threw an uncaught TypeError on every rpc `session_start`. The session bootstrap now branches on `ctx.mode`: under `tui` nothing changes; under `rpc` the six powerline widgets are exported as `string[]` widget lines (the only form that crosses the rpc UI subprotocol), refreshed on the same scheduler cadence as a TUI repaint, and the welcome overlay degrades to a single `notify`. `tests/pi-host-rpc.test.ts` boots the real pi host over JSONL — LF-framed, both pipes drained — and asserts every slash command registers, the `powerline-*` widgets and statuses arrive as `extension_ui_request` records, and not a single non-JSON line ever reaches stdout. Diagnostics moved from `console.debug` (stdout — protocol corruption) to a `debugLog` helper on stderr.
+
+## [1.24.0] - 2026-11-12
+
+### Fixed
+- **Git probes no longer race interactive git.** Every read-only `git` spawn (`src/git/status.ts`, `bash-mode/completion.ts`) now runs with `GIT_OPTIONAL_LOCKS=0` and `windowsHide: true`, so status polling can't refresh `.git/index` under a real checkout and orphaned `index.lock` files stop bricking the repo.
+- **Think levels high/xhigh/max got their rainbow back.** The thinking segment collapsed all three into the plain `thinking` color; it now uses dedicated `thinkingHigh`/`thinkingXhigh`/`thinkingMax` semantic colors (default `rainbow`, overridable per preset — the `rainbow` ColorValue itself is new).
+- **Token totals prefer the provider-reported `totalTokens`.** The four-field sum undercounted providers that report reasoning/other tokens only in the total.
+
 ## [1.23.0] - 2026-11-08
 
 ### Fixed

package/RELEASE.md

@@ -113,11 +113,34 @@ Measured from this repository on 2026-11-08:
 | `npm whoami` with `secrets.NPM_TOKEN` | `chefgroeponline` — valid |
 | `ACTIONS_ID_TOKEN_REQUEST_URL` in a job with `id-token: write` | present |
 | `POST /-/npm/v1/oidc/token/exchange/package/@groeponline%2fpi-wishcraft` | **401** |
-
-Two consequences: publishes carry no provenance attestation, and the token has
-to be replaced by hand when it expires. Switching to trusted publishing is a
-one-time npmjs.com change, after which the `NODE_AUTH_TOKEN` env comes out of
-the job:
+| `npm publish` with that token (v1.23.0, run 42464125440) | **EOTP** — one-time password required |
+
+**The token authenticates but cannot write.** It is a *Publish* token on an
+account with 2FA enabled, so npm demands an OTP for `npm publish` and a CI
+runner can never answer one.
+
+**Resolved 2026-11-09 03:58 UTC.** The org `NPM_TOKEN` secret was replaced with a
+granular token that has *Bypass 2FA*; run 42559311821 (dispatch on `v1.23.0`)
+then published `1.23.0` and created its GitHub Release. No workflow change was
+needed — `NODE_AUTH_TOKEN` still publishes. `v1.18.0`–`v1.22.0` stay unpublished:
+their tag refs carry unpinned `uses: actions/...@v7` and the org policy rejects
+them, so they cannot be replayed without rewriting tags. `1.23.0` supersedes them.
+
+The two routes that were available, for the record:
+
+- **Token route (unblocks v1.23.0 as tagged):** Access Tokens → Generate New
+  Token → **Granular**, read+write on `@groeponline` (or a classic
+  **Automation** token), with **Bypass 2FA** enabled; store it as the org
+  `NPM_TOKEN` secret. Then replay the tag:
+  `gh workflow run release.yml --ref v1.23.0` — that same job also creates the
+  missing GitHub Release.
+- **OIDC route (no credential at all):** configure the trusted publisher below
+  and drop the `NODE_AUTH_TOKEN` env from the `publish` job. A tag cut *before*
+  that change still carries the token env and cannot be replayed, so this route
+  publishes the next version and leaves the hole.
+
+Switching to trusted publishing is a one-time npmjs.com change, after which the
+`NODE_AUTH_TOKEN` env comes out of the job:
 
 1. Sign in as the maintainer of `@groeponline/pi-wishcraft` (`chefgroeponline
    <joep@chefgroep.online>` — `npm view @groeponline/pi-wishcraft maintainers`).
@@ -149,9 +172,15 @@ Rules that follow from the current (token) configuration:
 
 For a scoped package npm answers a PUT with **404, not 403**, when the caller
 may not publish. That means the credential is missing, revoked, read-only or
-(`EOTP`) 2FA-blocked, or does not own the scope. It is not "package not found",
-and it is not a retryable transient. `ENEEDAUTH` instead means npm had no
-credential at all: `NODE_AUTH_TOKEN` was empty and the OIDC exchange refused.
+does not own the scope. It is not "package not found", and it is not a
+retryable transient. Two neighbours are distinct and have their own fix:
+
+- `ENEEDAUTH` — npm had no credential at all: `NODE_AUTH_TOKEN` was empty and
+  the OIDC exchange refused.
+- `EOTP` — the credential authenticates but the account requires a one-time
+  password for writes, which CI cannot supply. This is what v1.23.0 hit. The
+  token needs 2FA bypass (granular token with *Bypass 2FA*, or a classic
+  Automation token); retrying with the same token only burns another run.
 
 `scripts/npm-publish.sh` prints that diagnosis instead of the raw 404. Recovery:
 

package/bash-mode/completion.ts

@@ -246,6 +246,8 @@ function runGit(args: string[], cwd: string): string[] {
       cwd,
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
+      env: { ...process.env, GIT_OPTIONAL_LOCKS: "0" },
+      windowsHide: true,
     });
     if (result.status !== 0 || !result.stdout) return [];
     return result.stdout.split("\n").map((line) => line.trim()).filter(Boolean);

package/bash-mode/editor.ts

@@ -30,6 +30,7 @@ import type {
   BashModeEditorOptions,
   GhostSuggestion,
 } from "./types.ts";
+import { debugLog } from "../src/extension/core/debug-log.ts";
 
 const BRACKETED_PASTE_START = "\x1b[200~";
 const BRACKETED_PASTE_END = "\x1b[201~";
@@ -463,7 +464,7 @@ export class BashModeEditor extends CustomEditor {
       })
       .catch((error) => {
         if (controller.signal.aborted || (error instanceof Error && error.message === "aborted")) return;
-        console.debug("[wishcraft] Failed to resolve bash ghost suggestion:", error);
+        debugLog("[wishcraft] Failed to resolve bash ghost suggestion:", error);
       });
   }
 }

package/bash-mode/history.ts

@@ -7,6 +7,7 @@ import {
 } from "node:fs";
 import { dirname, join } from "node:path";
 import { getAgentPath, getHomeDir } from "../src/paths/agent-dirs.ts";
+import { debugLog } from "../src/extension/core/debug-log.ts";
 
 interface PersistedHistoryEntry {
   command: string;
@@ -108,7 +109,7 @@ export function readProjectHistory(cwd: string): PersistedHistoryEntry[] {
   } catch (error) {
     // Project history is a best-effort cache. If it is unreadable or malformed,
     // bash mode should keep working instead of failing command entry entirely.
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to read bash project history from ${filePath}:`,
       error,
     );
@@ -150,7 +151,7 @@ export function appendProjectHistory(
     });
   } catch (error) {
     // History persistence should never block a successful shell command from completing.
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to persist bash project history to ${filePath}:`,
       error,
     );
@@ -233,7 +234,7 @@ export function readGlobalShellHistory(shellPath: string): string[] {
     if (stat && (errorCode === "EACCES" || errorCode === "EPERM")) {
       globalHistoryCache.set(cacheKey, { ...stat, entries: [] });
     }
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to read global shell history for ${shellName}:`,
       error,
     );

package/build-stamp.json

@@ -1 +1 @@
-{"source_sha":"a12a4900dbbf32823e1c2c6261c850eb21834d38"}
+{"source_sha":"c5a4ed154027696731b82238816c26fe1ce76945"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groeponline/pi-wishcraft",
-  "version": "1.23.0",
+  "version": "1.25.0",
   "description": "Pi coding agent extension: operator cockpit with a live powerline status bar, idea queue, skill search, sticky Bash, hooks, policy guardrails, and TUI session UX.",
   "type": "module",
   "packageManager": "bun@1.4.2",
@@ -73,7 +73,8 @@
     "audit": "bun scripts/audit-gate.mjs",
     "preview": "bun scripts/preview.mjs",
     "verify:pi-package": "bun scripts/verify-pi-package-contract.mjs",
-    "hooks:install": "git config core.hooksPath .githooks"
+    "hooks:install": "git config core.hooksPath .githooks",
+    "test:integration": "node --experimental-strip-types --test tests/pi-host-rpc.test.ts"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",

package/src/config/tokens.ts

@@ -29,11 +29,20 @@ export type { TokenRole, WishcraftTokens };
 /**
  * Which token each legacy semantic color reads from.
  *
- * `thinking*` is deliberately absent: those four are Pi's own thinking-level
+ * `thinking*` is deliberately absent: those seven are Pi's own thinking-level
  * colors, not part of the Wishcraft palette, so they pass through untouched.
  */
 export const SEMANTIC_TOKEN_ROLE: Record<
-  Exclude<SemanticColor, "thinking" | "thinkingMinimal" | "thinkingLow" | "thinkingMedium">,
+  Exclude<
+    SemanticColor,
+    | "thinking"
+    | "thinkingMinimal"
+    | "thinkingLow"
+    | "thinkingMedium"
+    | "thinkingHigh"
+    | "thinkingXhigh"
+    | "thinkingMax"
+  >,
   TokenRole
 > = {
   model: "primary",
@@ -54,12 +63,21 @@ export const SEMANTIC_TOKEN_ROLE: Record<
 /** Pi thinking-level colors, passed through rather than tokenised. */
 export const THINKING_COLORS: Pick<
   Required<ColorScheme>,
-  "thinking" | "thinkingMinimal" | "thinkingLow" | "thinkingMedium"
+  | "thinking"
+  | "thinkingMinimal"
+  | "thinkingLow"
+  | "thinkingMedium"
+  | "thinkingHigh"
+  | "thinkingXhigh"
+  | "thinkingMax"
 > = {
   thinking: "thinkingOff",
   thinkingMinimal: "thinkingMinimal",
   thinkingLow: "thinkingLow",
   thinkingMedium: "thinkingMedium",
+  thinkingHigh: "rainbow",
+  thinkingXhigh: "rainbow",
+  thinkingMax: "rainbow",
 };
 
 /**

package/src/config/types.ts

@@ -3,7 +3,7 @@ import type { MotionEvent } from "../motion/types.ts";
 import type { CostCurrencyCode } from "../usage/rates.ts";
 
 // Theme color - either a pi theme color name or a custom hex color
-export type ColorValue = ThemeColor | `#${string}`;
+export type ColorValue = ThemeColor | `#${string}` | "rainbow";
 export type ThemeLike = Pick<Theme, "fg">;
 
 // Semantic color names for segments
@@ -17,6 +17,9 @@ export type SemanticColor =
   | "thinkingMinimal"
   | "thinkingLow"
   | "thinkingMedium"
+  | "thinkingHigh"
+  | "thinkingXhigh"
+  | "thinkingMax"
   | "context"
   | "contextWarn"
   | "contextError"

package/src/extension/core/debug-log.ts

@@ -0,0 +1,9 @@
+/**
+ * Diagnostics go to stderr, never stdout. In `pi --mode rpc` stdout is the
+ * JSONL protocol channel — a `console.debug` line there corrupts framing for
+ * the host. Use this instead of `console.debug` anywhere the extension can
+ * run under an rpc host.
+ */
+export function debugLog(message: string, ...args: unknown[]): void {
+  console.error(message, ...args);
+}

package/src/extension/core/state.ts

@@ -105,6 +105,7 @@ export function createRuntimeState(
     liveAssistantUsage: null,
     isStreaming: false,
     tuiRef: null,
+    rpcWidgetRefresh: null,
     restoreFooterStatusRepaintHook: null,
     stashShortcutInputUnsubscribe: null,
     dismissWelcomeOverlay: null,
@@ -165,6 +166,7 @@ export function createRuntimeState(
     }
 
     rt.tuiRef?.requestRender();
+    rt.rpcWidgetRefresh?.();
   }, STATUS_RENDER_DEBOUNCE_MS);
 
   rt.motionScheduler = new MotionScheduler({
@@ -172,6 +174,7 @@ export function createRuntimeState(
       // Motion only changes the Signal rail; segment data remains cached.
       rt.lastLayoutResult = null;
       rt.tuiRef?.requestRender();
+      rt.rpcWidgetRefresh?.();
     },
   });
 

package/src/extension/core/types.ts

@@ -55,6 +55,8 @@ export interface RuntimeState {
   liveAssistantUsage: SessionAssistantUsage | null;
   isStreaming: boolean;
   tuiRef: any;
+  /** Pushes fresh widget string[] over the rpc UI subprotocol; null under tui. */
+  rpcWidgetRefresh: (() => void) | null;
   restoreFooterStatusRepaintHook: (() => void) | null;
   stashShortcutInputUnsubscribe: (() => void) | null;
   dismissWelcomeOverlay: (() => void) | null;

package/src/extension/history/stash-history.ts

@@ -7,6 +7,7 @@ import { getAgentPath } from "../../paths/agent-dirs.ts";
 import { isRecord } from "../settings/settings-io.ts";
 import { hasNonWhitespaceText } from "./prompt-history.ts";
 import { STASH_HISTORY_LIMIT } from "../core/constants.ts";
+import { debugLog } from "../core/debug-log.ts";
 
 export function getStashHistoryPath(): string {
   return getAgentPath("powerline-footer", "stash-history.json");
@@ -50,7 +51,7 @@ export function readPersistedStashHistory(): string[] {
 
     const parsed = JSON.parse(readFileSync(stashHistoryPath, "utf-8"));
     if (!isRecord(parsed)) {
-      console.debug(
+      debugLog(
         `[wishcraft] Ignoring invalid stash history at ${stashHistoryPath}`,
       );
       return [];
@@ -58,7 +59,7 @@ export function readPersistedStashHistory(): string[] {
 
     return normalizeStashHistoryEntries(parsed.history);
   } catch (error) {
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to read stash history from ${stashHistoryPath}:`,
       error,
     );
@@ -77,7 +78,7 @@ export function persistStashHistory(history: string[]): void {
     mkdirSync(dirname(stashHistoryPath), { recursive: true });
     writeFileSync(stashHistoryPath, JSON.stringify(payload, null, 2) + "\n");
   } catch (error) {
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to persist stash history to ${stashHistoryPath}:`,
       error,
     );

package/src/extension/session/session-lifecycle.ts

@@ -44,6 +44,7 @@ import {
   finishFailedCompaction,
 } from "../queue/queue-integration.ts";
 import { setupCustomEditor } from "../ui/custom-editor.ts";
+import { disposeRpcWidgets, installRpcWidgets } from "../ui/rpc-widgets.ts";
 import {
   setupWelcomeHeader,
   setupWelcomeOverlay,
@@ -173,15 +174,28 @@ export function registerSessionLifecycle(
     initVibeManager(ctx);
 
     if (rt.enabled && ctx.hasUI) {
-      setupCustomEditor(pi, rt, ctx);
-      if (shouldShowStartupWelcome(event.reason, config.welcome)) {
-        if (settings.quietStartup === true) {
-          setupWelcomeHeader(rt, ctx);
-        } else {
-          setupWelcomeOverlay(rt, ctx);
+      if (ctx.mode === "rpc") {
+        // In rpc mode component factories, custom overlays, the editor and
+        // footer/header are all no-ops; widgets only cross the wire as
+        // string[] lines. `ctx.hasUI` is still true, so gate on the mode.
+        installRpcWidgets(rt, ctx);
+        if (shouldShowStartupWelcome(event.reason, config.welcome)) {
+          ctx.ui.notify(
+            `Wishcraft cockpit active (preset: ${config.preset})`,
+            "info",
+          );
         }
       } else {
-        dismissWelcome(rt, ctx);
+        setupCustomEditor(pi, rt, ctx);
+        if (shouldShowStartupWelcome(event.reason, config.welcome)) {
+          if (settings.quietStartup === true) {
+            setupWelcomeHeader(rt, ctx);
+          } else {
+            setupWelcomeOverlay(rt, ctx);
+          }
+        } else {
+          dismissWelcome(rt, ctx);
+        }
       }
       maybeNotifyTokenBudget(rt, ctx, settings);
     }
@@ -217,6 +231,8 @@ export function registerSessionLifecycle(
     rt.liveAssistantUsage = null;
     rt.tokenBudgetSnapshot = { day: "", dailyLimit: null, dailyUsed: 0 };
     rt.tuiRef = null;
+    rt.rpcWidgetRefresh = null;
+    disposeRpcWidgets();
     rt.currentEditor = null;
     resetLayoutCache(rt);
   });

package/src/extension/settings/settings-io.ts

@@ -12,6 +12,7 @@ import {
   nextPowerlineSettingWithPreset,
 } from "../../config/powerline-config.ts";
 import { getAgentPath } from "../../paths/agent-dirs.ts";
+import { debugLog } from "../core/debug-log.ts";
 
 export function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -60,7 +61,7 @@ export function readSettingsFile(
 
     const parsed = JSON.parse(readFileSync(settingsPath, "utf-8"));
     if (!isRecord(parsed)) {
-      console.debug(
+      debugLog(
         `[wishcraft] Ignoring non-object settings at ${settingsPath}`,
       );
       return {};
@@ -70,7 +71,7 @@ export function readSettingsFile(
   } catch (error) {
     // Settings are user-edited input. Log and keep the extension running with defaults
     // instead of crashing the UI during startup.
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to read settings from ${settingsPath}:`,
       error,
     );
@@ -88,7 +89,7 @@ export function readWritableSettingsFile(
   try {
     const parsed = JSON.parse(readFileSync(settingsPath, "utf-8"));
     if (!isRecord(parsed)) {
-      console.debug(
+      debugLog(
         `[wishcraft] Refusing to write settings to non-object file at ${settingsPath}`,
       );
       return null;
@@ -98,7 +99,7 @@ export function readWritableSettingsFile(
   } catch (error) {
     // Do not overwrite malformed user settings with partial data. Surface the failure
     // through the command handler so the user can fix the file intentionally.
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to parse settings at ${settingsPath}:`,
       error,
     );
@@ -115,7 +116,7 @@ export function readCompactionPolicyEnabled(
     if (!isRecord(parsed) || typeof parsed.enabled !== "boolean") return false;
     return parsed.enabled;
   } catch (error) {
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to read compaction policy from ${configPath}:`,
       error,
     );
@@ -171,7 +172,7 @@ export function writeSettingKey(
     writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
     return true;
   } catch (error) {
-    console.debug(
+    debugLog(
       `[wishcraft] Failed to persist setting '${key}' to ${settingsPath}:`,
       error,
     );

package/src/extension/shortcuts/shortcuts-config.ts

@@ -17,6 +17,7 @@ import type {
   PowerlineShortcuts,
   ShortcutBinding,
 } from "../core/types.ts";
+import { debugLog } from "../core/debug-log.ts";
 
 const APP_RESERVED_SHORTCUTS = [
   "escape",
@@ -283,13 +284,13 @@ export function resolveShortcutConfig(
 
     const replacement = findShortcutReplacement(key, used);
     if (!replacement) {
-      console.debug(
+      debugLog(
         `[wishcraft] Shortcut conflict for ${key}: "${configured}" is already in use`,
       );
       continue;
     }
 
-    console.debug(
+    debugLog(
       `[wishcraft] Shortcut conflict for ${key}: "${configured}" replaced with "${replacement}"`,
     );
 
@@ -334,7 +335,7 @@ export function parseBashModeSettings(
         : fallbackToggleShortcut;
 
   if (configuredToggleShortcut && toggleShortcut !== configuredToggleShortcut) {
-    console.debug(
+    debugLog(
       `[wishcraft] Bash mode shortcut conflict: "${configuredToggleShortcut}" replaced with "${toggleShortcut ?? "disabled"}"`,
     );
   }

package/src/extension/ui/deck/component.ts

@@ -370,6 +370,16 @@ export function createDeckComponent(
       if (state.route === "ideas") {
         const ideas = filteredIdeas(liveSnapshot(), state);
         if (!state.navMode && handleList(data, "selectedIdea", ideas.length)) return;
+        // Nav ↑↓ must reach the route-column handlers below, like every other
+        // list route; the body below used to swallow them (trailing return),
+        // stranding the cursor on Ideas forever.
+        if (matchesKey(data, "up") || matchesKey(data, "down")) {
+          if (state.navMode || ideas.length === 0) {
+            // fall through to the nav handlers at the bottom
+          } else {
+            return;
+          }
+        } else {
         const cursor = Math.min(state.selectedIdea, Math.max(0, ideas.length - 1));
         const idea = ideas[cursor];
         if (!idea?.id) return;
@@ -404,6 +414,7 @@ export function createDeckComponent(
           return;
         }
         return;
+        }
       }
 
       if (state.route === "ports") {

package/src/extension/ui/rpc-widgets.ts

@@ -0,0 +1,185 @@
+/**
+ * RPC surface for the powerline. In `pi --mode rpc` `ctx.ui.setWidget`
+ * ignores component factories — only the `string[]` form crosses the JSONL
+ * wire as `extension_ui_request` records. This adapter renders the same line
+ * producers the TUI widgets use and pushes the results as widget lines,
+ * refreshed on the same cadence as a TUI repaint.
+ *
+ * The TUI footer also hands the extension a ReadonlyFooterDataProvider —
+ * git branch, extension statuses, branch-change events. In rpc mode the
+ * host never builds a footer, so `rt.footerDataRef` stays null and every
+ * consumer would render empty. We therefore install our own provider: the
+ * branch comes from the shared git-status cache, statuses are mirrored
+ * through a wrapped `ctx.ui.setStatus`, and branch changes bridge onto the
+ * git-update bus like the footer does.
+ */
+
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import type { ReadonlyFooterDataProvider } from "@earendil-works/pi-coding-agent";
+
+import { getCurrentBranch, subscribeGitUpdates } from "../../git/status.ts";
+import { subscribePortsUpdates } from "../../segments/ports.ts";
+import { subscribeCustomSegmentUpdates } from "../../segments/custom.ts";
+import { debugLog } from "../core/debug-log.ts";
+import { requestStatusRender } from "../core/segment-context.ts";
+import { config } from "../core/state.ts";
+import type { RuntimeState } from "../core/types.ts";
+import {
+  renderBashTranscriptLines,
+  renderLastPromptLines,
+  renderPowerlinePrimaryLines,
+  renderPowerlineQueuePreviewLines,
+  renderPowerlineSecondaryLines,
+  renderPowerlineStatusLines,
+} from "./status-line-renderers.ts";
+
+/** rpc hosts have no tty; pick a stable line width for the exported lines. */
+const RPC_WIDGET_WIDTH = 80;
+
+interface RpcUi {
+  theme: Theme;
+  setWidget(
+    key: string,
+    lines: string[],
+    options?: { placement?: "aboveEditor" | "belowEditor" },
+  ): void;
+  setStatus(key: string, text: string | undefined): void;
+}
+
+interface RpcCtx {
+  ui: RpcUi;
+}
+
+type WidgetRenderer = (rt: RuntimeState, width: number, theme: Theme) => string[];
+
+function rpcWidgets(): Readonly<
+  {
+    key: string;
+    placement: "aboveEditor" | "belowEditor";
+    render: WidgetRenderer;
+  }[]
+> {
+  return [
+    {
+      key: "powerline-status",
+      placement: "aboveEditor",
+      render: (rt, width) => renderPowerlineStatusLines(rt, width),
+    },
+    {
+      key: "powerline-top",
+      placement: config.placement === "below" ? "belowEditor" : "aboveEditor",
+      render: (rt, width, theme) => renderPowerlinePrimaryLines(rt, width, theme),
+    },
+    {
+      key: "powerline-secondary",
+      placement: "belowEditor",
+      render: (rt, width, theme) =>
+        renderPowerlineSecondaryLines(rt, width, theme),
+    },
+    {
+      key: "powerline-bash-transcript",
+      placement: "belowEditor",
+      render: (rt, width, theme) =>
+        renderBashTranscriptLines(rt, width, theme),
+    },
+    {
+      key: "powerline-queue-preview",
+      placement: "belowEditor",
+      render: (rt, width, theme) =>
+        renderPowerlineQueuePreviewLines(rt, width, theme),
+    },
+    {
+      key: "powerline-last-prompt",
+      placement: "belowEditor",
+      render: (rt, width) => renderLastPromptLines(rt, width),
+    },
+  ];
+}
+
+function widgetWidth(): number {
+  const columns = process.stdout.columns;
+  return typeof columns === "number" && columns > 0 ? columns : RPC_WIDGET_WIDTH;
+}
+
+let disposeSessionResources: (() => void) | null = null;
+
+/**
+ * Register every powerline widget in its `string[]` form and keep the lines
+ * current via `rt.rpcWidgetRefresh`, driven by the status render scheduler
+ * plus the same async-segment subscriptions the TUI footer installs.
+ */
+export function installRpcWidgets(rt: RuntimeState, ctx: RpcCtx): void {
+  disposeSessionResources?.();
+
+  // Mirror setStatus so segments/status lines can read extension statuses in
+  // rpc — the host keeps them on its own (unreachable) footer provider.
+  const statusMirror = new Map<string, string>();
+  const originalSetStatus = ctx.ui.setStatus.bind(ctx.ui);
+  ctx.ui.setStatus = (key, text) => {
+    const previous = statusMirror.get(key);
+    if (text === undefined) {
+      statusMirror.delete(key);
+    } else {
+      statusMirror.set(key, text);
+    }
+    originalSetStatus(key, text);
+    // The host keeps statuses on a footer it never builds in rpc mode. A change
+    // here must wake the same render scheduler the TUI footer would have.
+    if (previous !== text) requestStatusRender(rt);
+  };
+  const restoreSetStatus = () => {
+    ctx.ui.setStatus = originalSetStatus;
+  };
+
+  const provider: ReadonlyFooterDataProvider = {
+    getGitBranch: () => getCurrentBranch(null),
+    getExtensionStatuses: () => statusMirror,
+    getAvailableProviderCount: () => 0,
+    onBranchChange: (callback) => subscribeGitUpdates(callback),
+  };
+  rt.footerDataRef = provider;
+
+  const unsubs = [
+    subscribeGitUpdates(() => requestStatusRender(rt)),
+    subscribePortsUpdates(() => requestStatusRender(rt)),
+    subscribeCustomSegmentUpdates(() => requestStatusRender(rt)),
+  ];
+
+  const theme = ctx.ui.theme;
+  const push = () => {
+    if (rt.currentCtx == null) return;
+    const width = widgetWidth();
+    for (const widget of rpcWidgets()) {
+      try {
+        ctx.ui.setWidget(widget.key, widget.render(rt, width, theme), {
+          placement: widget.placement,
+        });
+      } catch (error) {
+        debugLog(`[wishcraft] rpc widget ${widget.key} failed:`, error);
+      }
+    }
+  };
+
+  rt.rpcWidgetRefresh = () => {
+    // Invalidate the composed line only — wiping the session caches per tick
+    // would rebuild git/token stats on every refresh.
+    rt.lastLayoutResult = null;
+    rt.layoutDirty = true;
+    push();
+  };
+
+  disposeSessionResources = () => {
+    for (const unsub of unsubs) unsub();
+    restoreSetStatus();
+    rt.rpcWidgetRefresh = null;
+    if (rt.footerDataRef === provider) rt.footerDataRef = null;
+    disposeSessionResources = null;
+  };
+
+  push();
+}
+
+/** Drop the rpc provider, subscriptions and the status mirror. */
+export function disposeRpcWidgets(): void {
+  disposeSessionResources?.();
+}

package/src/extension/welcome/welcome-integration.ts

@@ -15,6 +15,7 @@ import { isRecord, readSettings } from "../settings/settings-io.ts";
 import type { RuntimeState } from "../core/types.ts";
 import { getQueueContext } from "../queue/queue-context.ts";
 import { pickNextReviewIdea } from "../queue/idea-review.ts";
+import { debugLog } from "../core/debug-log.ts";
 
 /**
  * Three next steps for an operator who has never run Wishcraft before.
@@ -309,7 +310,7 @@ export function setupWelcomeOverlay(rt: RuntimeState, ctx: any) {
         },
       )
       .catch((error: unknown) => {
-        console.debug("[wishcraft] Welcome overlay failed:", error);
+        debugLog("[wishcraft] Welcome overlay failed:", error);
       });
   }, 100);
 }

package/src/git/status.ts

@@ -94,6 +94,10 @@ function runGit(args: string[], timeoutMs = 200): Promise<string | null> {
   return new Promise((resolve) => {
     const proc = spawn("git", args, {
       stdio: ["ignore", "pipe", "pipe"],
+      // Read-only probes must not refresh .git/index — a stray index.lock
+      // there races interactive git and bricks the repo (upstream #156/#180).
+      env: { ...process.env, GIT_OPTIONAL_LOCKS: "0" },
+      windowsHide: true,
     });
 
     let stdout = "";

package/src/segments/system.ts

@@ -32,7 +32,13 @@ export const thinkingSegment: StatusLineSegment = {
     const content = `think:${label}`;
 
     if (level === "high" || level === "xhigh" || level === "max") {
-      return { content: color(ctx, "thinking", content), visible: true };
+      const highKey =
+        level === "high"
+          ? "thinkingHigh"
+          : level === "xhigh"
+            ? "thinkingXhigh"
+            : "thinkingMax";
+      return { content: color(ctx, highKey, content), visible: true };
     }
 
     if (level === "minimal") {

package/src/shell/cd-command.ts

@@ -3,6 +3,7 @@ import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { SessionManager, type ExtensionAPI, type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import type { AutocompleteItem } from "@earendil-works/pi-tui";
+import { debugLog } from "../extension/core/debug-log.ts";
 
 function stripMatchingQuotes(value: string): string {
   const trimmed = value.trim();
@@ -160,7 +161,7 @@ export async function runCdCommand(args: string, ctx: ExtensionCommandContext):
           nextCtx.ui.notify(`Changed directory to ${nextCtx.cwd}`, "info");
           nextCtx.ui.setTitle(`pi - ${basename(nextCtx.cwd) || nextCtx.cwd}`);
         } catch (error) {
-          console.debug("[wishcraft] Failed to update process cwd after /cd:", error);
+          debugLog("[wishcraft] Failed to update process cwd after /cd:", error);
         }
       },
     });
@@ -174,7 +175,7 @@ export async function runCdCommand(args: string, ctx: ExtensionCommandContext):
     try {
       ctx.ui.notify(`Failed to change directory: ${message}`, "error");
     } catch {
-      console.debug("[wishcraft] Failed to report /cd error:", error);
+      debugLog("[wishcraft] Failed to report /cd error:", error);
     }
   }
 }

package/src/theme/theme.ts

@@ -9,6 +9,7 @@ import type {
   SemanticColor,
   ThemeLike,
 } from "../config/types.ts";
+import { debugLog } from "../extension/core/debug-log.ts";
 
 export interface PowerlineThemeConfig {
   colors?: unknown;
@@ -25,6 +26,9 @@ const DEFAULT_COLORS: Required<ColorScheme> = {
   thinkingMinimal: "thinkingMinimal",
   thinkingLow: "thinkingLow",
   thinkingMedium: "thinkingMedium",
+  thinkingHigh: "rainbow",
+  thinkingXhigh: "rainbow",
+  thinkingMax: "rainbow",
   context: "dim",
   contextWarn: "warning",
   contextError: "error",
@@ -131,11 +135,11 @@ export function loadThemeConfig(): PowerlineThemeConfig {
       }
     } catch (e: unknown) {
       if (e instanceof SyntaxError) {
-        console.debug(`[theme] SyntaxError in ${path}:`, e.message);
+        debugLog(`[theme] SyntaxError in ${path}:`, e.message);
       } else if ((e as NodeJS.ErrnoException).code === 'ENOENT') {
         // File doesn't exist despite existsSync, ignore
       } else {
-        console.debug(`[theme] Unexpected error reading ${path}:`, e);
+        debugLog(`[theme] Unexpected error reading ${path}:`, e);
       }
     }
   }
@@ -189,6 +193,9 @@ export function applyColor(
   color: ColorValue,
   text: string,
 ): string {
+  if (color === "rainbow") {
+    return rainbow(text);
+  }
   if (typeof color === "string" && /^#[0-9a-fA-F]{6}$/.test(color)) {
     return `${hexToRgbAnsi(color)}${text}\x1b[0m`;
   }
@@ -200,7 +207,7 @@ export function applyColor(
     if (!loggedErrors.has(errorKey)) {
       loggedErrors.add(errorKey);
       if (loggedErrors.size > 100) loggedErrors.clear();
-      console.debug(`[theme] Invalid color "${errorKey}". Fallback to text.`, e);
+      debugLog(`[theme] Invalid color "${errorKey}". Fallback to text.`, e);
     }
     return theme.fg("text", text);
   }

package/src/usage/ledger.ts

@@ -36,6 +36,11 @@ export function isSessionAssistantMessage(value: unknown): value is AssistantMes
 }
 
 export function getUsageTokenTotal(usage: SessionAssistantUsage): number {
+  // Prefer the provider-reported total: it can cover token kinds the four
+  // fields miss (e.g. reasoning on providers that don't itemize).
+  if (typeof usage.totalTokens === "number" && usage.totalTokens > 0) {
+    return usage.totalTokens;
+  }
   return usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
 }
 

package/src/welcome/discover.ts

@@ -2,6 +2,7 @@ import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join, basename } from "node:path";
 import { getAgentPath, getHomeDir } from "../paths/agent-dirs.ts";
 import type { LoadedCounts } from "./types.ts";
+import { debugLog } from "../extension/core/debug-log.ts";
 
 const loggedDiscoveryErrors = new Set<string>();
 
@@ -26,7 +27,7 @@ export function logDiscoveryError(scope: string, error: unknown): void {
     loggedDiscoveryErrors.clear();
   }
 
-  console.debug(`[powerline-welcome] ${scope}:`, error);
+  debugLog(`[powerline-welcome] ${scope}:`, error);
 }
 
 function scanContextFiles(homeDir: string, cwd: string): number {

package/src/welcome/whats-new.ts

@@ -13,6 +13,7 @@ import {
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getAgentPath } from "../paths/agent-dirs.ts";
+import { debugLog } from "../extension/core/debug-log.ts";
 
 const MAX_WHATSNEW_LINES = 8;
 const WHATS_NEW_STATE_FILE = "whats-new.json";
@@ -159,7 +160,7 @@ function saveLastSeenVersion(version: string): void {
       "utf8",
     );
   } catch (error) {
-    console.debug("[wishcraft] Failed to persist whats-new state:", error);
+    debugLog("[wishcraft] Failed to persist whats-new state:", error);
   }
 }
 

package/src/working-vibes/manager.ts

@@ -16,6 +16,7 @@ import {
   type VibeMode,
 } from "./storage.ts";
 import { generateVibe } from "./provider.ts";
+import { debugLog } from "../extension/core/debug-log.ts";
 
 function trackRecentVibe(vibe: string): void {
   // Don't track fallback messages
@@ -67,9 +68,9 @@ async function generateAndUpdate(
   } catch (error) {
     // AbortError is expected on timeout/cancel - don't log as error
     if (error instanceof Error && error.name === "AbortError") {
-      console.debug("[working-vibes] Generation aborted");
+      debugLog("[working-vibes] Generation aborted");
     } else {
-      console.debug("[working-vibes] Generation failed:", error);
+      debugLog("[working-vibes] Generation failed:", error);
     }
     // Fallback already showing, no action needed
   }

package/src/working-vibes/native-indicator.ts

@@ -10,6 +10,7 @@ import { hasNerdFonts } from "../theme/icons.ts";
 import { nativeWorkingIndicator } from "./frames.ts";
 import type { NativeIndicatorSpec } from "./frames.ts";
 import { vibeState } from "./storage.ts";
+import { debugLog } from "../extension/core/debug-log.ts";
 
 type NativeIndicatorUi = {
   setWorkingIndicator?: (options?: { frames?: string[]; intervalMs?: number }) => void;
@@ -58,7 +59,7 @@ export function applyNativeWorkingIndicator(
     };
     ui.setWorkingIndicator({ frames: spec.frames.map(paint), intervalMs: spec.intervalMs });
   } catch (error) {
-    console.debug("[working-vibes] native indicator failed:", error);
+    debugLog("[working-vibes] native indicator failed:", error);
   }
 }
 
@@ -66,6 +67,6 @@ export function resetNativeWorkingIndicator(ui: NativeIndicatorUi | undefined):
   try {
     ui?.setWorkingIndicator?.();
   } catch (error) {
-    console.debug("[working-vibes] native indicator reset failed:", error);
+    debugLog("[working-vibes] native indicator reset failed:", error);
   }
 }

package/src/working-vibes/provider.ts

@@ -11,6 +11,7 @@ import type {
 import { normalizeContext } from "@earendil-works/pi-ai";
 import { requirePeerSymbol } from "../extension/core/peer-guard.ts";
 import { VIBE_SYSTEM_PROMPT, vibeState } from "./storage.ts";
+import { debugLog } from "../extension/core/debug-log.ts";
 
 // ═══════════════════════════════════════════════════════════════════════════
 // Types
@@ -136,7 +137,7 @@ export async function generateVibe(
   // Resolve model from registry
   const model = vibeState.extensionCtx.modelRegistry.find(provider, modelId);
   if (!model) {
-    console.debug(
+    debugLog(
       `[working-vibes] Model not found: ${vibeState.config.modelSpec}`,
     );
     return `${vibeState.config.fallback}...`;
@@ -146,7 +147,7 @@ export async function generateVibe(
   const auth =
     await vibeState.extensionCtx.modelRegistry.getApiKeyAndHeaders(model);
   if (!auth.ok) {
-    console.debug(`[working-vibes] Auth failed for ${provider}: ${auth.error}`);
+    debugLog(`[working-vibes] Auth failed for ${provider}: ${auth.error}`);
     return `${vibeState.config.fallback}...`;
   }
 
@@ -164,7 +165,7 @@ export async function generateVibe(
     response.stopReason === "error" &&
     response.errorMessage
   ) {
-    console.debug(
+    debugLog(
       `[working-vibes] Vibe generation failed for ${vibeState.config.modelSpec}: ${response.errorMessage}`,
     );
   }

package/src/working-vibes/storage.ts

@@ -10,6 +10,7 @@ import { getAgentPath } from "../paths/agent-dirs.ts";
 
 export type VibeMode = "generate" | "file";
 import { workingIndicatorStyles, type WorkingIndicatorStyle } from "./frames.ts";
+import { debugLog } from "../extension/core/debug-log.ts";
 export type { WorkingIndicatorStyle };
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -103,7 +104,7 @@ function readSettingsForLoad(): Record<string, unknown> {
 
     const parsed = JSON.parse(readFileSync(settingsPath, "utf-8"));
     if (!isRecord(parsed)) {
-      console.debug(
+      debugLog(
         `[working-vibes] Ignoring non-object settings at ${settingsPath}`,
       );
       return {};
@@ -111,7 +112,7 @@ function readSettingsForLoad(): Record<string, unknown> {
 
     return parsed;
   } catch (error) {
-    console.debug(
+    debugLog(
       `[working-vibes] Failed to load settings from ${settingsPath}:`,
       error,
     );
@@ -129,7 +130,7 @@ function readSettingsForWrite(scope: string): Record<string, unknown> | null {
   try {
     const parsed = JSON.parse(readFileSync(settingsPath, "utf-8"));
     if (!isRecord(parsed)) {
-      console.debug(
+      debugLog(
         `[working-vibes] Refusing to write ${scope}: settings at ${settingsPath} is not an object`,
       );
       return null;
@@ -137,7 +138,7 @@ function readSettingsForWrite(scope: string): Record<string, unknown> | null {
 
     return parsed;
   } catch (error) {
-    console.debug(
+    debugLog(
       `[working-vibes] Failed to parse settings while writing ${scope} at ${settingsPath}:`,
       error,
     );
@@ -156,7 +157,7 @@ function persistSettings(
     writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
     return true;
   } catch (error) {
-    console.debug(
+    debugLog(
       `[working-vibes] Failed to persist ${scope} to ${settingsPath}:`,
       error,
     );
@@ -300,7 +301,7 @@ export function loadVibesFromFile(theme: string): string[] {
       .map((line) => line.trim())
       .filter((line) => line.length > 0 && line.endsWith("..."));
   } catch (error) {
-    console.debug(
+    debugLog(
       `[working-vibes] Failed to load vibe file ${filePath}:`,
       error,
     );