lazyclaw 3.99.6 → 3.99.9

package/README.md

@@ -71,7 +71,7 @@ What you see on launch (TTY only):
   │  | |__ _ _____  _ _          │
   │  | / _` |_ / || | '_|         │
   │  |_\__,_/__\_, |_|            │
-  │  LazyClaw  |__/  3.99.6      │
+  │  LazyClaw  |__/  3.99.9      │
   ╰──────────────────────────────╯
 
   provider · anthropic

package/cli.mjs

@@ -1318,14 +1318,18 @@ async function cmdAgent(prompt, flags) {
 // (replaces rl.line with the full command). Tab still goes through
 // readline's tab-completer for cycling.
 function _attachGhostAutocomplete(rl) {
-  // Returns a `dispose()` callback that detaches the keypress listener
-  // and the rl 'line' listener installed below. Without disposal the
-  // process never exits — Node keeps the event loop alive while
-  // process.stdin has a 'keypress' listener attached. (This was the
-  // root cause of the slow `/exit` users reported.)
-  if (!process.stdout.isTTY) return () => {};
+  // Returns `{ dispose, suspend, resume }`. Dispose detaches the
+  // keypress + rl 'line' listeners (failure to do so leaks the
+  // event-loop ref, which is exactly the slow-exit bug v3.92
+  // fixed). Suspend / resume gate the keypress handler so the
+  // streaming chat output isn't interleaved with `\x1b[s\x1b[K\x1b[u`
+  // ghost-render escapes — that interleaving is what surfaces as
+  // visible gaps between Korean characters in long replies.
+  const noop = () => {};
+  if (!process.stdout.isTTY) return { dispose: noop, suspend: noop, resume: noop };
   const cmds = SLASH_COMMANDS.map((c) => c.cmd);
   let lastGhost = '';
+  let suspended = false;
   // Find the longest match for the current input. Returns '' when
   // nothing matches or when the input already equals a command.
   const findMatch = () => {
@@ -1362,6 +1366,10 @@ function _attachGhostAutocomplete(rl) {
   // _refreshLine, then return without forwarding the keypress.
   const onKeypress = (_str, key) => {
     if (!key) return;
+    // While a streaming response is being printed, do nothing —
+    // any ANSI cursor save / restore we emit would tear the wide-
+    // character (CJK) output apart on the visible terminal.
+    if (suspended) return;
     if (key.name === 'right' && lastGhost && rl.line === rl.line.trim() &&
         rl.cursor === (rl.line || '').length && (rl.line || '').length < lastGhost.length) {
       const accepted = lastGhost;
@@ -1387,13 +1395,23 @@ function _attachGhostAutocomplete(rl) {
   // over between turns.
   const onLine = () => { lastGhost = ''; };
   rl.on('line', onLine);
-  return () => {
+  const dispose = () => {
     try { process.stdin.removeListener('keypress', onKeypress); } catch (_) {}
     try { rl.removeListener('line', onLine); } catch (_) {}
     // Wipe any leftover ghost on screen so the user's terminal doesn't
     // keep a dim suffix after we exit.
     try { process.stdout.write('\x1b[s\x1b[K\x1b[u'); } catch (_) {}
   };
+  return {
+    dispose,
+    suspend: () => {
+      suspended = true;
+      // Wipe any half-rendered ghost before streaming starts so the
+      // first chunk lands at the same column as the prompt.
+      try { process.stdout.write('\x1b[s\x1b[K\x1b[u'); } catch (_) {}
+    },
+    resume: () => { suspended = false; },
+  };
 }
 
 // LazyClaw banner — printed once at the top of every interactive chat
@@ -1466,31 +1484,25 @@ function _printChatBanner(activeProvName, activeModel, version) {
 // when the user passes --pick. Falls back to plain stdin reads when
 // stdout isn't a TTY (CI/script callers should pass --non-interactive
 // equivalents instead).
-async function _pickProviderInteractive() {
-  const providers = Object.keys(_registryMod.PROVIDERS);
-  if (!providers.length) return { provider: 'mock', model: null };
-  const info = _registryMod.PROVIDER_INFO || {};
-  // Build one row per (provider, model) pair using the static
-  // PROVIDER_INFO.suggestedModels list (registry.mjs is the single
-  // source of truth). When a provider has no models (mock), we emit
-  // one row for the provider itself.
-  const items = [];
-  for (const name of providers) {
-    const meta = info[name] || {};
-    const models = (Array.isArray(meta.suggestedModels) && meta.suggestedModels.length)
-      ? meta.suggestedModels
-      : [null];
-    const keyTag = meta.requiresApiKey
-      ? '\x1b[38;5;245m[api key]\x1b[0m'
-      : (name === 'claude-cli' ? '\x1b[38;5;208m[subscription]\x1b[0m' : '\x1b[38;5;245m[no key]\x1b[0m');
-    for (const m of models) {
-      const label = m ? `${name.padEnd(11)}  ${m}` : `${name.padEnd(11)}  (no model)`;
-      items.push({ provider: name, model: m, label, keyTag });
-    }
-  }
+// Generic arrow-key menu used by the multi-step provider/model
+// picker below. Returns the picked item, or one of the sentinel
+// strings 'BACK' (Esc — caller should retry the previous step) or
+// 'CANCEL' (q — caller should bail entirely). Ctrl-C exits the
+// process directly, matching every other interactive prompt in the
+// CLI.
+//
+// `items` is an array of { id, label, desc, tag }. `tag` is an
+// optional pre-coloured pill (e.g. "[api key]") that lands on the
+// right side of the row. `defaultIdx` lets the caller pin where the
+// cursor lands; default 0.
+async function _arrowMenu({ title, subtitle, footer, items, defaultIdx = 0 }) {
   if (!process.stdout.isTTY || !process.stdin.isTTY) {
-    // Fall back to a single prompt — the picker UI is purely cosmetic.
-    process.stdout.write(`provider [${providers.join('|')}]: `);
+    // Non-TTY fallback: print the labels on stderr and read a single
+    // line of stdin. Used when somebody pipes input to `lazyclaw
+    // setup` — the wizard still works, just without arrows.
+    process.stderr.write(`${title}\n`);
+    items.forEach((it, i) => process.stderr.write(`  ${i + 1}. ${it.label}${it.desc ? ' — ' + it.desc : ''}\n`));
+    process.stderr.write('pick (number / id, blank for first): ');
     const ans = await new Promise((resolve) => {
       let buf = '';
       const onData = (chunk) => {
@@ -1499,38 +1511,47 @@ async function _pickProviderInteractive() {
       };
       process.stdin.on('data', onData);
     });
-    return { provider: ans || providers[0], model: null };
+    if (!ans) return items[0];
+    const byNum = parseInt(ans, 10);
+    if (Number.isFinite(byNum) && byNum >= 1 && byNum <= items.length) return items[byNum - 1];
+    const byId = items.find((it) => it.id === ans || it.label === ans);
+    return byId || items[0];
   }
-  // Default cursor: lands on item 0 (= the first row from PROVIDERS
-  // insertion order, which registry.mjs deliberately curates as the
-  // most user-familiar vendor — gemini at the time of writing).
-  let idx = 0;
 
   const readline = await import('node:readline');
   readline.emitKeypressEvents(process.stdin);
   if (process.stdin.setRawMode) process.stdin.setRawMode(true);
-  // Long lists need scrolling so the picker fits the terminal height.
-  // Reserve 6 rows for header + footer + breathing room.
+  let idx = Math.max(0, Math.min(items.length - 1, defaultIdx));
+  const accent = (s) => `\x1b[38;5;208m${s}\x1b[0m`;
+  const dim    = (s) => `\x1b[2m${s}\x1b[0m`;
+  const bold   = (s) => `\x1b[1m${s}\x1b[0m`;
+
   const draw = () => {
-    process.stdout.write('\x1b[?25l');     // hide cursor
-    process.stdout.write('\x1b[2J\x1b[H'); // clear screen
-    process.stdout.write('\x1b[38;5;208mLazyClaw — pick a provider/model\x1b[0m\n');
-    process.stdout.write('\x1b[2m↑/↓ to move · Enter to confirm · q to quit\x1b[0m\n');
-    process.stdout.write('\x1b[2m[subscription] = uses `claude` login (no key)  ·  [api key] = needs sk-... key  ·  [no key] = local\x1b[0m\n\n');
-    const rows = Math.max(6, (process.stdout.rows || 24) - 6);
+    process.stdout.write('\x1b[?25l\x1b[2J\x1b[H');
+    process.stdout.write(accent(title) + '\n');
+    if (subtitle) process.stdout.write(dim(subtitle) + '\n');
+    process.stdout.write(dim('↑/↓ to move · Enter to confirm · Esc to back · q to quit') + '\n\n');
+    const rows = Math.max(6, (process.stdout.rows || 24) - 8);
     let from = Math.max(0, idx - Math.floor(rows / 2));
     if (from + rows > items.length) from = Math.max(0, items.length - rows);
     const to = Math.min(items.length, from + rows);
+    // Pre-compute label width so descriptions line up across rows.
+    const labelW = items.reduce((w, it) => Math.max(w, (it.label || '').length), 12);
     for (let i = from; i < to; i++) {
       const it = items[i];
-      const marker = i === idx ? '\x1b[38;5;208m❯\x1b[0m ' : '  ';
-      const text = i === idx ? `\x1b[1m${it.label}\x1b[0m` : it.label;
-      process.stdout.write(`${marker}${text}  ${it.keyTag}\n`);
+      const marker = i === idx ? accent('❯ ') : '  ';
+      const lbl = (it.label || '').padEnd(labelW);
+      const lblOut = i === idx ? bold(lbl) : lbl;
+      const desc = it.desc ? '  ' + dim(it.desc) : '';
+      const tag = it.tag ? '  ' + it.tag : '';
+      process.stdout.write(`${marker}${lblOut}${desc}${tag}\n`);
     }
     if (to < items.length) {
-      process.stdout.write(`\x1b[2m  …(${items.length - to} more)\x1b[0m\n`);
+      process.stdout.write(`${dim(`  …(${items.length - to} more)`)}\n`);
     }
+    if (footer) process.stdout.write('\n' + dim(footer) + '\n');
   };
+
   draw();
   return await new Promise((resolve) => {
     const onKey = (_str, key) => {
@@ -1543,18 +1564,145 @@ async function _pickProviderInteractive() {
       else if (key.name === 'end')  { idx = items.length - 1; draw(); }
       else if (key.name === 'return') { cleanup(); resolve(items[idx]); }
       else if (key.ctrl && key.name === 'c') { cleanup(); process.exit(130); }
-      else if (key.name === 'q' || key.name === 'escape') { cleanup(); resolve(items[idx]); }
+      else if (key.name === 'escape') { cleanup(); resolve('BACK'); }
+      else if (key.name === 'q')      { cleanup(); resolve('CANCEL'); }
     };
     const cleanup = () => {
       process.stdin.off('keypress', onKey);
       if (process.stdin.setRawMode) process.stdin.setRawMode(false);
-      process.stdout.write('\x1b[?25h');     // show cursor
-      process.stdout.write('\x1b[2J\x1b[H'); // clear screen
+      process.stdout.write('\x1b[?25h\x1b[2J\x1b[H');
     };
     process.stdin.on('keypress', onKey);
   });
 }
 
+// Bucket every registered provider into one of three auth-method
+// families. The picker's first step asks the user which family
+// they want before drilling into specific providers — much less
+// overwhelming than a flat 40-row list. Bucket assignment lives
+// here (rather than registry.mjs) because it's a UX concept, not
+// an intrinsic provider attribute.
+function _providerFamilies() {
+  const info = _registryMod.PROVIDER_INFO || {};
+  const all = Object.keys(_registryMod.PROVIDERS);
+  const buckets = {
+    api: { label: 'API key', desc: 'paste an sk-... key during setup',  tag: '\x1b[38;5;245m[needs key]\x1b[0m', members: [] },
+    cli: { label: 'CLI / Local', desc: 'keyless — uses an existing CLI login or a local daemon', tag: '\x1b[38;5;208m[no key]\x1b[0m', members: [] },
+    mock: { label: 'Mock', desc: 'offline echo, only useful for testing', tag: '\x1b[38;5;245m[test]\x1b[0m', members: [] },
+  };
+  for (const name of all) {
+    if (name === 'mock') buckets.mock.members.push(name);
+    else if ((info[name] || {}).requiresApiKey) buckets.api.members.push(name);
+    else buckets.cli.members.push(name);
+  }
+  return buckets;
+}
+
+// Multi-step provider / model picker — replaces the flat 40-row
+// list of v3.99.5 with a drill-in:
+//
+//   Step 1 — auth family (API key / CLI-Local / Mock)
+//   Step 2 — provider in that family (gemini / openai / claude-cli / …)
+//   Step 3 — model in that provider's suggestedModels
+//
+// Esc at any step goes back one. q or Ctrl-C cancels entirely.
+// Steps that have only one option auto-advance so the user doesn't
+// stare at a single-row menu (e.g. the Mock family has just `mock`).
+async function _pickProviderInteractive() {
+  const providers = Object.keys(_registryMod.PROVIDERS);
+  if (!providers.length) return { provider: 'mock', model: null };
+  const info = _registryMod.PROVIDER_INFO || {};
+  const families = _providerFamilies();
+
+  // Non-TTY fallback — single-prompt picker, identical to before.
+  if (!process.stdout.isTTY || !process.stdin.isTTY) {
+    process.stdout.write(`provider [${providers.join('|')}]: `);
+    const ans = await new Promise((resolve) => {
+      let buf = '';
+      const onData = (chunk) => {
+        buf += chunk.toString();
+        if (buf.includes('\n')) { process.stdin.off('data', onData); resolve(buf.trim()); }
+      };
+      process.stdin.on('data', onData);
+    });
+    return { provider: ans || providers[0], model: null };
+  }
+
+  // ── Step 1 — auth family ──────────────────────────────────────
+  let family = null;
+  while (!family) {
+    const familyItems = Object.entries(families)
+      .filter(([, b]) => b.members.length > 0)
+      .map(([id, b]) => ({
+        id,
+        label: b.label,
+        desc: `${b.desc}  ·  ${b.members.join(' / ')}`,
+        tag: b.tag,
+      }));
+    const picked = await _arrowMenu({
+      title: 'LazyClaw setup — Step 1 of 3:  pick how you want to auth',
+      subtitle: 'API: bring your own key  ·  CLI/Local: use what\'s already on this machine  ·  Mock: offline test',
+      items: familyItems,
+    });
+    if (picked === 'CANCEL' || picked === 'BACK') return null;
+    family = picked;
+  }
+
+  // ── Step 2 — provider in that family ──────────────────────────
+  let provider = null;
+  while (!provider) {
+    const memberNames = families[family.id].members;
+    if (memberNames.length === 1) {
+      // Auto-advance — no point making the user pick from a single
+      // row.
+      provider = { id: memberNames[0] };
+      break;
+    }
+    const provItems = memberNames.map((name) => {
+      const meta = info[name] || {};
+      const models = (meta.suggestedModels || []).slice(0, 4).join(' · ') || '(default)';
+      return {
+        id: name,
+        label: name,
+        desc: `models: ${models}`,
+        tag: meta.requiresApiKey ? '\x1b[38;5;245m[api key]\x1b[0m' : '\x1b[38;5;208m[no key]\x1b[0m',
+      };
+    });
+    const picked = await _arrowMenu({
+      title: `LazyClaw setup — Step 2 of 3:  pick a ${family.label} provider`,
+      subtitle: `Showing ${memberNames.length} ${family.label.toLowerCase()} provider(s).`,
+      items: provItems,
+    });
+    if (picked === 'CANCEL') return null;
+    if (picked === 'BACK')   { family = null; return _pickProviderInteractive(); }
+    provider = picked;
+  }
+
+  // ── Step 3 — model ────────────────────────────────────────────
+  const meta = info[provider.id] || {};
+  const models = Array.isArray(meta.suggestedModels) ? meta.suggestedModels : [];
+  if (!models.length) {
+    // Provider has no curated models (mock) — return without a
+    // model so the underlying call uses the provider default.
+    return { provider: provider.id, model: null };
+  }
+  while (true) {
+    const modelItems = models.map((m) => ({ id: m, label: m, desc: '' }));
+    // Pin the cursor to the provider's defaultModel so Enter without
+    // navigation picks the most-recommended one.
+    const defaultIdx = Math.max(0, models.indexOf(meta.defaultModel || models[0]));
+    const picked = await _arrowMenu({
+      title: `LazyClaw setup — Step 3 of 3:  pick a model for ${provider.id}`,
+      subtitle: `Showing ${models.length} suggested model(s). Type the model id directly later via /model in chat to use anything not listed here.`,
+      items: modelItems,
+      defaultIdx,
+    });
+    if (picked === 'CANCEL') return null;
+    if (picked === 'BACK')   return _pickProviderInteractive(); // back to step 1
+    return { provider: provider.id, model: picked.id };
+  }
+}
+
 async function cmdChat(flags = {}) {
   await ensureRegistry();
   const sessionsMod = await import('./sessions.mjs');
@@ -1597,13 +1745,13 @@ async function cmdChat(flags = {}) {
     terminal: useTerminal,
     prompt: useTerminal ? '\x1b[38;5;208m›\x1b[0m ' : '',
   });
-  let _disposeGhost = () => {};
+  let _ghost = { dispose: () => {}, suspend: () => {}, resume: () => {} };
   if (useTerminal) {
     // Cursor-style ghost autocomplete: when the buffer starts with `/`,
     // render the longest matching command after the cursor in dim grey.
     // Right-arrow at end-of-line accepts. Tab still cycles via the
     // existing handleSlash branch; this only adds the inline preview.
-    _disposeGhost = _attachGhostAutocomplete(rl) || (() => {});
+    _ghost = _attachGhostAutocomplete(rl) || _ghost;
     rl.prompt();
   }
 
@@ -1855,6 +2003,32 @@ async function cmdChat(flags = {}) {
       process.stdout.write('\n^C interrupted — prompt is back\n');
     };
     process.on('SIGINT', onSigint);
+    // Pause the ghost-autocomplete keypress handler while the
+    // provider is streaming. Without this, every stale stdin event
+    // would trigger `\x1b[s\x1b[K\x1b[u` cursor save/restore writes
+    // that interleave with the streamed text and surface as visible
+    // gaps between CJK characters (visible in user-reported screen
+    // captures of Korean replies).
+    if (useTerminal) _ghost.suspend();
+    // Buffered writer — coalesce single-character streaming chunks
+    // into ~30 ms windows. Two reasons:
+    //   1. Korean / Japanese / Chinese tokens often arrive as one
+    //      character per chunk. Each individual `process.stdout.write`
+    //      can race against terminal redraw on a wide-cell character,
+    //      producing the same "visible space between every character"
+    //      symptom the suspend above also addresses.
+    //   2. Far fewer syscalls. A 200-char Korean reply was ~200
+    //      separate writes; this collapses to ~7-10.
+    let _writeBuf = '';
+    let _writeTimer = null;
+    const _flush = () => {
+      if (_writeBuf) { process.stdout.write(_writeBuf); _writeBuf = ''; }
+      _writeTimer = null;
+    };
+    const _writeChunk = (s) => {
+      _writeBuf += s;
+      if (!_writeTimer) _writeTimer = setTimeout(_flush, 30);
+    };
     try {
       for await (const chunk of prov.sendMessage(messages, {
         apiKey: _resolveAuthKey(cfg, activeProvName),
@@ -1863,13 +2037,21 @@ async function cmdChat(flags = {}) {
         signal: turnAc.signal,
         onUsage: accumulateUsage,
       })) {
-        process.stdout.write(chunk);
+        _writeChunk(chunk);
         acc += chunk;
       }
+      // Drain anything still buffered before the trailing newline so
+      // the prompt lands on its own line cleanly.
+      if (_writeTimer) clearTimeout(_writeTimer);
+      _flush();
       process.stdout.write('\n');
       messages.push({ role: 'assistant', content: acc });
       persistTurn('assistant', acc);
     } catch (err) {
+      // Drain pending buffer so partial reply stays on screen even
+      // when the stream errors mid-flight.
+      if (_writeTimer) clearTimeout(_writeTimer);
+      _flush();
       // ABORT errors are user-initiated; partial assistant output is
       // discarded (we don't append a half-reply to the message history
       // because the next turn would treat it as a complete reply and
@@ -1879,6 +2061,7 @@ async function cmdChat(flags = {}) {
       }
     } finally {
       process.off('SIGINT', onSigint);
+      if (useTerminal) _ghost.resume();
     }
     if (useTerminal) rl.prompt();
   } } finally {
@@ -1886,7 +2069,7 @@ async function cmdChat(flags = {}) {
     // hung for ~3-5 s while Node waited for stdin's keypress listener
     // and raw mode to release. Tearing them down explicitly drops the
     // exit time to <100 ms.
-    try { _disposeGhost(); } catch (_) {}
+    try { _ghost.dispose(); } catch (_) {}
     try { rl.close(); } catch (_) {}
     if (useTerminal && process.stdin.isTTY && process.stdin.setRawMode) {
       try { process.stdin.setRawMode(false); } catch (_) {}
@@ -3224,16 +3407,23 @@ async function cmdSetup(_sub, _positional, flags = {}) {
   try {
     await cmdOnboard({ pick: true });
   } catch (e) {
+    // Don't kill the process — the setup wizard is often called
+    // from inside cmdLauncher's loop, and a process.exit there
+    // would close the launcher entirely (the surface bug the
+    // user reported as "Setup 누르고 엔터 누르니까 바로 꺼져").
+    // Surface the error and let the caller decide.
     process.stderr.write(`onboard error: ${e?.message || e}\n`);
-    process.exit(1);
+    return;
   }
   // Re-read config after onboard wrote it. If the user aborted with
   // no provider set, bail out early — the rest of the wizard depends
-  // on a provider being configured.
+  // on a provider being configured. `return` (not process.exit) so a
+  // launcher caller can re-prompt or fall back gracefully.
   const cfgAfterOnboard = readConfig();
   if (!cfgAfterOnboard.provider) {
-    process.stdout.write(`\n  ${warn('Setup aborted — no provider configured. Run `lazyclaw setup` again when ready.')}\n\n`);
-    process.exit(0);
+    process.stdout.write(`\n  ${warn('Setup not completed — provider was not configured.')}\n`);
+    process.stdout.write(`  ${dim('Run `lazyclaw setup` again when ready, or pick "Onboard" from the menu for a single-step picker.')}\n\n`);
+    return;
   }
   process.stdout.write(`\n  ${ok('✓ provider:')} ${cfgAfterOnboard.provider}  ${dim('model:')} ${cfgAfterOnboard.model || '(default)'}\n\n`);
 
@@ -3360,32 +3550,81 @@ async function _runFirstTimeOnboard() {
   process.stdout.write('\n');
 }
 
-async function cmdLauncher() {
-  await ensureRegistry();
-  let cfg = readConfig();
-  // First-run guard: a fresh install has no `provider` set, so any
-  // menu pick that calls a provider (Chat / Agent / Doctor / etc.)
-  // would error halfway through with a confusing "missing api key"
-  // or "unknown provider". Detect that state up front and walk the
-  // user through onboard before showing the menu — once they've
-  // picked, re-read the config and continue normally.
-  if (!cfg.provider) {
-    // Delegate to the full setup wizard rather than the bare onboard
-    // picker — first-time users benefit from the workspace / skill /
-    // ping steps too. cmdSetup exits the process on abort, so the
-    // re-read below only fires when the wizard completed successfully.
-    await cmdSetup(undefined, [], {});
-    cfg = readConfig();
-    if (!cfg.provider) {
-      process.stdout.write('\n  Setup not completed — exiting.\n  Run `lazyclaw setup` when ready, then try `lazyclaw` again.\n\n');
-      process.exit(0);
+// Marker exception used by the launcher's process.exit guard. See
+// _dispatchMenuChoice below for why intercepting process.exit is
+// the cleanest way to keep the menu loop alive.
+class _DispatchExit extends Error {
+  constructor(code) {
+    super(`subcommand requested exit ${code}`);
+    this.name = 'DispatchExit';
+    this.exitCode = Number.isFinite(code) ? code : 0;
+  }
+}
+
+// Direct dispatch from a launcher pick. Replaces the previous
+// `process.argv = [...]; await main()` round-trip so we can reuse
+// the launcher across multiple iterations without compounding
+// state.
+//
+// Subcommand functions across this CLI freely call `process.exit()`
+// to signal their result — perfectly fine for one-shot CLI use,
+// fatal to a launcher loop because the first exit kills the whole
+// process before we can redraw the menu. Intercept process.exit for
+// the duration of the dispatch and turn it into a thrown exception
+// the loop can catch + log + continue from. This mirrors how Python
+// CLI frameworks handle SystemExit when running inside a REPL.
+async function _dispatchMenuChoice(argv) {
+  const sub = argv[0];
+  const rest = argv.slice(1);
+  const realExit = process.exit.bind(process);
+  process.exit = (code) => { throw new _DispatchExit(code); };
+  try {
+    switch (sub) {
+      case 'chat':       return await cmdChat({});
+      case 'agent':      return await cmdAgent(rest[0] || '-', {});
+      case 'onboard':    return await cmdOnboard({});
+      case 'setup':      return await cmdSetup(undefined, rest, {});
+      case 'workspace':  return await cmdWorkspace(rest[0], rest.slice(1), {});
+      case 'browse':     return await cmdBrowse(rest[0], {});
+      case 'skills':     return await cmdSkills(rest[0], rest.slice(1), {});
+      case 'sessions':   return await cmdSessions(rest[0], rest.slice(1), {});
+      case 'providers':  return await cmdProviders(rest[0], rest.slice(1), {});
+      case 'cron':       return await cmdCron(rest[0], rest.slice(1), {});
+      case 'auth':       return await cmdAuth(rest[0], rest.slice(1), {});
+      case 'pairing':    return await cmdPairing(rest[0], rest.slice(1), {});
+      case 'nodes':      return await cmdNodes(rest[0], rest.slice(1), {});
+      case 'message':    return await cmdMessage(rest[0], rest.slice(1), {});
+      case 'doctor':     return await cmdDoctor();
+      case 'status':     return await cmdStatus();
+      case 'help':       return cmdHelp();
+      case 'dashboard':  return await cmdDashboard({});
+      default:           throw new Error(`unknown menu choice: ${sub}`);
+    }
+  } catch (e) {
+    if (e instanceof _DispatchExit) {
+      // Subcommand wanted to exit. Surface a non-zero code so the
+      // user knows something flagged, but DON'T propagate — we want
+      // the launcher loop to continue.
+      if (e.exitCode !== 0) {
+        process.stderr.write(`  \x1b[2m(subcommand returned exit code ${e.exitCode})\x1b[0m\n`);
+      }
+      return;
     }
+    throw e;
+  } finally {
+    process.exit = realExit;
   }
-  const provider = cfg.provider;
-  const model = cfg.model || '(default)';
+}
+
+async function cmdLauncher() {
+  await ensureRegistry();
+  // Item table is fixed across iterations — only the dispatcher and
+  // the per-iteration draw redraw on each loop tick.
   const items = [
     { id: 'chat',      label: 'Chat',          desc: 'interactive REPL with the configured provider', argv: ['chat'] },
     { id: 'agent',     label: 'Agent',         desc: 'one-shot prompt — read text and exit',           argv: ['agent'], promptForBody: true },
+    { id: 'dashboard', label: 'Dashboard',     desc: 'open the lazyclaw web UI in your browser',       argv: ['dashboard'] },
+    { id: 'setup',     label: 'Setup',         desc: 'multi-step provider / workspace / skill wizard', argv: ['setup'] },
     { id: 'onboard',   label: 'Onboard',       desc: 'pick provider / model / api-key',                argv: ['onboard'] },
     { id: 'workspace', label: 'Workspace',     desc: 'AGENTS.md / SOUL.md / TOOLS.md prompt bundles',  argv: ['workspace', 'list'] },
     { id: 'browse',    label: 'Browse',        desc: 'fetch a URL → markdown',                         argv: ['browse'], promptForUrl: true },
@@ -3396,97 +3635,131 @@ async function cmdLauncher() {
     { id: 'doctor',    label: 'Doctor',        desc: 'diagnostic — config, providers, workflows',     argv: ['doctor'] },
     { id: 'status',    label: 'Status',        desc: 'current provider / model / masked key',          argv: ['status'] },
     { id: 'help',      label: 'Help',          desc: 'one-line summary of every subcommand',           argv: ['help'] },
-    { id: 'quit',      label: 'Quit',          desc: 'exit without doing anything',                    argv: null },
+    { id: 'quit',      label: 'Quit',          desc: 'exit lazyclaw',                                  argv: null },
   ];
 
-  const readline = await import('node:readline');
-  readline.emitKeypressEvents(process.stdin);
-  if (process.stdin.setRawMode) process.stdin.setRawMode(true);
-  let idx = 0;
-
-  // Pretty header — same accent palette as _printChatBanner so
-  // returning users recognise it.
   const accent = (s) => `\x1b[38;5;208m${s}\x1b[0m`;
   const dim    = (s) => `\x1b[2m${s}\x1b[0m`;
   const bold   = (s) => `\x1b[1m${s}\x1b[0m`;
   const ok     = (s) => `\x1b[32m${s}\x1b[0m`;
   const warn   = (s) => `\x1b[33m${s}\x1b[0m`;
 
-  const draw = () => {
-    process.stdout.write('\x1b[?25l\x1b[2J\x1b[H'); // hide cursor + clear
-    _renderBanner(readVersionFromRepo()).forEach((l) => process.stdout.write(l + '\n'));
-    process.stdout.write('\n');
-    const provDisplay = provider === '(unset — pick during onboard)'
-      ? warn(provider)
-      : ok(provider);
-    process.stdout.write(`  ${dim('provider ·')} ${provDisplay}\n`);
-    process.stdout.write(`  ${dim('model    ·')} ${ok(model)}\n`);
-    process.stdout.write(`  ${dim('config   ·')} ${dim(configPath())}\n`);
-    process.stdout.write('\n');
-    process.stdout.write(`  ${dim('↑/↓ to move · Enter to select · q or Esc to quit')}\n\n`);
-
-    // Trim list to terminal height so the menu still fits when
-    // someone shrinks the window or runs in a small split pane.
-    const rowsAvail = Math.max(items.length, (process.stdout.rows || 30) - 14);
-    const fromIdx = Math.max(0, Math.min(items.length - rowsAvail, idx - Math.floor(rowsAvail / 2)));
-    const toIdx = Math.min(items.length, fromIdx + rowsAvail);
-    for (let i = fromIdx; i < toIdx; i++) {
-      const it = items[i];
-      const marker = i === idx ? accent('❯ ') : '  ';
-      const lbl = i === idx ? bold(it.label.padEnd(11)) : it.label.padEnd(11);
-      process.stdout.write(`${marker}${lbl}  ${dim(it.desc)}\n`);
+  let idx = 0;
+  // Outer loop — each iteration is one menu render → pick →
+  // dispatch round. Subcommand return drops back here and the menu
+  // is redrawn. Quit / Esc / Ctrl-C breaks the loop and returns,
+  // which lets the calling main() exit naturally (no process.exit
+  // so the buffered writer / open file descriptors close cleanly).
+  while (true) {
+    // First-run / config-missing guard: a fresh install has no
+    // `provider` set, so any menu pick that calls a provider would
+    // error halfway through. Funnel through cmdSetup before
+    // rendering the menu the first time around.
+    let cfg = readConfig();
+    if (!cfg.provider) {
+      try { await cmdSetup(undefined, [], {}); }
+      catch (e) {
+        process.stderr.write(`setup error: ${e?.message || e}\n`);
+      }
+      cfg = readConfig();
+      if (!cfg.provider) {
+        process.stdout.write('\n  Setup not completed — exiting.\n  Run `lazyclaw setup` when ready, then try `lazyclaw` again.\n\n');
+        return;
+      }
     }
-    process.stdout.write('\n');
-  };
+    const provider = cfg.provider;
+    const model = cfg.model || '(default)';
 
-  // Tear down raw mode + listeners cleanly so the next subcommand
-  // starts with a sane stdin (otherwise `chat` after launcher inherits
-  // the launcher's raw mode and behaves weirdly).
-  const teardown = (onKey) => {
-    if (onKey) process.stdin.off('keypress', onKey);
-    if (process.stdin.setRawMode) process.stdin.setRawMode(false);
-    process.stdout.write('\x1b[?25h'); // show cursor
-    process.stdout.write('\x1b[2J\x1b[H'); // clear screen
-  };
-
-  draw();
-  const picked = await new Promise((resolve) => {
-    const onKey = (_str, key) => {
-      if (!key) return;
-      if (key.name === 'up')        { idx = (idx - 1 + items.length) % items.length; draw(); }
-      else if (key.name === 'down') { idx = (idx + 1) % items.length; draw(); }
-      else if (key.name === 'home') { idx = 0; draw(); }
-      else if (key.name === 'end')  { idx = items.length - 1; draw(); }
-      else if (key.name === 'pageup')   { idx = Math.max(0, idx - 5); draw(); }
-      else if (key.name === 'pagedown') { idx = Math.min(items.length - 1, idx + 5); draw(); }
-      else if (key.name === 'return')   { teardown(onKey); resolve(items[idx]); }
-      else if (key.ctrl && key.name === 'c') { teardown(onKey); resolve({ id: 'quit', argv: null }); }
-      else if (key.name === 'escape' || key.name === 'q') { teardown(onKey); resolve({ id: 'quit', argv: null }); }
+    // Re-establish stdin in raw / ref'd mode. A previous iteration
+    // (e.g. `chat`) deliberately paused + unref'd stdin in its
+    // exit-cleanup path so the process could end on /exit; now that
+    // we want to keep going, re-attach.
+    const readline = await import('node:readline');
+    readline.emitKeypressEvents(process.stdin);
+    if (process.stdin.setRawMode) process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.ref();
+
+    const draw = () => {
+      process.stdout.write('\x1b[?25l\x1b[2J\x1b[H'); // hide cursor + clear
+      _renderBanner(readVersionFromRepo()).forEach((l) => process.stdout.write(l + '\n'));
+      process.stdout.write('\n');
+      process.stdout.write(`  ${dim('provider ·')} ${ok(provider)}\n`);
+      process.stdout.write(`  ${dim('model    ·')} ${ok(model)}\n`);
+      process.stdout.write(`  ${dim('config   ·')} ${dim(configPath())}\n`);
+      process.stdout.write('\n');
+      process.stdout.write(`  ${dim('↑/↓ to move · Enter to select · q or Esc to quit')}\n\n`);
+      const rowsAvail = Math.max(items.length, (process.stdout.rows || 30) - 14);
+      const fromIdx = Math.max(0, Math.min(items.length - rowsAvail, idx - Math.floor(rowsAvail / 2)));
+      const toIdx = Math.min(items.length, fromIdx + rowsAvail);
+      for (let i = fromIdx; i < toIdx; i++) {
+        const it = items[i];
+        const marker = i === idx ? accent('❯ ') : '  ';
+        const lbl = i === idx ? bold(it.label.padEnd(11)) : it.label.padEnd(11);
+        process.stdout.write(`${marker}${lbl}  ${dim(it.desc)}\n`);
+      }
+      process.stdout.write('\n');
     };
-    process.stdin.on('keypress', onKey);
-  });
 
-  if (!picked || !picked.argv) {
-    process.exit(0);
+    draw();
+    const picked = await new Promise((resolve) => {
+      const onKey = (_str, key) => {
+        if (!key) return;
+        if (key.name === 'up')        { idx = (idx - 1 + items.length) % items.length; draw(); }
+        else if (key.name === 'down') { idx = (idx + 1) % items.length; draw(); }
+        else if (key.name === 'home') { idx = 0; draw(); }
+        else if (key.name === 'end')  { idx = items.length - 1; draw(); }
+        else if (key.name === 'pageup')   { idx = Math.max(0, idx - 5); draw(); }
+        else if (key.name === 'pagedown') { idx = Math.min(items.length - 1, idx + 5); draw(); }
+        else if (key.name === 'return')   { cleanup(); resolve(items[idx]); }
+        else if (key.ctrl && key.name === 'c') { cleanup(); resolve({ id: 'quit', argv: null }); }
+        else if (key.name === 'escape' || key.name === 'q') { cleanup(); resolve({ id: 'quit', argv: null }); }
+        function cleanup() {
+          process.stdin.off('keypress', onKey);
+          if (process.stdin.setRawMode) process.stdin.setRawMode(false);
+          process.stdout.write('\x1b[?25h\x1b[2J\x1b[H');
+        }
+      };
+      process.stdin.on('keypress', onKey);
+    });
+
+    if (!picked || picked.id === 'quit' || !picked.argv) {
+      // Plain return so main() can exit naturally.
+      return;
+    }
+
+    // Two menu items need a follow-up question before they can run:
+    // agent (prompt body), browse (URL). Ask once, then dispatch.
+    let argv = picked.argv;
+    if (picked.promptForBody) {
+      const body = await _quickPrompt('prompt: ');
+      if (!body) continue; // back to menu
+      argv = ['agent', body];
+    } else if (picked.promptForUrl) {
+      const url = await _quickPrompt('url: ');
+      if (!url) continue; // back to menu
+      argv = ['browse', url];
+    }
+
+    // Dispatch. Errors don't terminate the launcher — they're
+    // surfaced as a stderr line and the menu redraws. Lets the
+    // user recover from a transient API hiccup without a relaunch.
+    try {
+      await _dispatchMenuChoice(argv);
+    } catch (e) {
+      process.stderr.write(`\n  ${accent('✗')} ${e?.message || String(e)}\n`);
+    }
+
+    // Pause before re-drawing so the user can read the subcommand's
+    // output. `chat` is the special case: its REPL has already kept
+    // the user oriented for a long session, and they typed /exit
+    // explicitly, so jumping straight back to the menu reads as
+    // "ok, done with that conversation, back to the dashboard."
+    if (picked.id !== 'chat') {
+      process.stdout.write('\n');
+      await _quickPrompt(`  ${dim('Press Enter to return to the menu… ')}`);
+    }
   }
-  // Two surfaces need a follow-up question before they can run:
-  // - `agent`: needs a prompt body
-  // - `browse`: needs a URL
-  // Ask via a simple readline prompt so the launcher stays
-  // self-contained instead of forwarding into a half-typed argv.
-  if (picked.promptForBody) {
-    const body = await _quickPrompt('prompt: ');
-    if (!body) process.exit(0);
-    picked.argv = ['agent', body];
-  } else if (picked.promptForUrl) {
-    const url = await _quickPrompt('url: ');
-    if (!url) process.exit(0);
-    picked.argv = ['browse', url];
-  }
-  // Replace argv and re-enter main(). The chosen subcommand sees
-  // the same parser surface as if the user had typed it directly.
-  process.argv = [process.argv[0], process.argv[1], ...picked.argv];
-  await main();
 }
 
 async function _quickPrompt(label) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lazyclaw",
-  "version": "3.99.6",
+  "version": "3.99.9",
   "description": "Lazy, elegant terminal CLI for chatting with Claude / OpenAI / Gemini / Ollama and orchestrating multi-step LLM workflows. Banner-on-launch, slash-command ghost autocomplete, persistent sessions, local HTTP gateway.",
   "keywords": [
     "claude",