lazyclaw 6.7.0 → 6.9.0

package/commands/chat.mjs

@@ -11,6 +11,7 @@ import {
 } from '../lib/config.mjs';
 import { ensureRegistry, requireRegistry, getRegistry } from '../lib/registry_boot.mjs';
 import { SUBCOMMANDS, parseArgs, AGENT_REG_SUBS } from '../lib/args.mjs';
+import { LAZYCLAW_META_GUARD } from '../lib/nl_config_command.mjs';
 import {
   _attachGhostAutocomplete, _fetchModelsForProvider,
   _pickProviderInteractive, _printChatBanner,
@@ -176,7 +177,7 @@ export async function cmdChat(flags = {}) {
         } catch (err) { console.error(`skill error: ${err.message}`); process.exit(2); }
       }
       if (_inkSysParts.length && !_inkMessages.some((m) => m.role === 'system')) {
-        const merged = _inkSysParts.join('\n\n---\n\n');
+        const merged = [..._inkSysParts, LAZYCLAW_META_GUARD].join('\n\n---\n\n');
         _inkMessages.unshift({ role: 'system', content: merged });
         if (_inkSessionId) sessionsMod.appendTurn(_inkSessionId, 'system', merged, _inkCfgDir);
       }
@@ -219,6 +220,7 @@ export async function cmdChat(flags = {}) {
         setMessages: (next) => { _inkMessages = Array.isArray(next) ? next : []; },
         getProv: () => prov,
         setProv: (next) => { prov = wrapInteractiveProv(next); },
+        lookupProv,
         getActiveProvName: () => activeProvName,
         // Persist provider/model picks so they survive a restart (was
         // in-memory only — a model chosen via /model reverted to cfg.model on
@@ -455,7 +457,7 @@ export async function cmdChat(flags = {}) {
     }
   }
   if (sysParts.length && !messages.some(m => m.role === 'system')) {
-    const merged = sysParts.join('\n\n---\n\n');
+    const merged = [...sysParts, LAZYCLAW_META_GUARD].join('\n\n---\n\n');
     messages.unshift({ role: 'system', content: merged });
     if (sessionId) sessionsMod.appendTurn(sessionId, 'system', merged, cfgDir);
   }
@@ -651,11 +653,8 @@ export async function cmdChat(flags = {}) {
 // listener from a previous run doesn't crash the launch with EADDRINUSE.
 // Mirrors the Python server's auto-kill behaviour described in CLAUDE.md.
 
-
-
 // sandbox subcommands — list/test/add/use (Phase D).
 
-
 // Interactive launcher — fired when the user types `lazyclaw` with
 // no subcommand AND we're attached to a TTY. OpenClaw's launcher
 // pattern: ASCII banner + provider/model status + arrow-key menu of

package/commands/setup.mjs

@@ -12,6 +12,9 @@ import {
 } from '../lib/config.mjs';
 import { ensureRegistry, requireRegistry, getRegistry } from '../lib/registry_boot.mjs';
 import { SUBCOMMANDS, parseArgs, AGENT_REG_SUBS } from '../lib/args.mjs';
+import { runPermissionStep } from './setup_permission.mjs';
+import { runWizardSteps } from '../tui/wizard_back.mjs';
+import { promptWithBack } from '../tui/prompt_back.mjs';
 import {
   _attachGhostAutocomplete, _fetchModelsForProvider, _pauseChatForSubMenu,
   _pickModelInteractive, _pickProviderInteractive, _printChatBanner,
@@ -94,10 +97,6 @@ export async function cmdOnboard(flags) {
   console.log(JSON.stringify({ ok: true, written: configPath(), provider: next.provider, model: next.model || null, hasApiKey: !!next['api-key'] }));
 }
 
-
-
-
-
 export function cmdHelp(name) {
   if (!name) {
     process.stdout.write('lazyclaw — terminal AI assistant + workflow engine\n\n');
@@ -118,8 +117,6 @@ export function cmdHelp(name) {
   process.stdout.write(detail + '\n');
 }
 
-
-
 export async function cmdSetup(_sub, _positional, flags = {}) {
   await ensureRegistry();
   const accent = (s) => `\x1b[38;2;217;179;90m${s}\x1b[0m`;
@@ -175,9 +172,13 @@ export async function cmdSetup(_sub, _positional, flags = {}) {
   }
   process.stdout.write(`\n  ${ok('✓ provider:')} ${cfgAfterOnboard.provider}  ${dim('model:')} ${cfgAfterOnboard.model || '(default)'}\n\n`);
 
-  // Context window — asked right after the model pick (optional; Enter keeps
-  // defaults). Not a numbered step: it's part of the core model setup.
-  await runContextStep({ prompt: _quickPrompt, colors });
+  // Context window + tool-permission mode — core chat setup, looped so Esc on
+  // permission goes back one step to the context window (and Esc on the custom
+  // entries goes back too). Part of the model setup, not numbered steps.
+  const _backPrompt = (label) => promptWithBack(label);
+  await runWizardSteps(['context', 'permission'], (id) => (id === 'context'
+    ? runContextStep({ prompt: _quickPrompt, backPrompt: _backPrompt, colors })
+    : runPermissionStep({ prompt: _quickPrompt, backPrompt: _backPrompt, colors, cfg: cfgAfterOnboard })));
   }
 
   // ── Step 2/7: Verify one clean chat works ───────────────────
@@ -703,4 +704,3 @@ export async function cmdLauncher() {
   process.exit(0);
 }
 
-

package/commands/setup_channels.mjs

@@ -303,10 +303,12 @@ export async function runWebhookStep({ prompt, colors, write = (s) => process.st
 // Context-window step (asked right after the model pick): how much past
 // conversation to keep each turn — a sliding history budget, NOT the model's
 // hard limit. Enter on both prompts keeps the defaults.
-export async function runContextStep({ prompt, colors, write = (s) => process.stdout.write(s) }) {
+// Returns 'BACK' (Esc) / 'NEXT' for the wizard back-loop. backPrompt
+// (promptWithBack) makes Esc reachable on the custom number entry.
+export async function runContextStep({ prompt, backPrompt, colors, write = (s) => process.stdout.write(s) }) {
   const { dim, ok } = colors;
   const cf = await import('../config_features.mjs');
-  const { _pickChoice } = await import('../tui/pickers.mjs');
+  const { _arrowMenu } = await import('../tui/pickers.mjs');
   const cur = cf.chatWindowGet(readConfig());
   write(`  ${dim(`Context window — how much past conversation to send each turn (sliding budget, not the model's hard limit). Now: ${cur.turns} turns · ${cur.tokens} tokens.`)}\n\n`);
   // Pick a preset (or "custom" → type the two numbers). Presets cover the
@@ -318,12 +320,23 @@ export async function runContextStep({ prompt, colors, write = (s) => process.st
     { id: 'large', label: 'Large — 80 turns · 32k tokens', desc: 'more context, costs more', turns: 80, tokens: 32000 },
     { id: 'custom', label: 'Custom…', desc: 'type your own turns + token budget' },
   ];
-  const choice = await _pickChoice('Context window', PRESETS, { subtitle: 'how much past conversation to send each turn', fallback: 'keep' });
-  if (choice === 'keep') { write(`  ${dim('— kept defaults —')}\n\n`); return { skipped: true }; }
+  // _arrowMenu (not _pickChoice) so Esc is distinguishable as BACK, not folded
+  // into the "keep" fallback.
+  const picked = await _arrowMenu({ title: 'Context window', subtitle: 'Esc to go back · how much past conversation to send each turn', items: PRESETS });
+  if (picked === 'BACK') return 'BACK';
+  const choice = (picked === 'CANCEL' || picked == null) ? 'keep' : (typeof picked === 'object' ? picked.id : picked);
+  if (choice === 'keep') { write(`  ${dim('— kept defaults —')}\n\n`); return 'NEXT'; }
   let turns, tokens;
   if (choice === 'custom') {
-    turns = parseInt((await prompt(`  turns to keep (Enter = ${cur.turns}): `)).trim(), 10);
-    tokens = parseInt((await prompt(`  token budget (Enter = ${cur.tokens}): `)).trim(), 10);
+    if (typeof backPrompt === 'function') {
+      const t = await backPrompt(`  turns to keep (Esc = back · Enter = ${cur.turns}): `); if (t && t.back) return 'BACK';
+      const k = await backPrompt(`  token budget (Esc = back · Enter = ${cur.tokens}): `); if (k && k.back) return 'BACK';
+      turns = parseInt(String((t && t.value) || '').trim(), 10);
+      tokens = parseInt(String((k && k.value) || '').trim(), 10);
+    } else {
+      turns = parseInt((await prompt(`  turns to keep (Enter = ${cur.turns}): `)).trim(), 10);
+      tokens = parseInt((await prompt(`  token budget (Enter = ${cur.tokens}): `)).trim(), 10);
+    }
   } else {
     const p = PRESETS.find((x) => x.id === choice);
     turns = p ? p.turns : NaN;
@@ -338,7 +351,7 @@ export async function runContextStep({ prompt, colors, write = (s) => process.st
   const w = cf.chatWindowGet(cfg);
   write(`  ${ok('✓ context window:')} ${w.turns} turns · ${w.tokens} tokens\n`);
   write(`  ${dim('change later: /context turns <N> | tokens <N>')}\n\n`);
-  return { skipped: false, ...w };
+  return 'NEXT';
 }
 
 // Optional orchestration step: enable the multi-agent planner+workers pipeline.

package/commands/setup_permission.mjs

@@ -0,0 +1,45 @@
+// commands/setup_permission.mjs — the setup-wizard "tool permissions" step,
+// extracted from commands/setup.mjs to stay under the file-size gate (D8) and
+// to match the other modular steps (runContextStep / runChannelStep / …).
+//
+// Asks how the claude-cli agent should handle tool permissions and stores the
+// choice at cfg.chat.permissionMode. lib/permission_mode.resolvePermissionMode
+// reads it for every claude spawn; unset defaults to bypass (no nagging).
+//
+// Returns 'BACK' when the user pressed Esc (the wizard re-runs the previous
+// step), else 'NEXT'. A `backPrompt` (tui/prompt_back.promptWithBack) makes Esc
+// reachable; without it we fall back to the plain string `prompt` (no Esc).
+
+import { readConfig, writeConfig } from '../lib/config.mjs';
+import { parsePermissionChoice } from '../lib/permission_mode.mjs';
+
+export async function runPermissionStep({ prompt, backPrompt, colors, cfg } = {}) {
+  const accent = (colors && colors.accent) || ((s) => s);
+  const dim = (colors && colors.dim) || ((s) => s);
+  const ok = (colors && colors.ok) || ((s) => s);
+  const provider = String((cfg || readConfig()).provider || '');
+  // Only relevant to the claude-cli agent path (the one that spawns `claude`).
+  if (!/claude/.test(provider)) return 'NEXT';
+
+  process.stdout.write(`  ${dim('Tool permissions — when the agent edits files or runs commands:')}\n`);
+  process.stdout.write(`  ${dim('    bypass = never ask (fast) · ask = prompt each time · acceptEdits = auto-accept edits only · plan = read-only')}\n`);
+  const label = `  ${accent('permission')} [bypass/ask/acceptEdits/plan] ${dim('(Esc = back · Enter = bypass)')}: `;
+  let answer;
+  if (typeof backPrompt === 'function') {
+    const r = await backPrompt(label);
+    if (r && r.back) return 'BACK';
+    answer = r ? r.value : '';
+  } else {
+    answer = await prompt(label);
+  }
+  const mode = parsePermissionChoice(answer);
+  if (mode) {
+    const c = readConfig();
+    c.chat = { ...(c.chat || {}), permissionMode: mode };
+    writeConfig(c);
+    process.stdout.write(`  ${ok('✓ permission mode:')} ${mode}\n\n`);
+  } else {
+    process.stdout.write(`  ${dim('(unrecognised — kept the current setting)')}\n\n`);
+  }
+  return 'NEXT';
+}

package/lib/nl_config_command.mjs

@@ -0,0 +1,122 @@
+// lib/nl_config_command.mjs — turn a few high-signal natural-language requests
+// into REAL lazyclaw config changes, so the chat model can't just reply
+// "done" without anything happening (the user's bug: orchestrator on/off and
+// planner/worker model swaps typed in chat were hallucinated as success).
+//
+// Deliberately CONSERVATIVE — it must never hijack a genuine chat turn. It only
+// fires on short, imperative messages that clearly name a setting + an action,
+// and bails on anything that looks like a question. Everything it doesn't catch
+// falls through to the model (where the system-prompt honesty guard tells it to
+// point at the real command instead of claiming success).
+
+import { resolveModelAlias } from '../providers/claude_cli.mjs';
+import { orchestratorGet, orchestratorSet, orchestratorEnable } from '../config_features.mjs';
+
+// Appended to the chat system prompt (when one exists) so the model stops
+// claiming it changed a setting it can't reach. The common orchestrator on/off
+// and planner/worker swaps ARE applied for real by detectConfigCommand above;
+// everything else must be redirected to a command, not faked.
+export const LAZYCLAW_META_GUARD =
+  'You are running inside the lazyclaw CLI. You CANNOT change lazyclaw\'s own configuration ' +
+  '(provider, orchestrator planner/workers, models, agents, teams) from this chat — you have no tool for it. ' +
+  'If the user asks you to change a setting, do NOT claim you did it. Instead give the exact command: ' +
+  '`/orchestrator off | planner <provider:model> | worker add <provider:model>`, `lazyclaw agent add …`, ' +
+  '`lazyclaw team …`, or `lazyclaw config set <key> <value>`. ' +
+  '(Plain-language orchestrator on/off and planner/worker model changes are applied automatically — others are not.)';
+
+const ORCH = /오케스트라|오케스트레이터|오케스트레이션|orchestrat/i;
+const OFF = /\boff\b|\bdisable\b|끄|꺼|비활성/i;
+const ON = /\bon\b|\benable\b|켜|활성/i;
+const KO_MODEL = [['소넷', 'sonnet'], ['쏘넷', 'sonnet'], ['하이쿠', 'haiku'], ['오퍼스', 'opus'], ['오푸스', 'opus']];
+const MODEL_TOKEN = /\b(opus|sonnet|haiku|gpt-?[0-9][\w.-]*|gemini-?[0-9][\w.-]*|o[0-9]|claude-[a-z0-9-]+)\b/i;
+
+// Questions / explanations must pass straight through to the model.
+function looksLikeQuestion(t) {
+  return /[?？]/.test(t) ||
+    /(법|방법|어떻게|어케|뭐|무엇|설명|알려|차이|왜|how\b|what\b|why\b|explain|difference|\bvs\b)/i.test(t);
+}
+
+function extractModel(t) {
+  for (const [ko, en] of KO_MODEL) if (t.includes(ko)) return en;
+  const m = MODEL_TOKEN.exec(t);
+  if (!m) return null;
+  const tok = m[1].toLowerCase();
+  return resolveModelAlias(tok) || tok;
+}
+
+// Returns an intent object or null. Intents:
+//   { kind: 'orchestrator', enable: boolean }
+//   { kind: 'planner'|'worker', model: string }
+export function detectConfigCommand(text) {
+  const t = String(text || '').trim();
+  if (!t || t.length > 80) return null;       // long → a real task, not a command
+  if (looksLikeQuestion(t)) return null;
+
+  if (ORCH.test(t)) {
+    if (OFF.test(t)) return { kind: 'orchestrator', enable: false }; // 비활성 → off (checked first)
+    if (ON.test(t)) return { kind: 'orchestrator', enable: true };
+  }
+
+  const wantsPlanner = /플래너|planner/i.test(t);
+  const wantsWorker = /워커|worker/i.test(t);
+  if (wantsPlanner && wantsWorker) return null;  // ambiguous — do them in separate messages
+  if (wantsPlanner || wantsWorker) {
+    const model = extractModel(t);
+    if (model) return { kind: wantsPlanner ? 'planner' : 'worker', model };
+  }
+  return null;
+}
+
+const provOf = (spec) => {
+  const s = String(spec || '');
+  return s.includes(':') ? s.split(':')[0] : (s || 'claude-cli');
+};
+
+// Apply a detected intent for real. deps: { readConfig, writeConfig, ctxCfg? }.
+// Returns a short confirmation string to show the user.
+export function applyConfigCommand(intent, deps) {
+  const cfg = deps.readConfig();
+  const syncCtx = () => {
+    if (deps.ctxCfg) { deps.ctxCfg.provider = cfg.provider; deps.ctxCfg.orchestrator = cfg.orchestrator; }
+  };
+
+  if (intent.kind === 'orchestrator') {
+    orchestratorEnable(cfg, intent.enable);
+    deps.writeConfig(cfg); syncCtx();
+    return intent.enable
+      ? '✓ Orchestrator ON — chats route through planner + workers. Set models with `/orchestrator planner <provider:model>` and `/orchestrator worker add <provider:model>`.'
+      : `✓ Orchestrator off — chats route to \`${cfg.provider}\`.`;
+  }
+
+  const o = orchestratorGet(cfg);
+  if (intent.kind === 'planner') {
+    const spec = `${provOf(o.planner)}:${intent.model}`;
+    orchestratorSet(cfg, { planner: spec });
+    deps.writeConfig(cfg); syncCtx();
+    return `✓ Planner → \`${spec}\`.`;
+  }
+  // worker — set the workers list to the chosen model (preserves the provider).
+  const spec = `${provOf((o.workers && o.workers[0]) || o.planner)}:${intent.model}`;
+  orchestratorSet(cfg, { workers: [spec] });
+  deps.writeConfig(cfg); syncCtx();
+  return `✓ Workers → [\`${spec}\`].`;
+}
+
+// After an orchestrator on/off flips cfg.provider, re-point the REPL's LIVE
+// provider state from cfg — otherwise the status bar AND the next turn keep
+// using the old provider (the bug: "orchestrator off" but it still replies as
+// orchestrator). The HUD reads activeProvName and run_turn reads ctx.getProv(),
+// neither of which follows cfg.provider on its own. Best-effort; safe to call
+// from any host (missing setters are skipped).
+export function refreshLiveProvider(ctx) {
+  if (!ctx || !ctx.cfg) return;
+  const name = ctx.cfg.provider;
+  if (!name) return;
+  try { if (typeof ctx.setActiveProvName === 'function') ctx.setActiveProvName(name); } catch { /* ignore */ }
+  try {
+    const lookup = ctx.lookupProv || (ctx.registryMod && ((n) => ctx.registryMod.PROVIDERS && ctx.registryMod.PROVIDERS[n]));
+    const p = lookup && lookup(name);
+    if (p && typeof ctx.setProv === 'function') ctx.setProv(p);
+  } catch { /* ignore */ }
+  try { if (typeof ctx.setActiveModel === 'function') ctx.setActiveModel(ctx.cfg.model || null); } catch { /* ignore */ }
+}

package/lib/permission_mode.mjs

@@ -0,0 +1,36 @@
+// lib/permission_mode.mjs — the claude-cli permission mode lazyclaw passes to
+// the spawned `claude` (`--permission-mode <mode>`).
+//
+// lazyclaw is an autonomous-agent CLI: the agentic / team path already runs the
+// agent with bypassPermissions so it doesn't stop to ask before every tool. The
+// interactive chat path historically passed no flag, so claude fell back to its
+// own "default" mode and prompted on each tool — annoying when you just want it
+// to run. This centralises the choice: `cfg.chat.permissionMode` (asked at
+// setup) drives every claude spawn; unset defaults to bypassPermissions so the
+// out-of-the-box experience doesn't nag. Cautious users pick 'default' (prompt
+// each time), 'acceptEdits' (auto-accept edits, prompt for the rest), or 'plan'.
+
+export const PERMISSION_MODES = ['default', 'acceptEdits', 'bypassPermissions', 'plan'];
+
+export const DEFAULT_PERMISSION_MODE = 'bypassPermissions';
+
+// Resolve the effective mode from config. An unset or unrecognised value falls
+// back to the default rather than handing claude an invalid --permission-mode.
+export function resolvePermissionMode(cfg) {
+  const m = cfg && cfg.chat && cfg.chat.permissionMode;
+  return PERMISSION_MODES.includes(m) ? m : DEFAULT_PERMISSION_MODE;
+}
+
+// Map a setup-wizard answer to a permission mode. Empty (Enter) → the default
+// (bypass). Returns null for an unrecognised answer so the caller can keep the
+// current value rather than guess.
+const CHOICE_MAP = {
+  '': DEFAULT_PERMISSION_MODE, bypass: 'bypassPermissions', b: 'bypassPermissions',
+  ask: 'default', default: 'default', d: 'default', prompt: 'default',
+  acceptedits: 'acceptEdits', accept: 'acceptEdits', edits: 'acceptEdits', e: 'acceptEdits',
+  plan: 'plan', p: 'plan',
+};
+export function parsePermissionChoice(answer) {
+  const k = String(answer ?? '').trim().toLowerCase();
+  return Object.prototype.hasOwnProperty.call(CHOICE_MAP, k) ? CHOICE_MAP[k] : null;
+}

package/package.json

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

package/providers/claude_cli.mjs

@@ -142,6 +142,10 @@ export function buildArgs(prompt, opts = {}) {
   const maxTurns = opts.maxTurns == null ? 1 : opts.maxTurns;
   if (maxTurns > 0) args.push('--max-turns', String(maxTurns));
   args.push('--tools', opts.tools == null ? '' : String(opts.tools));
+  // Permission mode (e.g. bypassPermissions) so the agent doesn't stop to ask
+  // before every tool. Only emitted when set — the caller centralises the
+  // default via lib/permission_mode.resolvePermissionMode.
+  if (opts.permissionMode) args.push('--permission-mode', String(opts.permissionMode));
   const modelAlias = resolveModelAlias(opts.model);
   if (modelAlias) args.push('--model', modelAlias);
   return args;
@@ -174,7 +178,7 @@ export const claudeCliProvider = {
         const { getSession } = await import('./claude_cli_session.mjs');
         const session = getSession(opts.sessionKey, {
           bin, model: opts.model, cwd: opts.cwd, lean: opts.lean,
-          maxTurns: opts.maxTurns, tools: opts.tools,
+          maxTurns: opts.maxTurns, tools: opts.tools, permissionMode: opts.permissionMode,
           system: opts.sessionSystem || opts.system || messages.find((m) => m.role === 'system')?.content,
         });
         let yielded = false;

package/providers/claude_cli_session.mjs

@@ -52,6 +52,7 @@ class ClaudeSession {
     const mt = o.maxTurns == null ? 1 : o.maxTurns;
     if (mt > 0) args.push('--max-turns', String(mt));
     args.push('--tools', o.tools == null ? '' : String(o.tools));
+    if (o.permissionMode) args.push('--permission-mode', String(o.permissionMode));
     const model = resolveModelAlias(o.model);
     if (model) args.push('--model', model);
     if (o.system && String(o.system).trim()) args.push('--append-system-prompt', String(o.system));

package/tui/pickers.mjs

@@ -499,84 +499,82 @@ export async function _pickProviderInteractive() {
   }
 
   // ── Step 2 — provider in that family ──────────────────────────
-  let provider = null;
-  while (!provider) {
-    const memberNames = families[family.id].members;
-    const provItems = memberNames.map((name) => {
-      const meta = info[name] || {};
-      const isCustom = !!meta.custom;
-      const isBuiltinCompat = !!meta.builtinOpenAICompat;
-      // Step-2 desc used to preview four suggested model ids per provider.
-      // That made the row read like "gemini · models: gemini-2.5-pro ·
-      // gemini-2.5-flash · gemini-2.0-flash · gemini-2.0-flash-thinking-exp",
-      // which is too dense and partly redundant — step 3 already shows the
-      // full curated list. Keep the row to a vendor label + endpoint hint.
-      let desc = '';
-      if (isCustom) desc = `custom · ${meta.baseUrl || ''}`;
-      else if (isBuiltinCompat) desc = meta.label || meta.baseUrl || '';
-      else if (meta.label && meta.label !== name) desc = meta.label;
-      return {
-        id: name,
-        label: name,
-        desc,
-        tag: isCustom
-          ? paint('38;5;213', '[custom]')
-          : (meta.requiresApiKey ? paint('38;5;245', '[api key]') : paint('38;5;208', '[no key]')),
-      };
-    });
-    // Surface a "+ Add a new custom endpoint…" entry inside the API-key
-    // family. NIM, OpenRouter, vLLM, LM Studio, Together, Groq, etc. all
-    // speak the OpenAI Chat-Completions wire format — this single hook
-    // covers every one of them without shipping a per-vendor provider.
-    if (family.id === 'api') {
-      provItems.push({
-        id: '__add_custom__',
-        label: '+ Add a custom OpenAI-compatible endpoint…',
-        desc: 'NVIDIA NIM · OpenRouter · Together · Groq · vLLM · LM Studio · …',
-        tag: paint('38;5;213', '[new]'),
+  for (;;) {  // loop Steps 2+3: Esc in Step 3 returns to Step 2, not Step 1
+    let provider = null;
+    while (!provider) {
+      const memberNames = families[family.id].members;
+      const provItems = memberNames.map((name) => {
+        const meta = info[name] || {};
+        const isCustom = !!meta.custom;
+        const isBuiltinCompat = !!meta.builtinOpenAICompat;
+        // Step-2 row: vendor label + endpoint hint only (Step 3 shows models).
+        let desc = '';
+        if (isCustom) desc = `custom · ${meta.baseUrl || ''}`;
+        else if (isBuiltinCompat) desc = meta.label || meta.baseUrl || '';
+        else if (meta.label && meta.label !== name) desc = meta.label;
+        return {
+          id: name,
+          label: name,
+          desc,
+          tag: isCustom
+            ? paint('38;5;213', '[custom]')
+            : (meta.requiresApiKey ? paint('38;5;245', '[api key]') : paint('38;5;208', '[no key]')),
+        };
       });
+      // Surface a "+ Add a new custom endpoint…" entry inside the API-key
+      // family. NIM, OpenRouter, vLLM, LM Studio, Together, Groq, etc. all
+      // speak the OpenAI Chat-Completions wire format — this single hook
+      // covers every one of them without shipping a per-vendor provider.
+      if (family.id === 'api') {
+        provItems.push({
+          id: '__add_custom__',
+          label: '+ Add a custom OpenAI-compatible endpoint…',
+          desc: 'NVIDIA NIM · OpenRouter · Together · Groq · vLLM · LM Studio · …',
+          tag: paint('38;5;213', '[new]'),
+        });
+      }
+      if (memberNames.length === 1 && family.id !== 'api') {
+        // Auto-advance — no point making the user pick from a single row,
+        // unless we just appended the "+ Add custom" entry above.
+        provider = { id: memberNames[0] };
+        break;
+      }
+      const picked = await _arrowMenu({
+        title: `LazyClaw setup — Step 2 of 3:  pick a ${family.label} provider`,
+        subtitle: `Showing ${provItems.length} ${family.label.toLowerCase()} option(s). Type to filter.`,
+        items: provItems,
+        searchable: true,
+      });
+      if (picked === 'CANCEL') return null;
+      if (picked === 'BACK')   { family = null; return _pickProviderInteractive(); }
+      if (picked && picked.id === '__add_custom__') {
+        const added = await _addCustomProviderInteractive();
+        if (!added) continue; // back to provider list
+        // Force the registry to pick up the new entry and recompute the
+        // family bucket for the next loop iteration.
+        await ensureRegistry();
+        Object.assign(families, _providerFamilies());
+        provider = { id: added.name };
+        break;
+      }
+      provider = picked;
     }
-    if (memberNames.length === 1 && family.id !== 'api') {
-      // Auto-advance — no point making the user pick from a single row,
-      // unless we just appended the "+ Add custom" entry above.
-      provider = { id: memberNames[0] };
-      break;
-    }
-    const picked = await _arrowMenu({
-      title: `LazyClaw setup — Step 2 of 3:  pick a ${family.label} provider`,
-      subtitle: `Showing ${provItems.length} ${family.label.toLowerCase()} option(s). Type to filter.`,
-      items: provItems,
-      searchable: true,
+
+    // ── Step 3 — model picker ────────────────────────────────────────
+    // v5.3.2 — the setup wizard no longer surfaces composite providers
+    // (orchestrator is filtered out of _providerFamilies above), so this
+    // step is just the regular model picker. The orchestrator wizard
+    // (_setupOrchestratorInteractive) stays reachable via the dedicated
+    // `lazyclaw orchestrator …` subcommand and an explicit
+    // `--provider orchestrator` invocation.
+    const picked = await _pickModelInteractive(provider.id, {
+      titlePrefix: 'LazyClaw setup — Step 3 of 3:',
+      onBack: 'restart',
     });
     if (picked === 'CANCEL') return null;
-    if (picked === 'BACK')   { family = null; return _pickProviderInteractive(); }
-    if (picked && picked.id === '__add_custom__') {
-      const added = await _addCustomProviderInteractive();
-      if (!added) continue; // back to provider list
-      // Force the registry to pick up the new entry and recompute the
-      // family bucket for the next loop iteration.
-      await ensureRegistry();
-      Object.assign(families, _providerFamilies());
-      provider = { id: added.name };
-      break;
-    }
-    provider = picked;
+    if (picked === 'BACK')   continue; // Esc in Step 3 -> back to Step 2 (one step)
+    return { provider: provider.id, model: picked };
   }
-
-  // ── Step 3 — model picker ────────────────────────────────────────
-  // v5.3.2 — the setup wizard no longer surfaces composite providers
-  // (orchestrator is filtered out of _providerFamilies above), so this
-  // step is just the regular model picker. The orchestrator wizard
-  // (_setupOrchestratorInteractive) stays reachable via the dedicated
-  // `lazyclaw orchestrator …` subcommand and an explicit
-  // `--provider orchestrator` invocation.
-  const picked = await _pickModelInteractive(provider.id, {
-    titlePrefix: 'LazyClaw setup — Step 3 of 3:',
-    onBack: 'restart',
-  });
-  if (picked === 'CANCEL') return null;
-  if (picked === 'BACK')   return _pickProviderInteractive();
-  return { provider: provider.id, model: picked };
 }
 
 // _setupOrchestratorInteractive moved to tui/orchestrator_setup.mjs (it imports

package/tui/prompt_back.mjs

@@ -0,0 +1,85 @@
+// tui/prompt_back.mjs — a raw-mode line prompt that can return BACK on Esc.
+//
+// The setup wizard's typed questions used cooked-mode readline, which never
+// sees Esc (it only resolves on Enter), so "Esc to go back a step" did nothing.
+// This reads keys in raw mode: Enter submits, Esc goes back, arrow keys (which
+// are Esc-PREFIXED sequences) are ignored, Backspace edits, Ctrl-C cancels.
+//
+// classifyKey is pure (unit-tested); promptWithBack is driven by an injectable
+// input/output so it's testable with a fake TTY (no real keyboard).
+
+// Map a raw input chunk to an action. A LONE Esc is "back"; an Esc that begins
+// an escape sequence (\x1b[ or \x1bO — arrows, function keys) is "escseq" and
+// must be ignored so navigation keys don't fire "back".
+export function classifyKey(chunk) {
+  const s = String(chunk == null ? '' : chunk);
+  if (s === '\x1b') return { type: 'back' };
+  if (/^\x1b[[O]/.test(s)) return { type: 'escseq' };
+  if (s === '\r' || s === '\n' || s === '\r\n') return { type: 'submit' };
+  if (s === '\x03') return { type: 'cancel' };           // Ctrl-C
+  if (s === '\x7f' || s === '\b') return { type: 'backspace' };
+  const text = s.replace(/[\x00-\x1f\x7f]/g, '');         // strip control bytes
+  return text ? { type: 'text', text } : { type: 'ignore' };
+}
+
+// Prompt for a line, resolving { value, back }. `back` is true when the user
+// pressed Esc. Falls back to a plain (no-Esc) readline on a non-TTY input.
+// escDelayMs disambiguates a lone Esc from an Esc-sequence that arrives split
+// across two data events (rare, but some terminals do it).
+export function promptWithBack(label, opts = {}) {
+  const input = opts.input || process.stdin;
+  const output = opts.output || process.stdout;
+  const escDelayMs = opts.escDelayMs == null ? 40 : opts.escDelayMs;
+
+  if (!(input.isTTY && typeof input.setRawMode === 'function')) {
+    return _plainLine(label, input, output);
+  }
+
+  return new Promise((resolve) => {
+    output.write('\n' + label);
+    try { input.setRawMode(true); } catch { /* ignore */ }
+    input.resume();
+    let buf = '';
+    let escTimer = null;
+    const finish = (result) => {
+      if (escTimer) { clearTimeout(escTimer); escTimer = null; }
+      input.off('data', onData);
+      try { input.setRawMode(false); } catch { /* ignore */ }
+      output.write('\n');
+      resolve(result);
+    };
+    const onData = (d) => {
+      const s = d.toString('utf8');
+      // A lone Esc byte: wait briefly — if a [ / O follows it was an arrow/nav
+      // sequence (ignore), otherwise it's a real Esc (back).
+      if (s === '\x1b') {
+        escTimer = setTimeout(() => { escTimer = null; finish({ value: '', back: true }); }, escDelayMs);
+        return;
+      }
+      if (escTimer) {
+        clearTimeout(escTimer); escTimer = null;
+        if (/^[[O]/.test(s)) return;   // the tail of a split Esc-sequence
+      }
+      const k = classifyKey(s);
+      switch (k.type) {
+        case 'escseq': case 'ignore': return;
+        case 'back': return finish({ value: '', back: true });
+        case 'submit': return finish({ value: buf.trim(), back: false });
+        case 'cancel': finish({ value: '', back: false, cancel: true }); try { process.exit(130); } catch { /* tests */ } return;
+        case 'backspace': if (buf) { buf = buf.slice(0, -1); output.write('\b \b'); } return;
+        case 'text': buf += k.text; output.write(k.text); return;
+        default: return;
+      }
+    };
+    input.on('data', onData);
+  });
+}
+
+async function _plainLine(label, input, output) {
+  const readline = await import('node:readline');
+  output.write('\n');
+  const rl = readline.createInterface({ input, output });
+  const value = await new Promise((res) => rl.question(label, res));
+  rl.close();
+  return { value: String(value).trim(), back: false };
+}

package/tui/run_turn.mjs

@@ -28,6 +28,9 @@
 import { Chalk } from 'chalk';
 import { chatAgenticGet, chatPlanModeGet, effectiveChatTools } from '../config_features.mjs';
 import { defaultSandboxSpec } from '../sandbox/index.mjs';
+import { resolvePermissionMode } from '../lib/permission_mode.mjs';
+import { detectConfigCommand, applyConfigCommand, refreshLiveProvider } from '../lib/nl_config_command.mjs';
+import { readConfig as _readCfg, writeConfig as _writeCfg } from '../lib/config.mjs';
 
 // Force ANSI on these turn-status markers regardless of stdout TTY detection:
 // the Ink path routes them through React state (Ink preserves embedded SGR
@@ -206,6 +209,29 @@ async function _runAgenticTurn({ ctx, messages, sysMsg, activeProvName, activeMo
 export function makeRunTurn({ ctx, writeFn }) {
   return async function runTurn(text, signal) {
     if (signal?.aborted) return;
+
+    // Natural-language config commands (orchestrator on/off, planner/worker
+    // model) are applied for REAL here — otherwise the model just replies
+    // "done" while nothing changes (the reported bug). Conservative matcher;
+    // anything it doesn't catch falls through to the model below.
+    const _cmd = detectConfigCommand(text);
+    if (_cmd) {
+      const _msgs = ctx.getMessages();
+      _msgs.push({ role: 'user', content: text });
+      ctx.persistTurn('user', text);
+      let reply;
+      try {
+        reply = applyConfigCommand(_cmd, { readConfig: _readCfg, writeConfig: _writeCfg, ctxCfg: ctx.cfg });
+        // orchestrator on/off flips the active provider — re-point the live REPL
+        // provider so it stops replying as orchestrator + the HUD refreshes.
+        if (_cmd.kind === 'orchestrator') refreshLiveProvider(ctx);
+      } catch (e) { reply = `⚠ couldn't apply that change: ${e?.message || e}`; }
+      try { writeFn(reply + '\n'); } catch { /* sink best-effort */ }
+      _msgs.push({ role: 'assistant', content: reply });
+      ctx.persistTurn('assistant', reply);
+      return;
+    }
+
     const messages = ctx.getMessages();
     messages.push({ role: 'user', content: text });
     try { ctx.onCharsSent && ctx.onCharsSent(text.length); }
@@ -296,6 +322,9 @@ export function makeRunTurn({ ctx, writeFn }) {
         // a one-shot spawn on any session failure, and the session respawns if
         // the system prompt changes (plan-mode toggle) so it can't go stale.
         persistent: ctx.cfg?.chat?.persistentSession !== false,
+        // claude-cli permission mode (cfg.chat.permissionMode, asked at setup;
+        // defaults to bypassPermissions). claude-cli reads it; others ignore it.
+        permissionMode: resolvePermissionMode(ctx.cfg),
         sessionKey: (ctx.getSessionId && ctx.getSessionId()) || ctx.syntheticChatSessionId,
         ...(sysMsg ? { sessionSystem: sysMsg.content } : {}),
         ...(maxTokens !== undefined ? { maxTokens } : {}),

package/tui/status_bar.mjs

@@ -4,16 +4,36 @@
 // Extracted from repl.mjs so the HUD can grow without pushing repl.mjs over the
 // file-size ratchet.
 
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from './theme.mjs';
 import { formatHudRow, formatGauge } from './hud.mjs';
 
+// How fast the streaming dot pulses, in ms. Exported so it's not a magic number.
+export const BLINK_MS = 450;
+
+// The leading status glyph. While streaming, the dot pulses (bright ↔ dim) so
+// there's a live "something is happening" signal; idle is a steady hollow dot.
+// Pure (takes the current blink phase) so it's unit-testable without a timer.
+export function streamingIndicator(streaming, blinkOn, t = theme) {
+  if (!streaming) return t.dim('○ idle');
+  return blinkOn ? t.accent('● streaming') : t.dim('● streaming');
+}
+
 export function StatusBar({ provider, model, streaming, ctxUsed, ctxTotal, hud }) {
+  // Pulse the streaming dot. The interval only runs while streaming and is torn
+  // down as soon as the turn ends (or the bar unmounts).
+  const [blinkOn, setBlinkOn] = useState(true);
+  useEffect(() => {
+    if (!streaming) { setBlinkOn(true); return undefined; }
+    const id = setInterval(() => setBlinkOn((b) => !b), BLINK_MS);
+    return () => clearInterval(id);
+  }, [streaming]);
+
   // Numbers are computed upstream (chat-history budget, not provider self-report);
   // formatGauge only changes the RENDERING — adds percent + bar + warn marker.
   const ctx = (ctxUsed != null && ctxTotal != null) ? formatGauge(ctxUsed, ctxTotal) : '--';
-  const indicator = streaming ? theme.accent('● streaming') : theme.dim('○ idle');
+  const indicator = streamingIndicator(streaming, blinkOn);
   const prov = provider || '?';
   const mdl = model || '?';
   const hudRow = hud ? formatHudRow(hud) : '';

package/tui/wizard_back.mjs

@@ -0,0 +1,19 @@
+// tui/wizard_back.mjs — drive a sequence of setup-wizard steps with Esc-back.
+//
+// Each step runs its own I/O and returns one of:
+//   'BACK'   — the user pressed Esc → re-run the previous step
+//   'CANCEL' — abort the whole group
+//   (anything else) — advance to the next step
+// Esc on the FIRST step stays on it (there's nothing before it in the group).
+// Pure control flow (the steps do the prompting) so it's unit-testable.
+
+export async function runWizardSteps(stepIds, runStep) {
+  let i = 0;
+  while (i < stepIds.length) {
+    const r = await runStep(stepIds[i], i);
+    if (r === 'CANCEL') return 'CANCEL';
+    if (r === 'BACK') { i = i > 0 ? i - 1 : 0; continue; }
+    i += 1;
+  }
+  return 'DONE';
+}