jeo-code 0.7.18 → 0.7.19

package/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 The README mirrors the latest 5 entries — regenerate with `bun run changelog:sync`.
 
+## [0.7.19] - 2026-06-26
+_The live model picker gains gajae-code's `/model` provider tabs, and skill invocation is consolidated onto a single `$` entrypoint. The picker now shows an `ALL` tab plus one tab per provider that `tab`/`shift+tab` cycles, and skills (including their declared aliases) are invoked only via `$` — the slash palette stays builtins-only._
+
+### Added
+- **`/model` live picker gets a provider/group tab bar (gajae-code parity).** `src/tui/components/select-list.ts` adds a synthetic `ALL_TAB` first tab plus one tab per distinct item `group`, a `tabList()`/`activeTab()`/`cycleTab()` API, and tab-scoped visibility in `computeVisible()`. `renderSelectList` gains a `showTabs` option that draws the tab bar (active tab highlighted) and a `tab provider` key hint; `renderLiveModelPicker` (`live-model-picker.ts`) enables it. `runLaunchCommand` (`src/commands/launch.ts`) wires the `tab` key (with `shift+tab` to step back) into the picker key handler.
+
+### Changed
+- **Skills are invoked ONLY via the `$` entrypoint — declared aliases become `$`-invocable, never `/` commands.** This reverses 0.7.18's slash-alias dispatch: `src/skills/catalog.ts` replaces `parseSkillSlashInvocation` with `getSkillByDollarToken` (resolve by exact name → exact declared alias without its leading `/` → unique name prefix), and `parseSkillInvocation` now also matches a declared alias, so `$obsidian-capture` loads the skill that declares `/obsidian-capture`. `runLaunchCommand` drops every `/`-alias dispatch path (one-shot and REPL), leaves `skillSlashDetails` empty so the slash menu stays builtins-only, and surfaces declared-alias tokens in `$` autocomplete via `resolvedSkillTokens`.
 
 ## [0.7.18] - 2026-06-26
 _Slash-command discovery and the `/model` flow reach gajae-code parity. The slash palette/autocomplete now fuzzy-matches command names (with a description fallback for intent-style queries), resolved skills can contribute their own `/aliases` as real dispatchable commands, and `/model` runs gjc's two-menu target → reasoning flow so a picked model can be assigned to the default or any subagent role with its own thinking budget._

package/README.ja.md

@@ -205,11 +205,11 @@ CI は `.github/workflows/npm-publish.yml` で公開します — GitHub リリ
 ## 変更履歴 (Changelog)
 
 <!-- CHANGELOG:START (auto-generated from CHANGELOG.md — run `bun run changelog:sync`) -->
+- **[0.7.19]** (2026-06-26) — The live model picker gains gajae-code's `/model` provider tabs, and skill invocation is consolidated onto a single `$` entrypoint. The picker now shows an `ALL` tab plus one tab per provider that `tab`/`shift+tab` cycles, and skills (including their declared aliases) are invoked only via `$` — the slash palette stays builtins-only.
 - **[0.7.18]** (2026-06-26) — Slash-command discovery and the `/model` flow reach gajae-code parity. The slash palette/autocomplete now fuzzy-matches command names (with a description fallback for intent-style queries), resolved skills can contribute their own `/aliases` as real dispatchable commands, and `/model` runs gjc's two-menu target → reasoning flow so a picked model can be assigned to the default or any subagent role with its own thinking budget.
 - **[0.7.17]** (2026-06-25) — Developer workflow parity (gjc `dev:link`/`dev:doctor`, adapted for jeo's zero-native-dep Bun runtime): the global `jeo` command can be linked to run this checkout's source hot to every edit, with a drift doctor that flags when `jeo` resolves to a compiled binary or an installed copy instead. README gains "Skill migration and bundled skill inspection" + "Development" sections. Also ships OKF concept-memory search/scoring with budget-aware injection and a round of workflow-prompt hardening (anti-punt, todo-first planning, verdict discipline) that keeps every loop escape hatch intact.
 - **[0.7.16]** (2026-06-25) — Bundled skills get a safe installer: `jeo skills sync` materializes the built-in workflow skills into `~/.jeo/skills`, preserving local edits by default, with a CI-friendly `--check` drift report and a `--force` overwrite.
 - **[0.7.15]** (2026-06-25) — Rollback release: the runtime source and test suite are restored to the **0.7.9** state. The intervening 0.7.10–0.7.14 runtime changes (quiet-mode/`-q`, `/resume` transcript rework, `mutatedFiles` plumbing, Ollama `num_ctx`, tmux REPL reaping, and related engine/provider/TUI edits) are reverted. Published as a new version because npm cannot re-issue an existing version number; `latest` now serves code identical to 0.7.9.
-- **[0.7.14]** (2026-06-25) — Quieter, cleaner output: a new `-q`/`--quiet` flag strips launch banners and courtesy logs, `/resume` no longer dumps walls of raw escaped JSON into scrollback, and a turn that edits files now reliably surfaces those paths to orchestrators.
 
 See [CHANGELOG.md](CHANGELOG.md) for the full history.
 <!-- CHANGELOG:END -->

package/README.ko.md

@@ -205,11 +205,11 @@ CI는 `.github/workflows/npm-publish.yml`로 배포합니다 — GitHub 릴리
 ## 변경 이력 (Changelog)
 
 <!-- CHANGELOG:START (auto-generated from CHANGELOG.md — run `bun run changelog:sync`) -->
+- **[0.7.19]** (2026-06-26) — The live model picker gains gajae-code's `/model` provider tabs, and skill invocation is consolidated onto a single `$` entrypoint. The picker now shows an `ALL` tab plus one tab per provider that `tab`/`shift+tab` cycles, and skills (including their declared aliases) are invoked only via `$` — the slash palette stays builtins-only.
 - **[0.7.18]** (2026-06-26) — Slash-command discovery and the `/model` flow reach gajae-code parity. The slash palette/autocomplete now fuzzy-matches command names (with a description fallback for intent-style queries), resolved skills can contribute their own `/aliases` as real dispatchable commands, and `/model` runs gjc's two-menu target → reasoning flow so a picked model can be assigned to the default or any subagent role with its own thinking budget.
 - **[0.7.17]** (2026-06-25) — Developer workflow parity (gjc `dev:link`/`dev:doctor`, adapted for jeo's zero-native-dep Bun runtime): the global `jeo` command can be linked to run this checkout's source hot to every edit, with a drift doctor that flags when `jeo` resolves to a compiled binary or an installed copy instead. README gains "Skill migration and bundled skill inspection" + "Development" sections. Also ships OKF concept-memory search/scoring with budget-aware injection and a round of workflow-prompt hardening (anti-punt, todo-first planning, verdict discipline) that keeps every loop escape hatch intact.
 - **[0.7.16]** (2026-06-25) — Bundled skills get a safe installer: `jeo skills sync` materializes the built-in workflow skills into `~/.jeo/skills`, preserving local edits by default, with a CI-friendly `--check` drift report and a `--force` overwrite.
 - **[0.7.15]** (2026-06-25) — Rollback release: the runtime source and test suite are restored to the **0.7.9** state. The intervening 0.7.10–0.7.14 runtime changes (quiet-mode/`-q`, `/resume` transcript rework, `mutatedFiles` plumbing, Ollama `num_ctx`, tmux REPL reaping, and related engine/provider/TUI edits) are reverted. Published as a new version because npm cannot re-issue an existing version number; `latest` now serves code identical to 0.7.9.
-- **[0.7.14]** (2026-06-25) — Quieter, cleaner output: a new `-q`/`--quiet` flag strips launch banners and courtesy logs, `/resume` no longer dumps walls of raw escaped JSON into scrollback, and a turn that edits files now reliably surfaces those paths to orchestrators.
 
 See [CHANGELOG.md](CHANGELOG.md) for the full history.
 <!-- CHANGELOG:END -->

package/README.md

@@ -232,11 +232,11 @@ Huge thanks to [gajae-code](https://github.com/Yeachan-Heo/gajae-code) for the i
 ## Changelog
 
 <!-- CHANGELOG:START (auto-generated from CHANGELOG.md — run `bun run changelog:sync`) -->
+- **[0.7.19]** (2026-06-26) — The live model picker gains gajae-code's `/model` provider tabs, and skill invocation is consolidated onto a single `$` entrypoint. The picker now shows an `ALL` tab plus one tab per provider that `tab`/`shift+tab` cycles, and skills (including their declared aliases) are invoked only via `$` — the slash palette stays builtins-only.
 - **[0.7.18]** (2026-06-26) — Slash-command discovery and the `/model` flow reach gajae-code parity. The slash palette/autocomplete now fuzzy-matches command names (with a description fallback for intent-style queries), resolved skills can contribute their own `/aliases` as real dispatchable commands, and `/model` runs gjc's two-menu target → reasoning flow so a picked model can be assigned to the default or any subagent role with its own thinking budget.
 - **[0.7.17]** (2026-06-25) — Developer workflow parity (gjc `dev:link`/`dev:doctor`, adapted for jeo's zero-native-dep Bun runtime): the global `jeo` command can be linked to run this checkout's source hot to every edit, with a drift doctor that flags when `jeo` resolves to a compiled binary or an installed copy instead. README gains "Skill migration and bundled skill inspection" + "Development" sections. Also ships OKF concept-memory search/scoring with budget-aware injection and a round of workflow-prompt hardening (anti-punt, todo-first planning, verdict discipline) that keeps every loop escape hatch intact.
 - **[0.7.16]** (2026-06-25) — Bundled skills get a safe installer: `jeo skills sync` materializes the built-in workflow skills into `~/.jeo/skills`, preserving local edits by default, with a CI-friendly `--check` drift report and a `--force` overwrite.
 - **[0.7.15]** (2026-06-25) — Rollback release: the runtime source and test suite are restored to the **0.7.9** state. The intervening 0.7.10–0.7.14 runtime changes (quiet-mode/`-q`, `/resume` transcript rework, `mutatedFiles` plumbing, Ollama `num_ctx`, tmux REPL reaping, and related engine/provider/TUI edits) are reverted. Published as a new version because npm cannot re-issue an existing version number; `latest` now serves code identical to 0.7.9.
-- **[0.7.14]** (2026-06-25) — Quieter, cleaner output: a new `-q`/`--quiet` flag strips launch banners and courtesy logs, `/resume` no longer dumps walls of raw escaped JSON into scrollback, and a turn that edits files now reliably surfaces those paths to orchestrators.
 
 See [CHANGELOG.md](CHANGELOG.md) for the full history.
 <!-- CHANGELOG:END -->

package/README.zh.md

@@ -205,11 +205,11 @@ CI 通过 `.github/workflows/npm-publish.yml` 发布 — GitHub 发布 release
 ## 更新日志 (Changelog)
 
 <!-- CHANGELOG:START (auto-generated from CHANGELOG.md — run `bun run changelog:sync`) -->
+- **[0.7.19]** (2026-06-26) — The live model picker gains gajae-code's `/model` provider tabs, and skill invocation is consolidated onto a single `$` entrypoint. The picker now shows an `ALL` tab plus one tab per provider that `tab`/`shift+tab` cycles, and skills (including their declared aliases) are invoked only via `$` — the slash palette stays builtins-only.
 - **[0.7.18]** (2026-06-26) — Slash-command discovery and the `/model` flow reach gajae-code parity. The slash palette/autocomplete now fuzzy-matches command names (with a description fallback for intent-style queries), resolved skills can contribute their own `/aliases` as real dispatchable commands, and `/model` runs gjc's two-menu target → reasoning flow so a picked model can be assigned to the default or any subagent role with its own thinking budget.
 - **[0.7.17]** (2026-06-25) — Developer workflow parity (gjc `dev:link`/`dev:doctor`, adapted for jeo's zero-native-dep Bun runtime): the global `jeo` command can be linked to run this checkout's source hot to every edit, with a drift doctor that flags when `jeo` resolves to a compiled binary or an installed copy instead. README gains "Skill migration and bundled skill inspection" + "Development" sections. Also ships OKF concept-memory search/scoring with budget-aware injection and a round of workflow-prompt hardening (anti-punt, todo-first planning, verdict discipline) that keeps every loop escape hatch intact.
 - **[0.7.16]** (2026-06-25) — Bundled skills get a safe installer: `jeo skills sync` materializes the built-in workflow skills into `~/.jeo/skills`, preserving local edits by default, with a CI-friendly `--check` drift report and a `--force` overwrite.
 - **[0.7.15]** (2026-06-25) — Rollback release: the runtime source and test suite are restored to the **0.7.9** state. The intervening 0.7.10–0.7.14 runtime changes (quiet-mode/`-q`, `/resume` transcript rework, `mutatedFiles` plumbing, Ollama `num_ctx`, tmux REPL reaping, and related engine/provider/TUI edits) are reverted. Published as a new version because npm cannot re-issue an existing version number; `latest` now serves code identical to 0.7.9.
-- **[0.7.14]** (2026-06-25) — Quieter, cleaner output: a new `-q`/`--quiet` flag strips launch banners and courtesy logs, `/resume` no longer dumps walls of raw escaped JSON into scrollback, and a turn that edits files now reliably surfaces those paths to orchestrators.
 
 See [CHANGELOG.md](CHANGELOG.md) for the full history.
 <!-- CHANGELOG:END -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeo-code",
-  "version": "0.7.18",
+  "version": "0.7.19",
   "description": "Clean, highly optimized AI coding agent using spec-first loop",
   "type": "module",
   "main": "src/cli.ts",

package/src/commands/launch.ts

@@ -14,7 +14,7 @@ import { runDeepInterviewEngine, type DeepInterviewEngineOptions } from "./deep-
 import { runRalplanEngine, type RalplanEngineOptions } from "./ralplan";
 import { runTeamEngine, type TeamEngineOptions } from "./team";
 import { runUltragoalEngine, type UltragoalEngineOptions } from "./ultragoal";
-import { skillsPromptSection, loadSkills, buildSkillTask, workflowSkillsForPrompt, parseSkillInvocation, parseSkillChain, parseSkillSlashInvocation, skillSlashAliases, looksLikeSkillEcho, skillInvocationCard, type SkillDoc, type SkillInvocation } from "../skills/catalog";
+import { skillsPromptSection, loadSkills, buildSkillTask, workflowSkillsForPrompt, parseSkillInvocation, parseSkillChain, skillSlashAliases, looksLikeSkillEcho, skillInvocationCard, type SkillDoc, type SkillInvocation } from "../skills/catalog";
 import { formatForgeBox, scaleForgeWidth } from "../tui/components/forge";
 import { interactiveOAuthLogin } from "./auth";
 import { logoutOAuth, OAUTH_PROVIDERS, API_KEY_ONLY_PROVIDERS, setApiKey } from "../auth";
@@ -522,27 +522,17 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
 
   const workflowSkills = workflowSkillsForPrompt(resolvedSkills);
   const resolvedSkillNames = resolvedSkills.map(s => s.name);
-  // Skills can ADD `/` commands: every slash alias a resolved skill declares (frontmatter
-  // `aliases:`/`slash:`) becomes a real, dispatchable palette command grouped under "skills",
-  // so installing a skill extends the slash menu, autocomplete, and previews — not just `$<name>`.
-  // First declarer of an alias wins (aliases are owner-scoped, so cross-skill collisions are rare).
+  // Skills are invoked ONLY via the `$` entrypoint — never as `/` commands. A skill's declared
+  // aliases (frontmatter `aliases:`/`slash:`) are additionally `$`-invocable (`/obsidian-capture`
+  // → `$obsidian-capture`), so they extend `$` autocomplete (see resolvedSkillTokens) rather than
+  // the slash palette. The slash menu stays builtins-only, hence skillSlashDetails is empty.
   const skillSlashDetails: SlashCommandInfo[] = [];
-  {
-    const seenAlias = new Set<string>();
-    for (const s of resolvedSkills) {
-      for (const alias of skillSlashAliases(s)) {
-        const key = alias.toLowerCase();
-        if (seenAlias.has(key)) continue;
-        seenAlias.add(key);
-        skillSlashDetails.push({
-          command: alias,
-          usage: `${alias} [intent]`,
-          description: `${s.name} skill — ${s.summary}`,
-          group: "skills",
-        });
-      }
-    }
-  }
+  // Declared-alias tokens (the alias text without its leading `/`), surfaced in `$` autocomplete
+  // next to skill names so installing a skill grows the `$` menu, not the `/` menu.
+  const resolvedSkillTokens = [...new Set([
+    ...resolvedSkillNames,
+    ...resolvedSkills.flatMap(s => skillSlashAliases(s).map(a => a.replace(/^\//, ""))),
+  ])];
 
   const protocol = buildToolProtocol(allowedTools);
   const preamble = flags.systemPrompt ?? "You are the jeo, an interactive coding agent.\nAccomplish the user's request by calling tools and verifying your work.";
@@ -1277,18 +1267,12 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
       }
       return;
     }
-    // A `$skill` invocation resolves to a single skill.
+    // A `$skill` invocation resolves to a single skill (by name, declared alias, or unique prefix).
     const skillInvocation = parseSkillInvocation(messageContent, resolvedSkills);
     if (skillInvocation) {
       await runOneSkillShot(skillInvocation);
       return;
     }
-    // A declared skill `/alias` (e.g. `jeo "/obsidian-capture note"`) dispatches the owning skill.
-    const slashSkill = parseSkillSlashInvocation(messageContent, resolvedSkills);
-    if (slashSkill) {
-      await runOneSkillShot(slashSkill);
-      return;
-    }
     try {
       const { reply, rendered, usage } = await runTurn(messageContent, shouldUseOneShotTui(flags.noTui));
       if (!rendered) console.log(stripMarkdown(renderMarkdownTables(reply)) + usage);
@@ -1483,7 +1467,7 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
       slashCommands: [...base.slashCommands, ...skillSlashDetails.map(d => d.command)],
       liveModels: liveModelsCache ? flattenModels(liveModelsCache).map(e => e.model) : [],
       aliases: aliasNames,
-      skillNames: resolvedSkillNames,
+      skillNames: resolvedSkillTokens,
       modelsForProvider: p => liveModelsCache?.find(r => r.provider === p)?.models ?? [],
       mentionPaths,
     };
@@ -2236,7 +2220,7 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
 
   const runSelectPicker = async <T>(
     render: (cols: number, rows: number) => string[],
-    onKey: (ch: string, key: { name?: string; ctrl?: boolean; meta?: boolean } | undefined) => boolean | undefined,
+    onKey: (ch: string, key: { name?: string; ctrl?: boolean; meta?: boolean; shift?: boolean } | undefined) => boolean | undefined,
   ): Promise<void> => {
     pickerActive = true; // closes the readline output gate for the picker's lifetime
     disarmPreview();
@@ -2305,7 +2289,7 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
     process.stdout.on("resize", onPickerResize);
     try {
       await new Promise<void>(resolve => {
-        const handler = (ch: string, key: { name?: string; ctrl?: boolean; meta?: boolean } | undefined) => {
+        const handler = (ch: string, key: { name?: string; ctrl?: boolean; meta?: boolean; shift?: boolean } | undefined) => {
           const done = onKey(ch, key);
           if (done) {
             process.stdin.off("keypress", handler);
@@ -2420,6 +2404,11 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
           list.page(1, 6);
           return false;
         }
+        if (key?.name === "tab") {
+          // gajae-code parity: cycle the provider tab (shift+tab steps back).
+          list.cycleTab(key.shift ? -1 : 1);
+          return false;
+        }
         if (key?.name === "backspace") {
           list.backspace();
           return false;
@@ -4407,15 +4396,7 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
         }
         continue;
       }
-      const aliasInvocation = parseSkillInvocation(input, resolvedSkills);
-      if (aliasInvocation?.invokedAs) {
-        try {
-          await runSkillInvocation(aliasInvocation.skill, aliasInvocation.intent, aliasInvocation.invokedAs);
-        } catch (err) {
-          console.log(`! ${(err as Error).message}`);
-        }
-        continue;
-      }
+
       // Unresolved `$skill` → suggest precisely, never silently send the typo to the model.
       // `$exact`/`$prefix`/chains already ran above; a leftover `$word` is a missed skill
       // attempt, EXCEPT `$UPPERCASE` env-var-style tokens (e.g. `$HOME`) which pass through.
@@ -4443,20 +4424,7 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
           continue;
         }
       }
-      // A declared skill slash alias (e.g. `/obsidian-capture note`) dispatches the owning skill,
-      // passing the alias as the routing signal and the rest of the line as the intent. Placed
-      // after every built-in slash handler (built-ins win) and before the unhandled-slash fallback.
-      if (!flags.noSkills && input.startsWith("/")) {
-        const slashSkill = parseSkillSlashInvocation(input, resolvedSkills);
-        if (slashSkill) {
-          try {
-            await runSkillInvocation(slashSkill.skill, slashSkill.intent, slashSkill.invokedAs);
-          } catch (err) {
-            console.log(`! ${(err as Error).message}`);
-          }
-          continue;
-        }
-      }
+
       // Unhandled slash attempt → suggest, don't send the typo to the model.
       if (isSlashAttempt(input)) {
         const m = matchSlash(input, [...completionContext().slashCommands]);

package/src/skills/catalog.ts

@@ -521,18 +521,19 @@ export function getSkillBySlash(skills: SkillDoc[], command: string): SkillDoc |
   return skills.find(s => skillSlashAliases(s).some(a => a.toLowerCase() === q));
 }
 
-/** Resolve a leading `/alias` slash command to the skill that DECLARES it, e.g.
- *  `/obsidian-capture note text` → { skill, intent: "note text", invokedAs: "/obsidian-capture" }.
- *  Returns null when the first token is not a declared skill slash alias. This is what lets an
- *  installed skill add real, dispatchable `/` commands (not just routing-hint metadata): only the
- *  FIRST token is matched, and the rest of the line becomes the intent passed to the skill. */
-export function parseSkillSlashInvocation(input: string, skills: SkillDoc[]): SkillInvocation | null {
-  const trimmed = input.trim();
-  if (!trimmed.startsWith("/")) return null;
-  const command = trimmed.split(/\s+/, 1)[0] ?? "";
-  const skill = getSkillBySlash(skills, command);
-  if (!skill) return null;
-  return { skill, intent: trimmed.slice(command.length).trim(), invokedAs: command };
+/** Resolve a bare `$`-token (the text after `$`, no leading `$`) to a skill: exact name,
+ *  then exact declared alias (the alias compared without its leading `/`), then unique name
+ *  prefix. This makes declared aliases first-class `$` entrypoints — `$obsidian-capture`
+ *  resolves the skill that declares `/obsidian-capture` — so skills stay `$`-managed and a
+ *  declared `alias` becomes an invocable `$<alias>`, never a dispatchable `/` command. */
+export function getSkillByDollarToken(skills: SkillDoc[], token: string): SkillDoc | undefined {
+  const q = token.toLowerCase();
+  if (!q) return undefined;
+  const byName = skills.find(s => s.name.toLowerCase() === q);
+  if (byName) return byName;
+  const byAlias = skills.find(s => skillSlashAliases(s).some(a => a.replace(/^\//, "").toLowerCase() === q));
+  if (byAlias) return byAlias;
+  return uniquePrefixSkill(skills, token);
 }
 
 export interface SkillInvocation {
@@ -541,17 +542,17 @@ export interface SkillInvocation {
   invokedAs?: string;
 }
 /** Parse only an explicit `$skill` invocation. Skills are invokable ONLY via the `$`
- * entrypoint — `/` commands and slash aliases never load a skill file, and pasted SKILL.md
- * paths cannot hijack an ordinary coding request. Only the FIRST token counts, and only
- * when a skill with that exact name (or unique name prefix) is loaded; `$HOME is what?` or
- * any unknown `$word` falls through to the model as an ordinary prompt. */
+ * entrypoint — `/` commands never load a skill file, and pasted SKILL.md paths cannot
+ * hijack an ordinary coding request. Only the FIRST token counts, and only when a skill
+ * with that exact name, exact declared alias, or unique name prefix is loaded; `$HOME is
+ * what?` or any unknown `$word` falls through to the model as an ordinary prompt. */
 export function parseSkillInvocation(input: string, skills: SkillDoc[]): SkillInvocation | null {
   const trimmed = input.trim();
   if (!trimmed) return null;
 
   const command = trimmed.split(/\s+/, 1)[0] ?? "";
   if (command.length > 1 && command.startsWith("$")) {
-    const dollarSkill = getSkillFrom(skills, command.slice(1)) ?? uniquePrefixSkill(skills, command.slice(1));
+    const dollarSkill = getSkillByDollarToken(skills, command.slice(1));
     if (dollarSkill) {
       return { skill: dollarSkill, intent: trimmed.slice(command.length).trim(), invokedAs: command };
     }
@@ -563,8 +564,8 @@ export function parseSkillInvocation(input: string, skills: SkillDoc[]): SkillIn
  *  "build auth". This is what lets `$` invoke several skills in one line — they all run,
  *  in order. Scanning stops at the first non-`$` token, OR a `$UPPERCASE` env-var-style
  *  token (e.g. `$HOME`), which is left in the intent so shell-style references pass through.
- *  Each `$name` resolves by exact name then unique prefix; names that resolve to nothing go
- *  into `unresolved` (so the REPL can report every typo, not just the first). Returns null
+ *  Each `$name` resolves by exact name, exact declared alias, then unique prefix; names that
+ *  resolve to nothing go into `unresolved` (so the REPL can report every typo, not just the first). Returns null
  *  only when the input opens with no parseable `$skill` token at all. */
 export function parseSkillChain(
   input: string,
@@ -581,7 +582,7 @@ export function parseSkillChain(
     if (!tok.startsWith("$") || tok.length < 2) break;
     const name = tok.slice(1);
     if (/^[A-Z_][A-Z0-9_]*$/.test(name)) break; // env-var-style → boundary; keep in intent
-    const skill = getSkillFrom(skills, name) ?? uniquePrefixSkill(skills, name);
+    const skill = getSkillByDollarToken(skills, name);
     if (skill) invocations.push({ skill, intent: "", invokedAs: tok });
     else unresolved.push(name);
   }

package/src/tui/components/live-model-picker.ts

@@ -104,7 +104,7 @@ export function liveModelPicker(entries: PickEntry[], opts: LiveModelPickerOptio
 }
 
 export function renderLiveModelPicker(list: SelectList<PickEntry>, opts: RenderSelectOptions = {}): string[] {
-  return renderSelectList(list, { title: "Select a live model", rows: 12, ...opts });
+  return renderSelectList(list, { title: "Select a live model", rows: 12, showTabs: true, ...opts });
 }
 
 /** The five reasoning levels in display order, lightest → heaviest. */

package/src/tui/components/select-list.ts

@@ -12,6 +12,9 @@ import { padLineTo } from "./layout";
 import { visibleWidth } from "./color";
 import { truncate as truncateAnsi } from "../terminal";
 
+/** Synthetic first tab that shows every item regardless of its provider/group. */
+export const ALL_TAB = "ALL";
+
 export interface SelectItem<T> {
   value: T;
   label: string;
@@ -32,6 +35,7 @@ export interface SelectItem<T> {
 export class SelectList<T> {
   private readonly items: SelectItem<T>[];
   private query = "";
+  private tabIndex = 0; // 0 = ALL; 1..N = a provider/group tab
   private cursor = 0; // index into the *visible* list
 
   constructor(items: SelectItem<T>[]) {
@@ -45,9 +49,35 @@ export class SelectList<T> {
   }
 
   private computeVisible(): SelectItem<T>[] {
+    let list = this.items;
+    const tab = this.activeTab();
+    if (tab !== ALL_TAB) list = list.filter(i => (i.group ?? "") === tab);
     const q = this.query.trim().toLowerCase();
-    if (!q) return this.items;
-    return this.items.filter(i => i.label.toLowerCase().includes(q) || (i.group ?? "").toLowerCase().includes(q));
+    if (!q) return list;
+    return list.filter(i => i.label.toLowerCase().includes(q) || (i.group ?? "").toLowerCase().includes(q));
+  }
+
+  /** Distinct provider/group tabs: "ALL" first, then each group in first-seen order. */
+  tabList(): string[] {
+    const seen: string[] = [];
+    for (const it of this.items) {
+      if (it.group && !seen.includes(it.group)) seen.push(it.group);
+    }
+    return [ALL_TAB, ...seen];
+  }
+
+  /** Active tab — "ALL" shows everything; otherwise items of one provider/group. */
+  activeTab(): string {
+    const tabs = this.tabList();
+    return tabs[Math.min(this.tabIndex, tabs.length - 1)] ?? ALL_TAB;
+  }
+
+  /** Cycle the active provider/group tab (wraps); resets the cursor to the first match. */
+  cycleTab(dir: 1 | -1): void {
+    const n = this.tabList().length;
+    if (n <= 1) return;
+    this.tabIndex = (Math.min(this.tabIndex, n - 1) + dir + n) % n;
+    this.cursor = this.firstEnabled(this.computeVisible());
   }
 
   private firstEnabled(list: SelectItem<T>[]): number {
@@ -136,6 +166,8 @@ export interface RenderSelectOptions {
   unicode?: boolean;
   /** Apply chalk color (default true). */
   color?: boolean;
+  /** Render a provider/group tab bar (gajae-code `/model` parity) and the `tab` key hint. */
+  showTabs?: boolean;
 }
 
 /**
@@ -159,6 +191,15 @@ export function renderSelectList<T>(list: SelectList<T>, opts: RenderSelectOptio
     }
   }
 
+  if (opts.showTabs) {
+    const tabs = list.tabList();
+    if (tabs.length > 1) {
+      const active = list.activeTab();
+      const bar = "  " + tabs.map(t => (t === active ? tint(`[${t}]`, chalk.cyan.bold) : tint(` ${t} `, chalk.gray))).join(" ");
+      out.push(cols ? clampToCols(bar, cols) : bar);
+    }
+  }
+
   const items = list.visible();
   if (items.length === 0) {
     const empty = tint("  (no matches)", chalk.gray);
@@ -208,7 +249,9 @@ export function renderSelectList<T>(list: SelectList<T>, opts: RenderSelectOptio
 
   const q = list.filter();
   const filterPart = q ? `filter: ${q}` : "type to filter";
-  const keys = unicode ? "\u2191/\u2193 move \u00b7 enter select \u00b7 esc cancel" : "up/down move . enter select . esc cancel";
+  const showTab = opts.showTabs && list.tabList().length > 1;
+  const tabHint = showTab ? (unicode ? " \u00b7 tab provider" : " . tab provider") : "";
+  const keys = (unicode ? "\u2191/\u2193 move \u00b7 enter select \u00b7 esc cancel" : "up/down move . enter select . esc cancel") + tabHint;
   const footer = tint(`  ${filterPart}  \u2014  ${keys}`, chalk.gray);
   out.push(cols ? clampToCols(footer, cols) : footer);
   return out;