@hmharness/cli 0.6.0 → 0.6.2

package/dist/tui.js

@@ -932,12 +932,109 @@ export async function tui(yes, noWeb = false) {
         void notifyUpdate(home, current, (latest) => rt.addText(`↑ ${t.updateHint(latest)}`, 'dim'));
     }
     let history = [];
+    // 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.
+    const taskQueue = [];
+    let taskRunning = false;
+    let currentAbort = null;
     rt.onSubmit(() => {
         const line = rt.consumeInput().trim();
         if (!line)
             return;
-        void handleLine(line);
+        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.addText(`📋 queued: "${line.slice(0, 60)}${line.length > 60 ? '…' : ''}" (${taskQueue.length} waiting)`, 'dim');
+            return;
+        }
+        void executeTaskQueue(line);
     });
+    async function executeTaskQueue(firstTask) {
+        taskRunning = true;
+        let task = firstTask;
+        while (task) {
+            await runSingleTask(task);
+            task = taskQueue.shift();
+            if (task)
+                rt.addText(`▶ next queued: "${task.slice(0, 60)}${task.length > 60 ? '…' : ''}"`, 'dim');
+        }
+        taskRunning = false;
+    }
+    async function runSingleTask(line) {
+        rt.addUser(line);
+        rt.setBusy(true, t.running);
+        currentAbort = new AbortController();
+        let appender = null;
+        let kind = null;
+        try {
+            const result = await runAgentTask({
+                task: line,
+                registry: reg,
+                cfg,
+                yes: autoApprove,
+                resumeMessages: history,
+                signal: currentAbort.signal,
+                approvalAsk: (name, args) => rt.requestApproval(name, args),
+                events: {
+                    onLine: (l) => { if (kind === 'reasoning')
+                        rt.foldThinking(); appender = null; kind = null; rt.addText(l, 'dim'); },
+                    onDelta: (k, chunk) => {
+                        if (k !== kind) {
+                            if (kind === 'reasoning')
+                                rt.foldThinking();
+                            appender = rt.startStream(k === 'reasoning' ? 'think' : 'say');
+                            kind = k;
+                        }
+                        appender?.(chunk);
+                    },
+                    onToolCall: (name, args) => {
+                        if (kind === 'reasoning')
+                            rt.foldThinking();
+                        appender = null;
+                        kind = null;
+                        const brief = name === 'run_command' && typeof args.command === 'string'
+                            ? args.command
+                            : JSON.stringify(args);
+                        rt.addText(`${YELLOW('●')} ${CYAN(name)} ${DIM(brief.replace(/\s+/g, ' ').slice(0, 90))}`);
+                    },
+                    onToolResult: (name, output, isError) => {
+                        const dot = isError ? RED('✗') : GREEN('•');
+                        const first = output.split('\n').find((l) => l.trim()) ?? '';
+                        rt.addText(`  ${dot} ${DIM('⎿ ' + first.trim().slice(0, 100))}`);
+                    },
+                },
+            });
+            rt.setBusy(false);
+            rt.setStatus(`↑${result.usage.promptTokens} ↓${result.usage.completionTokens} tok · ${result.turns} turns · ${result.toolUses} tools`);
+            history = [...history, { role: 'user', content: line }, ...result.messages.slice(history.length + 2)];
+        }
+        catch (err) {
+            rt.setBusy(false);
+            rt.addText(String(err), 'err');
+        }
+        finally {
+            currentAbort = null;
+        }
+    }
     async function handleLine(line) {
         if (line === '/exit' || line === '/quit') {
             rt.destroy();
@@ -945,6 +1042,31 @@ export async function tui(yes, noWeb = false) {
                 c.close();
             process.exit(0);
         }
+        if (line === '/queue' || line.startsWith('/queue ')) {
+            const sub = line.slice(7).trim();
+            if (sub === 'clear') {
+                const n = taskQueue.length;
+                taskQueue.length = 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
+            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');
+            return;
+        }
         if (line === '?' || line === '/help') {
             rt.addText(COMMANDS.map((c) => '  ' + c.name.padEnd(11) + ' ' + String(t[c.key])).join('\n'), 'dim');
             return;
@@ -1176,57 +1298,6 @@ export async function tui(yes, noWeb = false) {
             }
             return;
         }
-        rt.addUser(line);
-        rt.setBusy(true, t.running);
-        let appender = null;
-        let kind = null;
-        try {
-            const result = await runAgentTask({
-                task: line,
-                registry: reg,
-                cfg,
-                yes: autoApprove,
-                resumeMessages: history,
-                approvalAsk: (name, args) => rt.requestApproval(name, args),
-                events: {
-                    onLine: (l) => { if (kind === 'reasoning')
-                        rt.foldThinking(); appender = null; kind = null; rt.addText(l, 'dim'); },
-                    onDelta: (k, chunk) => {
-                        if (k !== kind) {
-                            if (kind === 'reasoning')
-                                rt.foldThinking(); // collapse before the next phase
-                            appender = rt.startStream(k === 'reasoning' ? 'think' : 'say');
-                            kind = k;
-                        }
-                        appender?.(chunk);
-                    },
-                    onToolCall: (name, args) => {
-                        if (kind === 'reasoning')
-                            rt.foldThinking();
-                        appender = null;
-                        kind = null;
-                        // fold the args to their essence: for run_command the command
-                        // string itself, otherwise a short JSON tail
-                        const brief = name === 'run_command' && typeof args.command === 'string'
-                            ? args.command
-                            : JSON.stringify(args);
-                        rt.addText(`${YELLOW('●')} ${CYAN(name)} ${DIM(brief.replace(/\s+/g, ' ').slice(0, 90))}`);
-                    },
-                    onToolResult: (name, output, isError) => {
-                        const dot = isError ? RED('✗') : GREEN('•');
-                        const first = output.split('\n').find((l) => l.trim()) ?? '';
-                        rt.addText(`  ${dot} ${DIM('⎿ ' + first.trim().slice(0, 100))}`);
-                    },
-                },
-            });
-            rt.setBusy(false);
-            rt.setStatus(`↑${result.usage.promptTokens} ↓${result.usage.completionTokens} tok · ${result.turns} turns · ${result.toolUses} tools`);
-            history = [...history, { role: 'user', content: line }, ...result.messages.slice(history.length + 2)];
-        }
-        catch (err) {
-            rt.setBusy(false);
-            rt.addText(String(err), 'err');
-        }
     }
     await rt.waitExit();
     rt.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmharness/cli",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "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.0",
-    "@hmharness/evolution": "0.6.0",
-    "@hmharness/domain-harmony": "0.6.0",
-    "@hmharness/domain-ops": "0.6.0",
-    "@hmharness/agent": "0.6.0",
-    "@hmharness/web": "0.6.0"
+    "@hmharness/kernel": "0.6.2",
+    "@hmharness/evolution": "0.6.2",
+    "@hmharness/domain-harmony": "0.6.2",
+    "@hmharness/domain-ops": "0.6.2",
+    "@hmharness/agent": "0.6.2",
+    "@hmharness/web": "0.6.2"
   }
 }