vrr/spawn
2
0
Fork 0
mirror of https://github.com/OpenRouterTeam/spawn.git synced 2026-05-19 08:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix: truncate picker lines to terminal width to prevent redraw corruption (#1772)

Browse source 
Long labels (e.g. "Claude Code on GCP Compute Engine -- spawn-trial-000-ahmed")
wrap to multiple rows, but the redraw logic uses a fixed line count to cursor-up.
This causes old content to pile up on every arrow-key press.

Query terminal width via `stty size` and truncate all lines to fit within
a single row, with a 1-char margin to prevent auto-wrap edge cases.

Co-authored-by: Claude <claude@anthropic.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
A 2026-02-22 17:22:46 -08:00 • committed by GitHub
parent 4dc124a8e9
commit 2413db6ade
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@openrouter/spawn",
"version": "0.6.18",
"version": "0.6.19",
"type": "module",
"bin": {
"spawn": "cli.js"

57
cli/src/picker.ts
View file

@ -81,6 +81,25 @@ const A = {
col1: "\x1b[1G",
};
/** Truncate a string to `max` visible characters, adding \u2026 if needed. */
const trunc = (s: string, max: number): string =>
s.length <= max ? s : s.slice(0, Math.max(max - 1, 0)) + "\u2026";
/** Get terminal column width from a tty file descriptor. */
function getTTYCols(ttyFd: number): number {
try {
const res = spawnSync("stty", ["size"], { stdio: [ttyFd, "pipe", "pipe"] });
if (res.status === 0 && res.stdout) {
const parts = res.stdout.toString().trim().split(/\s+/);
if (parts.length >= 2) {
const c = parseInt(parts[1], 10);
if (c > 0) return c;
}
}
} catch {}
return 80;
}
// ── TTY picker ────────────────────────────────────────────────────────────────
/**
@ -181,6 +200,9 @@ export function pickToTTY(config: PickConfig): string | null {
}
}
const cols = getTTYCols(ttyFd);
const maxW = cols - 1; // leave 1 char margin to prevent terminal auto-wrap
// header line + one line per option + footer line
const pickerHeight = config.options.length + 2;
@ -188,20 +210,24 @@ export function pickToTTY(config: PickConfig): string | null {
if (!first) {
w(A.up(pickerHeight) + A.col1 + A.clearBelow);
}
w(`${A.bold}${A.cyan}? ${config.message}${A.reset}\r\n`);
w(`${A.bold}${A.cyan}? ${trunc(config.message, maxW - 2)}${A.reset}\r\n`);
for (let i = 0; i < config.options.length; i++) {
const opt = config.options[i];
if (i === selected) {
w(`${A.green}${A.bold}> ${opt.label}${A.reset}`);
const label = trunc(opt.label, maxW - 2);
w(`${A.green}${A.bold}> ${label}${A.reset}`);
if (opt.hint) {
w(` ${A.dim}${opt.hint}${A.reset}`);
const remaining = maxW - 2 - label.length - 2;
if (remaining > 3) {
w(` ${A.dim}${trunc(opt.hint, remaining)}${A.reset}`);
}
}
} else {
w(` ${A.dim}${opt.label}${A.reset}`);
w(` ${A.dim}${trunc(opt.label, maxW - 2)}${A.reset}`);
}
w("\r\n");
}
w(`${A.dim} \u2191/\u2193 move \u23ce select Ctrl-C cancel${A.reset}\r\n`);
w(`${A.dim} ${trunc("\u2191/\u2193 move \u23ce select Ctrl-C cancel", maxW - 2)}${A.reset}\r\n`);
};
// ── render & key loop ─────────────────────────────────────────────────────
@ -241,7 +267,7 @@ export function pickToTTY(config: PickConfig): string | null {
// Replace picker with a one-line confirmation
w(A.up(pickerHeight) + A.col1 + A.clearBelow);
const opt = config.options[selected];
w(`${A.green}${A.bold}> ${config.message}:${A.reset} ` + `${A.cyan}${opt.label}${A.reset}\r\n`);
w(`${A.green}${A.bold}> ${config.message}:${A.reset} ` + `${A.cyan}${trunc(opt.label, maxW - config.message.length - 4)}${A.reset}\r\n`);
break outer;
}
@ -335,6 +361,9 @@ export function pickToTTYWithActions(config: PickConfig): PickResult {
}
}
const cols = getTTYCols(ttyFd);
const maxW = cols - 1; // leave 1 char margin to prevent terminal auto-wrap
const footerHint = config.deleteKey
? "\u2191/\u2193 move \u23ce select d delete Ctrl-C cancel"
: "\u2191/\u2193 move \u23ce select Ctrl-C cancel";
@ -346,20 +375,24 @@ export function pickToTTYWithActions(config: PickConfig): PickResult {
if (!first) {
w(A.up(pickerHeight) + A.col1 + A.clearBelow);
}
w(`${A.bold}${A.cyan}? ${config.message}${A.reset}\r\n`);
w(`${A.bold}${A.cyan}? ${trunc(config.message, maxW - 2)}${A.reset}\r\n`);
for (let i = 0; i < config.options.length; i++) {
const opt = config.options[i];
if (i === selected) {
w(`${A.green}${A.bold}> ${opt.label}${A.reset}`);
const label = trunc(opt.label, maxW - 2);
w(`${A.green}${A.bold}> ${label}${A.reset}`);
if (opt.hint) {
w(` ${A.dim}${opt.hint}${A.reset}`);
const remaining = maxW - 2 - label.length - 2;
if (remaining > 3) {
w(` ${A.dim}${trunc(opt.hint, remaining)}${A.reset}`);
}
}
} else {
w(` ${A.dim}${opt.label}${A.reset}`);
w(` ${A.dim}${trunc(opt.label, maxW - 2)}${A.reset}`);
}
w("\r\n");
}
w(`${A.dim} ${footerHint}${A.reset}\r\n`);
w(`${A.dim} ${trunc(footerHint, maxW - 2)}${A.reset}\r\n`);
};
// ── render & key loop ─────────────────────────────────────────────────────
@ -396,7 +429,7 @@ export function pickToTTYWithActions(config: PickConfig): PickResult {
// Replace picker with a one-line confirmation
w(A.up(pickerHeight) + A.col1 + A.clearBelow);
const opt = config.options[selected];
w(`${A.green}${A.bold}> ${config.message}:${A.reset} ${A.cyan}${opt.label}${A.reset}\r\n`);
w(`${A.green}${A.bold}> ${config.message}:${A.reset} ${A.cyan}${trunc(opt.label, maxW - config.message.length - 4)}${A.reset}\r\n`);
break outer;
}