@nanhara/hara 0.98.3 → 0.99.0

package/dist/index.js

@@ -2743,6 +2743,7 @@ program.action(async (opts) => {
                 orgId: __activeP.kind === "gateway" ? __activeP.deviceId || __activeP.id : undefined,
                 routeHost: __routeForHeader?.host,
                 modelSource: __modelSource,
+                visionModel: cfg.visionModel,
             },
             visionNotice: __visionNotice,
             cycleApproval: (m) => cycleMode(m),

package/dist/tui/App.js

@@ -160,20 +160,45 @@ export function shortenSession(uuid) {
         return "";
     return uuid.slice(0, 8);
 }
-/** Layout constants for the field grid. Field names live in a 10-char column;
- *  values start at column 12 (after 2 spaces). The view uses `padField` to
- *  pad a label so the values align vertically across rows. */
-const FIELD_PAD = 10;
-const padField = (name) => name.padEnd(FIELD_PAD, " ");
+/** Data-driven label column (mirrors codex's `FieldFormatter::from_labels`): pad every label to the
+ *  width of the WIDEST label actually shown this render, so values line up without a hard-coded column.
+ *  Returns a `(label) => padded` closure. A 3-space gap after the padded label separates label↔value. */
+export function fieldFormatter(labels) {
+    const width = labels.reduce((w, l) => Math.max(w, l.length), 0);
+    return (label) => label.padEnd(width, " ");
+}
+/** Dim trailing clause for the model line: the vision sidecar (only when configured). Pure so the
+ *  composition (spacing, silence-when-unset) can be pinned in a unit test without rendering React.
+ *  Returns "" when no describer is configured (native-vision main models stay silent — 顾雅 spec).
+ *  The actionable `/model ↹` hint is rendered separately (in green) by the view. */
+export function modelLineSuffix(visionModel) {
+    return visionModel ? ` · vision ${visionModel}` : "";
+}
+// The header is emitted ONCE into <Static> (App's id:-1 sentinel). A rounded, dim-bordered card
+// (codex polish) that HUGS its content via alignSelf="flex-start" — so it neither spans the full
+// width nor blows out on resize. Keeps hara's identity: seal-red ◆ glyph + title, the org/profile
+// grid, and the vision sidecar clause. One accent (◆ + title); one green affordance (/model ↹).
 function HeaderCard(props) {
     const { version, modelLabel, cwd, agentsMdLoaded, session, kind } = props;
     const home = process.env.HOME ?? "";
     const cwdShort = shortenHome(cwd, home);
     const sessionShort = shortenSession(session);
-    // Identity line — branches on kind. Personal collapses kind+model into one line;
-    // org splits identity (org/label/id/route) from model (with its source).
-    const identity = kind === "org" ? (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: `  ${padField("org")}` }), _jsx(Text, { children: props.orgLabel ?? props.orgId ?? "(unnamed)" }), props.orgId && props.orgLabel ? _jsx(Text, { dimColor: true, children: `  ·  ${props.orgId}` }) : null, props.routeHost ? (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "  →  " }), _jsx(Text, { dimColor: true, children: props.routeHost })] })) : null] })) : (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: `  ${padField(props.profileId ? `personal:${props.profileId}` : "personal")}` }), _jsx(Text, { children: modelLabel }), props.routeHost ? (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "  →  " }), _jsx(Text, { dimColor: true, children: props.routeHost })] })) : null] }));
-    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { children: [_jsx(Text, { color: accent(), children: "> " }), _jsx(Text, { color: accent(), bold: true, children: `hara` }), _jsx(Text, { dimColor: true, children: ` · v${version} — the coding agent that runs like an org` })] }), _jsx(Text, { children: " " }), identity, kind === "org" ? (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: `  ${padField("model")}` }), _jsx(Text, { children: modelLabel }), props.modelSource ? _jsx(Text, { dimColor: true, children: `  ·  from ${props.modelSource}` }) : null] })) : null, _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: `  ${padField("cwd")}` }), _jsx(Text, { dimColor: true, children: cwdShort }), agentsMdLoaded ? _jsx(Text, { dimColor: true, children: "  ·  AGENTS.md" }) : null] }), sessionShort ? (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: `  ${padField("session")}` }), _jsx(Text, { dimColor: true, children: sessionShort })] })) : null, _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "  /help · @file · shift+tab · esc" })] }));
+    const isOrg = kind === "org";
+    // Data-driven label column: the first grid row is `org`/`profile`, then `model`, `cwd`, and
+    // `session` (only when present). Pad to the widest of exactly the labels we render this pass.
+    const labels = [isOrg ? "org" : "profile", "model", "cwd", ...(sessionShort ? ["session"] : [])];
+    const pad = fieldFormatter(labels);
+    const GAP = "   "; // 3-space label↔value gap (codex spacing)
+    // No leading indent here: paddingX={1} on the card already insets content 1 cell, and the title
+    // glyph starts at that same column — so labels stay flush-left with `◆ hara` (codex alignment).
+    const row = (label, body) => (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: `${pad(label)}${GAP}` }), body] }));
+    // First grid row: personal → `profile  personal[:<id>]`; org → `org  <label> · <id> → <host>`.
+    const identityRow = isOrg
+        ? row("org", (_jsxs(Text, { children: [_jsx(Text, { children: props.orgLabel ?? props.orgId ?? "(unnamed)" }), props.orgId && props.orgLabel ? _jsx(Text, { dimColor: true, children: ` · ${props.orgId}` }) : null, props.routeHost ? _jsx(Text, { dimColor: true, children: ` → ${props.routeHost}` }) : null] })))
+        : row("profile", _jsx(Text, { children: props.profileId ? `personal:${props.profileId}` : "personal" }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", borderDimColor: true, paddingX: 1, alignSelf: "flex-start", marginBottom: 1, children: [_jsxs(Text, { children: [_jsx(Text, { color: accent(), bold: true, children: "◆ hara" }), _jsx(Text, { dimColor: true, children: `   v${version} · the agent that runs like an org` })] }), _jsx(Text, { children: " " }), identityRow, row("model", (_jsxs(Text, { children: [_jsx(Text, { children: modelLabel }), isOrg
+                                ? props.modelSource ? _jsx(Text, { dimColor: true, children: ` · from ${props.modelSource}` }) : null
+                                : props.visionModel ? _jsx(Text, { dimColor: true, children: modelLineSuffix(props.visionModel) }) : null, _jsx(Text, { children: "   " }), _jsx(Text, { color: "green", children: "/model ↹" })] }))), row("cwd", (_jsxs(Text, { children: [_jsx(Text, { children: cwdShort }), agentsMdLoaded ? _jsx(Text, { dimColor: true, children: " · AGENTS.md" }) : null] }))), sessionShort ? row("session", _jsx(Text, { children: sessionShort })) : null] }), _jsx(Text, { dimColor: true, children: "  Tip: @ attach file · ctrl+t transcript · ctrl+r reasoning · shift+tab approval · esc interrupt" })] }));
 }
 // Spinner verb: while a turn is running, prefer the in_progress todo's activeForm (or its text),
 // so the bottom line reads "▶ updating tests…" instead of an abstract "working". Falls back to
@@ -532,5 +557,5 @@ export function App({ initialStatus, model, cwd, header, onSubmit, cycleApproval
     });
     if (showTranscript)
         return _jsx(Transcript, { items: [...history, ...current], onClose: () => setShowTranscript(false) });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: header ? [{ id: -1, kind: "notice", text: "" }, ...history] : history, children: (item) => (item.id === -1 ? _jsx(HeaderCard, { ...header }, "hdr") : _jsx(Block, { item: item }, item.id)) }), current.map((item) => (_jsx(Block, { item: item, open: reasoningOpen }, item.id))), !prompt && _jsx(TodoPanel, { todos: todos }), working && !prompt && _jsx(Working, { todos: todos }), prompt && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", children: `  ${stripAnsi(prompt.title)}` }), prompt.options.map((o, i) => (_jsx(Text, { color: i === promptSel ? "cyan" : undefined, bold: i === promptSel, children: (i === promptSel ? " ❯ " : "   ") + `${i + 1}. ` + o.label }, i))), _jsx(Text, { dimColor: true, children: `   ↑↓ or 1–${prompt.options.length} to choose · Enter · Esc cancels` })] })), askText && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", children: `  ? ${stripAnsi(askText.title)}` }), _jsx(Text, { dimColor: true, children: "   type your answer below · Enter to send · Esc cancels" })] })), pool.length > 0 && !prompt && !askText && (_jsx(Box, { flexDirection: "column", children: pool.map((l, i) => (_jsx(Text, { color: accent(), children: `  › ${l.length > 72 ? l.slice(0, 72) + "…" : l}` }, i))) })), _jsx(InputBox, { status: status, cwd: cwd, isActive: !prompt, working: working && !askText, queued: pool.length, vim: vim, onSubmit: handleSubmit, onClipboardImage: onClipboardImage })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: header ? [{ id: -1, kind: "notice", text: "" }, ...history] : history, children: (item) => (item.id === -1 ? _jsx(HeaderCard, { ...header }, "hdr") : _jsx(Block, { item: item }, item.id)) }), current.map((item) => (_jsx(Block, { item: item, open: reasoningOpen }, item.id))), !prompt && _jsx(TodoPanel, { todos: todos }), working && !prompt && _jsx(Working, { todos: todos }), prompt && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", children: `  ${stripAnsi(prompt.title)}` }), prompt.options.map((o, i) => (_jsx(Text, { color: i === promptSel ? "cyan" : undefined, bold: i === promptSel, children: (i === promptSel ? " ❯ " : "   ") + `${i + 1}. ` + o.label }, i))), _jsx(Text, { dimColor: true, children: `   ↑↓ or 1–${prompt.options.length} to choose · Enter · Esc cancels` })] })), askText && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", children: `  ? ${stripAnsi(askText.title)}` }), _jsx(Text, { dimColor: true, children: "   type your answer below · Enter to send · Esc cancels" })] })), pool.length > 0 && !prompt && !askText && (_jsx(Box, { flexDirection: "column", children: pool.map((l, i) => (_jsx(Text, { color: accent(), children: `  › ${l.length > 72 ? l.slice(0, 72) + "…" : l}` }, i))) })), _jsx(InputBox, { status: status, cwd: cwd, model: model, route: header?.routeHost, isActive: !prompt, working: working && !askText, queued: pool.length, vim: vim, onSubmit: handleSubmit, onClipboardImage: onClipboardImage })] }));
 }

package/dist/tui/InputBox.js

@@ -1,13 +1,12 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-// The framed input box (ink): a top border carrying the session name in the right corner, the
-// prompt line in the middle, and a bottom border carrying the approval modes + token usage +
-// concurrency. Composed from <Text> rows (no ink border fork needed) so the title sits exactly
-// where we want it. Pure-ish: pass `width` to make rendering deterministic in tests.
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+// The framed input box (ink): a rounded, dim-bordered box (codex polish) wrapping the prompt line,
+// with a single dim footer line rendered BELOW the box (model · approval · route · cwd · usage · ctx)
+// and the ModeBar under that. Pure-ish: pass `width` to make rendering deterministic in tests.
 //
 // Render-stability principles (codex-style, for slow/remote terminals): ink erases and rewrites the
 // ENTIRE dynamic region on every frame, so the box's cost scales with (a) how many lines it occupies
 // and (b) how often any of them change. Two levers here:
-//   1. The static chrome (borders, mode bar, mention popup) is memoized so a keystroke that only
+//   1. The static chrome (footer, mode bar, mention popup) is memoized so a keystroke that only
 //      changes the prompt text doesn't force React to reconcile the unchanged rows.
 //   2. Line-wrapping + cursor are computed deterministically from (value, cursor, width) in one memo,
 //      so long input wraps under a stable continuation indent and the cursor never drifts — instead
@@ -24,17 +23,30 @@ const tok = (n) => (n >= 1000 ? `${(n / 1000).toFixed(1)}k` : `${n}`);
 // The prompt gutter ("› " / "◆ ") is 2 cells wide; wrapped continuation lines indent by the same
 // amount so the text column is stable across visual rows.
 const GUTTER = 2;
-const TopBorder = memo(function TopBorder({ name, width }) {
-    const labelLen = name.length + 2; // "⏺ " + name
-    const left = Math.max(2, width - labelLen - 3);
-    return (_jsxs(Box, { children: [_jsxs(Text, { dimColor: true, children: ["─".repeat(left), " "] }), _jsx(Text, { color: "cyan", children: "\u23FA" }), _jsxs(Text, { bold: true, children: [" ", name] }), _jsx(Text, { dimColor: true, children: " \u2500" })] }));
-});
-// Bottom border carries token usage + concurrency at the right corner (modes moved to ModeBar below).
-const BottomBorder = memo(function BottomBorder({ s, width }) {
-    const usage = `↑${tok(s.input)} ↓${tok(s.output)}${s.ctxPct > 0 ? ` · ctx ${s.ctxPct}%` : ""}`;
-    const label = s.agents > 0 ? `${usage} · ⛁${s.agents}` : `${usage} · ⛁ idle`;
-    const left = Math.max(2, width - label.length - 3);
-    return (_jsx(Box, { children: _jsx(Text, { dimColor: true, children: `${"─".repeat(left)} ${label} ─` }) }));
+// Tilde-collapse HOME and keep the project tail — a compact cwd for the one-line footer. Local (tiny)
+// copy so InputBox doesn't reach back into App.tsx (App imports InputBox — avoid the cycle).
+export function footerCwd(abs, home = process.env.HOME ?? "", maxLen = 28) {
+    let p = abs;
+    if (home && (p === home || p.startsWith(home + "/")))
+        p = "~" + p.slice(home.length);
+    if (p.length <= maxLen)
+        return p;
+    const tail = p.slice(-(maxLen - 1));
+    const slash = tail.indexOf("/");
+    return "…" + (slash > 0 ? tail.slice(slash) : tail);
+}
+/** Compose the single dim footer line rendered below the box. Pure so the ordering/spacing (and the
+ *  optional route segment) can be pinned without rendering React. Shape (codex-style status line):
+ *  `<model> · <approval>[ · <route>] · <cwd> · ↑<in> ↓<out> · ctx <pct>%`. `ctx N%` is always present
+ *  (from 0 on) so the field never pops in mid-session and shifts the layout. */
+export function footerLine(model, s, cwdShort, route) {
+    const routeSeg = route ? ` · ${route}` : "";
+    return `  ${model} · ${s.approval}${routeSeg} · ${cwdShort} · ↑${tok(s.input)} ↓${tok(s.output)} · ctx ${s.ctxPct}%`;
+}
+// The merged status footer (was split across the old top/bottom dash-rules): model · approval ·
+// route · cwd · usage · ctx. Memoized so a prompt keystroke doesn't reconcile it.
+const Footer = memo(function Footer({ model, s, cwdShort, route }) {
+    return _jsx(Text, { dimColor: true, children: footerLine(model, s, cwdShort, route) });
 });
 const MODE_DESC = {
     suggest: "confirms edits & commands",
@@ -197,8 +209,9 @@ const InputLine = memo(function InputLine({ value, cursor, width, gutter, gutter
     }
     return (_jsx(Box, { flexDirection: "column", children: rows.map((row, i) => (_jsxs(Box, { children: [_jsx(Text, { color: gutterColor, children: i === 0 ? gutter : "  " }), _jsx(Text, { children: renderRow(value, row, cursor, true, i === rows.length - 1, `r${i}_`) })] }, i))) }));
 });
-/** Top border (session) + prompt line + bottom border (usage) + ModeBar, with an @path popup. */
-export function InputBox({ status, cwd, width, onSubmit, onClipboardImage, isActive = true, working = false, queued = 0, vim = false, placeholder = "Type a task · /help · @file · Ctrl+V paste image · shift+tab mode · Esc interrupts", }) {
+/** Bordered prompt box + one dim status footer (model · approval · route · cwd · usage · ctx) +
+ *  ModeBar, with an @path popup. */
+export function InputBox({ status, cwd, model, route, width, onSubmit, onClipboardImage, isActive = true, working = false, queued = 0, vim = false, placeholder = "Type a task · /help · @file · Ctrl+V paste image · shift+tab mode · Esc interrupts", }) {
     const { stdout } = useStdout();
     const w = width ?? stdout?.columns ?? 80;
     const [value, setValue] = useState("");
@@ -356,5 +369,9 @@ export function InputBox({ status, cwd, width, onSubmit, onClipboardImage, isAct
     }, { isActive });
     const gutter = vim && mode === "normal" ? "◆ " : "› ";
     const gutterColor = vim ? (mode === "normal" ? "yellow" : "green") : "cyan";
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(TopBorder, { name: status.sessionName || "session", width: w }), _jsx(InputLine, { value: value, cursor: cursor, width: w, gutter: gutter, gutterColor: gutterColor, placeholder: placeholder }), vim ? _jsx(Text, { dimColor: true, children: mode === "normal" ? "  -- NORMAL --  i/a insert · h l 0 $ w b e move · x dd D cw p edit" : "  -- INSERT --  Esc → normal" }) : null, _jsx(BottomBorder, { s: status, width: w }), working ? _jsx(Text, { dimColor: true, children: `  ⌨ working — Enter queues your message${queued ? ` · ${queued} queued` : ""} · Esc interrupts` }) : null, popupOpen ? _jsx(MentionPopup, { items: candidates, selected: selIdx, query: mention.query }) : null, _jsx(ModeBar, { approval: status.approval })] }));
+    // The prompt box borders subtract 2 cells (1 each side) from the usable text width; InputLine's
+    // deterministic wrap needs the INNER width so the cursor/continuation gutter stay exact.
+    const innerW = Math.max(1, w - 2);
+    const cwdShort = footerCwd(cwd);
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { borderStyle: "round", borderColor: "gray", borderDimColor: true, paddingX: 1, children: _jsx(InputLine, { value: value, cursor: cursor, width: innerW, gutter: gutter, gutterColor: gutterColor, placeholder: placeholder }) }), vim ? _jsx(Text, { dimColor: true, children: mode === "normal" ? "  -- NORMAL --  i/a insert · h l 0 $ w b e move · x dd D cw p edit" : "  -- INSERT --  Esc → normal" }) : null, _jsx(Footer, { model: model, s: status, cwdShort: cwdShort, route: route }), working ? _jsx(Text, { dimColor: true, children: `  ⌨ working — Enter queues your message${queued ? ` · ${queued} queued` : ""} · Esc interrupts` }) : null, popupOpen ? _jsx(MentionPopup, { items: candidates, selected: selIdx, query: mention.query }) : null, _jsx(ModeBar, { approval: status.approval })] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanhara/hara",
-  "version": "0.98.3",
+  "version": "0.99.0",
   "description": "hara — a coding agent CLI that runs like an engineering org.",
   "bin": {
     "hara": "dist/index.js"