@hmharness/cli 0.4.1 → 0.4.3

package/dist/tui.d.ts

@@ -46,6 +46,8 @@ export declare class TuiRuntime {
     private modeTag;
     /** rows for the `/model ` picker (configured providers first, set by driver) */
     private modelChoices;
+    /** rows for the `/resume ` session picker (id prefix + first user line) */
+    private sessionChoices;
     /** Wheel/click handling: NO mouse reporting by default - select/copy
      *  always works and terminals translate the wheel to arrow keys on the
      *  alternate screen. Reporting turns on ONLY while a palette is open
@@ -63,9 +65,16 @@ export declare class TuiRuntime {
         name: string;
         desc: string;
     }>): void;
+    setSessionChoices(list: Array<{
+        name: string;
+        desc: string;
+    }>): void;
     /** Focus the /model picker (used by the bare `/model` command so the
      *  printed list is never a dead end - the live palette opens on it). */
     openModelPicker(): void;
+    /** Focus the /resume session picker - same live palette as /model:
+     *  arrows/wheel navigate, Enter loads the highlighted session. */
+    openSessionPicker(): void;
     /** Run the highlighted palette row (shared by Enter and palette clicks);
      *  with no palette open it just submits the typed input. */
     private pickHighlighted;
@@ -89,14 +98,19 @@ export declare class TuiRuntime {
      *  while it shows, clicks choose its rows and the wheel drives its
      *  selection; drag-select resumes the moment it closes. */
     private syncMouseReporting;
-    /** The palette data source: `/model ` opens the model picker, otherwise
-     *  slash commands. Rows are {name, desc} so both share one renderer. */
+    /** The palette data source: `/model ` opens the model picker, `/resume `
+     *  the session picker, otherwise slash commands. Rows are {name, desc} so
+     *  all three share one renderer, keyboard and click machinery. */
     private panelItems;
     configure(model: string, cwdName: string, skillCount: number, locale: Locale, version?: string): void;
     destroy(): void;
     waitExit(): Promise<void>;
     private quit;
     addText(text: string, style?: 'dim' | 'plain' | 'err'): void;
+    /** The user's own input, chat-style: separated by a blank line above and
+     *  below, right-aligned to the terminal width so it reads as "the human
+     *  side" against left-aligned model output. */
+    addUser(text: string): void;
     startStream(kind: 'think' | 'say'): (chunk: string) => void;
     /** Collapse a streamed thinking block to its final folded summary line. */
     foldThinking(): void;

package/dist/tui.js

@@ -11,7 +11,7 @@
  * Not a TTY? Prints a pointer to the plain REPL instead.
  */
 import { stdin, stdout } from 'node:process';
-import { basename } from 'node:path';
+import { basename, join } from 'node:path';
 import { createRequire } from 'node:module';
 import { loadConfig, homeDir, resolveProvider, listProviders, setChatRoute, setLocale, PROVIDER_PRESETS, addProviders, detectLocalProviders } from '@hmharness/kernel';
 import { listDrafts, listSkills, runBench, runEvolution } from '@hmharness/evolution';
@@ -102,6 +102,7 @@ export const COMMANDS = [
     { name: '/bench', key: 'cmdBench' },
     { name: '/evolve', key: 'cmdEvolve' },
     { name: '/mcp', key: 'cmdMcp' },
+    { name: '/resume', key: 'cmdResume' },
     { name: '/status', key: 'cmdStatus' },
     { name: '/clear', key: 'cmdClear' },
     { name: '/web', key: 'cmdWeb' },
@@ -166,6 +167,8 @@ export class TuiRuntime {
     modeTag = '';
     /** rows for the `/model ` picker (configured providers first, set by driver) */
     modelChoices = [];
+    /** rows for the `/resume ` session picker (id prefix + first user line) */
+    sessionChoices = [];
     /** Wheel/click handling: NO mouse reporting by default - select/copy
      *  always works and terminals translate the wheel to arrow keys on the
      *  alternate screen. Reporting turns on ONLY while a palette is open
@@ -194,6 +197,10 @@ export class TuiRuntime {
         this.modelChoices = list;
         this.dirty = true;
     }
+    setSessionChoices(list) {
+        this.sessionChoices = list;
+        this.dirty = true;
+    }
     /** Focus the /model picker (used by the bare `/model` command so the
      *  printed list is never a dead end - the live palette opens on it). */
     openModelPicker() {
@@ -202,13 +209,26 @@ export class TuiRuntime {
         this.cmdIdx = 0;
         this.dirty = true;
     }
+    /** Focus the /resume session picker - same live palette as /model:
+     *  arrows/wheel navigate, Enter loads the highlighted session. */
+    openSessionPicker() {
+        this.input = '/resume ';
+        this.caret = this.input.length;
+        this.cmdIdx = 0;
+        this.dirty = true;
+    }
     /** Run the highlighted palette row (shared by Enter and palette clicks);
      *  with no palette open it just submits the typed input. */
     pickHighlighted() {
         const hits = this.panelItems(this.input);
         const pick = hits.length ? hits[Math.min(this.cmdIdx, hits.length - 1)].name : '';
         if (pick) {
-            this.input = this.input.startsWith('/model') ? `/model ${pick} ` : pick + ' ';
+            if (this.input.startsWith('/model'))
+                this.input = `/model ${pick} `;
+            else if (this.input.startsWith('/resume'))
+                this.input = `/resume ${pick}`;
+            else
+                this.input = pick + ' ';
             this.caret = this.input.length;
             this.cmdIdx = 0;
         }
@@ -270,8 +290,9 @@ export class TuiRuntime {
         this.mouseReported = want;
         stdout.write(want ? '\x1b[?1000h\x1b[?1006h' : '\x1b[?1000l\x1b[?1006l');
     }
-    /** The palette data source: `/model ` opens the model picker, otherwise
-     *  slash commands. Rows are {name, desc} so both share one renderer. */
+    /** The palette data source: `/model ` opens the model picker, `/resume `
+     *  the session picker, otherwise slash commands. Rows are {name, desc} so
+     *  all three share one renderer, keyboard and click machinery. */
     panelItems(input) {
         if (input === '/model' || input.startsWith('/model ')) {
             const q = input.slice(6).trim().toLowerCase();
@@ -282,6 +303,10 @@ export class TuiRuntime {
             const all = [...configured, ...rest];
             return q ? all.filter((i) => i.name.toLowerCase().startsWith(q)) : all;
         }
+        if (input === '/resume' || input.startsWith('/resume ')) {
+            const q = input.slice(7).trim().toLowerCase();
+            return q ? this.sessionChoices.filter((i) => i.name.toLowerCase().startsWith(q)) : this.sessionChoices;
+        }
         return matchCommands(input).map((c) => ({ name: c.name, desc: String(this.t[c.key]) }));
     }
     configure(model, cwdName, skillCount, locale, version) {
@@ -318,6 +343,21 @@ export class TuiRuntime {
         this.scrollFromBottom = 0;
         this.dirty = true;
     }
+    /** The user's own input, chat-style: separated by a blank line above and
+     *  below, right-aligned to the terminal width so it reads as "the human
+     *  side" against left-aligned model output. */
+    addUser(text) {
+        const width = Math.max(20, (stdout.columns || 100) - 2);
+        const lines = [''];
+        for (const l of wrapTo(text.replace(/\n+/g, ' '), width)) {
+            const pad = Math.max(1, width - strWidth(l));
+            lines.push(' '.repeat(pad) + BOLD(l));
+        }
+        lines.push('');
+        this.entries.push({ lines });
+        this.scrollFromBottom = 0;
+        this.dirty = true;
+    }
     startStream(kind) {
         const width = Math.max(20, (stdout.columns || 100) - 2);
         const lines = [];
@@ -493,6 +533,12 @@ export class TuiRuntime {
                 this.openModelPicker();
                 return;
             }
+            // same two-stage rule for /resume: bare command + Enter opens the
+            // session picker (focus moves to the list), never loads row 0 blindly
+            if (this.input === '/resume') {
+                this.openSessionPicker();
+                return;
+            }
             // palette open: Enter runs the highlighted row (a command, or a
             // /model target), not the raw input; without a palette it submits
             this.pickHighlighted();
@@ -503,7 +549,9 @@ export class TuiRuntime {
             if (hits.length) {
                 this.input = this.input.startsWith('/model')
                     ? `/model ${hits[Math.min(this.cmdIdx, hits.length - 1)].name} `
-                    : hits[Math.min(this.cmdIdx, hits.length - 1)].name + ' ';
+                    : this.input.startsWith('/resume')
+                        ? `/resume ${hits[Math.min(this.cmdIdx, hits.length - 1)].name}`
+                        : hits[Math.min(this.cmdIdx, hits.length - 1)].name + ' ';
                 this.caret = this.input.length;
                 this.cmdIdx = 0;
                 this.dirty = true;
@@ -906,6 +954,52 @@ export async function tui(yes, noWeb = false) {
             rt.addText(up ? t.tuiWebLinked(DEFAULT_WEB_PORT) : t.tuiWebHint, 'dim');
             return;
         }
+        if (line === '/resume' || line.startsWith('/resume ')) {
+            const arg = line.slice(8).trim();
+            const { latestSession, loadTranscript } = await import('@hmharness/kernel');
+            const { readdir } = await import('node:fs/promises');
+            // refresh the picker rows: id prefix + first user line as the preview
+            let files = [];
+            try {
+                files = (await readdir(join(home, 'sessions'))).filter((f) => f.endsWith('.jsonl'));
+            }
+            catch { /* none */ }
+            files.sort();
+            const recent = files.slice(-8).reverse();
+            const rows = [];
+            for (const f of recent) {
+                try {
+                    const tr = await loadTranscript(join(home, 'sessions', f));
+                    const firstUser = tr?.messages.find((m) => m.role === 'user')?.content ?? '';
+                    rows.push({ name: f.slice(0, 18), desc: (firstUser || '(no user line)').replace(/\n/g, ' ').slice(0, 56) });
+                }
+                catch { /* skip unreadable */ }
+            }
+            rt.setSessionChoices(rows);
+            if (!arg) {
+                // bare /resume opens the LIVE picker - same arrows/wheel/Enter/click
+                // machinery as /model; a printed text list is a dead end (user-
+                // reported: "上下键无法选择")
+                if (rows.length === 0) {
+                    rt.addText(t.cmdResumeNone, 'dim');
+                    return;
+                }
+                rt.openSessionPicker();
+                return;
+            }
+            const file = await latestSession(home, arg);
+            const tr = file ? await loadTranscript(file) : null;
+            if (!tr || tr.messages.length === 0) {
+                rt.addText(t.cmdResumeNotFound(arg), 'err');
+                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));
+            rt.addText(t.cmdResumeLoaded(tr.messages.length), 'dim');
+            return;
+        }
         if (line === '/yolo' || line === '/yolo on' || line === '/yolo off') {
             const turnOn = line === '/yolo' ? !autoApprove : line === '/yolo on';
             autoApprove = turnOn;
@@ -1054,7 +1148,7 @@ export async function tui(yes, noWeb = false) {
             }
             return;
         }
-        rt.addText(`❯ ${line}`);
+        rt.addUser(line);
         rt.setBusy(true, t.running);
         let appender = null;
         let kind = null;
@@ -1083,11 +1177,17 @@ export async function tui(yes, noWeb = false) {
                             rt.foldThinking();
                         appender = null;
                         kind = null;
-                        rt.addText(`${YELLOW('●')} ${CYAN(name)} ${DIM(JSON.stringify(args).slice(0, 100))}`);
+                        // 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('•');
-                        rt.addText(`  ${dot} ${DIM('⎿ ' + output.split('\n').slice(0, 2).join(' ').slice(0, 110))}`);
+                        const first = output.split('\n').find((l) => l.trim()) ?? '';
+                        rt.addText(`  ${dot} ${DIM('⎿ ' + first.trim().slice(0, 100))}`);
                     },
                 },
             });

package/dist/web-daemon.d.ts

@@ -1,6 +1,9 @@
 export declare const DEFAULT_WEB_PORT = 7788;
 export declare function readWebPid(): number;
-/** cheap probe: does OUR server answer on the port (not just any listener)? */
+/** cheap probe: does OUR server answer on the port (not just any listener)?
+ *  Accepts ANY hmh /api/state shape - a daemon from an older build still
+ *  serves the UI, and rejecting it made the TUI auto-link spawn a fresh
+ *  daemon that died on EADDRINUSE every startup (the "lost setting" bug). */
 export declare function hmhWebUp(port: number): Promise<boolean>;
 export declare function stopWebDaemon(): boolean;
 /**

package/dist/web-daemon.js

@@ -5,6 +5,7 @@
  * HMH_HOME; the daemon runs detached with no window and survives terminals.
  */
 import { spawn } from 'node:child_process';
+import { execSync } from 'node:child_process';
 import { openSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { homeDir } from '@hmharness/kernel';
@@ -27,41 +28,67 @@ function alive(pid) {
         return false;
     }
 }
-/** cheap probe: does OUR server answer on the port (not just any listener)? */
+/** cheap probe: does OUR server answer on the port (not just any listener)?
+ *  Accepts ANY hmh /api/state shape - a daemon from an older build still
+ *  serves the UI, and rejecting it made the TUI auto-link spawn a fresh
+ *  daemon that died on EADDRINUSE every startup (the "lost setting" bug). */
 export async function hmhWebUp(port) {
     try {
         const r = await fetch(`http://127.0.0.1:${port}/api/state`, { signal: AbortSignal.timeout(1500) });
         if (!r.ok)
             return false;
-        const d = (await r.json());
-        return typeof d.model === 'string';
+        const d = await r.json();
+        return !!d && typeof d === 'object';
     }
     catch {
         return false;
     }
 }
-export function stopWebDaemon() {
-    const pid = readWebPid();
-    if (!pid || !alive(pid)) {
-        try {
-            unlinkSync(join(homeDir(), 'web.pid'));
+/** Windows-first: find the PID LISTENING on 127.0.0.1:<port> via netstat.
+ *  Used to reclaim a port held by an orphaned/old daemon whose pid file is
+ *  stale - `hmh web stop` must be able to evict it, or restarts never heal. */
+function portOwnerPid(port) {
+    if (process.platform !== 'win32')
+        return 0;
+    try {
+        const out = execSync(`netstat -ano -p tcp`, { encoding: 'utf8', timeout: 5000 });
+        for (const line of out.split('\n')) {
+            const m = line.trim().match(new RegExp(`^(TCP)\\s+\\S*?:${port}\\s+\\S+\\s+LISTENING\\s+(\\d+)$`));
+            if (m)
+                return Number(m[2]);
         }
-        catch { /* absent */ }
-        return false;
     }
-    if (process.platform === 'win32')
-        spawn('taskkill', ['/PID', String(pid), '/T', '/F'], { windowsHide: true });
-    else {
-        try {
-            process.kill(pid);
+    catch { /* netstat unavailable - give up quietly */ }
+    return 0;
+}
+export function stopWebDaemon() {
+    const pid = readWebPid();
+    let killed = false;
+    if (pid && alive(pid)) {
+        if (process.platform === 'win32')
+            spawn('taskkill', ['/PID', String(pid), '/T', '/F'], { windowsHide: true });
+        else {
+            try {
+                process.kill(pid);
+            }
+            catch { /* gone */ }
         }
-        catch { /* gone */ }
+        killed = true;
     }
     try {
         unlinkSync(join(homeDir(), 'web.pid'));
     }
     catch { /* absent */ }
-    return true;
+    // stale pid file but the port is still held (orphaned/old daemon): evict
+    const owner = portOwnerPid(DEFAULT_WEB_PORT);
+    if (owner && owner !== pid) {
+        try {
+            spawn('taskkill', ['/PID', String(owner), '/T', '/F'], { windowsHide: true });
+            killed = true;
+        }
+        catch { /* best effort */ }
+    }
+    return killed;
 }
 /** Spawn the daemon (no window, detached). Returns the pid. */
 function spawnWebDaemon(port, entry = process.argv[1]) {

package/package.json

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