@groeponline/pi-wishcraft 1.3.0 → 1.4.0

package/src/extension/hooks/index.ts

@@ -11,6 +11,7 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { SETTING_DEFAULTS } from "../../config/settings-registry.ts";
 import type { RuntimeState } from "../core/types.ts";
 import {
   getSettingsPath,
@@ -44,7 +45,7 @@ let hooksSettings: WishcraftHooksSettings = {};
 let hooksEnabled = false;
 let policyRules: PolicyRule[] = [];
 let policyEnabled = false;
-let repairsEnabled = true;
+let repairsEnabled: boolean = SETTING_DEFAULTS["wishcraft.repairsEnabled"];
 let pendingSessionContext: string | null = null;
 
 function refreshSettings(cwd: string): void {
@@ -59,10 +60,15 @@ function refreshSettings(cwd: string): void {
   const policy = parsePolicySettings(globalWishcraft);
   policyRules = policy.rules;
   policyEnabled = policy.enabled;
-  repairsEnabled =
-    !merged ||
-    typeof merged !== "object" ||
-    (merged as Record<string, unknown>).repairsEnabled !== false;
+  if (!merged || typeof merged !== "object" || Array.isArray(merged)) {
+    repairsEnabled = SETTING_DEFAULTS["wishcraft.repairsEnabled"];
+  } else {
+    const configured = (merged as Record<string, unknown>).repairsEnabled;
+    repairsEnabled =
+      typeof configured === "boolean"
+        ? configured
+        : SETTING_DEFAULTS["wishcraft.repairsEnabled"];
+  }
 }
 
 function hasAnyHook(hooks: WishcraftHooksSettings): boolean {

package/src/extension/session/read-hints.ts

@@ -1,3 +1,4 @@
+import { SETTING_DEFAULTS } from "../../config/settings-registry.ts";
 import { readSettings } from "../settings/settings-io.ts";
 
 export interface ReadToolInput {
@@ -43,9 +44,12 @@ export function readHintsEnabled(wishcraftSettings: unknown): boolean {
     typeof wishcraftSettings !== "object" ||
     Array.isArray(wishcraftSettings)
   ) {
-    return true;
+    return SETTING_DEFAULTS["wishcraft.readHints"];
   }
-  return (wishcraftSettings as Record<string, unknown>).readHints !== false;
+  const configured = (wishcraftSettings as Record<string, unknown>).readHints;
+  return typeof configured === "boolean"
+    ? configured
+    : SETTING_DEFAULTS["wishcraft.readHints"];
 }
 
 /** True when core read output already carries an offset/range continuation line. */

package/src/extension/settings/wishcraft-config-items.ts

@@ -1,119 +1,23 @@
-/**
- * Declarative groups for `/wishcraft settings`.
- * Kept beside the overlay so the TUI file stays under the size budget.
- */
+/** Data-driven groups for `/wishcraft settings`, derived from the canonical registry. */
+import {
+  SETTINGS_REGISTRY,
+  SETTING_GROUPS,
+  type SettingDefinition,
+  type SettingValue,
+} from "../../config/settings-registry.ts";
 
-import { STRUCTURAL_PRESET_NAMES } from "../../config/types.ts";
-import { MOTION_LEVELS } from "../../motion/accessibility.ts";
-
-export type ConfigValue = boolean | string | number | null;
-
-export interface ConfigItem {
-  /** Label in the list. */
-  label: string;
-  /** Path inside settings ("powerline.placement", "wishcraft.hooksEnabled", ...). */
-  path: string;
-  /** Edit kind. */
-  kind: "toggle" | "select" | "text" | "number";
-  /** For select: the choices. */
-  choices?: string[];
-  /** Hint under the group. */
-  hint?: string;
-  /** Detail explanation (optional). */
-  description?: string;
-  /** Effective value when the setting is absent (toggles only; defaults to false). */
-  default?: boolean;
-}
+export type ConfigValue = SettingValue | null;
+export type ConfigItem = SettingDefinition;
 
 export interface ConfigGroup {
   title: string;
   items: ConfigItem[];
 }
 
-const SEPARATORS = [
-  "powerline",
-  "powerline-thin",
-  "slash",
-  "pipe",
-  "block",
-  "none",
-  "ascii",
-  "dot",
-  "chevron",
-  "star",
-];
-
-/** Build groups from current settings (values shown live). */
+/** Build the operator groups from the canonical registry. */
 export function buildConfigGroups(_settings: Record<string, unknown>): ConfigGroup[] {
-  return [
-    {
-      title: "Status bar",
-      items: [
-        { label: "Preset", path: "powerline.preset", kind: "select", choices: ["default", "minimal", "compact", "full", "nerd", "ascii", "chef"] },
-        {
-          label: "Structural base",
-          path: "powerline.appearance.base",
-          kind: "select",
-          choices: [...STRUCTURAL_PRESET_NAMES],
-          hint: "colors and motion for Signal; layout preset stays separate",
-        },
-        {
-          label: "Motion level",
-          path: "powerline.motionLevel",
-          kind: "select",
-          choices: [...MOTION_LEVELS],
-          hint: "full · reduced · functional · off",
-        },
-        { label: "Separator", path: "powerline.separator", kind: "select", choices: SEPARATORS },
-        { label: "Placement", path: "powerline.placement", kind: "select", choices: ["above", "below"] },
-        { label: "Path mode", path: "powerline.segmentOptions.path.mode", kind: "select", choices: ["basename", "abbreviated", "full"] },
-        { label: "Path max length", path: "powerline.segmentOptions.path.maxLength", kind: "number", hint: "0 = unlimited" },
-        { label: "Time format", path: "powerline.segmentOptions.time.format", kind: "select", choices: ["12h", "24h"] },
-        { label: "Time seconds", path: "powerline.segmentOptions.time.showSeconds", kind: "toggle" },
-        { label: "Git host icons", path: "powerline.segmentOptions.git.hostIcon", kind: "toggle" },
-        { label: "Git ahead/behind", path: "powerline.segmentOptions.git.showAheadBehind", kind: "toggle" },
-        { label: "Git latest commit", path: "powerline.segmentOptions.git.showCommit", kind: "toggle" },
-        { label: "Context format", path: "powerline.segmentOptions.context.format", kind: "select", choices: ["full", "percent"] },
-        { label: "Cache-read format", path: "powerline.segmentOptions.cache_read.format", kind: "select", choices: ["tokens", "percent", "both"] },
-        { label: "Cost display", path: "powerline.segmentOptions.cost.subscriptionDisplay", kind: "select", choices: ["subscription", "reported-cost", "both"] },
-        { label: "Currency", path: "powerline.segmentOptions.cost.currency", kind: "text" },
-        { label: "Ports include UDP", path: "powerline.segmentOptions.openPorts.includeUdp", kind: "toggle" },
-        { label: "TPS window (ms)", path: "powerline.segmentOptions.tps.windowMs", kind: "number", hint: "default 1000" },
-        { label: "TPS mode", path: "powerline.segmentOptions.tps.mode", kind: "select", choices: ["both", "out", "in"] },
-        { label: "TPS label", path: "powerline.segmentLabels.tps", kind: "text", hint: "empty = no label" },
-      ],
-    },
-    {
-      title: "Welcome & vibes",
-      items: [
-        { label: "Welcome overlay", path: "powerline.welcome", kind: "toggle", hint: "on = overlay at startup, off = no welcome" },
-        { label: "Animate wishcraft lantern", path: "wishcraft.welcome.animateLantern", kind: "toggle", hint: "flicker on the lantern" },
-      ],
-    },
-    {
-      title: "Skills",
-      items: [
-        { label: "Inline expand /command and $skill", path: "wishcraft.inlineSkills", kind: "toggle", hint: "needs a restart to take effect" },
-        { label: "Read hints", path: "wishcraft.readHints", kind: "toggle", default: true, hint: "off = no continuation hint after partial reads" },
-      ],
-    },
-    {
-      title: "Hooks & repairs (harness)",
-      items: [
-        { label: "Hooks enabled", path: "wishcraft.hooksEnabled", kind: "toggle", hint: "preToolUse / postToolUse / sessionStart command hooks" },
-        { label: "Tool-input repairs", path: "wishcraft.repairsEnabled", kind: "toggle", hint: "null-for-optional, auto-link, json-array, path aliases" },
-        { label: "Daily token budget", path: "wishcraft.tokenBudget.daily", kind: "number", hint: "colours the cost segment; never blocks. 0 = off" },
-      ],
-    },
-    {
-      title: "Shortcuts",
-      items: [
-        { label: "Menu", path: "powerlineShortcuts.menu", kind: "text", hint: "e.g. alt+p" },
-        { label: "Info", path: "powerlineShortcuts.info", kind: "text" },
-        { label: "Stash", path: "powerlineShortcuts.stashHistory", kind: "text" },
-        { label: "Idea", path: "powerlineShortcuts.ideaCapture", kind: "text" },
-        { label: "Queue", path: "powerlineShortcuts.queueOpen", kind: "text" },
-      ],
-    },
-  ];
+  return SETTING_GROUPS.map((group) => ({
+    title: group.title,
+    items: SETTINGS_REGISTRY.filter((item) => item.group === group.id),
+  }));
 }

package/src/extension/settings/wishcraft-config.ts

@@ -75,7 +75,9 @@ export function assignNestedConfigValue(
   return true;
 }
 
-/** Nested write (new object per level) + persist to settings.json. */
+/** Nested write (new object per level) + persist to settings.json.
+ * An empty string for a text field means "clear" — the key is removed from settings
+ * so the code falls through to the default. */
 export function writeConfigPath(
   cwd: string,
   path: string,
@@ -112,20 +114,16 @@ function isPrintable(data: string): boolean {
 
 /** Value shown for a config item given its stored value. */
 export function displayValue(item: ConfigItem, value: ConfigValue): string {
-  // An unset toggle renders as its declared default (read hints default on).
-  if (item.kind === "toggle" && (value === null || value === undefined)) {
-    return (item.default ?? false) ? "on" : "off";
-  }
-  if (value === null || value === undefined || value === "") return item.kind === "toggle" ? "off" : "—";
-  if (item.kind === "toggle") return value ? "on" : "off";
-  return String(value);
+  const effective = value ?? item.defaultValue ?? null;
+  if (effective === null || effective === "") return item.kind === "toggle" ? "off" : "—";
+  if (item.kind === "toggle") return effective === true ? "on" : "off";
+  return String(effective);
 }
 
-/** Next stored boolean after toggling `item` from its current `value`. */
+/** Next stored boolean after toggling `item` from its current effective value. */
 export function nextToggleValue(item: ConfigItem, value: ConfigValue): boolean {
-  const effective =
-    item.kind === "toggle" && value === null ? (item.default ?? false) : value === true;
-  return !effective;
+  const effective = value ?? item.defaultValue ?? false;
+  return effective !== true;
 }
 
 function coerce(item: ConfigItem, current: ConfigValue, next: string): ConfigValue {
@@ -190,9 +188,11 @@ export async function showWishcraftConfig(rt: RuntimeState, ctx: any): Promise<v
       };
 
       const cycleSelect = (item: ConfigItem, forward: boolean) => {
+        if (item.kind !== "select") return;
         const cur = readConfigPath(settings, item.path);
-        const list = item.choices ?? [];
-        const idx = list.indexOf(String(cur ?? list[0]));
+        const list = item.choices;
+        const effective = cur ?? item.defaultValue ?? list[0];
+        const idx = list.indexOf(String(effective));
         const next = list[(idx + (forward ? 1 : list.length - 1) + list.length) % list.length]!;
         const ok = writeConfigPath(cwd, item.path, next);
         settings = readSettings(cwd);
@@ -208,14 +208,15 @@ export async function showWishcraftConfig(rt: RuntimeState, ctx: any): Promise<v
 
       const toggle = (item: ConfigItem) => {
         const cur = readConfigPath(settings, item.path);
-        const ok = writeConfigPath(cwd, item.path, nextToggleValue(item, cur));
+        const next = nextToggleValue(item, cur);
+        const ok = writeConfigPath(cwd, item.path, next);
         settings = readSettings(cwd);
         groups = buildConfigGroups(settings);
         if (item.path.startsWith("powerline")) {
           reloadPowerlineFromSettings(rt, settings);
         }
         ctx.ui.notify(
-          ok ? `${item.label}: ${!(cur === true) ? "on" : "off"} (saved)` : `${item.label} not saved`,
+          ok ? `${item.label}: ${next ? "on" : "off"} (saved)` : `${item.label} not saved`,
           ok ? "info" : "warning",
         );
       };
@@ -282,7 +283,8 @@ export async function showWishcraftConfig(rt: RuntimeState, ctx: any): Promise<v
               editing = false;
               editBuffer = "";
             } else if (matchesKey(data, "enter")) {
-              if (editBuffer.trim() !== "") applyEdit(editBuffer.trim());
+              // Save even if empty — allows clearing a field (e.g. remove a shortcut binding)
+              applyEdit(editBuffer.trim());
               editing = false;
               editBuffer = "";
             } else if (matchesKey(data, "backspace")) {

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

@@ -17,6 +17,7 @@ import { logDiscoveryError } from "../../welcome/discover.ts";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { RuntimeState } from "../core/types.ts";
 import {
+  getAvailableCommands,
   getAvailableSkills,
   invalidateSkillCache,
   recordSkillUsage,
@@ -59,32 +60,51 @@ function isExcluded(index: number, ranges: Array<[number, number]>): boolean {
 }
 
 /**
- * Expandeer alle inline triggers (/command en $skill) in de tekst
+ * Expandeer inline triggers — /command (trigger-based) en $skill (name-based)
+ * via gescheiden lookups.
+ *
+ *   /command → expandeert ALLEEN als de skill `trigger: /command` heeft
+ *   $skill   → expandeert op basis van `name:` in frontmatter
+ *
+ * Skills zonder `trigger:` reageren niet op /-prefix, en skills met
+ * `trigger:` reageren op de exacte trigger-naam (zonder /-prefix).
  */
 export function expandInlineTriggers(text: string): string {
   const availableSkills = getAvailableSkills();
+  const availableCommands = getAvailableCommands();
 
-  // Pattern for both /command and $skill
-  const TRIGGER_REGEX = /(^|[\s(])(\/|\$)([a-zA-Z0-9_-]+)/g;
   const excluded = findExcludedRanges(text);
 
+  // ── Match /command (trigger-based) ──
+  const SLASH_REGEX = /(^|[\s(])\/([a-zA-Z0-9_-]+)/g;
   const matches: Array<{
     start: number;
     end: number;
     full: string;
     name: string;
   }> = [];
-  let match: RegExpExecArray | null;
 
-  while ((match = TRIGGER_REGEX.exec(text)) !== null) {
-    // Skip als binnen code block
+  let match: RegExpExecArray | null;
+  while ((match = SLASH_REGEX.exec(text)) !== null) {
     if (isExcluded(match.index, excluded)) continue;
+    const name = match[2]!;
+    // Alleen expanden als er een skill met matching trigger is
+    if (!availableCommands.has(name)) continue;
+    matches.push({
+      start: match.index + match[1]!.length,
+      end: match.index + match[0].length,
+      full: match[0],
+      name,
+    });
+  }
 
-    const name = match[3]!;
-
-    // Alleen bekende skills expanden
+  // ── Match $skill (name-based) ──
+  const DOLLAR_REGEX = /(^|[\s(])\$([a-zA-Z0-9_-]+)/g;
+  while ((match = DOLLAR_REGEX.exec(text)) !== null) {
+    if (isExcluded(match.index, excluded)) continue;
+    const name = match[2]!;
+    // Alleen expanden als de skill-naam bekend is
     if (!availableSkills.has(name)) continue;
-
     matches.push({
       start: match.index + match[1]!.length,
       end: match.index + match[0].length,
@@ -107,6 +127,10 @@ export function expandInlineTriggers(text: string): string {
     }
   }
 
+  // /command lookups use command map, $skill lookups use skill map
+  const lookupMap = (m: { full: string }) =>
+    m.full.startsWith("/") ? availableCommands : availableSkills;
+
   // Rebuild the text with expansions
   let result = "";
   let cursor = 0;
@@ -114,7 +138,7 @@ export function expandInlineTriggers(text: string): string {
   for (const m of deduped) {
     result += text.slice(cursor, m.start);
 
-    const filePath = availableSkills.get(m.name)!;
+    const filePath = lookupMap(m).get(m.name)!;
     try {
       const rawContent = readFileSync(filePath, "utf8");
       const cleanContent = stripFrontmatter(rawContent);

package/src/extension/skills/skill-registry.ts

@@ -37,6 +37,8 @@ export interface SkillEntry {
   mtimeMs: number;
   /** All frontmatter keys (raw, including unknown). */
   frontmatterKeys: string[];
+  /** Frontmatter trigger value (e.g. /test, /showcase). */
+  trigger: string | null;
   /** Diagnostic message (core diagnostics, or empty description). */
   warning?: string;
 }
@@ -82,6 +84,7 @@ function scanLooseExtraFiles(
         lineCount: content.split("\n").length,
         mtimeMs,
         frontmatterKeys: parseFrontmatterKeys(content),
+        trigger: null,
         warning: "no description — the model will not see this skill in the prompt",
       });
       knownPaths.add(filePath);
@@ -95,6 +98,7 @@ const CACHE_TTL_MS = 30_000;
 let cachedAt = 0;
 let cachedEntries: SkillEntry[] | null = null;
 let cachedPathMap: Map<string, string> | null = null;
+let cachedTriggerMap: Map<string, string> | null = null;
 let cachedCwd: string | null = null;
 let onCacheInvalidated: (() => void) | null = null;
 
@@ -110,6 +114,7 @@ export function invalidateSkillCache(): void {
   cachedAt = 0;
   cachedEntries = null;
   cachedPathMap = null;
+  cachedTriggerMap = null;
   cachedCwd = null;
   onCacheInvalidated?.();
 }
@@ -237,6 +242,7 @@ function buildRejectedSkillEntries(
       lineCount,
       mtimeMs,
       frontmatterKeys: parseFrontmatterKeys(content),
+      trigger: null,
       warning: message,
     });
     knownPaths.add(filePath);
@@ -283,6 +289,7 @@ export function loadSkillCatalog(cwd: string = process.cwd()): SkillEntry[] {
     if (!warning && s.filePath && diagByPath.has(s.filePath)) {
       warning = diagByPath.get(s.filePath);
     }
+    const fm = content ? parseSkillFrontmatter(content) : { name: null, description: null, trigger: null };
     return {
       name: s.name,
       description: s.description,
@@ -295,6 +302,7 @@ export function loadSkillCatalog(cwd: string = process.cwd()): SkillEntry[] {
       lineCount,
       mtimeMs,
       frontmatterKeys: parseFrontmatterKeys(content),
+      trigger: fm.trigger ?? null,
       warning,
     };
   });
@@ -305,6 +313,25 @@ export function loadSkillCatalog(cwd: string = process.cwd()): SkillEntry[] {
     ...entries.map((e) => e.filePath),
     ...loose.map((e) => e.filePath),
   ]);
+
+  // ── Name dedup: prefer project > global > prompts > extra ──
+  // When the same skill name appears in multiple roots (e.g. both
+  // ~/.pi/agent/skills/test/ and ./.pi/skills/test/), keep only the
+  // highest-priority entry so the catalog never shows doubles.
+  const NAME_PRIORITY: Record<SkillCategory, number> = {
+    project: 0,
+    global: 1,
+    prompts: 2,
+    extra: 3,
+  };
+  const seen = new Map<string, { prio: number; entry: SkillEntry }>();
+  for (const e of entries) {
+    const prio = NAME_PRIORITY[e.category] ?? 4;
+    const cur = seen.get(e.name);
+    if (!cur || prio < cur.prio) seen.set(e.name, { prio, entry: e });
+  }
+  const deduped = [...seen.values()].map((v) => v.entry);
+
   const rejected = buildRejectedSkillEntries(
     result.diagnostics,
     catalogPaths,
@@ -314,20 +341,32 @@ export function loadSkillCatalog(cwd: string = process.cwd()): SkillEntry[] {
   cachedAt = now;
   cachedCwd = cwd;
   cachedEntries = [
-    ...entries.filter((e) => !looseNames.has(e.name)),
+    ...deduped.filter((e) => !looseNames.has(e.name)),
     ...loose,
     ...rejected,
   ].sort((a, b) => a.name.localeCompare(b.name));
   cachedPathMap = new Map(cachedEntries.map((e) => [e.name, e.filePath] as const));
+  cachedTriggerMap = new Map(
+    cachedEntries
+      .filter((e) => e.trigger !== null)
+      .map((e) => [e.trigger!, e.filePath] as const),
+  );
   return cachedEntries;
 }
 
-/** Compat: name → file path (for inline-invocation). */
+/** Compat: name → file path (for inline-invocation $skill). */
 export function getAvailableSkills(): Map<string, string> {
   loadSkillCatalog();
   return cachedPathMap ?? new Map();
 }
 
+/** Compat: trigger → file path (for inline-invocation /command).
+ * Only skills with a `trigger: /command` frontmatter field are returned. */
+export function getAvailableCommands(): Map<string, string> {
+  loadSkillCatalog();
+  return cachedTriggerMap ?? new Map();
+}
+
 // ---------------------------------------------------------------------------
 // Usage-ledger (~/.pi/agent/skill-usage.json)
 // ---------------------------------------------------------------------------

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

@@ -59,6 +59,7 @@ export function createDeckNavState(
     assignEvent: "streaming",
     skillCreate: false,
     skillCreateName: "",
+    navMode: false,
   };
 }
 
@@ -155,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;
       }
@@ -167,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) {
@@ -182,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;
@@ -248,7 +268,7 @@ export function createDeckComponent(
         }
         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;
@@ -266,7 +286,7 @@ export function createDeckComponent(
       }
 
       if (state.route === "ideas") {
-        if (handleList(data, "selectedIdea", liveSnapshot().ideas.length)) return;
+        if (!state.navMode && handleList(data, "selectedIdea", liveSnapshot().ideas.length)) return;
       }
 
       if (matchesKey(data, "up")) {
@@ -311,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]!);
         }
       }
@@ -324,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/routes.ts

@@ -1,7 +1,8 @@
 import type { DeckRoute, DeckRouteDef } from "./types.ts";
 import { DECK_ROUTES } from "./types.ts";
+import { getContributedDeckRoutes } from "../../contrib/registry.ts";
 
-export const DECK_ROUTE_DEFS: readonly DeckRouteDef[] = [
+export const BUILTIN_DECK_ROUTE_DEFS: readonly DeckRouteDef[] = [
   { id: "home", label: "Home", jumpKey: "h", description: "Session overview and next intent" },
   { id: "signal", label: "Signal", jumpKey: "s", description: "Lane layout and live activity" },
   { id: "skills", label: "Skills", jumpKey: "k", description: "Catalog and health diagnostics" },
@@ -15,8 +16,22 @@ export const DECK_ROUTE_DEFS: readonly DeckRouteDef[] = [
   { id: "diagnostics", label: "Diagnostics", jumpKey: "d", description: "Environment and capability checks" },
 ];
 
+export const DECK_ROUTE_DEFS: readonly DeckRouteDef[] = BUILTIN_DECK_ROUTE_DEFS;
+
+export function getAllDeckRouteDefs(): readonly DeckRouteDef[] {
+  const contributed = getContributedDeckRoutes().map((r) => ({
+    id: r.id as DeckRoute,
+    label: r.label,
+    jumpKey: r.jumpKey ?? "",
+    description: r.description ?? "",
+  }));
+  // ponytail: no dedup beyond registry — built-ins win, contributed appended
+  return [...BUILTIN_DECK_ROUTE_DEFS, ...contributed];
+}
+
 export function isDeckRoute(value: string): value is DeckRoute {
-  return (DECK_ROUTES as readonly string[]).includes(value);
+  if ((DECK_ROUTES as readonly string[]).includes(value)) return true;
+  return getContributedDeckRoutes().some((r) => r.id === value);
 }
 
 export function parseDeckRouteArg(args: string | undefined): DeckRoute {

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

@@ -94,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;
 }