mergestorm 0.3.7 → 0.3.8

package/dist/errors.js

@@ -1,12 +1,17 @@
 /** Thrown by command handlers; one-shot mode maps `exitCode` onto process.exitCode. */
 export class CommandError extends Error {
     exitCode;
-    constructor(message, exitCode = 1) {
+    code;
+    constructor(message, exitCode = 1, code) {
         super(message);
         this.name = "CommandError";
         this.exitCode = exitCode;
+        this.code = code;
     }
 }
+export function isCommandErrorCode(err, code) {
+    return err instanceof CommandError && err.code === code;
+}
 /** Review/status poll aborted by Ctrl+C — shell returns to the prompt. */
 export class DetachedError extends Error {
     jobId;

package/dist/git-stack.d.ts

@@ -18,6 +18,11 @@ export declare function createBranchFromHead(name: string, cwd?: string): void;
 /** Slugify a free-form name into a safe branch segment. */
 export declare function slugifyBranchName(raw: string): string;
 export declare function defaultLayerBranchName(explicit?: string): string;
+/**
+ * How many commits are on `head` that are not reachable from `base`
+ * (`git rev-list --count base..head`). Used by stack submit to refuse empty layers.
+ */
+export declare function commitsAheadOf(base: string, head: string, cwd?: string): number;
 /** Push branch to origin and set upstream. */
 export declare function pushBranch(branch: string, cwd?: string): void;
 /** First line of the tip commit on `branch` (for PR title). */

package/dist/git-stack.js

@@ -95,6 +95,18 @@ export function defaultLayerBranchName(explicit) {
     }
     return `ms/${new Date().toISOString().slice(0, 10)}-${Date.now().toString(36).slice(-4)}`;
 }
+/**
+ * How many commits are on `head` that are not reachable from `base`
+ * (`git rev-list --count base..head`). Used by stack submit to refuse empty layers.
+ */
+export function commitsAheadOf(base, head, cwd = process.cwd()) {
+    const out = git(["rev-list", "--count", `${base}..${head}`], cwd).trim();
+    const n = Number.parseInt(out, 10);
+    if (!Number.isFinite(n) || n < 0) {
+        throw new Error(`Could not count commits on ${head} ahead of ${base}`);
+    }
+    return n;
+}
 /** Push branch to origin and set upstream. */
 export function pushBranch(branch, cwd = process.cwd()) {
     try {

package/dist/git.d.ts

@@ -1,5 +1,10 @@
 export declare function git(args: string[], cwd?: string): string;
-export declare function collectChangedFiles(base: string, head: string): Promise<{
+/** Parse `origin` remote into GitHub owner/repo when possible. */
+export declare function parseGithubOriginRepo(cwd?: string): {
+    owner: string;
+    repo: string;
+} | null;
+export declare function collectChangedFiles(base: string, head: string, cwd?: string): Promise<{
     path: string;
     content: string;
 }[]>;

package/dist/git.js

@@ -1,4 +1,5 @@
 import { spawnSync } from "node:child_process";
+import { realpathSync } from "node:fs";
 import { readFile, stat } from "node:fs/promises";
 import path from "node:path";
 export function git(args, cwd = process.cwd()) {
@@ -13,22 +14,47 @@ export function git(args, cwd = process.cwd()) {
         throw new Error(`git ${args.join(" ")} failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
-export async function collectChangedFiles(base, head) {
-    const names = git(["diff", "--name-only", "--diff-filter=ACMR", `${base}...${head}`])
+/** Parse `origin` remote into GitHub owner/repo when possible. */
+export function parseGithubOriginRepo(cwd = process.cwd()) {
+    try {
+        const url = git(["remote", "get-url", "origin"], cwd).trim();
+        if (!url)
+            return null;
+        const m = url.match(/^(?:https?:\/\/|git@)?github\.com[:/]([A-Za-z0-9_-]+)\/([A-Za-z0-9_.-]+?)(?:\.git)?\/?$/i);
+        if (!m?.[1] || !m[2])
+            return null;
+        return { owner: m[1], repo: m[2] };
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Repo-root absolute path for the current working tree.
+ * Kept local (not imported from repo-identity) to avoid a git ↔ repo-identity cycle.
+ */
+function repoRoot(cwd = process.cwd()) {
+    return realpathSync(git(["rev-parse", "--show-toplevel"], cwd).trim());
+}
+export async function collectChangedFiles(base, head, cwd = process.cwd()) {
+    const root = repoRoot(cwd);
+    const names = git(["diff", "--name-only", "--diff-filter=ACMR", `${base}...${head}`], cwd)
         .split("\n")
         .map((s) => s.trim())
         .filter(Boolean);
     const files = [];
     for (const name of names.slice(0, 40)) {
+        const abs = path.join(root, name);
         try {
-            const st = await stat(path.join(process.cwd(), name));
+            const st = await stat(abs);
             if (!st.isFile() || st.size > 400_000)
                 continue;
-            const content = await readFile(path.join(process.cwd(), name), "utf8");
+            const content = await readFile(abs, "utf8");
             files.push({ path: name, content });
         }
         catch {
-            // deleted or unreadable
+            // deleted or unreadable — do not silently drop without a hint
+            console.warn(`Warning: could not read ${name} for review upload (resolved from repo root); skipping file contents`);
         }
     }
     return files;

package/dist/node-version.d.ts

@@ -0,0 +1,11 @@
+/** Mergestorm CLI requires Node 22+ (matches package.json engines). */
+export declare const MIN_NODE_MAJOR = 22;
+/** Parse major version from a Node version string (e.g. "22.22.3" → 22). */
+export declare function nodeMajor(version?: string): number;
+/**
+ * Fatal message when the runtime is too old. Kept pure for unit tests —
+ * callers print + exit.
+ */
+export declare function unsupportedNodeMessage(version?: string, minMajor?: number): string;
+/** True when this process may run the CLI. */
+export declare function isSupportedNode(version?: string, minMajor?: number): boolean;

package/dist/node-version.js

@@ -0,0 +1,19 @@
+/** Mergestorm CLI requires Node 22+ (matches package.json engines). */
+export const MIN_NODE_MAJOR = 22;
+/** Parse major version from a Node version string (e.g. "22.22.3" → 22). */
+export function nodeMajor(version = process.versions.node) {
+    const major = Number.parseInt(version.split(".")[0] ?? "", 10);
+    return Number.isFinite(major) ? major : 0;
+}
+/**
+ * Fatal message when the runtime is too old. Kept pure for unit tests —
+ * callers print + exit.
+ */
+export function unsupportedNodeMessage(version = process.versions.node, minMajor = MIN_NODE_MAJOR) {
+    return (`mergestorm requires Node.js ${minMajor}+ (found v${version}). ` +
+        `Upgrade Node, then re-run: https://nodejs.org/`);
+}
+/** True when this process may run the CLI. */
+export function isSupportedNode(version = process.versions.node, minMajor = MIN_NODE_MAJOR) {
+    return nodeMajor(version) >= minMajor;
+}

package/dist/pr-body.d.ts

@@ -1,5 +1,5 @@
 /**
- * Build a GitHub PR body from a tip commit message (#217).
+ * Build a GitHub PR body from a tip commit message.
  * Pure — no git / network.
  */
 /**

package/dist/pr-body.js

@@ -1,5 +1,5 @@
 /**
- * Build a GitHub PR body from a tip commit message (#217).
+ * Build a GitHub PR body from a tip commit message.
  * Pure — no git / network.
  */
 const TRAILER_RE = /^(fixes|closes|resolves)\s+#(\d+)\s*$/i;

package/dist/repo-identity.js

@@ -5,18 +5,37 @@ import { mergestormHome } from "./config.js";
 import { CommandError } from "./errors.js";
 import { git } from "./git.js";
 export const LEGACY_STACK_META_REL = path.join(".mergestorm", "stack.json");
+/** Classify git "not a repo" failures once at the boundary; callers match on code. */
+function rethrowIfNotARepo(err) {
+    const detail = err instanceof Error ? err.message : String(err);
+    if (/not a git repository/i.test(detail)) {
+        throw new CommandError(detail, 1, "not_a_repo");
+    }
+    throw err;
+}
 export function gitTopLevel(cwd = process.cwd()) {
-    return realpathSync(git(["rev-parse", "--show-toplevel"], cwd).trim());
+    try {
+        return realpathSync(git(["rev-parse", "--show-toplevel"], cwd).trim());
+    }
+    catch (err) {
+        rethrowIfNotARepo(err);
+    }
 }
 export function gitCommonDir(cwd = process.cwd()) {
-    const raw = git(["rev-parse", "--git-common-dir"], cwd).trim();
+    let raw;
+    try {
+        raw = git(["rev-parse", "--git-common-dir"], cwd).trim();
+    }
+    catch (err) {
+        rethrowIfNotARepo(err);
+    }
     const absolute = path.isAbsolute(raw) ? raw : path.resolve(cwd, raw);
     try {
         return realpathSync(absolute);
     }
     catch (err) {
         if (err?.code === "ENOENT") {
-            throw new CommandError(`git common directory is missing (${absolute}); this is often a linked worktree whose main repository was deleted. Run \`mg stack reset --force\` to clear local pre-submit state.`);
+            throw new CommandError(`git common directory is missing (${absolute}); this is often a linked worktree whose main repository was deleted. Run \`mg stack reset --force\` to clear local pre-submit state.`, 1, "not_a_repo");
         }
         throw err;
     }

package/dist/shell.d.ts

@@ -1,5 +1,5 @@
-import { type CommandSpec } from "./ui/prompt.js";
-export declare const COMMANDS: CommandSpec[];
+/** Shell autocomplete + `/help` — derived from the command registry (STRUCT-01). */
+export declare const COMMANDS: import("./ui/prompt.js").CommandSpec[];
 /** Strips an optional leading "/" so both "review" and "/review" work. */
 export declare function parseLine(line: string): {
     cmd: string;

package/dist/shell.js

@@ -1,38 +1,13 @@
 import { stdout as output } from "node:process";
 import { loadConfig, resolveApiKey } from "./config.js";
 import { CommandError, DetachedError } from "./errors.js";
-import { cmdBranches, cmdChain } from "./commands/branches.js";
-import { cmdCredits } from "./commands/credits.js";
-import { cmdJobs, cmdThread } from "./commands/jobs.js";
-import { cmdLogin } from "./commands/login.js";
-import { cmdLogout } from "./commands/logout.js";
-import { cmdReview } from "./commands/review.js";
-import { cmdStack } from "./commands/stack.js";
-import { cmdStatus } from "./commands/status.js";
-import { cmdWhoami } from "./commands/whoami.js";
+import { dispatchCommand, shellCommandSpecs, } from "./commands/registry.js";
 import { ansi } from "./ui/ansi.js";
 import { printBannerHeader, shellPrompt } from "./ui/banner.js";
 import { CTRL_C_EXIT_HINT, CtrlCExitGate } from "./ui/ctrl-c-exit.js";
 import { askLine, PromptClosedError } from "./ui/prompt.js";
-export const COMMANDS = [
-    { name: "help", summary: "Show available commands" },
-    { name: "login", summary: "Sign in via browser (or paste a key)" },
-    { name: "logout", summary: "Remove the stored API key" },
-    { name: "review", summary: "Review git diff (default main...HEAD)" },
-    { name: "status", summary: "Show a review job" },
-    { name: "credits", summary: "Credit balance with usage bars" },
-    { name: "usage", summary: "Credit balance with usage bars" },
-    { name: "jobs", summary: "Recent review jobs (default 10)" },
-    { name: "branches", summary: "Pick a recently reviewed branch" },
-    { name: "chains", summary: "Alias for branches" },
-    { name: "chain", summary: "Show a branch review-chain timeline" },
-    { name: "whoami", summary: "Key + plan + API base" },
-    { name: "thread", summary: "Jobs in a review thread" },
-    { name: "stack", summary: "Stacks: create, submit, list, adopt, restack, land" },
-    { name: "clear", summary: "Clear screen and reprint banner" },
-    { name: "exit", summary: "Leave the shell" },
-    { name: "quit", summary: "Leave the shell" },
-];
+/** Shell autocomplete + `/help` — derived from the command registry (STRUCT-01). */
+export const COMMANDS = shellCommandSpecs();
 function printHelp() {
     const rows = COMMANDS.map((c) => `  ${ansi.green("/" + c.name.padEnd(10))} ${c.summary}`).join("\n");
     console.log(`
@@ -125,48 +100,17 @@ export async function runShell() {
             }
             busyAbort = new AbortController();
             try {
-                if (cmd === "login") {
-                    await cmdLogin(args);
-                    await printBannerHeader();
-                }
-                else if (cmd === "logout") {
-                    await cmdLogout();
-                    await printBannerHeader();
-                }
-                else if (cmd === "review") {
-                    await cmdReview(args, { signal: busyAbort.signal, interactive: true });
-                }
-                else if (cmd === "status") {
-                    if (!args[0]) {
-                        throw new CommandError('usage: status <job_id>');
-                    }
-                    await cmdStatus(args[0], { format: "pretty", signal: busyAbort.signal });
-                }
-                else if (cmd === "credits" || cmd === "usage") {
-                    await cmdCredits(args);
-                }
-                else if (cmd === "jobs") {
-                    await cmdJobs(args);
-                }
-                else if (cmd === "branches" || cmd === "chains") {
-                    await cmdBranches(args);
-                }
-                else if (cmd === "chain") {
-                    await cmdChain(args);
-                }
-                else if (cmd === "whoami") {
-                    await cmdWhoami(args);
-                }
-                else if (cmd === "thread") {
-                    if (!args[0]) {
-                        throw new CommandError("usage: thread <slug>");
-                    }
-                    await cmdThread(args[0], args.slice(1));
-                }
-                else if (cmd === "stack") {
-                    await cmdStack(args);
-                }
-                else {
+                const ok = await dispatchCommand(cmd, args, {
+                    mode: "shell",
+                    signal: busyAbort.signal,
+                    afterAuth: async () => {
+                        try {
+                            await printBannerHeader();
+                        }
+                        catch { /* banner is best-effort */ }
+                    },
+                });
+                if (!ok) {
                     console.error(ansi.dim(`unknown command "${cmd}" -- type help`));
                 }
             }

package/dist/stack-meta.js

@@ -5,7 +5,7 @@
 import { randomUUID } from "node:crypto";
 import { chmod, copyFile, mkdir, readFile, readdir, rename, rm, rmdir, unlink, writeFile, } from "node:fs/promises";
 import path from "node:path";
-import { CommandError } from "./errors.js";
+import { CommandError, isCommandErrorCode } from "./errors.js";
 import { git } from "./git.js";
 import { cliStacksRoot, gitTopLevel, LEGACY_STACK_META_REL, legacyStackMetaPath, repoStateDir, stackMetaPath as resolveStackMetaPath, } from "./repo-identity.js";
 /** Exported only for legacy migration/tests. New state never uses this path. */
@@ -200,14 +200,10 @@ export async function resetStackMeta(cwd = process.cwd(), stacksRoot = cliStacks
         legacyFile = legacyStackMetaPath(cwd);
     }
     catch (err) {
-        const code = err?.code;
-        if (code !== undefined)
-            throw err;
-        if (err instanceof Error &&
-            (err.message.includes("not a git repository") ||
-                err.message.includes("git common directory is missing"))) {
+        // Outside a worktree / deleted main repo: reset is a no-op (nothing to clear).
+        // Match on CommandError.code — do not treat it as a Node errno.
+        if (isCommandErrorCode(err, "not_a_repo"))
             return;
-        }
         throw err;
     }
     await rm(stateFile, { force: true });

package/dist/ui/banner.js

@@ -1,8 +1,9 @@
 import { getMe } from "../api.js";
+import { CommandError } from "../errors.js";
 import { keyDisplay, loadConfig, resolveApiKey } from "../config.js";
 import { cliVersion } from "../version.js";
 import { ansi } from "./ansi.js";
-import { frameWidth, padVisible, roundedBox, sideBySide, visibleWidth, } from "./box.js";
+import { frameWidth, padVisible, preferBoxedUi, roundedBox, sideBySide, visibleWidth, } from "./box.js";
 import { TORNADO_LOGO } from "./logo.js";
 import { usageBar } from "./usage.js";
 const WORDMARK = `
@@ -36,7 +37,7 @@ const WHATS_NEW = {
         "`mg` short alias — same binary as `mergestorm`",
     ],
     "0.3.3": [
-        "`stack list` / `adopt` / `restack` / `land` / `auto-land`",
+        "`stack list` / `adopt` / `restack` / `land` / `auto-promote`",
     ],
     "0.3.4": [
         "`stack create` / `submit` — author stacks with `mg` (not Graphite)",
@@ -54,14 +55,25 @@ const WHATS_NEW = {
         "MIT license + public source at github.com/marginsystems/mergestorm-cli",
         "npm repository/bugs point at the public CLI repo",
     ],
+    "0.3.8": [
+        "Command registry + CommandError.code (no message-regex control flow)",
+        "cmdStackSubmit unit-tested; shared findings renderer; origin parse in git.ts",
+        "Review poll retries + status <job_id> recovery; empty-submit / narrow-TTY fixes",
+        "login --key muted + validated; API timeouts; Node 22 hard-fail; --version",
+    ],
 };
-function formatStatusLines(me, key, barWidth) {
+function formatStatusLines(me, key, barWidth, keyInvalid = false) {
     if (!key) {
         return [
             `${ansi.dim("○")} not logged in — type ${ansi.green("login")} to sign in`,
             `  or ${ansi.green("login --key")} to paste an API key`,
         ];
     }
+    if (keyInvalid) {
+        return [
+            `${ansi.dim("○")} API key invalid or revoked — type ${ansi.green("login")} to sign in again`,
+        ];
+    }
     const display = me?.key.prefix ?? keyDisplay(key) ?? "msk_live_…";
     if (!me) {
         return [`${ansi.green("●")} logged in (${ansi.bold(display)})`];
@@ -76,7 +88,7 @@ function formatStatusLines(me, key, barWidth) {
 function tipsLines() {
     return [
         ansi.dim("Tips for getting started"),
-        `  ${ansi.green("review")}      review main...HEAD`,
+        `  ${ansi.green("review")}      review origin/HEAD or main`,
         `  ${ansi.green("stack")}       create → submit → restack → land`,
         `  ${ansi.green("/help")}       list all commands`,
     ];
@@ -99,8 +111,20 @@ export async function printBannerHeader() {
     const cfg = await loadConfig();
     const key = resolveApiKey(cfg);
     let me = null;
+    let keyInvalid = false;
     if (key) {
-        me = await getMe(cfg);
+        try {
+            // Short probe so a hung API cannot stall shell startup for the full request budget.
+            me = await getMe(cfg, { timeoutMs: 8_000 });
+        }
+        catch (err) {
+            if (err instanceof CommandError) {
+                keyInvalid = true;
+            }
+            else {
+                throw err;
+            }
+        }
     }
     const version = cliVersion();
     const outer = frameWidth();
@@ -114,7 +138,7 @@ export async function printBannerHeader() {
     const leftCol = [
         ...logoLines,
         "",
-        ...formatStatusLines(me, key, barWidth),
+        ...formatStatusLines(me, key, barWidth, keyInvalid),
     ];
     const rightCol = [
         ...tipsLines(),
@@ -124,6 +148,14 @@ export async function printBannerHeader() {
     // Clip right column lines that overflow the right pane.
     const rightClipped = rightCol.map((line) => visibleWidth(line) <= rightColW ? line : padVisible(line, rightColW));
     const rows = sideBySide(leftCol, rightClipped, leftColW, 2);
+    if (!preferBoxedUi()) {
+        // Narrow panes — plain lines beat wrapped box frames.
+        console.log(ansi.boldGreen(`mergestorm v${version}`));
+        for (const line of rows)
+            console.log(line);
+        console.log("");
+        return;
+    }
     const panel = roundedBox(rows, {
         title: `mergestorm v${version}`,
         width: outer,

package/dist/ui/box.d.ts

@@ -1,9 +1,16 @@
 export declare function visibleWidth(str: string): number;
+/** Below this width, boxed chrome wraps on real TTYs — prefer plain output. */
+export declare const MIN_BOXED_COLUMNS = 48;
 /** Usable terminal columns (TTY), with a sensible fallback for pipes/tests. */
 export declare function terminalColumns(fallback?: number): number;
+/**
+ * Whether rounded/full-bleed boxes fit without wrapping.
+ * Non-TTY (unknown columns) keeps boxes for tests and CI logs.
+ */
+export declare function preferBoxedUi(): boolean;
 /**
  * Outer box width for Claude-style full-bleed frames.
- * Leaves 1 col margin so the right border doesn't wrap.
+ * Never wider than the terminal (minus 1 so the right border doesn't wrap).
  */
 export declare function frameWidth(fallback?: number): number;
 export interface RoundedBoxOptions {

package/dist/ui/box.js

@@ -4,20 +4,32 @@ const ANSI_PATTERN = /\u001b\[[0-9;]*m/g;
 export function visibleWidth(str) {
     return str.replace(ANSI_PATTERN, "").length;
 }
+/** Below this width, boxed chrome wraps on real TTYs — prefer plain output. */
+export const MIN_BOXED_COLUMNS = 48;
 /** Usable terminal columns (TTY), with a sensible fallback for pipes/tests. */
 export function terminalColumns(fallback = 80) {
     const cols = stdout.columns;
-    if (typeof cols === "number" && Number.isFinite(cols) && cols >= 40) {
+    if (typeof cols === "number" && Number.isFinite(cols) && cols >= 1) {
         return cols;
     }
     return fallback;
 }
+/**
+ * Whether rounded/full-bleed boxes fit without wrapping.
+ * Non-TTY (unknown columns) keeps boxes for tests and CI logs.
+ */
+export function preferBoxedUi() {
+    const cols = stdout.columns;
+    if (typeof cols !== "number" || !Number.isFinite(cols))
+        return true;
+    return cols >= MIN_BOXED_COLUMNS;
+}
 /**
  * Outer box width for Claude-style full-bleed frames.
- * Leaves 1 col margin so the right border doesn't wrap.
+ * Never wider than the terminal (minus 1 so the right border doesn't wrap).
  */
 export function frameWidth(fallback = 80) {
-    return Math.max(48, terminalColumns(fallback) - 1);
+    return Math.max(20, terminalColumns(fallback) - 1);
 }
 const ROUNDED = { tl: "╭", tr: "╮", bl: "╰", br: "╯", h: "─", v: "│" };
 const ASCII = { tl: "+", tr: "+", bl: "+", br: "+", h: "-", v: "|" };

package/dist/ui/findings.d.ts

@@ -0,0 +1,28 @@
+/** Shared review-job findings payload (API may send snake or camel for off-diff). */
+export type ReviewFindings = {
+    inline?: {
+        path: string;
+        line: number;
+        severity: string;
+        body: string;
+        title?: string;
+    }[];
+    off_diff?: {
+        path?: string;
+        line?: number;
+        severity: string;
+        body: string;
+    }[];
+    offDiff?: {
+        path?: string;
+        line?: number;
+        severity: string;
+        body: string;
+    }[];
+};
+export type RenderFindingsOptions = {
+    /** When true and both lists are empty, print the empty message. */
+    emptyMessage?: boolean;
+};
+/** Print inline + off-diff findings the same way for `review` and `status --pretty`. */
+export declare function renderFindings(findings: ReviewFindings | null | undefined, opts?: RenderFindingsOptions): void;

package/dist/ui/findings.js

@@ -0,0 +1,16 @@
+/** Print inline + off-diff findings the same way for `review` and `status --pretty`. */
+export function renderFindings(findings, opts = {}) {
+    const inline = findings?.inline ?? [];
+    const off = findings?.off_diff ?? findings?.offDiff ?? [];
+    for (const c of inline) {
+        console.log(`\n[${c.severity}] ${c.path}:${c.line}${c.title ? ` — ${c.title}` : ""}`);
+        console.log(c.body);
+    }
+    for (const c of off) {
+        console.log(`\n[${c.severity}] off-diff ${c.path ?? ""}`);
+        console.log(c.body);
+    }
+    if (opts.emptyMessage && inline.length === 0 && off.length === 0) {
+        console.log("\nNo findings.");
+    }
+}

package/dist/ui/prompt.js

@@ -2,7 +2,7 @@ import * as readline from "node:readline";
 import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
 import { ansi } from "./ansi.js";
-import { frameWidth, roundedBox, visibleWidth } from "./box.js";
+import { frameWidth, preferBoxedUi, roundedBox, visibleWidth } from "./box.js";
 import { CTRL_C_EXIT_HINT, CtrlCExitGate } from "./ctrl-c-exit.js";
 /** Thrown when the user asks to close the prompt (Ctrl+D empty, or Ctrl+C twice). */
 export class PromptClosedError extends Error {
@@ -46,8 +46,10 @@ export async function askLine(opts) {
         readline.emitKeypressEvents(input);
         input.setRawMode(true);
         input.resume();
+        const boxed = preferBoxedUi();
         // Row (0-based) of the "› buffer" content line among the rows we draw each frame.
-        const inputRow = (opts.prompt ? 1 : 0) + 1;
+        // Boxed: optional prompt + top border + content. Plain: optional prompt + content.
+        const inputRow = (opts.prompt ? 1 : 0) + (boxed ? 1 : 0);
         function currentDropdown() {
             if (!buffer.startsWith("/"))
                 return [];
@@ -61,11 +63,15 @@ export async function askLine(opts) {
             const rows = [];
             if (opts.prompt)
                 rows.push(ansi.dim(opts.prompt));
-            // Full terminal width input frame, not content-sized.
-            rows.push(...roundedBox([`${ansi.green("›")} ${buffer}`], {
-                padding: 1,
-                width: frameWidth(),
-            }));
+            const inputLine = `${ansi.green("›")} ${buffer}`;
+            if (boxed) {
+                // Full terminal width input frame, not content-sized.
+                rows.push(...roundedBox([inputLine], { padding: 1, width: frameWidth() }));
+            }
+            else {
+                // Plain prompt on narrow TTYs (avoids wrapped borders).
+                rows.push(inputLine);
+            }
             const dropdown = currentDropdown();
             if (dropdown.length) {
                 if (dropdownIndex >= dropdown.length)
@@ -81,7 +87,8 @@ export async function askLine(opts) {
             output.write(rows.join("\r\n") + "\r\n");
             linesDrawn = rows.length;
             const prefixWidth = visibleWidth(`${ansi.green("›")} `);
-            const targetCol = 1 + 1 + prefixWidth + cursor + 1;
+            // Boxed: border col + padding; plain: column 1.
+            const targetCol = (boxed ? 1 + 1 : 0) + prefixWidth + cursor + 1;
             output.write(`${up(linesDrawn - inputRow)}${col(targetCol)}`);
         }
         function cleanup() {

package/dist/ui/secret-input.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Read a single line without echoing characters (TTY).
+ * Non-TTY (piped CI) falls back to a normal readline question.
+ */
+export declare function readSecretLine(prompt: string): Promise<string>;