jeo-code 0.6.2 → 0.6.4

package/src/commands/launch.ts

@@ -19,8 +19,9 @@ import { formatForgeBox } from "../tui/components/forge";
 import { interactiveOAuthLogin } from "./auth";
 import { logoutOAuth } from "../auth";
 import type { AuthProvider } from "../auth";
-import { matchSlash, isSlashAttempt, formatSlashCommandList, formatSlashPreview, slashPreviewMatches, activeTriggerToken, tabCompleteSelection, type SlashCommandInfo } from "../tui/components/slash";
+import { matchSlash, isSlashAttempt, suggestSlashCommands, formatSlashCommandList, formatSlashPreview, slashPreviewMatches, activeTriggerToken, tabCompleteSelection, type SlashCommandInfo } from "../tui/components/slash";
 import { staticCompletionContext, readlineCompleter, formatCompletionPreview, tokenize, type CompletionContext } from "../tui/components/autocomplete";
+import { normalizeBaseUrl } from "./setup-helpers";
 import { EVOLUTION_STAGES, animateAsciiArt } from "../tui/components/ascii-art";
 import { getEvolutionTip } from "../tui/components/evolution";
 import { renderWelcome, playWelcomeSweep } from "../tui/components/welcome";
@@ -37,6 +38,7 @@ import { readGlobalConfig, saveConfigPatch } from "../agent/state";
 import { rememberModelPatch, recentModelsForDisplay } from "../agent/model-recency";
 import { describeModel, describeAllProviders, thinkingMaxTokens, discoverModels, flattenModels, resolveSelection, catalogMetadata, resolveRoleModel, CODEX_MODELS, qualifyModelId } from "../ai";
 import type { ProviderModelsResult, PickEntry, ProviderName, ModelRole, ThinkLevel } from "../ai";
+import { readGoalState, writeGoalState, clearGoalState, verifyGoal } from "../agent/goal-verifier";
 
 import { listAliases } from "../ai/model-registry";
 
@@ -45,7 +47,6 @@ import { SelectList, renderSelectList, type SelectItem } from "../tui/components
 import {
   formatModelLine,
   formatProviderPanel,
-  emitLoginCleanup,
   formatAgentsPanel,
   formatAgentDetail,
   formatConfigPanel,
@@ -56,7 +57,7 @@ import {
 } from "../tui/components/config-panel";
 import { liveModelPicker, renderLiveModelPicker, type ModelAssignmentBadge } from "../tui/components/live-model-picker";
 
-import { providerPicker, renderProviderPicker, buildProviderChoices } from "../tui/components/provider-picker";
+import { providerPicker, renderProviderPicker } from "../tui/components/provider-picker";
 import { detectLanguage, languageLabel, parseLineRange, sliceLines, formatCodeBlock, formatDiff, sanitizeForTerminal } from "../tui/components/code-view";
 import { categoryBadge } from "../tui/components/category-index";
 import { renderInputFrame } from "../tui/components/input-box";
@@ -1549,14 +1550,48 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
         // Todos checklist used to end a finished turn stuck at "✓0 ◐1 ·4 / 5"
         // because nothing ever forced the model to update item statuses).
         let turnTodos: { title: string; status: string }[] = [];
-        const onBeforeDone = (): string | null => {
+        const onBeforeDone = async (reason: string): Promise<string | null> => {
           const unfinished = turnTodos.filter(t => t.status !== "done");
-          if (turnTodos.length === 0 || unfinished.length === 0) return null;
-          return (
-            `Your todo list still shows ${unfinished.length} unfinished item(s): ${unfinished.map(t => `"${t.title}"`).join(", ")}. ` +
-            `Reconcile the plan first — call the todo tool resending the FULL list with every actually-completed item marked "done" ` +
-            `(drop items that no longer apply), then call done again.`
-          );
+          if (turnTodos.length > 0 && unfinished.length > 0) {
+            return (
+              `Your todo list still shows ${unfinished.length} unfinished item(s): ${unfinished.map(t => `"${t.title}"`).join(", ")}. ` +
+              `Reconcile the plan first — call the todo tool resending the FULL list with every actually-completed item marked "done" ` +
+              `(drop items that no longer apply), then call done again.`
+            );
+          }
+
+          const goalState = await readGoalState(cwd);
+          if (goalState && goalState.condition) {
+            const reBlockCount = goalState.verdicts.filter(v => v.verdict === "NOT_MET" || v.verdict === "IMPOSSIBLE").length;
+            const MAX_RE_BLOCKS = 2;
+
+            if (reBlockCount >= MAX_RE_BLOCKS) {
+              if (tui) tui.events().onNotice?.(`[Goal Verifier] Re-block cap of ${MAX_RE_BLOCKS} reached. Auto-allowing done.`);
+              else console.log(`[Goal Verifier] Re-block cap of ${MAX_RE_BLOCKS} reached. Auto-allowing done.`);
+              return null;
+            }
+
+            if (tui) tui.events().onNotice?.("[Goal Verifier] Running goal verification...");
+            const verdict = await verifyGoal(goalState.condition, history, sessionModel);
+
+            goalState.verdicts.push({
+              at: Date.now(),
+              verdict: verdict.verdict,
+              gap: verdict.reason,
+            });
+            await writeGoalState(goalState, cwd);
+
+            if (verdict.verdict === "NOT_MET" || verdict.verdict === "IMPOSSIBLE") {
+              const prefix = verdict.verdict === "IMPOSSIBLE" ? "[IMPOSSIBLE] " : "";
+              return (
+                `Goal verifier check failed: The goal "${goalState.condition}" is not yet met.\n` +
+                `Reason: ${prefix}${verdict.reason}\n` +
+                `Please address the remaining gaps and call done again.`
+              );
+            }
+          }
+
+          return null;
         };
         const fullTools = {
           ...DEFAULT_TOOLS,
@@ -2473,7 +2508,10 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
     const caret = rli.line === line && typeof rli.cursor === "number" ? rli.cursor : line.length;
     const { accent: boxAccent, shadow: boxShadow } = boxAccents(line);
     const frame = renderInputFrame(expandSentinel(line), {
-      cols,
+      // Cap the input box at 120 cols to match the live-turn box (renderLiveInputBox)
+      // and the user-card width, so the box doesn't visibly jump width on the
+      // idle→live transition on wide terminals. The status bar below stays full-width.
+      cols: Math.min(120, cols),
       color: true,
       unicode: true,
       accent: boxAccent,
@@ -3121,16 +3159,48 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
     // Idle-prompt resize: re-reserve the footer at the new terminal height so the
     // fixed reservation stays accurate (otherwise the next paint would target the
     // old row count and either over-shoot or under-paint the reserved region).
-    const idleResizeHandler = () => {
+    // gjc-style responsiveness: re-reserve the footer IMMEDIATELY on the first resize
+    // event (leading edge → no lag), then cap re-reservations to ~30fps during a
+    // drag-resize, with a trailing settle so the FINAL height is always reserved exactly.
+    // Skip same-geometry events; each re-reserve disarms→arms so it must not run per-event.
+    const RESIZE_THROTTLE_MS = 33;
+    let idleResizeTimer: ReturnType<typeof setTimeout> | undefined;
+    let lastIdleAt = 0;
+    let lastIdleCols = process.stdout.columns ?? 80;
+    let lastIdleRows = process.stdout.rows ?? 24;
+    const reReserveFooter = () => {
       if (!previewArmed) return;
+      const cols = process.stdout.columns ?? 80;
+      const rows = process.stdout.rows ?? 24;
+      if (cols === lastIdleCols && rows === lastIdleRows) return;
+      lastIdleCols = cols;
+      lastIdleRows = rows;
       try {
         disarmPreview();
         armPreview();
         drawFooter(promptHistoryLines ? historyPreviewLines(promptHistoryLines) : previewLines(typedLine, navIdx));
       } catch { /* ignore resize render races */ }
     };
+    const idleResizeHandler = () => {
+      if (!previewArmed) return;
+      const now = Date.now();
+      if (now - lastIdleAt >= RESIZE_THROTTLE_MS) {
+        lastIdleAt = now;
+        reReserveFooter();
+        return;
+      }
+      if (idleResizeTimer) clearTimeout(idleResizeTimer);
+      idleResizeTimer = setTimeout(() => {
+        idleResizeTimer = undefined;
+        lastIdleAt = Date.now();
+        reReserveFooter();
+      }, RESIZE_THROTTLE_MS);
+    };
     process.stdout.on("resize", idleResizeHandler);
-    promptListenerCleanups.push(() => process.stdout.off("resize", idleResizeHandler));
+    promptListenerCleanups.push(() => {
+      process.stdout.off("resize", idleResizeHandler);
+      if (idleResizeTimer) clearTimeout(idleResizeTimer);
+    });
   }
 
   while (true) {
@@ -3548,6 +3618,32 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
         }
         continue;
       }
+      if (input === "/goal" || input.startsWith("/goal ")) {
+        const arg = input.substring(5).trim();
+        if (!arg) {
+          const current = await readGoalState(cwd);
+          if (current) {
+            console.log(`Current goal: "${current.condition}" (set at ${new Date(current.setAt).toLocaleTimeString()})`);
+          } else {
+            console.log("Usage: /goal <condition>   (set a natural language stop condition for the session)");
+            console.log("       /goal clear         (clear the current goal)");
+          }
+          continue;
+        }
+        if (arg === "clear" || arg === "none") {
+          await clearGoalState(cwd);
+          console.log("Goal cleared.");
+          continue;
+        }
+        const state = {
+          condition: arg,
+          setAt: Date.now(),
+          verdicts: [],
+        };
+        await writeGoalState(state, cwd);
+        console.log(`Goal set to: "${arg}"`);
+        continue;
+      }
       // ---- gjc-parity inspection commands ------------------------------------
       if (input === "/usage") {
         const total = sessionUsage.inputTokens + sessionUsage.outputTokens;
@@ -3632,8 +3728,17 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
       }
       if (input.startsWith("/provider") && (input === "/provider" || input[9] === " ")) {
         const tokens = input.substring(9).trim().split(/\s+/).filter(Boolean);
-        let name = (tokens[0] ?? "").toLowerCase();
-        const explicitModel = tokens[1];
+        const name = (tokens[0] ?? "").toLowerCase();
+        // gjc-parity (semantic): /provider is ONBOARDING ONLY — set up OAuth credentials
+        // or an API-compatible endpoint. Switching the active provider/model lives in /model.
+        const providerOnboardingUsage = (): string[] => [
+          "Provider onboarding — set up credentials or an API-compatible endpoint:",
+          "  OAuth / subscription : /provider login [anthropic|openai|gemini|antigravity]   (alias: /login)",
+          "  API-compatible       : /provider add --base-url <url> [--model <model>] [--compat openai]   (reads OPENAI_API_KEY)",
+          "                         show current / clear: /provider add   ·   /provider add clear",
+          "  Logout               : /logout <provider>",
+          "Switch the active model or provider with /model.",
+        ];
         // `/provider login|auth [name]` → run OAuth login from the REPL.
         if (name === "login" || name === "auth") {
           const cloud = ["anthropic", "openai", "gemini", "antigravity"] as const;
@@ -3643,14 +3748,13 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
             if (process.stdin.isTTY && process.stdout.isTTY) {
               target = await pickCloudProvider(statuses);
             } else {
-              // No provider given → show current status and let the user pick.
               console.log("Log in to which provider?");
               cloud.forEach((p, i) => {
                 const st = statuses.find(s => s.name === p);
                 console.log(`  ${i + 1}) ${p.padEnd(10)} ${st?.ready ? `✓ ${st.label}` : "· not ready"}`);
               });
-              const ans = (await promptInput("Choose [1-3] or name (blank to cancel): ")).trim().toLowerCase();
-              const byNum: Record<string, string> = { "1": "anthropic", "2": "openai", "3": "gemini" };
+              const ans = (await promptInput(`Choose [1-${cloud.length}] or name (blank to cancel): `)).trim().toLowerCase();
+              const byNum: Record<string, string> = Object.fromEntries(cloud.map((p, i) => [String(i + 1), p]));
               target = byNum[ans] ?? ((cloud as readonly string[]).includes(ans) ? ans : undefined);
             }
             if (!target) {
@@ -3661,131 +3765,107 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
           console.log(`Starting OAuth login for ${target}…`);
           try {
             const { email } = await interactiveOAuthLogin(target as AuthProvider, rl);
-            // Tidy back to the initial query-input screen: the OAuth flow printed
-            // browser prompts / "waiting…" lines that clutter scrollback. Clear the
-            // screen + scrollback and re-render the welcome (same path as /clear),
-            // then a single concise confirmation. lastPickIndex is still seeded so
-            // `/model #N` works; the verbose live-model dump is dropped (it cluttered).
+            console.log(`[SUCCESS] OAuth login complete for ${target}${email ? ` (${email})` : ""}. Tokens saved to ~/.jeo/config.json.`);
             const live = await refreshLiveModelsCache();
             const after = (await describeAllProviders()).find(s => s.name === target);
+            if (after) console.log(`  status → ${after.name}: ${after.ready ? `✓ ${after.label}` : after.label}`);
             const forProvider = live.filter(r => r.provider === target);
-            if (forProvider.some(r => r.ok && r.models.length > 0)) lastPickIndex = flattenModels(forProvider);
-            // Tidy back to the initial query-input screen: the OAuth flow printed
-            // browser prompts / "waiting…" lines that clutter scrollback. emitLoginCleanup
-            // clears + re-renders the welcome (same path as /clear) then prints one
-            // confirmation; the verbose live-model dump is dropped (lastPickIndex is
-            // still seeded so /model #N works). Orchestration is unit-tested.
-            emitLoginCleanup(
-              {
-                clear: () => { disarmPreview(); process.stdout.write("\x1b[2J\x1b[3J\x1b[H"); },
-                write: line => console.log(line),
-              },
-              {
-                isTty: process.stdout.isTTY === true,
-                provider: target,
-                email,
-                ready: after?.ready ?? false,
-                label: after?.label,
-                welcomeLines: renderWelcome(welcomeData),
-              },
-            );
+            if (forProvider.some(r => r.ok && r.models.length > 0)) {
+              lastPickIndex = flattenModels(forProvider);
+              const viaCatalog = forProvider.some(r => r.fallback);
+              console.log(`  ${viaCatalog ? "catalog" : "live"} ${target} models → /model #N${viaCatalog ? "  (live list endpoint rejected this token; showing known models)" : ""}`);
+              logLines(formatPickListWithCapabilities(lastPickIndex, { cap: 12 }));
+            } else {
+              const failed = forProvider.find(r => !r.ok);
+              if (failed?.error) console.log(`  live ${target} models unavailable: ${failed.error}`);
+            }
           } catch (err) {
             console.log(`[FAILED] ${(err as Error).message} — or set ${target.toUpperCase()}_API_KEY.`);
+          } finally {
+            // The OAuth manual-code prompt opens an rl.question that is aborted the
+            // instant the browser callback (or a failure) settles the flow. Bun leaves
+            // that abandoned question's buffer behind, so the next prompt would adopt
+            // it as residual prefill and resurrect the submitted "/provider login" in
+            // the input box. Reset the readline line buffer so the prompt starts empty.
+            const rli = rl as unknown as { line?: string; cursor?: number };
+            rli.line = "";
+            rli.cursor = 0;
           }
           continue;
         }
-        const cfgNow = await readGlobalConfig();
-        const statuses = await describeAllProviders(cfgNow);
-        if (!name) {
-          if (process.stdin.isTTY && process.stdout.isTTY) {
-            // gjc-style interactive picker (grouped ready / needs-setup, current marked)
-            // instead of a static text dump — arrows + Enter switch, Esc cancels.
-            const current = (await describeModel(sessionModel || cfgNow.defaultModel, cfgNow)).provider;
-            const items = buildProviderChoices(statuses, true, current).map(c => ({
-              value: c.value as string,
-              label: c.label,
-              hint: c.hint,
-              group: c.group,
-            }));
-            const picked = await pickFromOptions("Select a provider  ↑↓ move · Enter switch · Esc cancel", items);
-            if (!picked) { console.log("(switch cancelled)"); continue; }
-            name = picked.toLowerCase(); // fall through to the switch logic below
-          } else {
-            console.log("Providers (credential · base URL):");
-            logLines(formatProviderPanel(statuses));
-            console.log("Switch with: /provider <name> [model]  ·  choose models: /model");
+        // `/provider add --base-url <url> [--model <m>] [--compat openai]` → register an
+        // OpenAI-compatible endpoint (sets openaiBaseUrl). gjc flag style; bare positional
+        // URL/model still accepted for leniency. `/provider add clear` removes it.
+        if (name === "add") {
+          const rest = tokens.slice(1);
+          if ((rest[0] ?? "").toLowerCase() === "clear") {
+            await saveConfigPatch(() => ({ openaiBaseUrl: undefined }));
+            await refreshLiveModelsCache();
+            console.log("OpenAI-compatible base URL cleared — saved to ~/.jeo/config.json.");
             continue;
           }
-        }
-        if (!isProviderName(name)) {
-          console.log(`Unknown provider '${name}'. Known: ${statuses.map(s => s.name).join(", ")}.`);
-          continue;
-        }
-        const st = statuses.find(s => s.name === name);
-        if (st && !st.ready) {
-          console.log(`! ${name} is not ready (${st.label}) — set ${st.envVar ?? "the provider key"} or configure a compatible base URL. Switching anyway.`);
-        }
-        const live = await getLiveModels();
-        const forProvider = live.filter(r => r.provider === name);
-        const providerPick = flattenModels(forProvider);
-        const currentResolved = (await describeModel(sessionModel || cfgNow.defaultModel)).resolved;
-        let pickedFromPicker = false;
-        let target = explicitModel ?? PROVIDER_DEFAULT[name];
-        if (!explicitModel && providerPick.length && process.stdin.isTTY && process.stdout.isTTY) {
-          const picked = await pickLiveProviderModel(name, providerPick, currentResolved, st && !st.ready && !selectableThoughNotReady(st) ? [name] : []);
-          if (!picked) {
-            console.log("(cancelled)");
+          let baseUrl: string | undefined;
+          let modelArg: string | undefined;
+          let compat: string | undefined;
+          for (let i = 0; i < rest.length; i++) {
+            const t = rest[i]!;
+            if (t === "--base-url" || t === "--url") baseUrl = rest[++i];
+            else if (t === "--model") modelArg = rest[++i];
+            else if (t === "--compat") compat = (rest[++i] ?? "").toLowerCase();
+            else if (t === "--api-key-env" || t === "--provider") { i++; /* gjc-only: jeo has no named-provider registry — ignored */ }
+            else if (!t.startsWith("--") && baseUrl === undefined) baseUrl = t; // positional url
+            else if (!t.startsWith("--") && modelArg === undefined) modelArg = t; // positional model
+          }
+          if (compat && compat !== "openai") {
+            console.log(`Only --compat openai is supported (got '${compat}') — jeo registers a single OpenAI-compatible endpoint.`);
             continue;
           }
-          pickedFromPicker = true;
-          target = qualifyModelId(picked.model, picked.provider);
-        } else if (explicitModel && providerPick.length) {
-          const sel = resolveSelection(providerPick, explicitModel);
-          if (sel.kind === "index" || sel.kind === "match") {
-            target = qualifyModelId(sel.entry.model, sel.entry.provider);
-            if (st && !st.ready) {
-              if (selectableThoughNotReady(st)) {
-                console.log(notReadyWarning(st));
-              } else {
-                console.log(`Cannot select ${sel.entry.model}: ${name} is not ready (${st.label}). Set ${st.envVar ?? "the provider key"} first.`);
-                continue;
-              }
-            }
-          } else if (sel.kind === "ambiguous") {
-            console.log(`'${explicitModel}' matches ${sel.matches.length} ${name} models — be more specific:`);
-            for (const e of sel.matches.slice(0, 12)) console.log(`  #${e.index}  ${e.model} (${e.provider})`);
+          if (!baseUrl) {
+            const cur = (await readGlobalConfig()).openaiBaseUrl;
+            console.log(cur ? `OpenAI-compatible base URL: ${cur}` : "No OpenAI-compatible base URL set.");
+            console.log("Set one with: /provider add --base-url <url> [--model <model>]   ·   clear with: /provider add clear");
             continue;
-          } else if (sel.kind === "out-of-range") {
-            console.log(`#${explicitModel.slice(1)} is out of range for ${name} (1-${sel.max}).`);
+          }
+          const url = normalizeBaseUrl(baseUrl, "");
+          if (!url) {
+            console.log("Provide a base URL, e.g. /provider add --base-url http://localhost:1234/v1");
             continue;
           }
-        } else if (explicitModel?.startsWith("#")) {
-          console.log(`No numbered ${name} model list is available yet.`);
-          continue;
-        }
-        const { resolved, provider } = await describeModel(target);
-        if (explicitModel && provider !== name) {
-          console.log(`! '${target}' resolves to ${provider}, not ${name}. Pick a ${name} model from the live list below.`);
-          if (providerPick.length) logLines(formatPickListWithCapabilities(providerPick, { cap: 20 }));
+          await saveConfigPatch(() => ({ openaiBaseUrl: url }));
+          if (modelArg) {
+            const qualified = qualifyModelId(modelArg, "openai");
+            sessionModel = qualified;
+            await saveConfigPatch(raw => rememberModelPatch(raw, qualified));
+            console.log(`OpenAI-compatible endpoint set: ${url} · default model ${qualified} — saved to ~/.jeo/config.json.`);
+          } else {
+            console.log(`OpenAI-compatible endpoint set: ${url} — saved to ~/.jeo/config.json.`);
+          }
+          const live = await refreshLiveModelsCache();
+          const forProvider = live.filter(r => r.provider === "openai");
+          const pick = flattenModels(forProvider);
+          if (pick.length) {
+            lastPickIndex = pick;
+            console.log("Discovered models at this endpoint — select with /model #N:");
+            logLines(formatPickListWithCapabilities(pick, { cap: 12 }));
+          } else {
+            const failed = forProvider.find(r => !r.ok);
+            console.log(failed?.error ? `  could not list models: ${failed.error}` : "  no models discovered yet — the endpoint may need a key (set OPENAI_API_KEY).");
+          }
           continue;
         }
-        if (pickedFromPicker && await applyPickedModelWithTarget(target)) {
-          if (providerPick.length) lastPickIndex = providerPick;
+        // Bare `/provider` (or `help`): show readiness + the onboarding usage. No switching.
+        if (!name || name === "help") {
+          const cfgNow = await readGlobalConfig();
+          const statuses = await describeAllProviders(cfgNow);
+          console.log("Providers (credential · base URL):");
+          logLines(formatProviderPanel(statuses));
+          for (const line of providerOnboardingUsage()) console.log(line);
           continue;
         }
-        sessionModel = target;
-        // MRU persistence: a provider/model pick becomes the default for EVERY
-        // future session and the head of the recents rotation.
-        await saveConfigPatch(raw => rememberModelPatch(raw, target));
-        console.log(`Model set to ${formatModelLine({ label: target, resolved, provider, ready: st?.ready })} — saved as default`);
-        // Show the provider's live, credentialed catalog so the user can pick a concrete id.
-        if (providerPick.length) {
-          lastPickIndex = providerPick;
-          if (!pickedFromPicker) {
-            console.log(`Live ${name} models — select with /model #N, /provider ${name} #N, or rerun /provider ${name} and use arrows+Enter:`);
-            logLines(formatPickListWithCapabilities(lastPickIndex, { current: resolved }));
-          }
-        }
+        // Anything else (a provider name) used to switch the active provider — that moved
+        // to /model (gjc semantics: /provider onboards, /model selects).
+        console.log(`'/provider ${name}' no longer switches providers — provider/model selection moved to /model.`);
+        console.log("Run /model to pick any provider's model (or /model <id|#N>). /provider now only onboards — see /provider help.");
         continue;
       }
       if (input.startsWith("/logout") && (input === "/logout" || input[7] === " ")) {
@@ -3964,11 +4044,11 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
               for (const e of sel.matches.slice(0, 12)) console.log(`  #${e.index}  ${e.model} (${e.provider})`);
               continue;
             } else if (sel.kind === "out-of-range") {
-              console.log(`#${modelArg.slice(1)} is out of range (1-${sel.max}). Use /model or /provider <name> first.`);
+              console.log(`#${modelArg.slice(1)} is out of range (1-${sel.max}). Use /model first.`);
               continue;
             }
           } else if (modelArg.startsWith("#")) {
-            console.log("Use /model or /provider <name> first to build the numbered live model list.");
+            console.log("Use /model first to build the numbered live model list.");
             continue;
           }
           // Persist a per-role model override to ~/.jeo/config.json (consumed by 'jeo team').
@@ -4038,11 +4118,11 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
               for (const e of sel.matches.slice(0, 12)) console.log(`  #${e.index}  ${e.model} (${e.provider})`);
               continue;
             } else if (sel.kind === "out-of-range") {
-              console.log(`#${chosenModel.slice(1)} is out of range (1-${sel.max}). Use /model or /provider <name> first.`);
+              console.log(`#${chosenModel.slice(1)} is out of range (1-${sel.max}). Use /model first.`);
               continue;
             }
           } else if (chosenModel.startsWith("#")) {
-            console.log("Use /model or /provider <name> first to build the numbered live model list.");
+            console.log("Use /model first to build the numbered live model list.");
             continue;
           }
           await saveConfigPatch(raw => ({ roles: { ...(raw.roles ?? {}), [tier]: chosenModel } }));
@@ -4123,12 +4203,12 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
               for (const e of sel.matches.slice(0, 12)) console.log(`  #${e.index}  ${e.model} (${e.provider})`);
               continue;
             } else if (sel.kind === "out-of-range") {
-              console.log(`#${toSave.slice(1)} is out of range (1-${sel.max}). Use /model or /provider <name> first.`);
+              console.log(`#${toSave.slice(1)} is out of range (1-${sel.max}). Use /model first.`);
               continue;
             }
             // kind "none" → treat `toSave` as a literal model id/alias.
           } else if (toSave.startsWith("#")) {
-            console.log("Use /model or /provider <name> first to build the numbered list.");
+            console.log("Use /model first to build the numbered list.");
             continue;
           }
           // Fall back to the FRESH on-disk default (not the stale session-start snapshot) so a
@@ -4196,11 +4276,11 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
               for (const e of sel.matches.slice(0, 12)) console.log(`  #${e.index}  ${e.model} (${e.provider})`);
               continue;
             } else if (sel.kind === "out-of-range") {
-              console.log(`#${roleModelArg.slice(1)} is out of range (1-${sel.max}). Use /model or /provider <name> first.`);
+              console.log(`#${roleModelArg.slice(1)} is out of range (1-${sel.max}). Use /model first.`);
               continue;
             }
           } else if (roleModelArg.startsWith("#")) {
-            console.log("Use /model or /provider <name> first to build the numbered list.");
+            console.log("Use /model first to build the numbered list.");
             continue;
           }
           if (roleModelArg) {
@@ -4251,12 +4331,12 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
             for (const e of sel.matches.slice(0, 12)) console.log(`  #${e.index}  ${e.model} (${e.provider})`);
             continue;
           } else if (sel.kind === "out-of-range") {
-            console.log(`#${arg.slice(1)} is out of range (1-${sel.max}). Use /model or /provider <name> first.`);
+            console.log(`#${arg.slice(1)} is out of range (1-${sel.max}). Use /model first.`);
             continue;
           }
           // kind "none" → fall through and treat `arg` as a literal model id/alias.
         } else if (arg.startsWith("#")) {
-          console.log("Use /model or /provider <name> first to build the numbered list.");
+          console.log("Use /model first to build the numbered list.");
           continue;
         }
         const label = arg || (sessionModel || defaultModel);
@@ -4282,7 +4362,7 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
           }
         }
         if (arg && liveModelsCache && resolved === label && !liveModelKnown(liveModelsCache, resolved)) {
-          console.log(`  (note: '${resolved}' is not in the live ${provider} catalog — use /model or /provider <name> to pick a valid id)`);
+          console.log(`  (note: '${resolved}' is not in the live ${provider} catalog — use /model to pick a valid id)`);
         }
         const meta = catalogMetadata(resolved);
         if (meta) console.log(`  ${formatCapabilityLine(meta)}`);
@@ -4450,7 +4530,9 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
         if (m.length) {
           for (const line of formatSlashCommandList(input, skillSlashDetails)) console.log(line);
         } else {
-          console.log(`Unknown command '${input}'. Try /help.`);
+          const cmds = [...completionContext().slashCommands];
+          const near = suggestSlashCommands(input, cmds);
+          console.log(near.length ? `Unknown command '${input}'. Did you mean ${near.join(", ")}?` : `Unknown command '${input}'. Try /help.`);
         }
         continue;
       }