@nanhara/hara 0.125.1 → 0.126.0

package/dist/tui/App.js

@@ -21,6 +21,16 @@ import { onTurnPhase, turnPhase } from "../agent/phase.js";
 import { listJobs, onJobsChange } from "../exec/jobs.js";
 import { ModelPicker } from "./model-picker.js";
 import { newSteerInteraction, newTurnInteraction, requestsTaskContinuation } from "../session/task.js";
+/** Composer work and executable task work are different states. Slash controls (for example `/model`)
+ * may keep the TUI busy while opening a picker or doing local bookkeeping, but there is no model task to
+ * steer. `/continue` and user-invocable skill commands are executable Agent turns. */
+export function submissionCanBeSteered(line, agentSlashCommands = []) {
+    const value = line.trim();
+    const slash = /^\/([a-z][\w-]*)(?:\s|$)/i.exec(value);
+    if (!slash)
+        return true;
+    return slash[1].toLowerCase() === "continue" || agentSlashCommands.includes(slash[1]);
+}
 let _id = 0;
 const nid = () => ++_id;
 const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, "");
@@ -265,7 +275,7 @@ export function spinnerVerb(list, elapsedSec) {
 // wall-clock start, so the "Ns" text stays exact and stable.
 const SPINNER_FRAME_MS = 125;
 const IDLE_HINTS = "⏎ send · @ file · ctrl+v image · ctrl+t transcript · shift+tab mode";
-function StatusRow({ working, todos, queued }) {
+function StatusRow({ working, steerable, todos, queued }) {
     const [frame, setFrame] = useState(0);
     const [phase, setPhase] = useState(() => turnPhase());
     const startRef = useRef(Date.now());
@@ -289,8 +299,12 @@ function StatusRow({ working, todos, queued }) {
     const elapsedSec = Math.floor((Date.now() - startRef.current) / 1000);
     // Pre-first-token honesty (codex-parity): "waiting for the model" reads very differently from a
     // generic "working" when the network is slow — the user knows the request is out, not dead.
-    const verb = (phase === "waiting" ? `waiting for the model… ${elapsedSec}s · esc to interrupt` : spinnerVerb(todos, elapsedSec)) + bgTag;
-    return (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "yellow", children: frames[frame % frames.length] }), _jsx(Text, { dimColor: true, children: ` ${verb} · ⏎ steers · /next queues${queued ? ` (${queued})` : ""}` })] }));
+    const verb = (phase === "awaiting_user"
+        ? "waiting for your answer · task timer paused · esc to cancel"
+        : phase === "waiting"
+            ? `waiting for the model… ${elapsedSec}s · esc to interrupt`
+            : spinnerVerb(todos, elapsedSec)) + bgTag;
+    return (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "yellow", children: frames[frame % frames.length] }), _jsx(Text, { dimColor: true, children: ` ${verb} · ${steerable ? "⏎ steers · /next queues" : "⏎ queues next"}${queued ? ` (${queued})` : ""}` })] }));
 }
 // Short per-mode descriptions for the ONE-ROW mode line (the old two-row ModeBar's long sentences
 // don't fit inline). Full behavior is documented in /help; this line is a switching aid, not a manual.
@@ -341,7 +355,7 @@ const TodoPanel = memo(function TodoPanel({ todos }) {
                 return (_jsx(Text, { color: inProg ? accent() : undefined, bold: inProg, dimColor: done, children: `  ${TODO_MARK[t.status]} ${t.text}` }, i));
             }), hiddenSummary ? _jsx(Text, { dimColor: true, children: hiddenSummary }) : null] }));
 });
-export function App({ initialStatus, model, cwd, header, onSubmit, cycleApproval, onClipboardImage, vim, visionNotice }) {
+export function App({ initialStatus, model, cwd, header, onSubmit, agentSlashCommands = [], cycleApproval, onClipboardImage, vim, visionNotice, }) {
     const { exit } = useApp();
     const { stdout: termOut } = useStdout();
     // Live tail budget: terminal rows minus the rest of the dynamic chrome (todo panel ≤10, status slot,
@@ -462,12 +476,12 @@ export function App({ initialStatus, model, cwd, header, onSubmit, cycleApproval
     const drainQueue = useCallback(() => {
         if (!queueRef.current.length)
             return [];
-        const barrier = queueRef.current.findIndex((item) => item.mode === "next");
+        const barrier = queueRef.current.findIndex((item) => item.mode !== "steer");
         const batch = (barrier < 0 ? queueRef.current : queueRef.current.slice(0, barrier));
         if (!batch.length)
             return [];
         queueRef.current = barrier < 0 ? [] : queueRef.current.slice(barrier);
-        setPool(queueRef.current.map((item) => `${item.mode === "next" ? "next: " : ""}${item.line.trim() || "🖼 (image)"}`));
+        setPool(queueRef.current.map((item) => `${item.mode === "next" ? "next: " : item.mode === "control" ? "control: " : ""}${item.line.trim() || "🖼 (image)"}`));
         if (batch.some((b) => b.images?.length))
             noteVisionIfNeeded();
         for (const b of batch)
@@ -498,25 +512,37 @@ export function App({ initialStatus, model, cwd, header, onSubmit, cycleApproval
             // Enter steers the live turn; `/next …` creates an explicit queue barrier for a separate next task.
             // Once such a barrier exists, later type-ahead stays behind it instead of leaking backward.
             const expectedTurnId = activeTurnRef.current;
-            if (!expectedTurnId)
-                return;
             const next = /^\/(?:next|queue)(?:\s+([\s\S]+))?$/.exec(t);
             if (next && !next[1]?.trim() && !images?.length) {
                 pushCurrent("notice", "usage: /next <message>  (queues a separate task after the current turn)");
                 return;
             }
-            const behindBarrier = queueRef.current.some((item) => item.mode === "next");
-            if (next || behindBarrier) {
-                queueRef.current.push({ mode: "next", line: next?.[1]?.trim() || line, images });
+            // A control command can be "working" without owning a TaskExecution. Input typed during that UI
+            // operation is a real next turn, never a steer and never disposable. The same next barrier keeps
+            // later messages ordered behind it.
+            const queuedLine = next?.[1]?.trim() || line;
+            const queuedControl = !submissionCanBeSteered(queuedLine, agentSlashCommands);
+            const behindBarrier = !expectedTurnId ||
+                queueRef.current.some((item) => item.mode !== "steer");
+            if (queuedControl) {
+                queueRef.current.push({ mode: "control", line: queuedLine, images });
+            }
+            else if (next || behindBarrier) {
+                queueRef.current.push({ mode: "next", line: queuedLine, images });
             }
             else {
                 queueRef.current.push({ mode: "steer", line, images, expectedTurnId });
             }
-            setPool(queueRef.current.map((item) => `${item.mode === "next" ? "next: " : ""}${item.line.trim() || "🖼 (image)"}`));
+            setPool(queueRef.current.map((item) => `${item.mode === "next" ? "next: " : item.mode === "control" ? "control: " : ""}${item.line.trim() || "🖼 (image)"}`));
             return;
         }
         const interaction = forcedInteraction ?? newTurnInteraction();
-        activeTurnRef.current = interaction.turnId;
+        // Only a model task may receive type-ahead steering. A slash control still sets `working` so its
+        // picker/output is serialized, but leaves this ref empty; submissions then queue as ordinary turns.
+        activeTurnRef.current =
+            interaction.kind === "steer" || submissionCanBeSteered(t, agentSlashCommands)
+                ? interaction.turnId
+                : null;
         // Fold the previous turn's checklist NOW, at the natural boundary (a new task begins). The old
         // 30s-idle timer yanked the input box UP by the panel's height while the user was reading/typing
         // (anti-bob); folding on submit means the shrink coincides with the user's own action.
@@ -655,7 +681,7 @@ export function App({ initialStatus, model, cwd, header, onSubmit, cycleApproval
         ctrlRef.current = null;
         if (activeTurnRef.current === interaction.turnId)
             activeTurnRef.current = null;
-    }, [working, prompt, askText, onSubmit, pushCurrent, model, exit, drainQueue, noteVisionIfNeeded]);
+    }, [working, prompt, askText, onSubmit, agentSlashCommands, pushCurrent, model, exit, drainQueue, noteVisionIfNeeded]);
     // A message can arrive after runAgent's final pending-input drain but before the view flips to idle. Late
     // steer groups retain expectedTurnId; explicit `/next` groups start ordinary task turns in FIFO order.
     useEffect(() => {
@@ -669,8 +695,12 @@ export function App({ initialStatus, model, cwd, header, onSubmit, cycleApproval
             for (let at = 0; at < batch.length;) {
                 const mode = batch[at].mode;
                 let end = at + 1;
-                while (end < batch.length && batch[end].mode === mode)
-                    end++;
+                // Controls are barriers and always execute one-at-a-time. Task steering/next messages may still
+                // coalesce within their own adjacent group to preserve the established type-ahead behavior.
+                if (mode !== "control") {
+                    while (end < batch.length && batch[end].mode === mode)
+                        end++;
+                }
                 const group = batch.slice(at, end);
                 const line = group.map((item) => item.line).join("\n\n");
                 const images = group.flatMap((item) => item.images ?? []);
@@ -755,5 +785,7 @@ export function App({ initialStatus, model, cwd, header, onSubmit, cycleApproval
                     const r = picker.resolve;
                     setPicker(null);
                     r(null);
-                } })), 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))) })), modeSelector ? _jsx(ModeLine, { approval: status.approval }) : _jsx(StatusRow, { working: working, todos: todos, queued: pool.length }), _jsx(InputBox, { status: status, cwd: cwd, model: model, route: header?.routeHost, isActive: !prompt, vim: vim, onSubmit: handleSubmit, onClipboardImage: onClipboardImage })] }));
+                } })), 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))) })), modeSelector
+                ? _jsx(ModeLine, { approval: status.approval })
+                : _jsx(StatusRow, { working: working, steerable: !!activeTurnRef.current, todos: todos, queued: pool.length }), _jsx(InputBox, { status: status, cwd: cwd, model: model, route: header?.routeHost, isActive: !prompt, vim: vim, onSubmit: handleSubmit, onClipboardImage: onClipboardImage })] }));
 }

package/dist/tui/model-picker.js

@@ -5,10 +5,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // thin ink shell over it (like the Transcript overlay).
 import { Box, Text, useInput } from "ink";
 import { useState } from "react";
+import { supportsReasoningStyle } from "../providers/reasoning.js";
 /** The levels ←→ cycles for a style. Binary thinking toggles (DashScope enable_thinking, Ollama think)
  *  show off/on; graded styles (OpenAI/Anthropic effort/budget) show the full dial; `none` → no control. */
-export function levelsFor(style) {
-    if (style === "none")
+export function levelsFor(style, model = "") {
+    if (!supportsReasoningStyle(style, model))
         return [];
     if (style === "enable_thinking" || style === "ollama_think")
         return ["off", "high"]; // "high" renders as "on"
@@ -24,14 +25,14 @@ export function levelLabel(style, e) {
 }
 /** Pure navigation: ↑↓ moves through models (wrapping); ←→ cycles the thinking level for the endpoint's
  *  style. No-ops when there are no models / the style has no levels. Exported for tests. */
-export function movePicker(s, key, modelCount, style) {
+export function movePicker(s, key, modelCount, style, model = "") {
     if (key === "up" || key === "down") {
         if (modelCount <= 0)
             return s;
         const d = key === "down" ? 1 : -1;
         return { ...s, modelIdx: (s.modelIdx + d + modelCount) % modelCount };
     }
-    const levels = levelsFor(style);
+    const levels = levelsFor(style, model);
     if (!levels.length)
         return s;
     const cur = Math.max(0, levels.indexOf(s.effort));
@@ -41,21 +42,23 @@ export function movePicker(s, key, modelCount, style) {
 export function ModelPicker({ models, style, current, effort, onSelect, onCancel, }) {
     const start = Math.max(0, models.indexOf(current ?? ""));
     const [s, setS] = useState({ modelIdx: start, effort });
+    const selectedModel = models[s.modelIdx] ?? current ?? "";
+    const levels = levelsFor(style, selectedModel);
     useInput((_input, key) => {
         if (key.escape)
             return onCancel();
         if (key.return)
-            return onSelect(models[s.modelIdx] ?? current ?? "", s.effort);
+            return onSelect(selectedModel, levels.length ? s.effort : undefined);
         if (key.upArrow)
             setS((p) => movePicker(p, "up", models.length, style));
         else if (key.downArrow)
             setS((p) => movePicker(p, "down", models.length, style));
         else if (key.leftArrow)
-            setS((p) => movePicker(p, "left", models.length, style));
+            setS((p) => movePicker(p, "left", models.length, style, selectedModel));
         else if (key.rightArrow)
-            setS((p) => movePicker(p, "right", models.length, style));
+            setS((p) => movePicker(p, "right", models.length, style, selectedModel));
     });
-    const hasLevels = levelsFor(style).length > 0;
+    const hasLevels = levels.length > 0;
     const dial = hasLevels ? `thinking ◀ ${levelLabel(style, s.effort)} ▶` : "";
     return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", children: `  pick a model  ·  ↑↓ model  ·  ${hasLevels ? "←→ thinking  ·  " : ""}⏎ apply  ·  esc` }), models.length === 0 ? (_jsx(Text, { dimColor: true, children: "   (this endpoint doesn't list models — use /model <id> to set one directly)" })) : (models.map((m, i) => {
                 const on = i === s.modelIdx;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanhara/hara",
-  "version": "0.125.1",
+  "version": "0.126.0",
   "description": "hara — a coding agent CLI that runs like an engineering org.",
   "bin": {
     "hara": "runtime-bootstrap.cjs"