lazyclaw 5.3.1 → 5.3.3

package/cli.mjs

@@ -853,6 +853,7 @@ async function cmdDoctor() {
   await ensureRegistry();
   const cfg = readConfig();
   const issues = [];
+  const warnings = [];
   if (!cfg.provider) issues.push('config.provider is missing — run `lazyclaw onboard`');
   // Only flag a missing api-key when the picked provider actually
   // requires one. claude-cli / ollama / mock all run keylessly, so the
@@ -864,6 +865,27 @@ async function cmdDoctor() {
   if (cfg.provider && !PROVIDERS_HAS(_registryMod.PROVIDERS, cfg.provider)) {
     issues.push(`unknown provider "${cfg.provider}" — registered: ${Object.keys(_registryMod.PROVIDERS).join(', ')}`);
   }
+  // v5.3.2 soft-migration — pre-5.3.2 wizards could write
+  // `provider: 'orchestrator'` even when the user never configured the
+  // orchestrator section (planner / workers). On those installs the
+  // first chat turn dies with an opaque "orchestrator not configured"
+  // error. Surface a warning + the fix hint, but never auto-rewrite
+  // cfg.json — the user might have legitimately picked orchestrator
+  // and just hasn't finished setup yet.
+  if (cfg.provider === 'orchestrator') {
+    const orch = cfg.orchestrator;
+    const configured = orch && typeof orch === 'object'
+      && typeof orch.planner === 'string' && orch.planner
+      && Array.isArray(orch.workers) && orch.workers.length > 0;
+    if (!configured) {
+      warnings.push(
+        'config.provider is "orchestrator" but cfg.orchestrator is missing/empty. '
+        + 'Pre-v5.3.2 setup wizards could leave you in this half-configured state. '
+        + 'Either finish orchestrator setup (`lazyclaw orchestrator set-planner …` + `lazyclaw orchestrator workers add …`) '
+        + 'or switch to a single concrete provider: `lazyclaw config set provider claude-cli`.'
+      );
+    }
+  }
   // C12 — MinGit / Windows safety net. mas/tools/git.mjs shells out to
   // `git`; on a stripped Windows PATH (no Git-for-Windows installed) or
   // a minimal Docker base image, that spawnSync ENOENTs and any agent
@@ -957,6 +979,7 @@ async function cmdDoctor() {
     nodeVersion: process.version,
     platform: `${process.platform}-${process.arch}`,
     issues,
+    warnings,
     knownProviders: Object.keys(_registryMod.PROVIDERS),
     workflows,
     git: gitInfo,
@@ -1941,7 +1964,15 @@ function _providerFamilies() {
     mock: { label: 'Mock', desc: 'offline echo, only useful for testing', tag: '\x1b[38;5;245m[test]\x1b[0m', members: [] },
   };
   for (const name of all) {
+    // v5.3.2 — orchestrator is strictly opt-in. It's still registered so
+    // `lazyclaw orchestrator …` and explicit `--provider orchestrator`
+    // keep working, but the setup wizard must never land on it as a
+    // default. Previously a fresh user picking "CLI/Local" got
+    // orchestrator bucketed alongside claude-cli/ollama and could end
+    // up with `{ provider: 'orchestrator', model: 'orchestrator' }`
+    // written to cfg.json.
     if (name === 'mock') buckets.mock.members.push(name);
+    else if (name === 'orchestrator') continue;
     else if ((info[name] || {}).requiresApiKey) buckets.api.members.push(name);
     else buckets.cli.members.push(name);
   }
@@ -1975,7 +2006,11 @@ async function _pickProviderInteractive() {
       };
       process.stdin.on('data', onData);
     });
-    return { provider: ans || providers[0], model: null };
+    // v5.3.2 — non-TTY fallback used to be `providers[0]`, which was
+    // whatever happened to be first in the registry (currently
+    // anthropic). Pin to claude-cli to match the interactive onboard
+    // hint at cmdOnboard (the keyless subscription path).
+    return { provider: ans || 'claude-cli', model: null };
   }
 
   // ── Step 1 — auth family ──────────────────────────────────────
@@ -2070,17 +2105,13 @@ async function _pickProviderInteractive() {
     provider = picked;
   }
 
-  // ── Step 3 — model (or, for composite providers, a config wizard) ───
-  // The orchestrator (and any future composite provider) has no model
-  // of its own — it dispatches to other providers. Step 3 routes
-  // through a custom wizard instead of the standard model picker.
-  const providerMeta = (_registryMod.PROVIDER_INFO || {})[provider.id] || {};
-  if (providerMeta.composite || provider.id === 'orchestrator') {
-    const result = await _setupOrchestratorInteractive();
-    if (result === 'CANCEL') return null;
-    if (result === 'BACK')   return _pickProviderInteractive();
-    return { provider: provider.id, model: 'orchestrator' };
-  }
+  // ── 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',
@@ -2471,7 +2502,11 @@ async function cmdChat(flags = {}) {
       if (picked.model) activeModel = picked.model;
     }
   }
-  if (!activeProvName) activeProvName = 'mock';
+  // v5.3.2 — last-resort safety net used to fall through to 'mock' (the
+  // offline echo provider), which silently degraded a wiped config into
+  // garbage replies. Default to claude-cli so the user lands on the
+  // keyless subscription path instead.
+  if (!activeProvName) activeProvName = 'claude-cli';
   let prov = lookupProv(activeProvName);
   if (!prov) { console.error(`unknown provider: ${activeProvName}`); process.exit(2); }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lazyclaw",
-  "version": "5.3.1",
+  "version": "5.3.3",
   "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",
@@ -87,6 +87,7 @@
     "better-sqlite3": "^11.10.0",
     "chalk": "^5.3.0",
     "ink": "^5.0.1",
+    "ink-testing-library": "^4.0.0",
     "node-ssh": "^13.2.0",
     "string-width": "^7.2.0",
     "undici": "^6.21.0"

package/providers/orchestrator.mjs

@@ -124,18 +124,33 @@ export function makeOrchestratorProvider(opts = {}) {
       const fallbackSpec = cfg.provider && cfg.provider !== 'orchestrator'
         ? `${cfg.provider}${cfg.model ? ':' + cfg.model : ''}`
         : 'claude-cli';
-      // First-run hint when cfg.orchestrator is missing entirely. The
-      // fallback path below still works (planner = cfg.provider, single
-      // worker = same), but the user almost certainly meant to opt in
-      // explicitly — surface the shortest valid CLI to set it up.
-      if (!cfg.orchestrator) {
-        yield `> orchestrator: \`cfg.orchestrator\` is not set. Defaulting to a single-agent chain on \`${fallbackSpec}\`.\n` +
-          `> Configure properly:  \`lazyclaw orchestrator set-planner ${fallbackSpec}\` then  \`lazyclaw orchestrator workers add <provider:model>\` (one per agent).\n\n`;
+      // Unconfigured-orchestrator path (v5.3.2 fix): when cfg.orchestrator
+      // is missing OR has no workers configured, the multi-agent pipeline
+      // is unjustified — there is no second backend to delegate to. The
+      // previous behaviour printed a "single-agent chain" banner and then
+      // still ran Plan → Execute(N) → Synthesis against the same backend,
+      // turning a trivial question into a 4-subtask decomposition. That
+      // violates §1 truthfulness (the banner promised a single chain) and
+      // the user's stated intent. Do a real passthrough instead.
+      const hasWorkers = Array.isArray(o.workers) && o.workers.length > 0;
+      if (!cfg.orchestrator || !hasWorkers) {
+        const direct = _lookupProvider(fallbackSpec);
+        if (!direct || direct.name === 'orchestrator') {
+          yield `⚠ orchestrator: not configured and fallback provider \`${fallbackSpec}\` is not registered. ` +
+            `Set \`cfg.orchestrator.planner\` + \`cfg.orchestrator.workers\`, or set \`cfg.provider\` to a real backend.\n`;
+          return;
+        }
+        yield `> Orchestrator not configured — using single-shot \`${direct.name}${direct.model ? ':' + direct.model : ''}\`. ` +
+          `Run \`lazyclaw orchestrator set-planner ${fallbackSpec}\` then \`lazyclaw orchestrator workers add <provider:model>\` to enable multi-agent.\n\n`;
+        for await (const chunk of direct.prov.sendMessage(messages, {
+          apiKey: keyResolver(cfg, direct.name),
+          model: direct.model || undefined,
+          signal: callerOpts.signal,
+        })) yield String(chunk);
+        return;
       }
       const plannerSpec = String(o.planner || fallbackSpec);
-      const workerSpecs = Array.isArray(o.workers) && o.workers.length
-        ? o.workers.map(String)
-        : [plannerSpec];
+      const workerSpecs = o.workers.map(String);
       const maxSubtasks = Number.isFinite(o.maxSubtasks) && o.maxSubtasks > 0 ? Math.min(10, o.maxSubtasks) : 5;
 
       const planner = _lookupProvider(plannerSpec);

package/tui/editor.mjs

@@ -17,10 +17,54 @@
 // amber notes. The box auto-fills the available terminal width via
 // Ink's flex defaults and grows vertically as the buffer wraps onto
 // new lines (Shift+Enter).
+//
+// v5.3.2: CJK / wide-character correctness. `string.length` returns the
+// UTF-16 code-unit count, which is wrong for column math — a Hangul or
+// Han glyph occupies 2 terminal cells but reports `.length === 1`. We
+// keep `state.cursor` in codepoint-index units (so `buffer.slice(0,
+// cursor)`, Backspace, and history recall still work), but expose all
+// display-column math through the `displayWidth()` helper and the
+// derived `cursorDisplayCol` field. The render also pins the Box to
+// `width: '100%'` so Ink's wrap-ansi (already string-width aware) gets
+// the full terminal budget — fixes the perceived right-edge truncation
+// on long Korean buffers.
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useInput } from 'ink';
+import stringWidth from 'string-width';
 import { theme } from './theme.mjs';
 
+// The accent prompt (`› `) prepended to the first rendered line. Its
+// display width matters for any caller that wants to know the usable
+// inner width of the editor box. Defined once so the value stays in
+// sync if the prompt glyph ever changes.
+export const PROMPT_PREFIX = '› ';
+export const PROMPT_WIDTH = stringWidth(PROMPT_PREFIX);
+export const CONTINUATION_GUTTER = '  ';
+export const CONTINUATION_WIDTH = stringWidth(CONTINUATION_GUTTER);
+
+// Public helper: display width of a buffer (or any substring of it),
+// counting wide chars (CJK, fullwidth, most emoji) as 2 cells and
+// ignoring ANSI escapes. Use this — never `.length` — for column math.
+export function displayWidth(text) {
+  if (!text) return 0;
+  return stringWidth(String(text));
+}
+
+// Display column of the caret given a state. Counts wide chars as 2.
+// On the first rendered line this is offset by PROMPT_WIDTH; on
+// continuation lines (after a Shift+Enter) it is offset by
+// CONTINUATION_WIDTH. Callers that only need the in-buffer column can
+// pass `{ withPrefix: false }`.
+export function cursorDisplayCol(state, { withPrefix = true } = {}) {
+  const before = String(state.buffer || '').slice(0, state.cursor || 0);
+  const newlineIdx = before.lastIndexOf('\n');
+  const lineSlice = newlineIdx === -1 ? before : before.slice(newlineIdx + 1);
+  const inLine = stringWidth(lineSlice);
+  if (!withPrefix) return inLine;
+  const prefix = newlineIdx === -1 ? PROMPT_WIDTH : CONTINUATION_WIDTH;
+  return prefix + inLine;
+}
+
 export function makeEditorState({ history = [] } = {}) {
   return {
     buffer: '',
@@ -173,6 +217,49 @@ export function Editor({
   }, [state.lastSubmit]);
 
   const lines = state.buffer.split('\n');
+  // Manual cell-aware wrapping. Ink's <Text wrap="wrap"> uses wrap-ansi,
+  // which IS string-width aware, but the box's width:'100%' resolves
+  // against ink-testing-library's stdout shim (and some real terminals
+  // when columns is reset by SIGWINCH late) at 100 cols regardless of
+  // the actual viewport — so wide CJK buffers visibly bleed past the
+  // box right edge in narrow terminals. Pre-wrap to the actual cell
+  // budget so Ink never has to guess.
+  const TERM = Math.max(20, process.stdout.columns || 80);
+  // Box overhead: 1 border + 1 padX on each side = 4 cells; first row
+  // also reserves PROMPT_WIDTH; continuation rows reserve CONTINUATION_WIDTH.
+  function wrapToBudget(text, firstBudget, contBudget) {
+    if (!text) return [''];
+    const out = [];
+    let line = '';
+    let lineW = 0;
+    let budget = firstBudget;
+    for (const ch of text) {
+      const w = stringWidth(ch);
+      if (lineW + w > budget) {
+        out.push(line);
+        line = ch;
+        lineW = w;
+        budget = contBudget;
+      } else {
+        line += ch;
+        lineW += w;
+      }
+    }
+    out.push(line);
+    return out;
+  }
+  const innerCells = Math.max(8, TERM - 4); // 2 border + 2 padX
+  const renderedLines = [];
+  for (let li = 0; li < lines.length; li++) {
+    const wrapped = wrapToBudget(lines[li], innerCells - PROMPT_WIDTH, innerCells - CONTINUATION_WIDTH);
+    for (let wi = 0; wi < wrapped.length; wi++) {
+      const isFirstLogical = li === 0 && wi === 0;
+      renderedLines.push({
+        prefix: isFirstLogical ? theme.accent(PROMPT_PREFIX) : CONTINUATION_GUTTER,
+        text: wrapped[wi],
+      });
+    }
+  }
   return React.createElement(
     Box,
     {
@@ -181,11 +268,12 @@ export function Editor({
       paddingX: 1,
       flexDirection: 'column',
       flexShrink: 0,
+      width: TERM,
     },
-    lines.map((ln, i) => React.createElement(
+    renderedLines.map((row, i) => React.createElement(
       Text,
-      { key: i },
-      i === 0 ? theme.accent('› ') + ln : '  ' + ln,
+      { key: i, wrap: 'truncate' },
+      row.prefix + row.text,
     )),
   );
 }