mirror of
https://github.com/qwibitai/nanoclaw.git
synced 2026-06-04 10:14:47 +08:00
4859d8fb2d
When a setup step fails — whether hard via fail() or soft via the
"What's left" / "Skipping the first chat" notes — offer to ask Claude
to diagnose. On consent, spawn `claude -p --output-format stream-json`
with a scrolling 3-line action window ("Reading x", "Running y") so
the 1–4 minute investigations feel active rather than hung. No hard
timeout: debugging can take time, Ctrl-C is the escape hatch.
The prompt is minimal: one-paragraph framing, failed step name + msg +
hint, and a list of file references (not contents). Claude's Read/Grep
tools fetch what they need. A per-step map in claude-assist.ts gives
the most relevant files per step; the rest is README + auto.ts +
logs/setup.log + the per-step raw log.
Claude responds with REASON + COMMAND lines. We show the reason in a
clack note, prefill the command via setup/run-suggested.sh (bash 4+
readline, 3.x fallback to Enter-to-run), and eval on the user's
confirm.
When the user runs a fix, fail() now offers to retry the failing step
rather than aborting. setup/logs.ts tracks successfully-completed step
names in-memory; fail() threads those as NANOCLAW_SKIP on a spawnSync
retry, so the child picks up exactly where the parent left off — no
rebuilding containers or reinstalling OneCLI.
Other polish in this change:
- fitToWidth + dimWrap in lib/theme.ts to prevent long spinner labels
from soft-wrapping (each terminal row stacks a stale copy otherwise).
- Shorter container step label ("Preparing your assistant's sandbox…")
so it fits on narrow terminals.
- Wordmark anchored in the clack intro line on every run.
- All 25 existing fail() call sites updated to await fail(...) since
fail is now async.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
125 lines
4.2 KiB
TypeScript
125 lines
4.2 KiB
TypeScript
/**
|
|
* NanoClaw brand palette for the terminal.
|
|
*
|
|
* Colors pulled from assets/nanoclaw-logo.png:
|
|
* brand cyan ≈ #2BB7CE — the "Claw" wordmark + mascot body
|
|
* brand navy ≈ #171B3B — the dark logo background + outlines
|
|
*
|
|
* Rendering gates:
|
|
* - No TTY (piped / redirected) → plain text, no ANSI
|
|
* - NO_COLOR set → plain text, no ANSI
|
|
* - COLORTERM truecolor/24bit → 24-bit ANSI (exact brand cyan)
|
|
* - Otherwise → kleur's 16-color cyan (closest fallback)
|
|
*/
|
|
import k from 'kleur';
|
|
|
|
const USE_ANSI = Boolean(process.stdout.isTTY) && !process.env.NO_COLOR;
|
|
const TRUECOLOR =
|
|
USE_ANSI &&
|
|
(process.env.COLORTERM === 'truecolor' || process.env.COLORTERM === '24bit');
|
|
|
|
export function brand(s: string): string {
|
|
if (!USE_ANSI) return s;
|
|
if (TRUECOLOR) return `\x1b[38;2;43;183;206m${s}\x1b[0m`;
|
|
return k.cyan(s);
|
|
}
|
|
|
|
export function brandBold(s: string): string {
|
|
if (!USE_ANSI) return s;
|
|
if (TRUECOLOR) return `\x1b[1;38;2;43;183;206m${s}\x1b[0m`;
|
|
return k.bold(k.cyan(s));
|
|
}
|
|
|
|
export function brandChip(s: string): string {
|
|
if (!USE_ANSI) return s;
|
|
if (TRUECOLOR) {
|
|
return `\x1b[48;2;43;183;206m\x1b[38;2;23;27;59m\x1b[1m${s}\x1b[0m`;
|
|
}
|
|
return k.bgCyan(k.black(k.bold(s)));
|
|
}
|
|
|
|
/**
|
|
* Wrap text so it fits inside clack's gutter without the terminal's soft
|
|
* wrap breaking the `│ …` bar on long lines. Works on a single string with
|
|
* embedded `\n`s; each logical line is wrapped independently.
|
|
*
|
|
* The `gutter` argument is the total horizontal overhead clack adds for
|
|
* the component the text lives in (e.g. 4 for `p.log.*`'s `│ ` prefix;
|
|
* 6-ish for `p.note`'s box). Caller picks it; we just subtract from
|
|
* `process.stdout.columns` and hard-wrap at word boundaries.
|
|
*/
|
|
export function wrapForGutter(text: string, gutter: number): string {
|
|
const cols = process.stdout.columns ?? 80;
|
|
const width = Math.max(30, cols - gutter);
|
|
return text
|
|
.split('\n')
|
|
.map((line) => wrapLine(line, width))
|
|
.join('\n');
|
|
}
|
|
|
|
/**
|
|
* Wrap + dim together. Needed instead of `k.dim(wrapForGutter(...))`
|
|
* because clack resets styling at each line break when rendering
|
|
* multi-line log content — a single outer dim envelope only colors the
|
|
* first line. Applying dim per-line gives each wrapped row its own
|
|
* `\x1b[2m…\x1b[0m` envelope so the whole block reads as one block.
|
|
*/
|
|
export function dimWrap(text: string, gutter: number): string {
|
|
return wrapForGutter(text, gutter)
|
|
.split('\n')
|
|
.map((line) => k.dim(line))
|
|
.join('\n');
|
|
}
|
|
|
|
const ANSI_RE = /\x1b\[[0-9;]*m/g;
|
|
|
|
function visibleLength(s: string): number {
|
|
return s.replace(ANSI_RE, '').length;
|
|
}
|
|
|
|
/**
|
|
* Truncate a label so the final line — base + reserved suffix — fits in
|
|
* the terminal width. Use on spinner labels that get an elapsed counter
|
|
* appended: if the total exceeds terminal width, clack's cursor-up
|
|
* redraw math breaks and each tick stacks a copy of the line instead
|
|
* of replacing it.
|
|
*
|
|
* `suffix` is the reserved space for what we'll append after `fit()`
|
|
* returns (e.g. ` (999s)` or a tool-use breadcrumb). We don't include
|
|
* it in the output — caller appends it.
|
|
*/
|
|
export function fitToWidth(base: string, suffix: string): string {
|
|
const cols = process.stdout.columns ?? 80;
|
|
// Overhead we reserve before sizing the label:
|
|
// spinner icon (1) + 2 padding spaces = 3
|
|
// clack's animated ellipsis after the label = up to 3 (". " -> "...")
|
|
// 1-char safety margin so wide-char glyphs don't tip over the edge
|
|
// Total reserved budget = 7 cols plus the caller's suffix.
|
|
const budget = Math.max(20, cols - 7 - visibleLength(suffix));
|
|
return base.length > budget ? base.slice(0, budget - 1) + '…' : base;
|
|
}
|
|
|
|
function wrapLine(line: string, width: number): string {
|
|
if (visibleLength(line) <= width) return line;
|
|
const words = line.split(' ');
|
|
const rows: string[] = [];
|
|
let cur = '';
|
|
let curLen = 0;
|
|
for (const word of words) {
|
|
const wLen = visibleLength(word);
|
|
if (curLen === 0) {
|
|
cur = word;
|
|
curLen = wLen;
|
|
} else if (curLen + 1 + wLen <= width) {
|
|
cur += ' ' + word;
|
|
curLen += 1 + wLen;
|
|
} else {
|
|
rows.push(cur);
|
|
cur = word;
|
|
curLen = wLen;
|
|
}
|
|
}
|
|
if (cur) rows.push(cur);
|
|
return rows.join('\n');
|
|
}
|