@groeponline/pi-wishcraft 1.2.0 → 1.3.1

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";
@@ -56,6 +59,7 @@ export function createDeckNavState(
     assignEvent: "streaming",
     skillCreate: false,
     skillCreateName: "",
+    navMode: false,
   };
 }
 
@@ -66,14 +70,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 +96,7 @@ export function createDeckComponent(
       searchOpen: false,
       searchQuery: "",
       selectedAppearance: jumpingToAppearance
-        ? appearanceIndex(refreshSnapshot().appearanceBase)
+        ? appearanceIndex(liveSnapshot().appearanceBase)
         : state.selectedAppearance,
     };
     composer = null;
@@ -100,7 +113,7 @@ export function createDeckComponent(
       return renderDeckFrame(
         theme,
         width,
-        refreshSnapshot(),
+        liveSnapshot(),
         state,
         rt.resolvedShortcuts,
         composer,
@@ -143,7 +156,7 @@ export function createDeckComponent(
 
       if (state.pendingJump === "g" && data.length === 1 && isOverlayPrintable(data)) {
         const route = deckRouteByJump(data);
-        state = { ...state, pendingJump: null };
+        state = { ...state, pendingJump: null, navMode: false };
         if (route) setRoute(route);
         return;
       }
@@ -155,8 +168,27 @@ export function createDeckComponent(
         return;
       }
 
+      // ←/tab returns focus to the NAVIGATION column in one press; from there
+      // ↑↓ moves the nav selection and any other key drops back into the list.
+      if (
+        !state.composerOpen &&
+        !state.skillCreate &&
+        (matchesKey(data, "left") || matchesKey(data, "tab"))
+      ) {
+        state = { ...state, navMode: true };
+        return;
+      }
+      if (state.navMode) {
+        if (matchesKey(data, "up") || matchesKey(data, "down")) {
+          // fall through to the nav handlers at the bottom
+        } else {
+          state = { ...state, navMode: false };
+          return;
+        }
+      }
+
       if (state.route === "appearance") {
-        if (handleList(data, "selectedAppearance", STRUCTURAL_PRESET_NAMES.length)) return;
+        if (!state.navMode && handleList(data, "selectedAppearance", STRUCTURAL_PRESET_NAMES.length)) return;
         if (matchesKey(data, "enter")) {
           const name = STRUCTURAL_PRESET_NAMES[state.selectedAppearance];
           if (name) {
@@ -170,7 +202,7 @@ export function createDeckComponent(
 
       if (state.route === "motion") {
         const count = filterMotions(state.searchQuery).length;
-        if (handleList(data, "selectedMotion", count)) return;
+        if (!state.navMode && handleList(data, "selectedMotion", count)) return;
         if (data === "t") {
           state = { ...state, assignEvent: cycleAssignEvent(state.assignEvent) };
           return;
@@ -209,6 +241,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,9 +266,9 @@ 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 (!state.navMode && handleList(data, "selectedSkill", rows.length)) return;
         if (matchesKey(data, "enter")) {
           const selected = rows[state.selectedSkill];
           if (!selected) return;
@@ -253,7 +286,7 @@ export function createDeckComponent(
       }
 
       if (state.route === "ideas") {
-        if (handleList(data, "selectedIdea", refreshSnapshot().ideas.length)) return;
+        if (!state.navMode && handleList(data, "selectedIdea", liveSnapshot().ideas.length)) return;
       }
 
       if (matchesKey(data, "up")) {
@@ -298,7 +331,7 @@ export function createDeckComponent(
       if (state.route !== "motion" && state.route !== "skills") {
         const matches = filterDeckRoutes(next);
         if (matches.length === 1) {
-          state = { ...state, searchOpen: false, searchQuery: "" };
+          state = { ...state, searchOpen: false, searchQuery: "", navMode: false };
           setRoute(matches[0]!);
         }
       }
@@ -311,7 +344,7 @@ export function createDeckComponent(
       }
       const matches = filterDeckRoutes(state.searchQuery);
       if (matches[0]) {
-        state = { ...state, searchOpen: false, searchQuery: "" };
+        state = { ...state, searchOpen: false, searchQuery: "", navMode: false };
         setRoute(matches[0]);
       }
     }

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

@@ -31,13 +31,13 @@ export function deckFooter(state: DeckNavState): string {
   if (state.skillCreate) return "type a name · enter create · esc cancel";
   switch (state.route) {
     case "appearance":
-      return "↑↓ select base · enter apply · / Search · g h Home · Esc Close";
+      return "↑↓ select base · enter apply · ←/tab nav · / Search · g h Home · Esc Close";
     case "motion":
-      return "↑↓ motion · t event · e composer · enter apply · Esc Close";
+      return "↑↓ motion · t event · e composer · enter apply · ←/tab nav · Esc Close";
     case "skills":
-      return "↑↓ skill · enter insert · n new · / filter · Esc Close";
+      return "↑↓ skill · enter insert · n new · / filter · ←/tab nav · Esc Close";
     case "ideas":
-      return "↑↓ idea · / Search · g h Home · Esc Close";
+      return "↑↓ idea · / Search · ←/tab nav · g h Home · Esc Close";
     default:
       return "/ Search   g h Home   g s Signal   g i Ideas   ? Help   Esc Close";
   }

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 {
@@ -89,4 +94,6 @@ export interface DeckNavState {
   assignEvent: import("../../../motion/types.ts").MotionEvent;
   skillCreate: boolean;
   skillCreateName: string;
+  /** True when ↑↓ moves the NAVIGATION column instead of the route list. */
+  navMode: boolean;
 }

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);
 }