@hmharness/cli 0.6.4 → 0.6.6

package/dist/tui.d.ts

@@ -32,6 +32,9 @@ export declare class TuiRuntime {
     private approval;
     private approvalResolve;
     private running;
+    /** queued task count: the busy hints line shows it live (queue at a glance,
+     *  no /queue query needed) */
+    private queued;
     private renderTimer?;
     private exitResolve;
     private driver;
@@ -116,6 +119,7 @@ export declare class TuiRuntime {
     foldThinking(): void;
     setBusy(busy: boolean, label?: string): void;
     setStatus(s: string): void;
+    setQueued(n: number): void;
     requestApproval(name: string, args: Record<string, unknown>): Promise<boolean>;
     consumeInput(): string;
     onSubmit(fn: () => void): void;

package/dist/tui.js

@@ -154,6 +154,9 @@ export class TuiRuntime {
     approval = null;
     approvalResolve = null;
     running = true;
+    /** queued task count: the busy hints line shows it live (queue at a glance,
+     *  no /queue query needed) */
+    queued = 0;
     renderTimer;
     exitResolve = null;
     driver = null;
@@ -418,6 +421,10 @@ export class TuiRuntime {
         this.status = s;
         this.dirty = true;
     }
+    setQueued(n) {
+        this.queued = Math.max(0, n);
+        this.dirty = true;
+    }
     requestApproval(name, args) {
         this.approval = { name, args };
         this.dirty = true;
@@ -855,9 +862,11 @@ export class TuiRuntime {
             }
         }
         frame.push(DIM('└' + '─'.repeat(iw + 2) + '┘'));
-        const hints = this.scrollFromBottom > 0
-            ? `${DIM(this.t.tuiScrolled)}`
-            : `${DIM(this.t.tuiHints)}`;
+        const hints = this.busy
+            ? `${DIM(this.t.tuiBusyHints(this.queued))}`
+            : this.scrollFromBottom > 0
+                ? `${DIM(this.t.tuiScrolled)}`
+                : `${DIM(this.t.tuiHints)}`;
         const stat = this.status && !this.busy ? DIM(this.status) : '';
         frame.push(truncateTo(hints + ' '.repeat(Math.max(1, W - strWidth(stripAnsi(hints)) - strWidth(stat))) + stat, W - 1));
         // Absolute per-row addressing: CUP resets the column and cancels the
@@ -935,34 +944,31 @@ export async function tui(yes, noWeb = false) {
     // Task queue: new submissions during a running task are queued (not
     // rejected, not run concurrently — sequential execution preserves history
     // integrity). Slash commands still run immediately (they're quick).
-    // `!` prefix inserts at FRONT (urgent). Esc interrupts the running task.
+    // Codex-style interaction: ONE key does both jobs — Enter sends when there
+    // is text and STOPS the running task when the line is empty (the TUI
+    // equivalent of the send button that becomes a stop button). No `!` prefix,
+    // no /queue skip: the queue is visible in the busy hints line.
     const taskQueue = [];
     let taskRunning = false;
     let currentAbort = null;
     rt.onSubmit(() => {
         const line = rt.consumeInput().trim();
-        if (!line)
+        if (!line) {
+            // empty Enter while running = stop (interrupts the current task;
+            // queued tasks still run — clear them first with /queue clear if not)
+            if (taskRunning) {
+                currentAbort?.abort();
+                rt.addText('⏹ interrupting current task (in-flight tool calls finish first; queued tasks still run)', 'dim');
+            }
             return;
+        }
         if (line.startsWith('/')) {
             void handleLine(line);
             return;
         }
-        if (line.startsWith('!')) {
-            // urgent: strip the ! and insert at front of queue (or run immediately)
-            const urgent = line.slice(1).trim();
-            if (!urgent)
-                return;
-            if (taskRunning) {
-                taskQueue.unshift(urgent);
-                rt.addText(`⚡ inserted at front: "${urgent.slice(0, 60)}${urgent.length > 60 ? '…' : ''}" (runs next)`, 'dim');
-                currentAbort?.abort(); // interrupt current to run the urgent task
-                return;
-            }
-            void executeTaskQueue(urgent);
-            return;
-        }
         if (taskRunning) {
             taskQueue.push(line);
+            rt.setQueued(taskQueue.length);
             rt.addText(`📋 queued: "${line.slice(0, 60)}${line.length > 60 ? '…' : ''}" (${taskQueue.length} waiting)`, 'dim');
             return;
         }
@@ -974,6 +980,7 @@ export async function tui(yes, noWeb = false) {
         while (task) {
             await runSingleTask(task);
             task = taskQueue.shift();
+            rt.setQueued(taskQueue.length);
             if (task)
                 rt.addText(`▶ next queued: "${task.slice(0, 60)}${task.length > 60 ? '…' : ''}"`, 'dim');
         }
@@ -1047,24 +1054,17 @@ export async function tui(yes, noWeb = false) {
             if (sub === 'clear') {
                 const n = taskQueue.length;
                 taskQueue.length = 0;
+                rt.setQueued(0);
                 rt.addText(n > 0 ? 'cleared ' + n + ' queued task(s)' : 'queue was already empty', 'dim');
                 return;
             }
-            if (sub === 'skip' || sub === 'interrupt') {
-                if (!taskRunning) {
-                    rt.addText('no task is running', 'dim');
-                    return;
-                }
-                currentAbort?.abort();
-                rt.addText('interrupting current task (finishes in-flight tool calls)...', 'dim');
-                return;
-            }
-            // bare /queue: show status
+            // bare /queue: show status. Operations are key-based, not command-based:
+            // empty Enter stops the current task, typed input queues, this only inspects.
             const status = taskRunning ? 'running' : 'idle';
             const queueList = taskQueue.length > 0
                 ? taskQueue.map((task, i) => '  ' + (i + 1) + '. ' + task.slice(0, 70)).join('\n')
                 : '  (empty)';
-            rt.addText('queue: ' + status + ' | ' + taskQueue.length + ' waiting\n' + queueList + '\n\ncommands: /queue clear, /queue skip, !<task> to insert at front', 'dim');
+            rt.addText('queue: ' + status + ' | ' + taskQueue.length + ' waiting\n' + queueList + '\n\nempty Enter = stop current · typed Enter = queue · /queue clear = drop all', 'dim');
             return;
         }
         if (line === '?' || line === '/help') {
@@ -1144,9 +1144,38 @@ export async function tui(yes, noWeb = false) {
                 return;
             }
             history = tr.messages;
-            const firstUser = tr.messages.find((m) => m.role === 'user')?.content ?? '';
             rt.clearScreen();
-            rt.addUser(firstUser.replace(/\n/g, ' ').slice(0, 120));
+            // Render the FULL session window, not just the first line (user
+            // feedback: "恢复的应该是整个会话窗口,而不仅仅是片段"). Long sessions
+            // are bounded from the tail so the visible window stays usable while
+            // the complete transcript still lives in `history` for the model.
+            const MAX_RENDER = 80;
+            const msgs = tr.messages;
+            const skipped = Math.max(0, msgs.length - MAX_RENDER);
+            rt.addText('--- resumed ' + (tr.id || arg) + ' · ' + msgs.length + ' messages'
+                + (skipped > 0 ? ' (' + skipped + ' earlier kept in context, not shown)' : '')
+                + ' ---', 'dim');
+            for (const m of (skipped > 0 ? msgs.slice(skipped) : msgs)) {
+                const text = typeof m.content === 'string' ? m.content : '';
+                if (m.role === 'user') {
+                    rt.addUser(text.replace(/\n+/g, ' ').slice(0, 400));
+                }
+                else if (m.role === 'assistant') {
+                    const calls = m.tool_calls ?? [];
+                    if (text.trim())
+                        rt.addText(text.slice(0, 2000));
+                    for (const c of calls)
+                        rt.addText('● ' + CYAN(String(c.function?.name ?? 'tool')) + DIM(' …'), 'dim');
+                }
+                else if (m.role === 'tool') {
+                    const first = text.split('\n').find((l) => l.trim()) ?? '';
+                    if (first)
+                        rt.addText('  ' + DIM('⎿ ' + first.trim().slice(0, 100)), 'dim');
+                }
+                else if (m.role === 'system' && text && !text.startsWith('[context pruned')) {
+                    rt.addText(DIM(text.slice(0, 300)), 'dim');
+                }
+            }
             rt.addText(t.cmdResumeLoaded(tr.messages.length), 'dim');
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmharness/cli",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "hmharness command line: one-shot tasks, an interactive REPL, a fullscreen TUI, the web frontend, and direct tool invocation.",
   "type": "module",
   "main": "dist/main.js",
@@ -43,11 +43,11 @@
     "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
-    "@hmharness/kernel": "0.6.4",
-    "@hmharness/evolution": "0.6.4",
-    "@hmharness/domain-harmony": "0.6.4",
-    "@hmharness/domain-ops": "0.6.4",
-    "@hmharness/agent": "0.6.4",
-    "@hmharness/web": "0.6.4"
+    "@hmharness/kernel": "0.6.6",
+    "@hmharness/evolution": "0.6.6",
+    "@hmharness/domain-harmony": "0.6.6",
+    "@hmharness/domain-ops": "0.6.6",
+    "@hmharness/agent": "0.6.6",
+    "@hmharness/web": "0.6.6"
   }
 }