@groeponline/pi-wishcraft 1.2.0 → 1.3.0

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+## [1.3.0] - 2026-08-25
+
 ## [1.2.0] - 2026-08-24
 
 ### Changed

package/ROADMAP.md

@@ -1,208 +1,146 @@
 # Roadmap — pi-wishcraft
 
-Herschreven 2026-08-18. Vijfde pass 2026-08-20: 0.19.0–0.19.2 staan
-op npm. CHE-40 (`/powerline` tab) is Done via #18. Overlay-submenus
-(CHE-42 / #19) starten 0.20. ROADMAP was achter op de code: hooks,
-repairs-subset en skills-manager v2 UI zitten al op `main`.
-
-Pi core is de engine. Wishcraft is de cockpit. Elke feature dient één van
-drie doelen: **grip** (skills, tokens, config), **prestatie** (repairs,
-hooks, read-hints), of **leven** (overlays, vibes, detail views).
-
-Elke release is één campagne met een done-criterium. P1 = deze release,
-P2 = volgende, P3 = richting 1.0. Wat in 0.19 staat, shipt. Wat later
-staat, start niet eerder.
-
----
-
-## Waarom wij bestaan
-
-De pi-extensiewereld heeft statusbalken. Ze heeft geen cockpit.
-
-**Upstream `nicobailon/pi-powerline-footer`** is een goede balk: git,
-context, stash, compaction-queue, vibes, welcome, bash-mode. Wij zijn
-daaruit gegroeid. Wat zij niet hebben, en wat onze publieke identiteit
-is:
-
-| Wij | Zij / de rest |
-|---|---|
-| Skills als OS: `/skills`, inline `/$`, usage, later doctor | Geen skill-manager |
-| Idee → actie: `#`, `/idea`, `/ideas`, `/ideas issue` | Alleen compaction-hold queue |
-| Eerlijke TPS: 1s-venster over 5s-ring, in/out gescheiden | Session-average of helemaal niks |
-| Tab-token completion + git ahead/behind | Niet of later |
-| Harness-laag (0.20): hooks + tool-input repairs op stock pi | Nergens in het extensie-ecosysteem |
-
-**oh-my-pi** is een hele agent-fork (~80k regels Rust-core, eigen tools,
-LSP, DAP). Dat is een ander product. Wij forken Mario's pi niet. Alles
-wat we willen van oh-my-pi vertalen we naar een extensie of we laten het
-liggen. De weddenschap: de beste cockpit op stock pi wint van een
-tweede engine.
-
-**Command Code** is een commerciële harness (hooks, tool-call repairs,
-read-tool engineering). Hun inzicht klopt: open modellen falen op het
-contract, niet op "slimheid". Wij kopiëren hun product niet. We gieten
-dezelfde principes in wat Pi al native biedt:
-
-- `pi.on("tool_call")` — `event.input` is mutable; `block` + `reason` +
-  `terminate` bestaan (`pi-coding-agent` 0.84.x
-  `dist/core/extensions/types.d.ts`).
-- `pi.on("tool_result")` — resultaat muteren.
-- `pi.on("session_start" | "input" | "turn_end")`.
-
-Geen core-patch. Geen tweede agent. Iedereen die `pi` draait kan de
-cockpit + harness installeren.
-
-**ChefGroep** (ChefBar-statuskeys, fleet-ports) is een privé-bonus, niet
-de publieke pitch. De npm-pagina moet leesbaar zijn voor iemand die pi
-gisteren installeerde.
-
-Kort: **wij zijn de cockpit + harness voor stock pi.** Niet de balk.
-Niet de fork. Niet de SaaS-agent.
-
----
-
-## Wat wij niet worden
-
-- Geen agent-fork. Geen oh-my-pi-lite.
-- Geen derde control surface naast ChefBar / Kater. Overlays blijven in
-  deze extensie.
-- Geen muis op de live footer. Pi core bezit die; overlay-navigatie is
-  het pad.
-- Geen eigen bulk-read tool. Core's verantwoordelijkheid; wij leveren
-  repairs + hints eromheen.
-- Geen PostHog in de balk. Events alleen op expliciete Joep-opt-in.
-- Geen custom embed/component-registratie voor footer-segments.
-  Segments zijn data; `customItems` + `command/env/static` dekken
-  gebruikerscontent.
-- Geen skills-markt als identiteit vóór 1.0. Eerst discovery die klopt
-  en een manager die zoekt.
-- Geen fleet-SSH `open_ports` zonder expliciete opt-in (`segmentOptions.openPorts.host`; sanitized, geen shell-injectie).
-- Geen versie-reset naar 1.0.0. We blijven op 0.19 → 0.20 → 1.0 wanneer
-  de cockpit stabiel is.
-
----
-
-## Mijlpalen
-
-- **0.19.0–0.19.2 — "Correctheid"** (geland). Bugs, hygiëne, catalogus,
-  auto-release, `/powerline` tab. Hooks, repairs-subset en skills
-  manager v2 UI gingen mee in #12, eerder dan deze sectie beloofde.
-  Done = npm 0.19.2 live, `/skills` filtert, `$test` expandeert geen
-  debris, verify-trio groen op de tag.
-- **0.20.0–0.22 — "Harness"** (0.20.0 + 0.21.0 op npm; leftovers in GRO-1414).
-  Overlay-chrome + CHE-42 drill-down, Configure als SelectList, token-overlays,
-  rest-repairs, README-hooks. Done = drie README-hookvoorbeelden, repair-teller,
-  `alt+p` overlay-boom, `/tps` deelt de ring met het segment.
-- **1.0 — "Cockpit"**. Skills-doctor/install, declaratieve policy,
-  preset-editor, idee-review, stabiele ChefGroep-statuskeys,
-  documentatie die waar is. Done = README dekt alles wat we shipten,
-  geen kapotte footer-belofte.
-- **vNext — "Operator Layer"** (in uitvoering). Stacked PRs PR0–PR8:
-  Deck control surface (`ctx.ui.custom`), animated Signal powerline,
-  zero-overhead Motion Engine (0 FPS idle), 10 signature structural presets,
-  semantische tokens, en first-class accessibility (`NO_COLOR`, reduced motion).
-  Zie [docs/design/vnext-release-plan.md](docs/design/vnext-release-plan.md).
-  - PR0 design corpus — geland (`docs/design/`).
-  - PR1 motion engine — geland (`src/motion/`): één scheduler op de bestaande
-    coalescing timer, semantische events, 6 channels, 0 FPS zonder consumers.
-  - PR2 semantic tokens — geland (`src/config/tokens.ts`): `PresetDef.tokens`
-    is optioneel en `DEFAULT_TOKENS` reproduceert `getDefaultColors()`.
-  - PR3 structural presets — geland (`src/config/structural-presets.ts`,
-    `src/config/appearance.ts`): 10 signature presets, mixable layers, Nerd/ASCII
-    glyph fallbacks; legacy layout presets ongewijzigd.
-  - PR4 animated Signal — geland (`src/signal/`): drie lanes, lifecycle-driven
-    motion op één gedeelde scheduler, `/signal` primair en 0 FPS in rust.
-  - PR5 Deck — geland (`src/extension/ui/deck/`): unified overlay via
-    `ctx.ui.custom`, Alt+P en `/wishcraft`, elf routes, jump/search navigatie.
-  - PR6 Appearance / Gallery — geland: Deck Motion gallery + composer,
-    50+ catalog defs, Enter assigns `powerline.appearance.motion`.
-  - PR7 accessibility — geland: `src/theme/detect.ts`,
-    `src/motion/accessibility.ts`, `powerline.motionLevel`.
-  - PR8 Craft + docs — geland: Deck Skill Workbench, idea/guardrail panes,
-    `skills/wishcraft-tui/references/*`, project subagents.
-
-## Top-15 track: remaining maturity gaps
-
-Written 2026-08-20, rebaselined on 0.27.1 (code review, not this ROADMAP
-alone). Feature density is high; several original gaps closed in
-0.23–0.27. What remains is the maturity layer that separates a top-15 pi
-extension from a feature-rich prototype.
-
-### Already shipped (0.22.x–0.27.x)
-- **CHE-41 per-segment detail** — `→` in Navigate, snapshot on open (0.22.1).
-- **CHE-42 drill-down** — #19 + Configure in #13.
-- **Changelog roll** — version headers drive the what's-new panel.
-- **Per-segment fault isolation** — throwing custom segments show `!id`
-  instead of blanking the footer (#34, 0.23.1).
-- **macOS open_ports** — netstat dot-address parsing (#34, 0.23.1).
-- **GitHub Release per npm tag** (#25, 0.23.2).
-- **CodeQL proto-pollution hardening** (#27, 0.23.3).
-- **setupHooks wired** (#26, 0.23.4).
-- **Policy engine** — declarative deny/inject, no spawn (GRO-1418, #29,
-  0.24.0).
-- **`/skills doctor`** — broken frontmatter, dupes, unused, budget
-  (GRO-1416, #28, 0.24.0 / 0.25.0 tag).
-- **`/skills new` templates** — no marketplace (GRO-1417, #32, 0.26.0).
-- **`/ideas` review overlay** — status, tags, skill insert (GRO-1419, #31,
-  0.27.0).
-- **English operator UI** — overlays, skill manager, `/wishcraft` TUI
-  (GRO-1422, #24, 0.27.1).
-- **`powerline.skills.count` + read hints + Status trim** (GRO-1420, 0.23.0).
-- **1.0.0 cockpit cut** — README lists doctor, templates, policy, and
-  idea-review (GRO-1421). Semver leaves 0.x.
-
-### Remaining open gaps (maturity)
-P1 — differentiation and quality:
-1. **Settings contract to pi core.** No `contributes.settings`/schema;
-   users hand-edit JSON. *Fix: typed settings schema + contributions.*
-2. **Zero-config first run.** Install still expects JSON edits for the most
-   useful features. *Fix: sensible defaults + first-run setup overlay.*
-3. **Perf budget / low-power mode.** Status renders every ~33ms; heavy
-   segments (bash-history, git) can hit the hot path. *Fix: configurable
-   refresh + lite mode / repeating scheduler with 0 FPS idle. Scheduler landed
-   in PR1 (`src/motion/scheduler.ts`); the segment hot path is still open.*
-4. **Accessibility (no-color / reduced-motion).** Truecolor + animations
-   (vibes, rainbow think) break on terminals without truecolor. *Fix:
-   `NO_COLOR`/8-color + reduced-motion respect (PR7).*
-
-P2 — full product, post-1.0:
-5. **Preset editor in-menu** — custom JSON-only today (addressed in PR3 & PR6).
-6. **Skill install from repo/npm** — discovery + doctor exist; install and
-   curate missing (addressed in PR8).
-7. **Host-status integration** — `ctx.ui.setStatus` beside the footer so
-   status also shows in host UI (`skills.count` is a start; full coverage
-   remains).
-
----
-
-## vNext Milestone: The Stacked PR Plan
-
-The complete vNext architecture is detailed in **[`docs/design/vnext-release-plan.md`](docs/design/vnext-release-plan.md)** and executed across 9 stacked pull requests:
-
-```mermaid
-graph LR
-  PR0["PR0: Design Corpus"] --> PR1["PR1: Motion Engine"]
-  PR1 --> PR2["PR2: Semantic Tokens"]
-  PR2 --> PR3["PR3: Preset Contract"]
-  PR3 --> PR4["PR4: Animated Signal"]
-  PR4 --> PR5["PR5: Wishcraft Deck"]
-  PR5 --> PR6["PR6: Appearance & Gallery"]
-  PR6 --> PR7["PR7: First-Class A11y"]
-  PR7 --> PR8["PR8: Craft, Skills & Docs"]
+Baseline: **v1.2.0**, published 2026-08-24.
+
+Pi is the engine. Wishcraft is the operator experience layer: Signal, Deck, skills, ideas, shell UX, hooks, repairs and policy without forking Pi core.
+
+Historical 0.x/1.0/vNext campaign detail belongs in `CHANGELOG.md` and `docs/design/`. This file describes only the current product contract and work that is still open.
+
+## Product boundary
+
+Wishcraft may extend the Pi experience, but it does not become:
+
+- a Pi fork or second agent engine;
+- a fleet/orchestration control plane;
+- a SaaS integrations bundle;
+- a second plugin runtime competing with Pi extensions;
+- a telemetry collector by default.
+
+External systems should connect through small contribution/integration contracts. Vendor-specific control planes belong outside Wishcraft.
+
+## Release line
+
+| Release | Theme | State | Done means |
+| --- | --- | --- | --- |
+| **1.2** | Operator Layer | shipped | Deck, universal Signal, structural appearance, motion gallery/composer, skill workbench and first-class motion accessibility |
+| **1.3** | Hardening | current | release invariant, render-path performance, one token source of truth, explicit renderer/lifecycle contracts, regression coverage |
+| **1.4** | Extension Contract | next | typed settings registry plus small contribution APIs; no new plugin runtime |
+| **1.5** | Craft Ecosystem | later | curated skill/package workflows built on Pi-native distribution and the contribution contract |
+| **2.0** | Stable Experience Platform | target | documented compatibility policy, migrations, performance budgets and stable public extension points |
+
+## 1.3 — Hardening
+
+No feature dump. This release exists to make the v1.2 surface trustworthy.
+
+### P0 — release integrity
+
+- One reusable `Verify` contract for PR verification and release gating.
+- Verify includes whitespace, typecheck, unit tests, circular dependency check and Pi package contract.
+- Release jobs depend on Verify and re-check the synchronized `origin/main` tree before tagging.
+- `main` should require the Verify check in repository rules before merge.
+
+### P0 — render/runtime performance
+
+- Deck paint must not run filesystem-backed skill discovery, skill doctor or settings parsing.
+- Expensive Deck data is cached as static snapshot state and refreshed only on open, relevant navigation or mutation.
+- Live model/Git/context/queue/Signal state remains cheap to repaint.
+- Idle motion stays 0 FPS.
+
+### P0 — appearance consistency
+
+- `src/config/types.ts` + `src/config/tokens.ts` are the canonical token contract.
+- `src/theme/tokens/*` is compatibility-only; it may re-export but may not define a second palette or semantic mapping.
+- One structural base must paint the same semantic roles regardless of the configuration path used to select it.
+
+### P0 — Signal contract
+
+- Signal is the universal status renderer for legacy and structural presets.
+- Legacy presets keep their existing segment/layout/color contract unless a structural appearance layer is explicitly selected.
+- Terminal one-shots (`success`, `warning`, `error`) settle to `idle/ready` after their finite burst.
+- Reduced/off/screen-reader modes communicate state without requiring animation.
+
+### P1 — verification matrix
+
+Add/keep regression coverage for:
+
+- widths around 40 / 80 / 120+ columns;
+- ASCII, Nerd Font and `NO_COLOR` rendering;
+- full / reduced / functional / off motion;
+- Deck render hot-path invariants;
+- legacy preset color compatibility;
+- release-gate dependency order;
+- Linux and macOS system-segment parsing.
+
+## 1.4 — Extension Contract
+
+The next architecture step is **composability**, not more built-in routes.
+
+### Typed settings registry
+
+One registry should drive:
+
+```text
+settings definition
+      │
+      ├─ parsing + validation
+      ├─ defaults + migrations
+      ├─ /wishcraft settings
+      ├─ Pi settings contribution (where supported)
+      └─ generated documentation/examples
+```
+
+This removes duplicate knowledge about settings and enables a real zero-config first run.
+
+### Small contribution API
+
+Target capabilities, subject to Pi host APIs:
+
+```text
+registerDeckRoute()
+registerSignalSource()
+registerMotion()
+registerAppearanceContribution()
+registerRecipeOrAction()
+contributeSettings()
 ```
 
----
-
-## Kwaliteit (altijd)
-
-- Overlay logic is testable via pure functions. No headless `ctx.ui`.
-- **English UI:** operator overlays, notify strings, and `/wishcraft` copy are
-  English. Do not add Dutch UI strings.
-- `prepublishOnly` = `tsc --noEmit`. Een slecht type ship't niet.
-- `madge --circular` blijft CI. Nieuwe map in `src/` → check mee.
-- Dependabot-vulns (devDep-transitief): waiven, track op GRO-603.
-  Niet required in CI. Geen stille bump van TypeScript 7 of
-  `@types/node` 26 in een bug-PR.
-- TPS-core blijft 1s sliding window over 5s-ring. Geen regressie
-  naar session-average of per-render EMA (beide spikten:
-  `tps:12775`).
+Rules:
+
+- Pi remains the package/extension runtime.
+- Contributions are data/callback contracts, not arbitrary nested plugin loaders.
+- Public contracts are versioned and capability-scoped.
+- A failing contribution cannot take down Signal or the Deck.
+
+## 1.5 — Craft Ecosystem
+
+After the contribution/settings contracts are stable:
+
+- skill import/install workflows from explicit trusted sources;
+- curated recipes/actions that compose existing Wishcraft/Pi capabilities;
+- package discovery surfaced through Pi-native package distribution rather than a parallel Wishcraft marketplace;
+- export/import of appearance and motion recipes with validation.
+
+## 2.0 — Stable Experience Platform
+
+2.0 is justified when the public contracts, not the feature count, are stable.
+
+Required before 2.0:
+
+- compatibility and deprecation policy;
+- settings migrations with round-trip tests;
+- measured render/performance budgets;
+- stable contribution API with fault isolation;
+- release provenance and required repository checks;
+- docs generated from canonical contracts where practical;
+- no known duplicate sources of truth for tokens, settings or release verification.
+
+## Always-on engineering rules
+
+- English operator UI.
+- No synchronous discovery work in paint/render loops.
+- No background animation when nothing consumes it.
+- Core Pi tools are not silently rewritten by Wishcraft repairs.
+- Policies and hooks remain explicitly disableable.
+- Security-sensitive paths fail closed.
+- Package/release verification runs before npm publication.
+- New features must fit the operator-layer boundary above.

package/docs/design/signal.md

@@ -1,68 +1,71 @@
-# Signal — The Animated Powerline Specification
+# Signal — Animated status contract
 
 ## Overview
 
-**Signal** is Wishcraft's animated powerline. While previous terminal footers were static rows of plain text, Signal turns status into an informative, living track.
+Signal is Wishcraft's status renderer for stock Pi. `/signal` is primary; `/powerline` remains a compatibility alias. No-args toggles the surface, `/signal menu` opens Navigate / Configure / Status, and `/signal <preset>` changes the information preset.
 
-- **Primary Command**: `/signal` (opens the Signal configuration deck or toggles view modes).
-- **Compatibility Alias**: `/powerline` (retained for backward compatibility).
+Signal divides status into three lanes:
 
----
-
-## 3-Lane Architecture
+```text
+LEFT / IDENTITY            CENTER / ACTIVITY            RIGHT / CONTEXT
+model · git · workspace    lifecycle · tool · motion    context · queue
+```
 
-Signal divides status information into three distinct, customizable lanes:
+A typical frame:
 
-```
-┌──────────────────────────────────────────────────────────────────────────────────┐
-│ LEFT LANE                    CENTER LANE                    RIGHT LANE           │
-│ Model · Git Status           Live Activity & Tools          Context · Queue      │
-├──────────────────────────────┼──────────────────────────────┼────────────────────┤
-│ ◆ GPT-5.6 ╾━━━━ main ━━━━    │ ╾✦╼━━━━ read_file ━━━━━━━    │ ctx █████░ 47%     │
-└──────────────────────────────┴──────────────────────────────┴────────────────────┘
+```text
+◆ GPT-5.6  main       ╾✦╼ read_file       ctx █████░ 47% · q1
 ```
 
-1. **Left Lane (Identity & Workspace)**
-   - Active Model badge (with provider color accent)
-   - Git branch and repository clean/dirty status
-   - Workspace directory (truncated gracefully on compact displays)
+## Renderer contract
 
-2. **Center Lane (Live Activity & Motion)**
-   - Current agent state (Thinking, Streaming, Tool Execution)
-   - Active tool call indicator (`read_file`, `grep`, `execute_command`)
-   - Traveling motion pulse representing data throughput
+**Signal is the universal status-line renderer.** This is intentional, including for the legacy layout preset names (`default`, `minimal`, `compact`, `full`, `nerd`, `ascii`, `chef`). There is no second legacy renderer hidden behind those names.
 
-3. **Right Lane (Metrics & Session)**
-   - Context window progress bar and percentage
-   - Queued user/agent instructions count
-   - Session cost / token consumption (if enabled)
+Compatibility is preserved at the data/config layer:
 
----
+- legacy presets still define their existing segment selection, layout options, separators, and explicit colors;
+- with no structural appearance layer selected, legacy preset colors remain exact;
+- structural preset names (`lanternwake` … `crucible`) opt into the vNext appearance personality and semantic-token palette;
+- `powerline.appearance.*` may mix palette, Signal grammar, chrome, glyphs, deck, welcome, and motion independently.
 
-## Live Motion Sweeps
+In other words: **one renderer, two compatible preset contracts**. A future change that restores a second renderer or silently remaps legacy colors is a breaking change and requires explicit migration tests.
 
-Signal animates only when actual work is being processed. The track reflects execution states through traveling pulses:
+## Three lanes
 
-### Token Streaming Wave
-```
-t0:  ◆ GPT-5.6 ╾▓▒░━━━━ main ━━━━━━━━━ read ━━━━━━━━━ ctx 47%
-t1:  ◆ GPT-5.6 ━╾▓▒░━━━ main ━━━━━━━━━ read ━━━━━━━━━ ctx 47%
-t2:  ◆ GPT-5.6 ━━━╾▓▒░━ main ━━━━━━━━━ read ━━━━━━━━━ ctx 47%
-t3:  ◆ GPT-5.6 ━━━━━━━━ main ╾▓▒░━━━━━ read ━━━━━━━━━ ctx 47%
-```
+1. **Identity / workspace** — model, Git state, path/workspace identity.
+2. **Activity** — thinking, streaming, tool execution, compacting and one-shot outcomes.
+3. **Context / queue** — context usage and queued/parked work.
 
-### Tool Execution Traveling Pulse
-```
-t0:  read ━━━╾✦╼━━━ grep ━━━━━━━━━ edit ━━━━━━━━━
-t1:  read ✓ ━━━━━━━ grep ━━━╾✦╼━━━ edit ━━━━━━━━━
-t2:  read ✓ ━━━━━━━ grep ✓ ━━━━━━━ edit ━━━╾✦╼━━━
+Width pressure is resolved inside Signal; lanes may compact or omit optional detail, but their semantic order stays identity → activity → context.
+
+## Motion lifecycle
+
+Signal owns no timer. It leases the shared MotionScheduler only while a motion channel needs frames.
+
+```text
+idle / ready       0 FPS
+      │
+      ├─ thinking / streaming / tool.start / compact  → active state
+      │
+      └─ success | warning | error                    → finite burst
+                                                        ↓
+                                                     idle / ready
+                                                     0 FPS
 ```
 
----
+Terminal one-shots (`success`, `warning`, `error`) settle their semantic state back to `idle/ready` when the final frame completes. This prevents a completed agent run from leaving `done` painted indefinitely without keeping a background timer alive.
+
+Reduced/functional/off motion policies may suppress frames entirely; status text must still communicate the state. `NO_COLOR`, screen-reader flags and ASCII fallback are first-class inputs to the same policy.
+
+## Fault isolation
+
+Signal builds on Wishcraft's segment isolation:
+
+- a failing custom segment is isolated instead of blanking the full status surface;
+- cached Git/session state is preferred during transient refreshes;
+- separators collapse around hidden/empty segments;
+- rendering must not perform unrelated discovery work such as the Deck skill doctor.
 
-## Fault Isolation & Error Boundaries
+## Performance invariant
 
-Signal builds on Pi-Wishcraft's existing segment architecture:
-- Every segment executes in an isolated `try/catch` wrapper.
-- If an individual segment fails (e.g. git command timeout or unexpected API response), it degrades gracefully to a silent fallback or a compact warning glyph without crashing the surrounding status line.
-- Segment separators adjust dynamically when neighboring segments are hidden or empty.
+Idle is 0 FPS. Continuous animation uses the shared coalescing scheduler. Expensive filesystem-backed discovery belongs outside paint/render paths; status rendering consumes already-resolved/cached state.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groeponline/pi-wishcraft",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Operator cockpit for Pi: live powerline status, searchable skills, idea queue, sticky Bash, hooks, policy controls, and session UX.",
   "type": "module",
   "files": [

package/src/config/appearance.ts

@@ -62,7 +62,6 @@ export function resolveAppearanceMix(
   config: AppearanceMixConfig = {},
 ): ResolvedAppearance {
   const baseName = config.base ?? "lanternwake";
-  const base = getStructuralPreset(baseName);
 
   const paletteName = layerPreset(config, "palette", baseName);
   const signalName = layerPreset(config, "signalLayout", baseName);

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

@@ -15,14 +15,8 @@ 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 {
-  dayKey,
-  loadUsageFileFromDisk,
-  tokenTotal,
-  totalsForRange,
-} from "../../usage/usage-store.ts";
-import { parseTokenBudget } from "../../usage/token-budget.ts";
-import { readSettings } from "../settings/settings-io.ts";
+import { tokenBudgetSnapshotForDay } from "../../usage/token-budget.ts";
+import { dayKey } from "../../usage/usage-store.ts";
 import {
   CUSTOM_COMPACTION_STATUS_KEY,
   EDITOR_STATUS_DEFER_MS,
@@ -120,10 +114,16 @@ export function installFooterStatusRepaintHook(
   };
 }
 
+export interface BuildSegmentContextOptions {
+  /** Omit token-budget data from lightweight UI snapshots. */
+  includeTokenBudget?: boolean;
+}
+
 export function buildSegmentContext(
   rt: RuntimeState,
   ctx: any,
   theme: Theme,
+  options: BuildSegmentContextOptions = {},
 ): SegmentContext {
   const presetDef = getPreset(config.preset);
   const colors: ColorScheme = liveColorScheme(
@@ -205,6 +205,10 @@ export function buildSegmentContext(
     getQueueContext(ctx),
     rt.powerlineCompacting,
   );
+  const budgetSnapshot = tokenBudgetSnapshotForDay(
+    rt.tokenBudgetSnapshot,
+    dayKey(Date.now()),
+  );
 
   return {
     model: ctx.model,
@@ -234,18 +238,14 @@ export function buildSegmentContext(
     effectiveCustomItems,
     options: segmentOptions,
     segmentLabels: new Map(Object.entries(config.segmentLabels)),
-    tokenBudget: (() => {
-      const dailyLimit = parseTokenBudget(
-        readSettings(ctx.cwd ?? process.cwd()).wishcraft,
-      ).daily;
-      const now = Date.now();
-      const todayStart = Date.parse(`${dayKey(now)}T00:00:00`);
-      const dailyUsed = tokenTotal(
-        totalsForRange(loadUsageFileFromDisk(), todayStart, now + 1),
-      );
-      return { dailyLimit, dailyUsed };
-    })(),
+    tokenBudget:
+      options.includeTokenBudget === false
+        ? undefined
+        : {
+            dailyLimit: budgetSnapshot.dailyLimit,
+            dailyUsed: budgetSnapshot.dailyUsed,
+          },
     theme,
     colors,
   };
-}
+}

package/src/extension/core/state.ts

@@ -117,6 +117,7 @@ export function createRuntimeState(
     currentEditor: null,
     costAlertNotified: false,
     tokenBudgetNotifiedLevel: 0,
+    tokenBudgetSnapshot: { day: "", dailyLimit: null, dailyUsed: 0 },
     bashModeActive: false,
     bashTranscript: new BashTranscriptStore(bashModeSettings),
     bashCompletionEngine: new BashCompletionEngine(),
@@ -174,4 +175,4 @@ export function createRuntimeState(
   });
 
   return rt;
-}
+}

package/src/extension/core/types.ts

@@ -11,6 +11,7 @@ import type {
   SessionTokenStatsCache,
 } from "../../usage/ledger.ts";
 import type { CoreContextUsageCache } from "../../usage/context.ts";
+import type { TokenBudgetSnapshot } from "../../usage/token-budget.ts";
 import type { WelcomeDismissScheduler } from "../../welcome/auto-dismiss.ts";
 import type { RenderScheduler } from "../../render/timer.ts";
 import type { MotionPolicy, MotionScheduler } from "../../motion/index.ts";
@@ -68,6 +69,8 @@ export interface RuntimeState {
   costAlertNotified: boolean;
   /** Highest daily-budget warning already shown this session (0 / 80 / 100). */
   tokenBudgetNotifiedLevel: 0 | 80 | 100;
+  /** Event-driven token-budget snapshot consumed by render paths without disk I/O. */
+  tokenBudgetSnapshot: TokenBudgetSnapshot;
   bashModeActive: boolean;
   bashTranscript: BashTranscriptStore;
   bashCompletionEngine: BashCompletionEngine;
@@ -105,4 +108,4 @@ export interface RuntimeState {
   motionPolicy: MotionPolicy;
   /** Live Signal event, motion frame, and activity label. */
   signal: SignalRuntime;
-}
+}

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

@@ -16,26 +16,10 @@ import {
   onVibeToolCall,
 } from "../../working-vibes/index.ts";
 import {
-  getSessionTotalCost,
   getUsageTokenTotal,
   isSessionAssistantMessage,
 } from "../../usage/ledger.ts";
-import {
-  formatCostAlertMessage,
-  shouldTriggerCostAlert,
-} from "./cost-alert.ts";
-import {
-  formatTokenBudgetWarning,
-  parseTokenBudget,
-  tokenBudgetLevel,
-} from "../../usage/token-budget.ts";
-import {
-  recordUsageEvent,
-  loadUsageFileFromDisk,
-  tokenTotal,
-  totalsForRange,
-  dayKey,
-} from "../../usage/usage-store.ts";
+import { recordUsageEvent } from "../../usage/usage-store.ts";
 import {
   detectCustomCompactionEnabled,
   readSettings,
@@ -81,52 +65,10 @@ import {
   dispatchSignalEvent,
   settleSignal,
 } from "../../signal/integration.ts";
-
-/**
- * Fire the configured `powerline.costAlert` warning at most once per session.
- * Reads the running cost from the (cached) token ledger so repeated calls are
- * cheap; a UI-less or already-notified session short-circuits immediately.
- */
-function maybeNotifyCostAlert(rt: RuntimeState, ctx: any): void {
-  if (!ctx?.hasUI || rt.costAlertNotified) return;
-  const threshold = config.costAlert;
-  const sessionEvents = rt.sessionBranchCache.get(ctx.sessionManager);
-  const totalCost = getSessionTotalCost(rt.tokenStatsCache.get(sessionEvents));
-  if (
-    !shouldTriggerCostAlert({
-      totalCost,
-      threshold,
-      alreadyNotified: rt.costAlertNotified,
-    })
-  ) {
-    return;
-  }
-  rt.costAlertNotified = true;
-  ctx.ui.notify(
-    formatCostAlertMessage(
-      totalCost,
-      threshold as number,
-      config.segmentOptions?.cost?.currency ?? "USD",
-    ),
-    "warning",
-  );
-}
-
-function maybeNotifyTokenBudget(rt: RuntimeState, ctx: any): void {
-  if (!ctx?.hasUI) return;
-  const daily = parseTokenBudget(readSettings(ctx.cwd ?? process.cwd()).wishcraft)
-    .daily;
-  if (!daily) return;
-  const now = Date.now();
-  const todayStart = Date.parse(`${dayKey(now)}T00:00:00`);
-  const used = tokenTotal(
-    totalsForRange(loadUsageFileFromDisk(), todayStart, now + 1),
-  );
-  const { level } = tokenBudgetLevel(used, daily);
-  if (level === 0 || level <= rt.tokenBudgetNotifiedLevel) return;
-  rt.tokenBudgetNotifiedLevel = level;
-  ctx.ui.notify(formatTokenBudgetWarning(used, daily, level), "warning");
-}
+import {
+  maybeNotifyCostAlert,
+  maybeNotifyTokenBudget,
+} from "./session-notifications.ts";
 
 // Helper to extract recent agent response text (skipping thinking blocks)
 function getRecentAgentContext(ctx: any): string | undefined {
@@ -180,6 +122,7 @@ export function registerSessionLifecycle(
     rt.liveAssistantUsage = null;
     rt.costAlertNotified = false;
     rt.tokenBudgetNotifiedLevel = 0;
+    rt.tokenBudgetSnapshot = { day: "", dailyLimit: null, dailyUsed: 0 };
     rt.powerlineCompacting = false;
     rt.deliverAfterRetrySettles = false;
     rt.stashedEditorText = null;
@@ -232,7 +175,7 @@ export function registerSessionLifecycle(
       } else {
         dismissWelcome(rt, ctx);
       }
-      maybeNotifyTokenBudget(rt, ctx);
+      maybeNotifyTokenBudget(rt, ctx, settings);
     }
   });
 
@@ -264,6 +207,7 @@ export function registerSessionLifecycle(
     rt.getThinkingLevelFn = null;
     rt.currentThinkingLevel = null;
     rt.liveAssistantUsage = null;
+    rt.tokenBudgetSnapshot = { day: "", dailyLimit: null, dailyUsed: 0 };
     rt.tuiRef = null;
     rt.currentEditor = null;
     resetLayoutCache(rt);
@@ -482,4 +426,4 @@ export function registerSessionLifecycle(
       schedulePostCompactionDelivery(pi, rt, ctx);
     }
   });
-}
+}

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

@@ -0,0 +1,91 @@
+import { getSessionTotalCost } from "../../usage/ledger.ts";
+import {
+  formatTokenBudgetWarning,
+  parseTokenBudget,
+  tokenBudgetLevel,
+} from "../../usage/token-budget.ts";
+import {
+  dayKey,
+  loadUsageFileFromDisk,
+  tokenTotal,
+  totalsForRange,
+} from "../../usage/usage-store.ts";
+import { config } from "../core/state.ts";
+import type { RuntimeState } from "../core/types.ts";
+import { readSettings } from "../settings/settings-io.ts";
+import {
+  formatCostAlertMessage,
+  shouldTriggerCostAlert,
+} from "./cost-alert.ts";
+
+/** Notify once when the configured per-session cost threshold is crossed. */
+export function maybeNotifyCostAlert(rt: RuntimeState, ctx: any): void {
+  if (!ctx?.hasUI || rt.costAlertNotified) return;
+  const threshold = config.costAlert;
+  const sessionEvents = rt.sessionBranchCache.get(ctx.sessionManager);
+  const totalCost = getSessionTotalCost(rt.tokenStatsCache.get(sessionEvents));
+  if (
+    !shouldTriggerCostAlert({
+      totalCost,
+      threshold,
+      alreadyNotified: rt.costAlertNotified,
+    })
+  ) {
+    return;
+  }
+
+  rt.costAlertNotified = true;
+  ctx.ui.notify(
+    formatCostAlertMessage(
+      totalCost,
+      threshold as number,
+      config.segmentOptions?.cost?.currency ?? "USD",
+    ),
+    "warning",
+  );
+}
+
+/**
+ * Refresh disk-backed budget data at lifecycle boundaries, never during paint.
+ * A local-day rollover also resets the per-day warning latch.
+ */
+export function refreshTokenBudgetSnapshot(
+  rt: RuntimeState,
+  ctx: any,
+  settings?: ReturnType<typeof readSettings>,
+): { daily: number | null; used: number; level: 0 | 80 | 100 } {
+  const now = Date.now();
+  const day = dayKey(now);
+  if (rt.tokenBudgetSnapshot.day !== day) {
+    rt.tokenBudgetNotifiedLevel = 0;
+  }
+
+  const resolvedSettings = settings ?? readSettings(ctx.cwd ?? process.cwd());
+  const daily = parseTokenBudget(resolvedSettings.wishcraft).daily;
+  if (!daily) {
+    rt.tokenBudgetSnapshot = { day, dailyLimit: null, dailyUsed: 0 };
+    return { daily: null, used: 0, level: 0 };
+  }
+
+  const todayStart = Date.parse(`${day}T00:00:00`);
+  const used = tokenTotal(
+    totalsForRange(loadUsageFileFromDisk(), todayStart, now + 1),
+  );
+  rt.tokenBudgetSnapshot = { day, dailyLimit: daily, dailyUsed: used };
+  const { level } = tokenBudgetLevel(used, daily);
+  return { daily, used, level };
+}
+
+/** Refresh the daily budget and emit its 80%/100% warning at most once per day. */
+export function maybeNotifyTokenBudget(
+  rt: RuntimeState,
+  ctx: any,
+  settings?: ReturnType<typeof readSettings>,
+): void {
+  if (!ctx?.hasUI) return;
+  const { daily, used, level } = refreshTokenBudgetSnapshot(rt, ctx, settings);
+  if (!daily || level === 0 || level <= rt.tokenBudgetNotifiedLevel) return;
+
+  rt.tokenBudgetNotifiedLevel = level;
+  ctx.ui.notify(formatTokenBudgetWarning(used, daily, level), "warning");
+}

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

@@ -26,7 +26,10 @@ import {
 import type { RuntimeState } from "../../core/types.ts";
 import { appearanceDisplayName } from "../../../config/structural-presets.ts";
 import { filterSkillRows, selectedGalleryMotion } from "./route-bodies.ts";
-import { buildDeckSessionSnapshot } from "./session-snapshot.ts";
+import {
+  buildDeckSessionSnapshot,
+  buildDeckStaticSnapshot,
+} from "./session-snapshot.ts";
 import { deckRouteByJump, deckRouteIndex } from "./routes.ts";
 import { filterDeckRoutes, renderDeckFrame } from "./render.ts";
 import { DECK_ROUTE_DEFS } from "./routes.ts";
@@ -66,14 +69,23 @@ export function createDeckComponent(
   theme: import("@earendil-works/pi-coding-agent").Theme,
   done: () => void,
 ) {
-  const refreshSnapshot = () => buildDeckSessionSnapshot(rt, ctx);
+  let staticSnapshot = buildDeckStaticSnapshot(ctx);
+  const liveSnapshot = () => buildDeckSessionSnapshot(rt, ctx, staticSnapshot);
+  const refreshStaticSnapshot = (): void => {
+    staticSnapshot = buildDeckStaticSnapshot(ctx);
+  };
+
   let state = createDeckNavState(
     initialRoute,
-    appearanceIndex(refreshSnapshot().appearanceBase),
+    appearanceIndex(liveSnapshot().appearanceBase),
   );
   let composer: ComposerDraft | null = null;
 
   const setRoute = (route: DeckRoute): void => {
+    const routeChanged = route !== state.route;
+    if (routeChanged && (route === "skills" || route === "guardrails")) {
+      refreshStaticSnapshot();
+    }
     const jumpingToAppearance = route === "appearance" && state.route !== "appearance";
     state = {
       ...state,
@@ -83,7 +95,7 @@ export function createDeckComponent(
       searchOpen: false,
       searchQuery: "",
       selectedAppearance: jumpingToAppearance
-        ? appearanceIndex(refreshSnapshot().appearanceBase)
+        ? appearanceIndex(liveSnapshot().appearanceBase)
         : state.selectedAppearance,
     };
     composer = null;
@@ -100,7 +112,7 @@ export function createDeckComponent(
       return renderDeckFrame(
         theme,
         width,
-        refreshSnapshot(),
+        liveSnapshot(),
         state,
         rt.resolvedShortcuts,
         composer,
@@ -209,6 +221,7 @@ export function createDeckComponent(
             if (!name) return;
             try {
               const { filePath } = writeSkillFromTemplate(name, "standard");
+              refreshStaticSnapshot();
               state = { ...state, skillCreate: false, skillCreateName: "" };
               ctx.ui.notify(`Created ${name}. ${filePath}`, "info");
             } catch (error) {
@@ -233,7 +246,7 @@ export function createDeckComponent(
           state = { ...state, skillCreate: true, skillCreateName: "" };
           return;
         }
-        const snapshot = refreshSnapshot();
+        const snapshot = liveSnapshot();
         const rows = filterSkillRows(snapshot.skills, state.searchQuery);
         if (handleList(data, "selectedSkill", rows.length)) return;
         if (matchesKey(data, "enter")) {
@@ -253,7 +266,7 @@ export function createDeckComponent(
       }
 
       if (state.route === "ideas") {
-        if (handleList(data, "selectedIdea", refreshSnapshot().ideas.length)) return;
+        if (handleList(data, "selectedIdea", liveSnapshot().ideas.length)) return;
       }
 
       if (matchesKey(data, "up")) {

package/src/extension/ui/deck/session-snapshot.ts

@@ -9,21 +9,13 @@ import { collectSkillDoctorInputs, diagnoseSkills } from "../../skills/skill-doc
 import { parsePolicySettings } from "../../hooks/policy-config.ts";
 import { readSettings } from "../../settings/settings-io.ts";
 import { describePolicy } from "../../../motion/accessibility.ts";
-import type { DeckSessionSnapshot } from "./types.ts";
+import type { DeckSessionSnapshot, DeckStaticSnapshot } from "./types.ts";
 
-export function buildDeckSessionSnapshot(rt: RuntimeState, ctx: any): DeckSessionSnapshot {
-  const theme = { fg: (_color: string, text: string) => text } as Theme;
-  let segmentCtx;
-  try {
-    segmentCtx = buildSegmentContext(rt, ctx, theme);
-  } catch {
-    segmentCtx = null;
-  }
-
-  const queue = rt.queueStore.summarize(
-    getQueueContext(ctx),
-    rt.powerlineCompacting,
-  );
+/**
+ * Build the expensive Deck data once per open/navigation refresh.
+ * This intentionally owns filesystem-backed skill discovery/doctor and settings reads.
+ */
+export function buildDeckStaticSnapshot(ctx: any): DeckStaticSnapshot {
   const cwd = ctx.cwd ?? process.cwd();
   const skills = loadSkillCatalog(cwd);
   const doctorInputs = collectSkillDoctorInputs(cwd);
@@ -35,6 +27,51 @@ export function buildDeckSessionSnapshot(rt: RuntimeState, ctx: any): DeckSessio
   const warnings = doctor.filter((row) => row.status !== "ok").length;
   const settings = readSettings(cwd);
   const policy = parsePolicySettings(settings.wishcraft);
+
+  return {
+    skillsTotal: skills.length,
+    skillsWarnings: warnings,
+    policyEnabled: policy.enabled,
+    policyRuleCount: policy.rules.length,
+    skills: skills.slice(0, 24).map((skill) => {
+      const row = doctor.find((entry) => entry.skill === skill.name);
+      const usage = doctorInputs.usage.get(skill.name);
+      return {
+        name: skill.name,
+        category: skill.category,
+        status: row?.status ?? (skill.warning ? "warn" : "ok"),
+        description: skill.description.slice(0, 72),
+        usage: usage?.count ?? 0,
+      };
+    }),
+    guardrailRules: policy.rules.slice(0, 8).map((rule) => ({
+      action: rule.action,
+      tool: rule.tool,
+      reason: rule.action === "deny" ? rule.reason : rule.context.slice(0, 48),
+    })),
+  };
+}
+
+/** Build only runtime-backed data during paint; no filesystem discovery here. */
+export function buildDeckSessionSnapshot(
+  rt: RuntimeState,
+  ctx: any,
+  staticSnapshot: DeckStaticSnapshot = buildDeckStaticSnapshot(ctx),
+): DeckSessionSnapshot {
+  const theme = { fg: (_color: string, text: string) => text } as Theme;
+  let segmentCtx;
+  try {
+    segmentCtx = buildSegmentContext(rt, ctx, theme, {
+      includeTokenBudget: false,
+    });
+  } catch {
+    segmentCtx = null;
+  }
+
+  const queue = rt.queueStore.summarize(
+    getQueueContext(ctx),
+    rt.powerlineCompacting,
+  );
   const appearance = resolveAppearanceMix(
     effectiveAppearanceMix(config.appearance, config.preset),
   );
@@ -56,6 +93,7 @@ export function buildDeckSessionSnapshot(rt: RuntimeState, ctx: any): DeckSessio
   }
 
   return {
+    ...staticSnapshot,
     modelLabel,
     branchLabel,
     contextPercent: Math.round(segmentCtx?.contextPercent ?? 0),
@@ -65,10 +103,6 @@ export function buildDeckSessionSnapshot(rt: RuntimeState, ctx: any): DeckSessio
     signalMotion: rt.signal.motionId,
     queueCount: queue.queueCount,
     ideaCount: queue.ideaCount,
-    skillsTotal: skills.length,
-    skillsWarnings: warnings,
-    policyEnabled: policy.enabled,
-    policyRuleCount: policy.rules.length,
     shellName: rt.shellSession?.state.shellName ?? null,
     bashModeActive: rt.bashModeActive,
     appearanceBase: appearance.base,
@@ -76,17 +110,6 @@ export function buildDeckSessionSnapshot(rt: RuntimeState, ctx: any): DeckSessio
     nextIntent: queue.leadingText,
     motionLevel: config.motionLevel,
     policySummary: describePolicy(rt.motionPolicy),
-    skills: skills.slice(0, 24).map((skill) => {
-      const row = doctor.find((entry) => entry.skill === skill.name);
-      const usage = doctorInputs.usage.get(skill.name);
-      return {
-        name: skill.name,
-        category: skill.category,
-        status: row?.status ?? (skill.warning ? "warn" : "ok"),
-        description: skill.description.slice(0, 72),
-        usage: usage?.count ?? 0,
-      };
-    }),
     ideas: rt.queueStore
       .list()
       .filter((item) => item.intent === "idea")
@@ -95,10 +118,5 @@ export function buildDeckSessionSnapshot(rt: RuntimeState, ctx: any): DeckSessio
         text: item.text.slice(0, 64),
         reviewStatus: item.reviewStatus ?? "idea",
       })),
-    guardrailRules: policy.rules.slice(0, 8).map((rule) => ({
-      action: rule.action,
-      tool: rule.tool,
-      reason: rule.action === "deny" ? rule.reason : rule.context.slice(0, 48),
-    })),
   };
 }

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

@@ -28,7 +28,18 @@ export interface DeckRouteDef {
   description: string;
 }
 
-export interface DeckSessionSnapshot {
+/** Expensive discovery/config data cached outside the render hot path. */
+export interface DeckStaticSnapshot {
+  skillsTotal: number;
+  skillsWarnings: number;
+  policyEnabled: boolean;
+  policyRuleCount: number;
+  skills: DeckSkillRow[];
+  guardrailRules: DeckGuardrailRow[];
+}
+
+/** Cheap session/runtime data that may be rebuilt for each paint. */
+export interface DeckSessionSnapshot extends DeckStaticSnapshot {
   modelLabel: string;
   branchLabel: string;
   contextPercent: number;
@@ -38,10 +49,6 @@ export interface DeckSessionSnapshot {
   signalMotion: string;
   queueCount: number;
   ideaCount: number;
-  skillsTotal: number;
-  skillsWarnings: number;
-  policyEnabled: boolean;
-  policyRuleCount: number;
   shellName: string | null;
   bashModeActive: boolean;
   appearanceBase: string;
@@ -49,9 +56,7 @@ export interface DeckSessionSnapshot {
   nextIntent: string | null;
   motionLevel: string;
   policySummary: string;
-  skills: DeckSkillRow[];
   ideas: DeckIdeaRow[];
-  guardrailRules: DeckGuardrailRow[];
 }
 
 export interface DeckSkillRow {

package/src/extension/ui/signal-layout.ts

@@ -6,7 +6,6 @@
  * ---------------------------------------------------------------------------
  */
 
-import { visibleWidth } from "@earendil-works/pi-tui";
 import type { PresetDef, SegmentContext } from "../../config/types.ts";
 import { renderSegmentWithWidth } from "./layout.ts";
 import { getSeparator } from "../../theme/separators.ts";

package/src/signal/controller.ts

@@ -39,8 +39,12 @@ export function createSignalRuntime(now = Date.now()): SignalRuntime {
 export interface SetSignalEventOptions {
   activity?: string;
   motionId?: string;
+  /** Motion to restore when a terminal one-shot settles back to semantic idle. */
+  settleMotionId?: string;
   /** Finite events stop after this many frames. */
   maxTicks?: number;
+  /** Terminal one-shots return to semantic idle when their final frame completes. */
+  settleOnDone?: boolean;
 }
 
 export function setSignalEvent(
@@ -79,6 +83,14 @@ export function setSignalEvent(
     onDone() {
       runtime.release = null;
       if (options.maxTicks !== undefined) runtime.active = false;
+      if (options.settleOnDone) {
+        runtime.event = "idle";
+        runtime.motionId = options.settleMotionId ?? defaultMotionFor("idle");
+        runtime.tick = 0;
+        runtime.startedAt = Date.now();
+        runtime.activity = "ready";
+        runtime.active = false;
+      }
     },
   });
 }

package/src/signal/integration.ts

@@ -17,7 +17,9 @@ export function dispatchSignalEvent(
   setSignalEvent(rt.signal, rt.motionScheduler, rt.motionPolicy, event, {
     activity,
     motionId: resolved.motion[event] ?? resolved.signal.animation,
+    settleMotionId: resolved.motion.idle,
     maxTicks: isFiniteEvent(event) ? 6 : undefined,
+    settleOnDone: isTerminalEvent(event),
   });
   rt.lastLayoutResult = null;
   rt.tuiRef?.requestRender();
@@ -35,8 +37,10 @@ function isFiniteEvent(event: MotionEvent): boolean {
     event === "idea.capture" ||
     event === "skill.insert" ||
     event === "policy.deny" ||
-    event === "success" ||
-    event === "warning" ||
-    event === "error"
+    isTerminalEvent(event)
   );
 }
+
+function isTerminalEvent(event: MotionEvent): boolean {
+  return event === "success" || event === "warning" || event === "error";
+}

package/src/theme/tokens/mapping.ts

@@ -1,62 +1,21 @@
 /**
- * src/theme/tokens/mapping.ts
- * ---------------------------------------------------------------------------
- * Default token mapping and legacy SemanticColor bridge for Wishcraft.
- * ---------------------------------------------------------------------------
+ * Compatibility bridge for the canonical Wishcraft token mapping.
+ * New code should import from src/config/tokens.ts.
  */
 
-import type { ColorScheme, SemanticColor } from "../../config/types.ts";
-import type { WishcraftTokens } from "./types.ts";
+import type { ColorScheme, WishcraftTokens } from "../../config/types.ts";
+import {
+  DEFAULT_TOKENS as CANONICAL_DEFAULT_TOKENS,
+  colorSchemeFromTokens,
+  resolveTokens,
+} from "../../config/tokens.ts";
 
-export const DEFAULT_TOKENS: WishcraftTokens = {
-  surface: "#0f172a",
-  surfaceRaised: "#1e293b",
-  text: "#f8fafc",
-  textMuted: "dim",
-  primary: "#f59e0b",
-  secondary: "#00afaf",
-  accent: "#ea580c",
-  success: "success",
-  warning: "warning",
-  error: "error",
-  focus: "#38bdf8",
-  selection: "#334155",
-  motionDim: "dim",
-  motionHot: "#fbbf24",
-  motionTrail: "#78350f",
-};
+export const DEFAULT_TOKENS: WishcraftTokens = CANONICAL_DEFAULT_TOKENS;
 
-/**
- * Derives legacy SemanticColor configuration from modern WishcraftTokens.
- */
 export function deriveColorSchemeFromTokens(tokens: WishcraftTokens): Required<ColorScheme> {
-  return {
-    model: tokens.primary,
-    shellMode: tokens.accent,
-    path: tokens.secondary,
-    gitClean: tokens.success,
-    gitDirty: tokens.warning,
-    thinking: "thinkingOff",
-    thinkingMinimal: "thinkingMinimal",
-    thinkingLow: "thinkingLow",
-    thinkingMedium: "thinkingMedium",
-    context: tokens.textMuted,
-    contextWarn: tokens.warning,
-    contextError: tokens.error,
-    cost: tokens.text,
-    tokens: tokens.textMuted,
-    queue: tokens.accent,
-    separator: tokens.textMuted,
-    border: tokens.surfaceRaised,
-  };
+  return colorSchemeFromTokens(tokens);
 }
 
-/**
- * Creates WishcraftTokens by merging overrides onto defaults.
- */
 export function createTokens(overrides?: Partial<WishcraftTokens>): WishcraftTokens {
-  return {
-    ...DEFAULT_TOKENS,
-    ...overrides,
-  };
+  return resolveTokens(overrides);
 }

package/src/theme/tokens/types.ts

@@ -1,39 +1,6 @@
 /**
- * src/theme/tokens/types.ts
- * ---------------------------------------------------------------------------
- * Semantic Design Tokens for Wishcraft (Crush pattern).
- * ---------------------------------------------------------------------------
+ * Compatibility exports for the canonical Wishcraft token contract.
+ * New code should import from src/config/types.ts.
  */
 
-import type { ThemeColor } from "@earendil-works/pi-coding-agent";
-
-export type ColorValue = ThemeColor | `#${string}`;
-
-export interface WishcraftTokens {
-  // Surfaces & Backgrounds
-  surface: ColorValue;
-  surfaceRaised: ColorValue;
-
-  // Typography
-  text: ColorValue;
-  textMuted: ColorValue;
-
-  // Brand & Accents
-  primary: ColorValue;
-  secondary: ColorValue;
-  accent: ColorValue;
-
-  // Feedback & State
-  success: ColorValue;
-  warning: ColorValue;
-  error: ColorValue;
-
-  // Interaction
-  focus: ColorValue;
-  selection: ColorValue;
-
-  // Motion & Animation Channels
-  motionDim: ColorValue;
-  motionHot: ColorValue;
-  motionTrail: ColorValue;
-}
+export type { ColorValue, WishcraftTokens } from "../../config/types.ts";

package/src/usage/token-budget.ts

@@ -12,6 +12,12 @@ export interface TokenBudgetLevel {
   level: 0 | 80 | 100;
 }
 
+export interface TokenBudgetSnapshot {
+  day: string;
+  dailyLimit: number | null;
+  dailyUsed: number;
+}
+
 export function parseTokenBudget(wishcraftSettings: unknown): TokenBudget {
   if (!wishcraftSettings || typeof wishcraftSettings !== "object") {
     return { daily: null };
@@ -36,6 +42,23 @@ export function tokenBudgetLevel(used: number, daily: number | null): TokenBudge
   return { ratio, level: 0 };
 }
 
+/**
+ * Return the budget visible for a local day. A long-lived session that crosses
+ * midnight must never carry yesterday's usage into the new day; the next
+ * lifecycle refresh will repopulate usage from disk after a new usage event.
+ */
+export function tokenBudgetSnapshotForDay(
+  snapshot: TokenBudgetSnapshot,
+  day: string,
+): TokenBudgetSnapshot {
+  if (snapshot.day === day) return snapshot;
+  return {
+    day,
+    dailyLimit: snapshot.dailyLimit,
+    dailyUsed: 0,
+  };
+}
+
 export function formatTokenBudgetWarning(
   used: number,
   daily: number,