@hmharness/cli 0.8.1 → 0.8.2

package/dist/main.js

@@ -5,7 +5,7 @@
  *   hmh init                 create HMH_HOME skeleton + config
  *   hmh "do something"       one-shot task (full agent loop, streaming)
  *   hmh                      interactive REPL (conversation memory kept)
- *   hmh resume [id-prefix]   continue a past session by id prefix (or latest)
+ *   hmh resume [id-prefix|--last] continue a past session (bare: codex-style picker)
  *   hmh web [--port=7788]    local web frontend (SSE streaming + approvals)
  *   hmh tui                  lite terminal UI (status header + slash commands)
  *   hmh ops [scan|brief|stats|status]  ops keeper: radar / npm download stats
@@ -23,7 +23,7 @@ import readline from 'node:readline/promises';
 import { stdin, stdout } from 'node:process';
 import { join } from 'node:path';
 import { stopWebDaemon, startWebDaemon, hmhWebUp, readWebPid } from "./web-daemon.js";
-import { chat, homeDir, resolveProvider, initHome, latestSession, listProviders, loadConfig, loadTranscript, mcpServerTools, Registry, runLoop, setChatRoute, setLocale, } from '@hmharness/kernel';
+import { chat, homeDir, resolveProvider, initHome, latestSession, listProviders, listSessions, loadConfig, loadTranscript, mcpServerTools, Registry, runLoop, setChatRoute, setLocale, } from '@hmharness/kernel';
 import { listSkills, listDrafts, promoteSkill, runBench, runEvolution, rollbackSkill, unpromoteSkill, } from '@hmharness/evolution';
 import { harmonyTools } from '@hmharness/domain-harmony';
 import { baseTools, buildRegistry, buildSystemPrompt, runAgentTask, strings } from '@hmharness/agent';
@@ -61,6 +61,7 @@ async function runTask(task, taskOpts = {}) {
         cfg,
         yes: taskOpts.yes,
         resumeMessages: taskOpts.resumeMessages,
+        sessionId: taskOpts.sessionId,
         events: {
             onLine: (l) => stdout.write(DIM(`  ${l}\n`)),
             onDelta: (kind, chunk) => {
@@ -92,7 +93,7 @@ async function runTask(task, taskOpts = {}) {
     // working transcript minus the system prompt and the task line we appended
     return { messages: result.messages, sessionId: result.sessionId };
 }
-async function repl(yes, initialHistory) {
+async function repl(yes, initialHistory, initialSessionId) {
     const home = homeDir();
     let cfg = await loadConfig();
     let autoApprove = yes;
@@ -115,6 +116,9 @@ async function repl(yes, initialHistory) {
     // The REPL keeps conversation memory across its own lines (and any
     // resumed history); each line re-injects fresh memory/skills.
     let history = initialHistory ? [...initialHistory] : [];
+    // one rollout per conversation: the first task creates it, later lines and
+    // `hmh resume` sessions append to it (codex thread semantics)
+    let currentSessionId = initialSessionId;
     try {
         while (true) {
             let line;
@@ -214,6 +218,7 @@ async function repl(yes, initialHistory) {
                     // line-mode twin of the TUI /clear: clear the conversation so the
                     // next task starts fresh (REPL counterpart was missing)
                     history = [];
+                    currentSessionId = undefined;
                     stdout.write(DIM(t.cmdClearDone) + '\n');
                     continue;
                 }
@@ -254,10 +259,12 @@ async function repl(yes, initialHistory) {
                 continue;
             }
             try {
-                const r = await runTask(line, { yes: autoApprove, sharedRl: rl, registry: reg, clients, resumeMessages: history });
+                const r = await runTask(line, { yes: autoApprove, sharedRl: rl, registry: reg, clients, resumeMessages: history, sessionId: currentSessionId });
                 // working transcript = [system, ...resumeMessages, user, ...new turns];
                 // only the NEW turns (past the replayed prefix) extend history.
                 history = [...history, { role: 'user', content: line }, ...r.messages.slice(history.length + 2)];
+                // one rollout per REPL conversation (codex thread semantics)
+                currentSessionId = r.sessionId;
             }
             catch (err) {
                 stdout.write(`error: ${String(err)}\n`);
@@ -328,7 +335,8 @@ async function main() {
 usage:
   hmh "do something"       one-shot task (full agent loop, streaming)
   hmh                      interactive REPL (conversation memory kept, /help for commands)
-  hmh resume [id-prefix]   continue a past session by id prefix (or latest)
+  hmh resume [id-prefix|--last]   continue a past session (bare = full-screen picker,
+                             --last = newest session in this directory)
   hmh web start|stop|status   web UI as a silent background daemon (no window,
                              survives closing everything; log ~/.hmharness/web.log)
   hmh web [--port=7788]       web UI in the foreground (debugging)
@@ -750,7 +758,23 @@ flags:
     }
     if (cmd === 'resume') {
         await initHome();
-        const file = await latestSession(homeDir(), arg);
+        const home = homeDir();
+        // bare `hmh resume` on a TTY = codex `codex resume`: the TUI comes up
+        // with the full-frame picker already open (typeahead, cwd filter, sort)
+        if (!arg && !rest.includes('--last') && stdin.isTTY) {
+            const { tui } = await import("./tui.js");
+            await tui(yes, false, { resumeAtStart: true });
+            return;
+        }
+        // `--last`: newest rollout in THIS cwd (codex resume --last)
+        let file = null;
+        if (rest.includes('--last')) {
+            const page = await listSessions(home, { cwd: process.cwd(), limit: 1 });
+            file = page.items[0]?.file ?? null;
+        }
+        else {
+            file = await latestSession(home, arg);
+        }
         if (!file) {
             stdout.write(arg ? `No session matches prefix "${arg}".\n` : 'No sessions yet.\n');
             return;
@@ -761,7 +785,8 @@ flags:
             return;
         }
         stdout.write(DIM(`resuming ${tr.id} · ${tr.messages.length} messages · model ${tr.model}\n`));
-        await repl(yes, tr.messages);
+        // repl keeps appending to THIS rollout for the whole conversation
+        await repl(yes, tr.messages, tr.id);
         return;
     }
     if (cmd && !cmd.startsWith('-')) {

package/dist/resume-picker.d.ts

@@ -0,0 +1,75 @@
+/**
+ * Codex-style resume picker (transplant of codex-rs/tui/src/resume_picker.rs,
+ * trimmed to hmharness's surface). This module is the pure state machine +
+ * formatting; TuiRuntime owns rendering and key plumbing. Codex behaviors kept:
+ *  - typeahead: case-insensitive substring across title/id/cwd/branch
+ *    (codex Row::matches_query)
+ *  - toolbar Filter[Cwd|All] x Sort[Updated|Created], Tab cycles focus,
+ *    arrows change the focused value, changes trigger a reload
+ *    (codex toggle_sort_key / SessionFilterMode)
+ *  - Enter accepts, Esc clears the query first then closes, Backspace pops
+ *    (codex handle_key)
+ *  - paging: rows arrive page by page; moving within LOAD_NEAR_THRESHOLD of
+ *    the end asks for the next page (codex maybe_load_more_for_scroll);
+ *    a query that matches nothing loaded yet keeps searching forward
+ *    (codex SearchState::Active)
+ */
+import type { SessionSummary } from '@hmharness/kernel';
+export type PickerSort = 'updated' | 'created';
+/** 0 = filter control, 1 = sort control (codex toolbar Tab cycle) */
+export type PickerFocus = 0 | 1;
+export interface PickerState {
+    query: string;
+    rows: SessionSummary[];
+    selected: number;
+    sort: PickerSort;
+    cwdOnly: boolean;
+    focus: PickerFocus;
+    /** next listSessions cursor; null = scan complete */
+    nextCursor: string | null;
+    /** a (re)load is in flight - renders the loading markers */
+    loading: boolean;
+    /** true before the first page lands (initial vs empty-result states) */
+    initial: boolean;
+}
+export declare function initialPickerState(sort?: PickerSort, cwdOnly?: boolean): PickerState;
+/** codex Row::matches_query: lowercase substring across every display field. */
+export declare function matchesQuery(row: SessionSummary, q: string): boolean;
+export declare function visibleRows(state: PickerState): SessionSummary[];
+export type PickerEffect = {
+    kind: 'none';
+} | {
+    kind: 'reload';
+} | {
+    kind: 'load-more';
+} | {
+    kind: 'search-more';
+} | {
+    kind: 'accept';
+    row: SessionSummary;
+} | {
+    kind: 'close';
+};
+/** Normalize a raw stdin chunk to the picker's key vocabulary; anything the
+ *  picker does not own returns null so the caller leaves it to the runtime. */
+export declare function pickerKey(data: string): string | null;
+export declare function reducePicker(state: PickerState, key: string): {
+    state: PickerState;
+    effect: PickerEffect;
+};
+/** "2m" / "3h" / "4d" relative time for the row tail. */
+export declare function relTime(iso: string, now?: number): string;
+/** One list row: `❯ 2026-09-12T17-30  run a harmless command      2h`.
+ *  The id prefix (filename timestamp - codex shows the same) is the anchor
+ *  the eye scans by; the title truncates into the remaining width. */
+export declare function formatRow(row: SessionSummary, selected: boolean, width: number): string;
+/** The search line: `query_` plus the toolbar on the right
+ *  (codex: `Filter:[Cwd]  Sort:[Updated]`, focused control highlighted). */
+export declare function toolbarLine(state: PickerState, labels: {
+    filter: string;
+    sort: string;
+    cwd: string;
+    all: string;
+    updated: string;
+    created: string;
+}, width: number, paint: (s: string, on: boolean) => string): string;

package/dist/resume-picker.js

@@ -0,0 +1,151 @@
+const LOAD_NEAR = 5; // codex LOAD_NEAR_THRESHOLD
+export function initialPickerState(sort = 'updated', cwdOnly = true) {
+    return { query: '', rows: [], selected: 0, sort, cwdOnly, focus: 0, nextCursor: null, loading: true, initial: true };
+}
+/** codex Row::matches_query: lowercase substring across every display field. */
+export function matchesQuery(row, q) {
+    if (!q)
+        return true;
+    const needle = q.toLowerCase();
+    return [row.title, row.id, row.cwd, row.branch ?? ''].some((f) => f.toLowerCase().includes(needle));
+}
+export function visibleRows(state) {
+    return state.query ? state.rows.filter((r) => matchesQuery(r, state.query)) : state.rows;
+}
+/** Normalize a raw stdin chunk to the picker's key vocabulary; anything the
+ *  picker does not own returns null so the caller leaves it to the runtime. */
+export function pickerKey(data) {
+    if (/^\x1bO[A-H]$/.test(data))
+        data = '\x1b[' + data[2]; // SS3 arrows, same as TuiRuntime
+    if (data === '\x1b[A' || data === '\x1b[B')
+        return data === '\x1b[A' ? 'up' : 'down';
+    if (data === '\r')
+        return 'enter';
+    if (data === '\x1b')
+        return 'esc';
+    if (data === '\t')
+        return 'tab';
+    if (data === '\x1b[C')
+        return 'right';
+    if (data === '\x1b[D')
+        return 'left';
+    if (data === '\x7f' || data === '\b')
+        return 'backspace';
+    if (data === '\x03')
+        return 'ctrl-c';
+    // single printable char (no modifiers) feeds the typeahead
+    if (data.length === 1 && data >= ' ')
+        return 'char:' + data;
+    return null;
+}
+export function reducePicker(state, key) {
+    const next = { ...state, rows: state.rows };
+    if (key.startsWith('char:')) {
+        next.query += key.slice(5);
+        next.selected = 0;
+        const vis = visibleRows(next);
+        return {
+            state: next,
+            effect: vis.length === 0 && next.nextCursor ? { kind: 'search-more' } : { kind: 'none' },
+        };
+    }
+    switch (key) {
+        case 'backspace':
+            if (next.query)
+                next.query = next.query.slice(0, -1);
+            next.selected = 0;
+            return { state: next, effect: { kind: 'none' } };
+        case 'up': {
+            const vis = visibleRows(next);
+            if (vis.length === 0)
+                return { state: next, effect: { kind: 'none' } };
+            next.selected = Math.max(0, next.selected - 1);
+            return { state: next, effect: nearEnd(next) };
+        }
+        case 'down': {
+            const vis = visibleRows(next);
+            if (vis.length === 0)
+                return { state: next, effect: next.nextCursor ? { kind: 'search-more' } : { kind: 'none' } };
+            next.selected = Math.min(vis.length - 1, next.selected + 1);
+            return { state: next, effect: nearEnd(next) };
+        }
+        case 'tab':
+            next.focus = next.focus === 0 ? 1 : 0;
+            return { state: next, effect: { kind: 'none' } };
+        case 'left':
+        case 'right': {
+            if (next.focus === 0)
+                next.cwdOnly = key === 'left'; // left -> Cwd, right -> All
+            else
+                next.sort = next.sort === 'updated' ? 'created' : 'updated';
+            next.selected = 0;
+            next.rows = [];
+            next.nextCursor = null;
+            next.loading = true;
+            next.initial = true;
+            return { state: next, effect: { kind: 'reload' } };
+        }
+        case 'enter': {
+            const vis = visibleRows(next);
+            if (vis.length === 0)
+                return { state: next, effect: { kind: 'none' } };
+            return { state: next, effect: { kind: 'accept', row: vis[Math.min(next.selected, vis.length - 1)] } };
+        }
+        case 'esc':
+            // codex: query non-empty -> clear it; empty -> exit
+            if (next.query) {
+                next.query = '';
+                next.selected = 0;
+                return { state: next, effect: { kind: 'none' } };
+            }
+            return { state: next, effect: { kind: 'close' } };
+        case 'ctrl-c':
+            return { state: next, effect: { kind: 'close' } };
+        default:
+            return { state: next, effect: { kind: 'none' } };
+    }
+}
+function nearEnd(state) {
+    const vis = visibleRows(state);
+    if (state.nextCursor && !state.loading && state.selected >= vis.length - LOAD_NEAR)
+        return { kind: 'load-more' };
+    return { kind: 'none' };
+}
+/** "2m" / "3h" / "4d" relative time for the row tail. */
+export function relTime(iso, now = Date.now()) {
+    const ms = now - Date.parse(iso);
+    if (!Number.isFinite(ms))
+        return '';
+    const m = Math.floor(ms / 60_000);
+    if (m < 1)
+        return 'now';
+    if (m < 60)
+        return m + 'm';
+    const h = Math.round(m / 60);
+    if (h < 24)
+        return h + 'h';
+    return Math.round(h / 24) + 'd';
+}
+/** One list row: `❯ 2026-09-12T17-30  run a harmless command      2h`.
+ *  The id prefix (filename timestamp - codex shows the same) is the anchor
+ *  the eye scans by; the title truncates into the remaining width. */
+export function formatRow(row, selected, width) {
+    const marker = selected ? '❯ ' : '  ';
+    const id = row.id.slice(0, 16);
+    const title = (row.title || '').replace(/\s+/g, ' ').trim();
+    const ago = relTime(row.updatedAt);
+    const titleWidth = Math.max(8, width - marker.length - id.length - 2 - ago.length - 1);
+    const shown = title.length > titleWidth ? title.slice(0, titleWidth - 1) + '…' : title.padEnd(titleWidth);
+    return `${marker}${id}  ${shown} ${ago}`;
+}
+/** The search line: `query_` plus the toolbar on the right
+ *  (codex: `Filter:[Cwd]  Sort:[Updated]`, focused control highlighted). */
+export function toolbarLine(state, labels, width, paint) {
+    const f = `${labels.filter}:[${state.cwdOnly ? labels.cwd : labels.all}]`;
+    const s = `${labels.sort}:[${state.sort === 'updated' ? labels.updated : labels.created}]`;
+    const bar = `${f}  ${s}`;
+    const room = Math.max(0, width - bar.length - 2);
+    const q = (state.query + '_').slice(0, room);
+    const pad = ' '.repeat(Math.max(1, room - q.length));
+    return q + pad + (state.focus === 0 ? paint(f, true) + '  ' + paint(s, false) : paint(f, false) + '  ' + paint(s, true));
+}

package/dist/tui.d.ts

@@ -1,3 +1,4 @@
+import { type SessionSummary } from '@hmharness/kernel';
 import { type Locale } from '@hmharness/agent';
 /** desc keys index into Strings (agent i18n); matched by name at runtime. */
 export declare const COMMANDS: Array<{
@@ -49,8 +50,6 @@ 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
@@ -68,16 +67,26 @@ 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;
+    /** While open the picker owns every key/wheel event and the whole frame -
+     *  the codex alt-screen picker contract. resolve fires on Enter (resume)
+     *  or Esc/Ctrl-C (close). */
+    private resumeModal;
+    openResumePicker(): Promise<{
+        kind: 'resume';
+        row: SessionSummary;
+    } | {
+        kind: 'close';
+    } | null>;
+    /** Fetch one listSessions page (reset=true restarts from page 1 after a
+     *  toolbar change). Dedupes by id, drops stale responses by token. */
+    private loadPickerPage;
+    private pickerInput;
+    /** Full-frame picker layout (codex draw_picker): title / search+toolbar /
+     *  list window / two hint lines / position footer. */
+    private renderResumePicker;
     /** Run the highlighted palette row (shared by Enter and palette clicks);
      *  with no palette open it just submits the typed input. */
     private pickHighlighted;
@@ -101,9 +110,10 @@ 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, `/resume `
-     *  the session picker, otherwise slash commands. Rows are {name, desc} so
-     *  all three share one renderer, keyboard and click machinery. */
+    /** The palette data source: `/model ` opens the model picker, otherwise
+     *  slash commands. (/resume submits straight through to the driver, which
+     *  opens the Codex-style full-frame picker - resume-picker.ts.) Rows are
+     *  {name, desc} so both share one renderer, keyboard and click machinery. */
     private panelItems;
     configure(model: string, cwdName: string, skillCount: number, locale: Locale, version?: string): void;
     destroy(): void;
@@ -129,10 +139,8 @@ export declare class TuiRuntime {
     private totalLines;
     private onKey;
     render(): void;
+    private flushFrame;
 }
-/** First user line of a session file WITHOUT a full parse: peek the first
- *  64KB, scan lines for the first user event. With hundreds of sessions a
- *  full loadTranscript per row would stall the picker for seconds; the user
- *  event is always near the head, so the peek is O(64KB) per session. */
-export declare function firstUserLinePeek(file: string): Promise<string>;
-export declare function tui(yes: boolean, noWeb?: boolean): Promise<void>;
+export declare function tui(yes: boolean, noWeb?: boolean, opts?: {
+    resumeAtStart?: boolean;
+}): Promise<void>;

package/dist/tui.js

@@ -11,13 +11,13 @@
  * Not a TTY? Prints a pointer to the plain REPL instead.
  */
 import { stdin, stdout } from 'node:process';
-import { basename, join } from 'node:path';
+import { basename } from 'node:path';
 import { createRequire } from 'node:module';
-import { open as fopen } from 'node:fs/promises';
-import { loadConfig, homeDir, resolveProvider, listProviders, setChatRoute, setLocale, PROVIDER_PRESETS, addProviders, detectLocalProviders } from '@hmharness/kernel';
+import { loadConfig, homeDir, resolveProvider, listProviders, setChatRoute, setLocale, PROVIDER_PRESETS, addProviders, detectLocalProviders, latestSession, listSessions, loadTranscript } from '@hmharness/kernel';
 import { listDrafts, listSkills, runBench, runEvolution } from '@hmharness/evolution';
 import { buildRegistry, runAgentTask, strings } from '@hmharness/agent';
 import { ensureWebDaemon, DEFAULT_WEB_PORT } from "./web-daemon.js";
+import { formatRow, initialPickerState, pickerKey, reducePicker, toolbarLine, visibleRows } from "./resume-picker.js";
 /** installed version, shown in the TUI header (v0.4.0) so users always
  *  know which build they are talking to - resolves in both src/ and dist/ */
 const HMH_VERSION = (() => {
@@ -171,8 +171,6 @@ 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
@@ -201,10 +199,6 @@ 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() {
@@ -213,14 +207,115 @@ 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;
+    /* ---------------- Codex-style resume picker modal ---------------- */
+    /** While open the picker owns every key/wheel event and the whole frame -
+     *  the codex alt-screen picker contract. resolve fires on Enter (resume)
+     *  or Esc/Ctrl-C (close). */
+    resumeModal = null;
+    openResumePicker() {
+        if (this.resumeModal)
+            return Promise.resolve(null);
+        return new Promise((resolve) => {
+            this.resumeModal = { st: initialPickerState('updated', true), resolve, token: 0 };
+            this.dirty = true;
+            void this.loadPickerPage(undefined, true);
+        });
+    }
+    /** Fetch one listSessions page (reset=true restarts from page 1 after a
+     *  toolbar change). Dedupes by id, drops stale responses by token. */
+    async loadPickerPage(cursor, reset) {
+        const modal = this.resumeModal;
+        if (!modal)
+            return;
+        const token = ++modal.token;
+        const st0 = reset
+            ? { ...modal.st, rows: [], selected: 0, nextCursor: null, loading: true, initial: true }
+            : { ...modal.st, loading: true };
+        modal.st = st0;
+        this.dirty = true;
+        let page;
+        try {
+            page = await listSessions(homeDir(), {
+                ...(reset ? {} : { cursor }),
+                sort: st0.sort,
+                cwd: st0.cwdOnly ? process.cwd() : null,
+            });
+        }
+        catch {
+            page = { items: [], nextCursor: null, numScanned: 0, reachedScanCap: false };
+        }
+        const live = this.resumeModal;
+        if (!live || live.token !== token)
+            return;
+        const seen = new Set(reset ? [] : live.st.rows.map((r) => r.id));
+        live.st = {
+            ...live.st,
+            rows: [...live.st.rows, ...page.items.filter((i) => !seen.has(i.id))],
+            nextCursor: page.nextCursor,
+            loading: false,
+            initial: false,
+        };
         this.dirty = true;
     }
+    pickerInput(key) {
+        const modal = this.resumeModal;
+        if (!modal)
+            return;
+        const { state, effect } = reducePicker(modal.st, key);
+        modal.st = state;
+        this.dirty = true;
+        if (effect.kind === 'accept') {
+            this.resumeModal = null;
+            modal.resolve({ kind: 'resume', row: effect.row });
+        }
+        else if (effect.kind === 'close') {
+            this.resumeModal = null;
+            modal.resolve({ kind: 'close' });
+        }
+        else if (effect.kind === 'reload') {
+            void this.loadPickerPage(undefined, true);
+        }
+        else if ((effect.kind === 'load-more' || effect.kind === 'search-more') && !state.loading && state.nextCursor) {
+            void this.loadPickerPage(state.nextCursor, false);
+        }
+    }
+    /** Full-frame picker layout (codex draw_picker): title / search+toolbar /
+     *  list window / two hint lines / position footer. */
+    renderResumePicker(frame, W, H) {
+        const st = this.resumeModal.st;
+        const t = this.t;
+        const count = ` ${st.rows.length}${st.loading ? '…' : ''} `;
+        frame.push(truncateTo(BOLD(' ' + t.pickerTitle) + ' '.repeat(Math.max(1, W - strWidth(t.pickerTitle) - count.length - 1)) + DIM(count), W));
+        frame.push(DIM('─'.repeat(W)));
+        frame.push(' ' + toolbarLine(st, {
+            filter: t.pickerLabelFilter, sort: t.pickerLabelSort, cwd: t.pickerValCwd, all: t.pickerValAll, updated: t.pickerValUpdated, created: t.pickerValCreated,
+        }, W - 2, (s, on) => (on ? CYAN(BOLD(s)) : DIM(s))));
+        frame.push(DIM('─'.repeat(W)));
+        const vis = visibleRows(st);
+        const listH = Math.max(3, H - 8);
+        const from = vis.length > listH
+            ? Math.min(Math.max(0, st.selected - Math.floor(listH / 2)), vis.length - listH)
+            : 0;
+        if (from > 0)
+            frame.push(DIM('  ↑ more'));
+        for (let i = 0; i < listH && from + i < vis.length; i++) {
+            const sel = from + i === st.selected;
+            const plain = truncateTo(formatRow(vis[from + i], sel, W - 1), W - 1);
+            frame.push(sel ? '\x1b[7m' + plain + ' '.repeat(Math.max(0, W - 1 - strWidth(plain))) + '\x1b[27m' : ' ' + plain);
+        }
+        if (st.loading)
+            frame.push(DIM('  ' + (vis.length === 0 ? t.pickerLoading : t.pickerMore)));
+        else if (vis.length === 0)
+            frame.push(DIM('  ' + (st.query ? t.pickerNoMatch : t.pickerEmpty)));
+        else if (from + listH < vis.length)
+            frame.push(DIM('  ↓ more'));
+        frame.push(DIM('─'.repeat(W)));
+        frame.push(DIM(truncateTo('  ' + t.pickerHint1, W - 1)));
+        frame.push(DIM(truncateTo('  ' + t.pickerHint2, W - 1)));
+        const pos = vis.length ? st.selected + 1 : 0;
+        const posLine = t.pickerPos(pos, vis.length, vis.length ? String(Math.round((pos / vis.length) * 100)) : '0');
+        frame.push(' '.repeat(Math.max(0, W - posLine.length - 1)) + DIM(posLine));
+    }
     /** Run the highlighted palette row (shared by Enter and palette clicks);
      *  with no palette open it just submits the typed input. */
     pickHighlighted() {
@@ -229,8 +324,6 @@ export class TuiRuntime {
         if (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;
@@ -294,9 +387,10 @@ 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, `/resume `
-     *  the session picker, otherwise slash commands. Rows are {name, desc} so
-     *  all three share one renderer, keyboard and click machinery. */
+    /** The palette data source: `/model ` opens the model picker, otherwise
+     *  slash commands. (/resume submits straight through to the driver, which
+     *  opens the Codex-style full-frame picker - resume-picker.ts.) Rows are
+     *  {name, desc} so both share one renderer, keyboard and click machinery. */
     panelItems(input) {
         if (input === '/model' || input.startsWith('/model ')) {
             const q = input.slice(6).trim().toLowerCase();
@@ -307,10 +401,6 @@ 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) {
@@ -337,6 +427,12 @@ export class TuiRuntime {
     }
     quit() {
         this.running = false;
+        // an open picker never resolves on its own once the TUI exits
+        if (this.resumeModal) {
+            const resolve = this.resumeModal.resolve;
+            this.resumeModal = null;
+            resolve({ kind: 'close' });
+        }
         this.exitResolve?.();
     }
     /* ---------------- content API ---------------- */
@@ -471,6 +567,15 @@ export class TuiRuntime {
         // matches so navigation never silently dies
         if (/^\x1bO[A-H]$/.test(data))
             data = '\x1b[' + data[2];
+        // resume picker modal owns every event while open - keyboard AND wheel
+        // (codex: the picker runs its own event loop until it resolves)
+        if (this.resumeModal) {
+            const wheel = parseWheel(data);
+            const key = wheel !== 0 ? (wheel < 0 ? 'up' : 'down') : pickerKey(data);
+            if (key !== null)
+                this.pickerInput(key);
+            return;
+        }
         // wheel-only mouse routing: 64 = wheel-up, 65 = wheel-down. With
         // button-event mode (1002) everything else - click, drag, release,
         // motion - still belongs to the terminal's native selection.
@@ -546,16 +651,12 @@ export class TuiRuntime {
             // Claude Code's two-stage flow: Enter shows the dialog, arrows/wheel
             // move, a second Enter confirms the highlighted row. The old behavior
             // silently switched to the first model on the very first Enter.
+            // (/resume needs no interception: submitting it opens the Codex-style
+            // modal via the driver, and '/resume <prefix>' loads directly.)
             if (this.input === '/model') {
                 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();
@@ -566,9 +667,7 @@ export class TuiRuntime {
             if (hits.length) {
                 this.input = this.input.startsWith('/model')
                     ? `/model ${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 + ' ';
+                    : hits[Math.min(this.cmdIdx, hits.length - 1)].name + ' ';
                 this.caret = this.input.length;
                 this.cmdIdx = 0;
                 this.dirty = true;
@@ -695,6 +794,11 @@ export class TuiRuntime {
         const W = stdout.columns || 100;
         const H = stdout.rows || 30;
         const frame = [];
+        if (this.resumeModal) {
+            this.renderResumePicker(frame, W, H);
+            this.flushFrame(frame, H);
+            return;
+        }
         // modal mouse reporting follows the palette (see syncMouseReporting);
         // click rows are re-recorded every frame because screen positions move
         this.syncMouseReporting();
@@ -882,6 +986,9 @@ export class TuiRuntime {
         // pending wrap a full-width line leaves behind — "\x1b[B" joins would skip
         // a row on immediate-wrap terminals (conhost) and push the frame past the
         // last line, scrolling the header away and clipping the input box.
+        this.flushFrame(frame, H);
+    }
+    flushFrame(frame, H) {
         const visible = frame.slice(0, H);
         let out = '';
         for (let i = 0; i < visible.length; i++)
@@ -890,35 +997,7 @@ export class TuiRuntime {
     }
 }
 /* ---------------- driver ---------------- */
-/** First user line of a session file WITHOUT a full parse: peek the first
- *  64KB, scan lines for the first user event. With hundreds of sessions a
- *  full loadTranscript per row would stall the picker for seconds; the user
- *  event is always near the head, so the peek is O(64KB) per session. */
-export async function firstUserLinePeek(file) {
-    try {
-        const fh = await fopen(file, 'r');
-        try {
-            const buf = Buffer.alloc(65_536);
-            const { bytesRead } = await fh.read(buf, 0, 65_536, 0);
-            for (const line of buf.toString('utf8', 0, bytesRead).split('\n')) {
-                if (!line.includes('"user"'))
-                    continue;
-                try {
-                    const ev = JSON.parse(line);
-                    if (ev.t === 'user' && typeof ev.text === 'string')
-                        return ev.text;
-                }
-                catch { /* partial line at the buffer edge - no preview */ }
-            }
-        }
-        finally {
-            await fh.close();
-        }
-    }
-    catch { /* unreadable file - no preview */ }
-    return '';
-}
-export async function tui(yes, noWeb = false) {
+export async function tui(yes, noWeb = false, opts = {}) {
     let cfg = await loadConfig();
     let autoApprove = yes || cfg.approval === 'auto';
     if (!stdin.isTTY) {
@@ -950,6 +1029,16 @@ export async function tui(yes, noWeb = false) {
         void notifyUpdate(home, current, (latest) => rt.addText(`↑ ${t.updateHint(latest)}`, 'dim'));
     }
     let history = [];
+    // Codex thread semantics: one rollout file per conversation. The first task
+    // creates it; every later turn (and everything after /resume) appends to it.
+    let currentSessionId;
+    // `hmh resume` startup: the picker comes up before the first prompt (codex
+    // `codex resume` behavior); Esc leaves a fresh conversation
+    if (opts.resumeAtStart) {
+        const pick = await rt.openResumePicker();
+        if (pick?.kind === 'resume')
+            await resumeInto(pick.row.file);
+    }
     // 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).
@@ -1008,6 +1097,7 @@ export async function tui(yes, noWeb = false) {
                 cfg,
                 yes: autoApprove,
                 resumeMessages: history,
+                sessionId: currentSessionId,
                 signal: currentAbort.signal,
                 approvalAsk: (name, args) => rt.requestApproval(name, args),
                 events: {
@@ -1047,6 +1137,7 @@ export async function tui(yes, noWeb = false) {
                 },
             });
             rt.setBusy(false);
+            currentSessionId = result.sessionId;
             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)];
         }
@@ -1058,6 +1149,49 @@ export async function tui(yes, noWeb = false) {
             currentAbort = null;
         }
     }
+    /** Load a rollout into the conversation: `history` for the model, a tail
+     *  window for the eye, and currentSessionId so the next turn APPENDS to
+     *  the same rollout (codex Resume semantics - one thread, one file). */
+    async function resumeInto(file) {
+        const tr = await loadTranscript(file);
+        if (!tr || tr.messages.length === 0) {
+            rt.addText(t.cmdResumeNotFound(tr?.id ?? file), 'err');
+            return;
+        }
+        history = tr.messages;
+        currentSessionId = tr.id;
+        rt.clearScreen();
+        // long sessions render from the tail so the visible window stays usable
+        // while the complete transcript 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 + ' · ' + 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');
+    }
     async function handleLine(line) {
         if (line === '/exit' || line === '/quit') {
             rt.destroy();
@@ -1087,8 +1221,12 @@ export async function tui(yes, noWeb = false) {
             rt.addText(COMMANDS.map((c) => '  ' + c.name.padEnd(11) + ' ' + String(t[c.key])).join('\n'), 'dim');
             return;
         }
+        // /clear = new thread (codex /new): blank screen, drop the in-memory
+        // transcript AND start a fresh rollout on the next task
         if (line === '/clear') {
             rt.clearScreen();
+            history = [];
+            currentSessionId = undefined;
             return;
         }
         if (line === '/status') {
@@ -1123,76 +1261,26 @@ export async function tui(yes, noWeb = false) {
         }
         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');
-            // ALL sessions, newest first - no arbitrary "recent 8" cap (user
-            // challenge: "不应该是所有历史会话吗"). Previews use the 64KB peek,
-            // never a full parse, so hundreds of rows still open instantly; the
-            // palette scrolls and head-prefix filtering narrows fast.
-            let files = [];
-            try {
-                files = (await readdir(join(home, 'sessions'))).filter((f) => f.endsWith('.jsonl'));
-            }
-            catch { /* none */ }
-            files.sort();
-            const recent = files.reverse();
-            const rows = [];
-            for (const f of recent) {
-                const firstUser = await firstUserLinePeek(join(home, 'sessions', f));
-                rows.push({ name: f.slice(0, 18), desc: (firstUser || '(无预览)').replace(/\n/g, ' ').slice(0, 56) });
-            }
-            rt.setSessionChoices(rows);
+            // bare /resume opens the Codex-style full-frame picker (typeahead,
+            // cwd filter, sort toolbar, lazy pages). It is a modal: it cannot share
+            // the screen with a running task's streaming output.
             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');
+                if (taskRunning) {
+                    rt.addText('task running - stop it first (empty Enter), then /resume', 'dim');
                     return;
                 }
-                rt.openSessionPicker();
+                const pick = await rt.openResumePicker();
+                if (!pick || pick.kind !== 'resume')
+                    return;
+                await resumeInto(pick.row.file);
                 return;
             }
             const file = await latestSession(home, arg);
-            const tr = file ? await loadTranscript(file) : null;
-            if (!tr || tr.messages.length === 0) {
+            if (!file) {
                 rt.addText(t.cmdResumeNotFound(arg), 'err');
                 return;
             }
-            history = tr.messages;
-            rt.clearScreen();
-            // 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');
+            await resumeInto(file);
             return;
         }
         if (line === '/yolo' || line === '/yolo on' || line === '/yolo off') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmharness/cli",
-  "version": "0.8.1",
+  "version": "0.8.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,13 +43,13 @@
     "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
-    "@hmharness/kernel": "0.8.0",
+    "@hmharness/kernel": "0.8.2",
     "@hmharness/observability": "0.7.0",
-    "@hmharness/evolution": "0.8.1",
+    "@hmharness/evolution": "0.8.3",
     "@hmharness/domain-harmony": "0.8.0",
     "@hmharness/domain-ops": "0.8.0",
-    "@hmharness/agent": "0.8.1",
+    "@hmharness/agent": "0.8.2",
     "@hmharness/evaluation": "0.8.0",
-    "@hmharness/web": "0.8.0"
+    "@hmharness/web": "0.8.2"
   }
 }