@groeponline/pi-wishcraft 1.17.0 → 1.24.0

package/docs/testing.md

@@ -0,0 +1,81 @@
+# Testing & tooling
+
+Bun owns installation and script execution. The test **runner** stays Node's
+`node:test`, and that split is deliberate.
+
+## Why Bun installs but Node runs the tests
+
+`bun test` runs this suite, but not identically: measured on 1.4.2 with 1037
+tests, it reports **1035 pass / 2 fail** where `node --test` reports 1037/0.
+
+| Failing under `bun test` | Cause |
+|---|---|
+| `ports.test.ts` — "serves stale rows past the TTL instead of blanking the number" | Bun's fake-timer semantics differ from `node:test`'s `mock.timers`; the TTL never advances as the test expects. |
+| `ptyshell-managed.test.ts` — "carries cwd between commands via the sentinel" | Bun's PTY/child-process timing diverges; the sentinel is read before the shell writes it. |
+
+Both suites assert real behaviour that Node's runner exercises correctly, so
+the choice is "keep the runner that proves the behaviour" rather than
+"rewrite two suites to fit a faster runner". The coverage thresholds
+(`--test-coverage-lines=70 --test-coverage-functions=60`) are `node:test` flags
+as well. Everything else — install, script invocation, lint, typecheck — is Bun.
+
+Re-evaluate when Bun's runner gains `node:test` timer parity; the gate is a
+single command change in `package.json`, not a rewrite.
+
+## Commands
+
+```bash
+bun install --frozen-lockfile   # install exactly what bun.lock pins
+bun run typecheck               # tsc --noEmit
+bun run lint                    # oxlint --deny-warnings
+bun run test                    # node:test + coverage thresholds
+bun run check                   # typecheck + lint + test
+bun run circular                # madge --circular
+bun run verify:package          # package + Pi contract gates
+bun run audit                   # dependency audit gate
+```
+
+## Pre-commit hook
+
+```bash
+bun run hooks:install   # git config core.hooksPath .githooks
+```
+
+`.githooks/pre-commit` runs `typecheck`, `lint` and only the test files the
+commit touches. It is fast by design; the full suite is CI's job (or
+`bun run check` before pushing).
+
+## Lint
+
+`oxlint` (config in `.oxlintrc.json`) is the lint gate: correctness rules are
+errors, and CI runs with `--deny-warnings`, so a warning fails the build the
+same way an error does. `no-control-regex` is off repo-wide because matching
+ANSI SGR sequences is the product, not an accident.
+
+## CI shape
+
+`.github/workflows/test.yml` runs seven independent lanes in parallel —
+`whitespace`, `typecheck`, `lint`, `test`, `circular`, `package-contract`,
+`audit` — each installing from the frozen lockfile through the
+`.github/actions/bun-setup` composite action. A final `verify` job aggregates
+them and keeps that name as the single required status check; it also carries
+the release-candidate promotion dispatch, so the Verify → Promote chain is
+unchanged.
+
+## Dependency audit
+
+`scripts/audit-gate.mjs` reads `bun audit --json` plus `bun pm ls --all`.
+Because `bun.lock` carries no `package-lock.json` for npm to read, the npm
+audit schema is gone; the gate keeps the same guarantees in bun's terms:
+
+- a new high/critical advisory fails, matched by GHSA id **and** package name;
+- a baselined advisory whose vulnerable range moved fails (the exemption is
+  pinned to the range a human reviewed);
+- an installed version the baseline does not list fails, so a second
+  vulnerable copy of an accepted package cannot inherit the exemption;
+- a baselined advisory that stops reporting as high/critical fails, so the
+  baseline cannot rot into a blanket exemption;
+- an audit that cannot run exits 2 instead of reading as "zero findings".
+
+`audit-baseline.json` and `.oxlintrc.json` are excluded from the published
+tarball; `bun.lock` never ships because `files` does not match it.

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@groeponline/pi-wishcraft",
-  "version": "1.17.0",
+  "version": "1.24.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",
   "engines": {
     "node": ">=22.19"
   },
@@ -11,6 +12,7 @@
     "*.md",
     "*.json",
     "!audit-baseline.json",
+    "!.oxlintrc.json",
     "banner.png",
     "docs/**/*.md",
     "src/**/*.ts",
@@ -60,14 +62,18 @@
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
+    "lint": "oxlint --deny-warnings src tests scripts index.ts bash-mode queue",
+    "lint:fix": "oxlint --fix src tests scripts index.ts bash-mode queue",
     "test": "node --experimental-strip-types --experimental-test-coverage --test-coverage-lines=70 --test-coverage-functions=60 --test tests/**/*.test.ts",
-    "release": "node scripts/release.mjs",
-    "prepublishOnly": "tsc --noEmit && node scripts/verify-package.mjs && npm run verify:pi-package",
-    "verify:package": "node scripts/verify-package.mjs && node scripts/verify-pi-package-contract.mjs",
+    "check": "bun run typecheck && bun run lint && bun run test",
+    "release": "bun scripts/release.mjs",
+    "prepublishOnly": "bun run typecheck && bun run lint && bun scripts/verify-package.mjs && bun run verify:pi-package",
+    "verify:package": "bun scripts/verify-package.mjs && bun scripts/verify-pi-package-contract.mjs",
     "circular": "madge --circular src index.ts bash-mode queue",
-    "audit": "node scripts/audit-gate.mjs",
-    "preview": "node --experimental-strip-types scripts/preview.mjs",
-    "verify:pi-package": "node scripts/verify-pi-package-contract.mjs"
+    "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"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
@@ -75,11 +81,12 @@
     "@earendil-works/pi-tui": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.99.2",
-    "@earendil-works/pi-coding-agent": "^0.99.2",
-    "@earendil-works/pi-tui": "^0.99.2",
+    "@earendil-works/pi-ai": "^1.5.0",
+    "@earendil-works/pi-coding-agent": "^1.5.0",
+    "@earendil-works/pi-tui": "^1.5.0",
     "@types/node": "24.13.3",
     "madge": "^8.0.0",
+    "oxlint": "^1.91.0",
     "typescript": "5.9.3"
   },
   "pi": {

package/src/config/settings-registry.ts

@@ -6,6 +6,7 @@
  */
 import { tr } from "../i18n/index.ts";
 import { MOTION_LEVELS } from "../motion/accessibility.ts";
+import { workingIndicatorStyles } from "../working-vibes/frames.ts";
 import { STRUCTURAL_PRESET_NAMES } from "./types.ts";
 
 export type SettingValue = boolean | string | number;
@@ -108,7 +109,7 @@ export const SETTINGS_REGISTRY = [
   { id: "status.ports.host", path: "powerline.segmentOptions.openPorts.host", group: "status", label: "Ports probe host", kind: "text", hint: "SSH host to probe (fleet) · empty = this machine" },
   { id: "welcome.enabled", path: "powerline.welcome", group: "vibes", label: "Welcome overlay", kind: "toggle", defaultValue: SETTING_DEFAULTS["powerline.welcome"], hint: "on = overlay at startup, off = no welcome" },
   { id: "welcome.lanternMotion", path: "wishcraft.welcome.animateLantern", group: "vibes", label: "Animate wishcraft lantern", kind: "toggle", hint: "flicker on the lantern" },
-  { id: "vibes.indicatorStyle", path: "wishcraft.workingIndicatorStyle", group: "vibes", label: "Working indicator", kind: "select", choices: ["dots", "pulse", "bar", "ascii"], defaultValue: SETTING_DEFAULTS["wishcraft.workingIndicatorStyle"], hint: "frame style used while the agent is working" },
+  { id: "vibes.indicatorStyle", path: "wishcraft.workingIndicatorStyle", group: "vibes", label: "Working indicator", kind: "select", choices: workingIndicatorStyles(), defaultValue: SETTING_DEFAULTS["wishcraft.workingIndicatorStyle"], hint: "frame style for Pi's own working spinner while the agent runs" },
   { id: "skills.inline", path: "wishcraft.inlineSkills", group: "skills", label: "Inline expand /command and $skill", kind: "toggle", hint: "needs a restart to take effect", restartRequired: true },
   { id: "skills.readHints", path: "wishcraft.readHints", group: "skills", label: "Read hints", kind: "toggle", defaultValue: SETTING_DEFAULTS["wishcraft.readHints"], hint: "off = no continuation hint after partial reads" },
   { id: "harness.hooks", path: "wishcraft.hooksEnabled", group: "harness", label: "Hooks enabled", kind: "toggle", defaultValue: SETTING_DEFAULTS["wishcraft.hooksEnabled"], hint: "gate for configured preToolUse / postToolUse / sessionStart hooks" },

package/src/config/structural-preset-table.ts

@@ -11,7 +11,6 @@ import type { StructuralPresetDef, StructuralPresetName } from "./types.ts";
 import {
   BORDERLESS_CHROME,
   DEFAULT_DECK,
-  DEFAULT_WELCOME,
   MINIMAL_CHROME,
   motion,
   ROUNDED_CHROME,

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/commands/commands.ts

@@ -1,6 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { type KeyId } from "@earendil-works/pi-tui";
-import type { StatusLinePreset } from "../../config/types.ts";
 import { PRESETS } from "../../config/presets.ts";
 import { registerCdCommand } from "../../shell/cd-command.ts";
 import { registerVibeCommand } from "./vibe-command.ts";

package/src/extension/core/peer-guard.ts

@@ -90,6 +90,11 @@ export const PEER_SYMBOL_REQUIREMENTS: readonly PeerSymbolRequirement[] = [
     symbol: "truncateToWidth",
     usedBy: "status line rendering",
   },
+  {
+    pkg: "@earendil-works/pi-tui",
+    symbol: "wrapTextWithAnsi",
+    usedBy: "welcome news expansion",
+  },
   {
     pkg: "@earendil-works/pi-tui",
     symbol: "SelectList",

package/src/extension/core/segment-context.ts

@@ -15,6 +15,12 @@ import { getDefaultColors } from "../../theme/theme.ts";
 import { getGitStatus } from "../../git/status.ts";
 import { getQueueContext } from "../queue/queue-context.ts";
 import { getUsageTokenTotal } from "../../usage/ledger.ts";
+import type { SessionAssistantUsage } from "../../usage/ledger.ts";
+import {
+  pushTpsSample,
+  ringMsForWindow,
+  tpsSamples,
+} from "../../usage/tps-ring.ts";
 import { tokenBudgetSnapshotForDay } from "../../usage/token-budget.ts";
 import { dayKey } from "../../usage/usage-store.ts";
 import {
@@ -119,9 +125,90 @@ export interface BuildSegmentContextOptions {
   includeTokenBudget?: boolean;
 }
 
+/**
+ * Structural subset of Pi's extension context that the context builder reads.
+ * Typed rather than `any` so a renamed Pi accessor fails the typecheck here
+ * instead of silently rendering defaults at runtime.
+ */
+export interface SegmentSourceContext {
+  sessionManager?: { getSessionId?: () => string | undefined };
+  model?: SegmentContext["model"];
+  modelRegistry?: {
+    // Pi types this as `(model: Model<Api>) => boolean`. Method-bivariance
+    // keeps that signature assignable without widening the segment model
+    // shape to the full SDK `Model` type.
+    isUsingOAuth?: {
+      bivariance(model: NonNullable<SegmentContext["model"]>): boolean;
+    }["bivariance"];
+  };
+  cwd?: string;
+  settingsManager?: {
+    getCompactionSettings?: () => { enabled?: boolean } | undefined;
+  };
+}
+
+interface ContextMetrics {
+  contextTokens: number;
+  contextPercent: number;
+  contextWindow: number;
+}
+
+/**
+ * Token/context numbers: cached core usage wins, the live assistant usage is
+ * the fallback, and the model's window bounds the percentage.
+ */
+function resolveContextMetrics(
+  rt: RuntimeState,
+  ctx: SegmentSourceContext,
+  usage: SessionAssistantUsage | undefined,
+): ContextMetrics {
+  const core =
+    rt.isStreaming && rt.liveAssistantUsage ? null : rt.coreContextUsageCache.get(ctx);
+  const contextTokens =
+    core?.contextTokens ?? (usage ? getUsageTokenTotal(usage) : 0);
+  const contextWindow = core?.contextWindow ?? ctx.model?.contextWindow ?? 0;
+  const contextPercent =
+    core?.contextPercent ??
+    (contextWindow > 0 ? (contextTokens / contextWindow) * 100 : 0);
+  return { contextTokens, contextPercent, contextWindow };
+}
+
+interface CustomItemState {
+  effectiveCustomItems: SegmentContext["effectiveCustomItems"];
+  customItemsById: SegmentContext["customItemsById"];
+  hiddenExtensionStatusKeys: Set<string>;
+}
+
+/** Merge configured + auto-discovered custom items and hide claimed statuses. */
+function resolveCustomItemState(
+  extensionStatuses: ReadonlyMap<string, string>,
+): CustomItemState {
+  const excludedStatusKeys = new Set<string>([
+    CUSTOM_COMPACTION_STATUS_KEY,
+    "stash",
+    ...HIDDEN_POWERLINE_STATUS_KEYS,
+  ]);
+  const effectiveCustomItems = deriveAutoCustomItems(
+    config.customItems,
+    extensionStatuses,
+    config.customItemsAuto,
+    excludedStatusKeys,
+  );
+  const customItemsById = new Map(
+    effectiveCustomItems.map((item) => [item.id, item]),
+  );
+  const hiddenExtensionStatusKeys = collectHiddenExtensionStatusKeys(
+    effectiveCustomItems,
+  );
+  for (const key of HIDDEN_POWERLINE_STATUS_KEYS) {
+    hiddenExtensionStatusKeys.add(key);
+  }
+  return { effectiveCustomItems, customItemsById, hiddenExtensionStatusKeys };
+}
+
 export function buildSegmentContext(
   rt: RuntimeState,
-  ctx: any,
+  ctx: SegmentSourceContext,
   theme: Theme,
   options: BuildSegmentContextOptions = {},
 ): SegmentContext {
@@ -133,72 +220,39 @@ export function buildSegmentContext(
     getDefaultColors,
   );
 
-  // Build usage stats and get thinking level from session (cached; the full
-  // event list is only re-scanned when events are appended or the trailing
-  // event's stats-relevant fields change, e.g. in-place streaming updates)
+  // Usage stats are cached; the full event list is only re-scanned when events
+  // are appended or the trailing event's stats-relevant fields change (e.g.
+  // in-place streaming updates).
   const sessionEvents = rt.sessionBranchCache.get(ctx.sessionManager);
   const tokenStats = rt.tokenStatsCache.get(sessionEvents);
   const { input, output, cacheRead, cacheWrite, cost, subagentCost } =
     tokenStats;
   const lastAssistant = tokenStats.lastAssistant;
-  const thinkingLevelFromSession = tokenStats.thinkingLevelFromSession;
 
-  // Calculate context percentage.
   const latestUsage = rt.isStreaming
     ? (rt.liveAssistantUsage ?? lastAssistant?.usage)
     : lastAssistant?.usage;
-  const coreContextUsage =
-    rt.isStreaming && rt.liveAssistantUsage
-      ? null
-      : rt.coreContextUsageCache.get(ctx);
-  const contextTokens =
-    coreContextUsage?.contextTokens ??
-    (latestUsage ? getUsageTokenTotal(latestUsage) : 0);
-  const contextWindow =
-    coreContextUsage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
-  const contextPercent =
-    coreContextUsage?.contextPercent ??
-    (contextWindow > 0 ? (contextTokens / contextWindow) * 100 : 0);
+  const { contextTokens, contextPercent, contextWindow } =
+    resolveContextMetrics(rt, ctx, latestUsage);
 
   const segmentOptions = mergeSegmentOptions(
     presetDef.segmentOptions,
     config.segmentOptions,
   );
 
-  // Get git status (cached)
   const gitBranch = rt.footerDataRef?.getGitBranch() ?? null;
   const gitStatus = getGitStatus(gitBranch, segmentOptions.git?.polling);
-  const extensionStatuses =
-    rt.footerDataRef?.getExtensionStatuses() ?? new Map();
-  const excludedStatusKeys = new Set<string>([
-    CUSTOM_COMPACTION_STATUS_KEY,
-    "stash",
-    ...HIDDEN_POWERLINE_STATUS_KEYS,
-  ]);
-  const effectiveCustomItems = deriveAutoCustomItems(
-    config.customItems,
-    extensionStatuses,
-    config.customItemsAuto,
-    excludedStatusKeys,
-  );
-  const customItemsById = new Map(
-    effectiveCustomItems.map((item) => [item.id, item]),
-  );
-  const hiddenExtensionStatusKeys = collectHiddenExtensionStatusKeys(
-    effectiveCustomItems,
-  );
-  for (const key of HIDDEN_POWERLINE_STATUS_KEYS) {
-    hiddenExtensionStatusKeys.add(key);
-  }
+  const extensionStatuses = rt.footerDataRef?.getExtensionStatuses() ?? new Map();
+  const { effectiveCustomItems, customItemsById, hiddenExtensionStatusKeys } =
+    resolveCustomItemState(extensionStatuses);
 
-  // Check if using OAuth subscription
   const usingSubscription = ctx.model
     ? (ctx.modelRegistry?.isUsingOAuth?.(ctx.model) ?? false)
     : false;
 
   const thinkingLevel =
     rt.currentThinkingLevel ??
-    thinkingLevelFromSession ??
+    tokenStats.thinkingLevelFromSession ??
     rt.getThinkingLevelFn?.() ??
     "off";
   const queueSummary = rt.queueStore.summarize(
@@ -248,4 +302,45 @@ export function buildSegmentContext(
     theme,
     colors,
   };
-}
+}
+const TPS_EVENT_MIN_GAP_MS = 30;
+let lastTpsEventAt = 0;
+let lastMarkedTurnStart: number | null = null;
+
+/**
+ * Event-driven TPS sampling, called from `message_update`. The ring used to be
+ * filled only while the `tps` segment rendered, so presets without that segment
+ * left `/tps` empty and every unrelated repaint added a duplicate sample.
+ *
+ * This is also the only writer of the turn marker: the first sample of a turn
+ * carries `turnStartAt`, the rest do not, so `measureTurn` can find both the
+ * turn boundary and the sample that produced its first token.
+ */
+export function sampleTpsFromSession(
+  rt: RuntimeState,
+  ctx: SegmentSourceContext,
+  now: number = Date.now(),
+): void {
+  if (now - lastTpsEventAt < TPS_EVENT_MIN_GAP_MS) return;
+  lastTpsEventAt = now;
+  const events = rt.sessionBranchCache.get(ctx.sessionManager);
+  const { input, output, cacheRead } = rt.tokenStatsCache.get(events);
+  const windowMs =
+    mergeSegmentOptions(getPreset(config.preset).segmentOptions, config.segmentOptions)
+      .tps?.windowMs ?? 1000;
+  const turnStartAt =
+    rt.turnStartedAt !== null && rt.turnStartedAt !== lastMarkedTurnStart
+      ? (lastMarkedTurnStart = rt.turnStartedAt)
+      : undefined;
+  pushTpsSample(
+    tpsSamples,
+    {
+      at: now,
+      output,
+      input,
+      uncachedInput: Math.max(0, input - cacheRead),
+      ...(turnStartAt === undefined ? {} : { turnStartAt }),
+    },
+    ringMsForWindow(windowMs),
+  );
+}

package/src/extension/core/state.ts

@@ -111,6 +111,7 @@ export function createRuntimeState(
     welcomeHeaderActive: false,
     welcomeOverlayShouldDismiss: false,
     lastUserPrompt: "",
+    turnStartedAt: null,
     showLastPrompt: true,
     stashedEditorText: null,
     stashedPromptHistory: readPersistedStashHistory(),

package/src/extension/core/types.ts

@@ -61,6 +61,11 @@ export interface RuntimeState {
   welcomeHeaderActive: boolean;
   welcomeOverlayShouldDismiss: boolean;
   lastUserPrompt: string;
+  /**
+   * Timestamp (ms) of the current turn's `agent_start`; null between turns.
+   * Only the first TPS sample of a turn carries it as a ring marker.
+   */
+  turnStartedAt: number | null;
   showLastPrompt: boolean;
   stashedEditorText: string | null;
   stashedPromptHistory: string[];

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

@@ -18,6 +18,9 @@ import { showSelectOverlay } from "../ui/menu-views.ts";
 import { getQueueContext } from "./queue-context.ts";
 import { isStaleExtensionContextError } from "../session/stale-context.ts";
 import { config } from "../core/state.ts";
+import { allWorkingIndicatorFrames } from "../../working-vibes/frames.ts";
+import { MOTION_CATALOG } from "../../motion/catalog.ts";
+import { framesOf } from "../../motion/frames.ts";
 import type { RuntimeState } from "../core/types.ts";
 
 export function requestQueueRender(rt: RuntimeState): void {
@@ -40,9 +43,24 @@ export function queueItemDescription(item: PowerlineQueueItem): string {
  * Pi's working indicator (spinner frame + "Working...") can end up at the start
  * of captured text when the editor buffer is captured while the agent runs.
  * Strip that prefix so ideas never render as a permanently "working" card.
+ *
+ * The frame alternation is built from the same tables the indicator draws from
+ * (`working-vibes/frames.ts` plus the Motion Catalog the `motion` style
+ * borrows), so a new style or motion can never leak its glyphs into an idea.
  */
-const CAPTURE_NOISE_PREFIX =
-  /^[\u2800-\u28FF][\u2800-\u28FF ]*\s*Working[.…]+\s*/;
+const SPINNER_FRAMES = [
+  ...new Set([
+    ...allWorkingIndicatorFrames(),
+    ...MOTION_CATALOG.flatMap((def) => framesOf(def)),
+  ]),
+]
+  .filter((frame) => frame.trim().length > 0)
+  .sort((a, b) => b.length - a.length)
+  .map((frame) => frame.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+
+const CAPTURE_NOISE_PREFIX = new RegExp(
+  `^\\s*(?:(?:${SPINNER_FRAMES.join("|")})\\s*)*Working[.…]+\\s*`,
+);
 
 export function stripCaptureNoisePrefix(text: string): string {
   let out = text;

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

@@ -4,6 +4,7 @@ import { BashTranscriptStore } from "../../../bash-mode/transcript.ts";
 import { BashCompletionEngine } from "../../../bash-mode/completion.ts";
 import { parsePowerlineConfig } from "../../config/powerline-config.ts";
 import { policyFromEnvironment } from "../../motion/accessibility.ts";
+import { defaultMotionFor } from "../../motion/catalog.ts";
 import { registerCustomSegments } from "../../segments/index.ts";
 import { registerCustomPresets } from "../../config/presets.ts";
 import { invalidateGitStatus } from "../../git/status.ts";
@@ -34,6 +35,7 @@ import {
   requestImmediateStatusRender,
   requestStatusRender,
   resetLayoutCache,
+  sampleTpsFromSession,
 } from "../core/segment-context.ts";
 import { getQueueContext } from "../queue/queue-context.ts";
 import {
@@ -62,6 +64,10 @@ import {
   clearSkillsCountPublisher,
 } from "../skills/skill-status.ts";
 import { maybeAppendReadHint } from "./read-hints.ts";
+import {
+  applyNativeWorkingIndicator,
+  resetNativeWorkingIndicator,
+} from "../../working-vibes/native-indicator.ts";
 import {
   dispatchSignalEvent,
   settleSignal,
@@ -181,7 +187,7 @@ export function registerSessionLifecycle(
     }
   });
 
-  pi.on("session_shutdown", async (_event, ctx) => {
+  pi.on("session_shutdown", async (_event, _ctx) => {
     clearSkillsCountPublisher();
     rt.sessionGeneration++;
     rt.dismissWelcomeOverlay?.();
@@ -260,9 +266,16 @@ export function registerSessionLifecycle(
 
   // Generate themed working message before agent starts (has access to user's prompt)
   pi.on("before_agent_start", async (event, ctx) => {
-    rt.lastUserPrompt = event.prompt;
+    const prompt =
+      event.messageType === "user"
+        ? event.prompt
+        : event.message.display && typeof event.message.content === "string"
+          ? event.message.content
+          : "";
+    rt.lastUserPrompt = prompt;
     if (ctx.hasUI) {
-      onVibeBeforeAgentStart(event.prompt, ctx.ui.setWorkingMessage);
+      onVibeBeforeAgentStart(prompt, ctx.ui.setWorkingMessage);
+      applyNativeWorkingIndicator(ctx.ui, rt.motionPolicy, defaultMotionFor("thinking"));
     }
   });
 
@@ -270,6 +283,7 @@ export function registerSessionLifecycle(
   // Also dismiss welcome when agent starts responding (handles `p "command"` case)
   pi.on("agent_start", async (_event, ctx) => {
     rt.isStreaming = true;
+    rt.turnStartedAt = Date.now();
     rt.liveAssistantUsage = null;
     onVibeAgentStart();
     dismissWelcome(rt, ctx);
@@ -287,6 +301,11 @@ export function registerSessionLifecycle(
       rt.liveAssistantUsage = event.message.usage;
       rt.currentCtx = ctx;
       rt.layoutDirty = true;
+      try {
+        sampleTpsFromSession(rt, ctx);
+      } catch (error) {
+        if (!isStaleExtensionContextError(error)) throw error;
+      }
       rt.statusRenderScheduler.schedule(CONTEXT_STATUS_RENDER_MS);
       if (rt.signal.event !== "streaming") {
         dispatchSignalEvent(rt, config.appearance, "streaming");
@@ -406,6 +425,7 @@ export function registerSessionLifecycle(
 
   pi.on("agent_end", async (_event, ctx) => {
     rt.isStreaming = false;
+    rt.turnStartedAt = null;
     rt.liveAssistantUsage = null;
     rt.coreContextUsageCache.reset();
     dispatchSignalEvent(rt, config.appearance, "success");
@@ -423,6 +443,7 @@ export function registerSessionLifecycle(
     try {
       if (hasUI) {
         onVibeAgentEnd(ctx.ui.setWorkingMessage); // working-vibes internal state + reset message
+        resetNativeWorkingIndicator(ctx.ui);
         if (rt.stashedEditorText !== null) {
           if (ctx.ui.getEditorText().trim() === "") {
             ctx.ui.setEditorText(rt.stashedEditorText);

package/src/extension/skills/inline-invocation.ts

@@ -162,7 +162,7 @@ export function expandInlineTriggers(text: string): string {
  */
 export function setupInlineInvocation(
   pi: ExtensionAPI,
-  rt: RuntimeState,
+  _rt: RuntimeState,
 ): void {
   pi.on("input", async (event: any) => {
     // Alleen interactive input verwerken

package/src/extension/ui/custom-editor.ts

@@ -48,14 +48,10 @@ import {
   runPowerlineShortcut,
   stashOrRestoreEditorText,
 } from "../shortcuts/shortcuts-router.ts";
-import {
-  dismissWelcome,
-  scheduleDismissWelcome,
-} from "../welcome/welcome-control.ts";
+import { scheduleDismissWelcome } from "../welcome/welcome-control.ts";
 import { config } from "../core/state.ts";
 import type { RuntimeState } from "../core/types.ts";
 import {
-  ensureShellSession,
   getShellCwd,
   getShellHistoryEntries,
   getShellPath,