@steerable/agent-cli 0.6.59 → 0.6.61

package/dist/tui/todos.d.ts

@@ -0,0 +1,6 @@
+export interface SessionTodo {
+    content: string;
+    status: 'pending' | 'in_progress' | 'completed';
+}
+/** The latest `todo_write` list. Each call replaces the whole list. */
+export declare function todosFromAction(tool: string | undefined, args: unknown, result: unknown): SessionTodo[] | null;

package/dist/tui/todos.js

@@ -0,0 +1,47 @@
+/** The latest `todo_write` list. Each call replaces the whole list. */
+export function todosFromAction(tool, args, result) {
+    if (tool !== 'todo_write')
+        return null;
+    return readTodos(result) ?? readTodos(args);
+}
+function readTodos(value) {
+    const direct = todoItems(value);
+    if (direct)
+        return direct;
+    const record = asRecord(value);
+    if (!record)
+        return null;
+    const nested = asRecord(record.data);
+    const envelope = asRecord(nested?.value);
+    return todoItems(record.todos) ?? todoItems(nested?.todos) ?? todoItems(envelope?.todos);
+}
+function todoItems(value) {
+    if (!Array.isArray(value))
+        return null;
+    const todos = [];
+    for (const item of value) {
+        const row = asRecord(item);
+        if (!row || typeof row.content !== 'string' || row.content.length === 0)
+            continue;
+        const status = row.status === 'in_progress' || row.status === 'completed' ? row.status : 'pending';
+        todos.push({ content: row.content, status });
+    }
+    return todos.length > 0 ? todos : null;
+}
+function asRecord(value) {
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        if (!trimmed.startsWith('{') && !trimmed.startsWith('['))
+            return null;
+        try {
+            return asRecord(JSON.parse(trimmed));
+        }
+        catch (error) {
+            void error;
+            return null;
+        }
+    }
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return null;
+    return value;
+}

package/dist/tui/transcript.d.ts

@@ -0,0 +1,31 @@
+export interface ToolAction {
+    id?: string;
+    tool?: string;
+    arguments?: unknown;
+    view?: {
+        title?: string;
+    };
+    result?: unknown;
+    success?: boolean;
+    error?: unknown;
+    durationMs?: number;
+}
+export declare function formatDuration(ms: number): string;
+export declare function toolStatus(action: ToolAction): string;
+export declare function toolOutput(action: ToolAction): string;
+export declare function plainMarkdown(source: string): string;
+export interface StoredMessage {
+    role?: string;
+    content?: string;
+    createdAt?: string | number;
+    messageMetadata?: string | null;
+}
+export type HistoryRow = {
+    kind: 'user' | 'assistant' | 'tree' | 'reasoning';
+    text: string;
+} | {
+    kind: 'tool';
+    action: ToolAction;
+};
+/** The list endpoint is newest-first. Dated lists are ordered by time; undated lists stay as given. */
+export declare function historyRows(messages: readonly StoredMessage[]): HistoryRow[];

package/dist/tui/transcript.js

@@ -0,0 +1,146 @@
+import { applyChildEvent, childLines } from './children.js';
+export function formatDuration(ms) {
+    if (!Number.isFinite(ms) || ms < 0)
+        return '';
+    if (ms < 10_000)
+        return `${(Math.round(ms / 100) / 10).toFixed(1)}s`;
+    return `${Math.round(ms / 1000)}s`;
+}
+export function toolStatus(action) {
+    const settled = typeof action.durationMs === 'number' || typeof action.success === 'boolean' || action.error != null;
+    if (!settled)
+        return '…';
+    const mark = action.success === false || action.error != null ? '✗' : '✓';
+    const duration = typeof action.durationMs === 'number' ? formatDuration(action.durationMs) : '';
+    return duration ? `${mark} ${duration}` : mark;
+}
+export function toolOutput(action) {
+    const error = textOf(action.error);
+    if (error)
+        return clip(error);
+    return clip(textOf(action.result));
+}
+export function plainMarkdown(source) {
+    const out = [];
+    let fence = false;
+    for (const line of source.replace(/\r\n/g, '\n').split('\n')) {
+        if (line.trim().startsWith('```')) {
+            fence = !fence;
+            continue;
+        }
+        if (fence) {
+            out.push(line);
+            continue;
+        }
+        out.push(line
+            .replace(/^#{1,6}\s+/, '')
+            .replace(/\*\*([^*\n]+)\*\*/g, '$1')
+            .replace(/~~([^~\n]+)~~/g, '$1')
+            .replace(/`([^`\n]+)`/g, '$1')
+            .replace(/\[([^\]\n]+)\]\([^)\n]+\)/g, '$1'));
+    }
+    return out.join('\n');
+}
+function textOf(value) {
+    if (typeof value === 'string')
+        return value;
+    if (!value || typeof value !== 'object')
+        return '';
+    const record = value;
+    for (const key of ['stdout', 'output', 'content', 'text', 'message', 'error']) {
+        if (typeof record[key] === 'string' && record[key])
+            return record[key];
+    }
+    const data = record.data;
+    if (typeof data === 'string')
+        return data;
+    if (data && typeof data === 'object')
+        return textOf(data);
+    return '';
+}
+function clip(text) {
+    const trimmed = text.replace(/\s+$/g, '');
+    return trimmed.length > 4000 ? `${trimmed.slice(0, 4000)}…` : trimmed;
+}
+/** The list endpoint is newest-first. Dated lists are ordered by time; undated lists stay as given. */
+export function historyRows(messages) {
+    const rows = [];
+    for (const message of inTimeOrder(messages)) {
+        if (message.role === 'user') {
+            rows.push({ kind: 'user', text: message.content ?? '' });
+            continue;
+        }
+        const meta = parseMeta(message.messageMetadata);
+        const timeline = Array.isArray(meta.timeline) ? meta.timeline : null;
+        if (timeline) {
+            let sawText = false;
+            for (const block of timeline) {
+                if (!block || typeof block !== 'object')
+                    continue;
+                const record = block;
+                if (record.type === 'text' && typeof record.content === 'string' && record.content.length > 0) {
+                    sawText = true;
+                    rows.push({ kind: 'assistant', text: record.content });
+                }
+                else if (record.type === 'reasoning' && typeof record.content === 'string' && record.content.length > 0) {
+                    rows.push({ kind: 'reasoning', text: record.content });
+                }
+                else if (record.type === 'tools' && Array.isArray(record.actions)) {
+                    for (const action of record.actions) {
+                        if (action && typeof action === 'object')
+                            rows.push({ kind: 'tool', action: action });
+                    }
+                }
+            }
+            if (!sawText && message.content)
+                rows.push({ kind: 'assistant', text: message.content });
+        }
+        else {
+            if (message.content)
+                rows.push({ kind: 'assistant', text: message.content });
+            const actions = Array.isArray(meta.executedActions) ? meta.executedActions : [];
+            for (const action of actions) {
+                if (action && typeof action === 'object')
+                    rows.push({ kind: 'tool', action: action });
+            }
+        }
+        appendChildren(rows, meta.orchestrationChildEvents);
+    }
+    return rows;
+}
+function inTimeOrder(messages) {
+    if (messages.length < 2)
+        return [...messages];
+    const times = messages.map((message) => message.createdAt == null ? null : String(message.createdAt));
+    if (times.some((time) => time == null))
+        return [...messages];
+    const first = times[0] ?? '';
+    const last = times[times.length - 1] ?? '';
+    if (first > last)
+        return [...messages].reverse();
+    return [...messages];
+}
+function appendChildren(rows, events) {
+    if (!Array.isArray(events))
+        return;
+    let children = [];
+    for (const event of events) {
+        if (event && typeof event === 'object')
+            children = applyChildEvent(children, event);
+    }
+    for (const line of childLines(children))
+        rows.push({ kind: 'tree', text: line });
+}
+function parseMeta(raw) {
+    if (!raw)
+        return {};
+    try {
+        const parsed = JSON.parse(raw);
+        if (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
+            return parsed;
+    }
+    catch (error) {
+        void error;
+    }
+    return {};
+}

package/dist/tui/usage.d.ts

@@ -0,0 +1,9 @@
+export interface UsageTotals {
+    turns?: number;
+    totalTokens?: number;
+    costUsd?: number;
+}
+/** One status line from `GET /api/v2/usage/summary`. */
+export declare function formatUsage(data: {
+    totals?: UsageTotals;
+} | null | undefined): string;

package/dist/tui/usage.js

@@ -0,0 +1,13 @@
+/** One status line from `GET /api/v2/usage/summary`. */
+export function formatUsage(data) {
+    const totals = data?.totals ?? {};
+    const turns = numberOf(totals.turns);
+    const tokens = numberOf(totals.totalTokens);
+    const cost = typeof totals.costUsd === 'number' && Number.isFinite(totals.costUsd)
+        ? ` · $${totals.costUsd.toFixed(2)}`
+        : '';
+    return `用量 ${turns} 回合 · ${tokens} token${cost}`;
+}
+function numberOf(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : 0;
+}

package/dist/tui/view.d.ts

@@ -8,13 +8,24 @@ export declare class OpenTuiView {
     private readonly body;
     private readonly readOnly;
     private readonly overlay;
+    private readonly picks;
+    private readonly attached;
+    private readonly queued;
+    private readonly search;
+    private readonly banner;
+    private readonly composer;
     private readonly draft;
     private readonly status;
     private readonly footer;
     private bodyKey;
     private overlayKey;
+    private picksKey;
+    private readonly syntax;
     constructor(renderer: CliRenderer);
+    scrollPage(direction: -1 | 1): void;
+    scrollEdge(edge: 'top' | 'bottom'): void;
     apply(screen: TuiScreen): void;
     private paintOverlay;
+    private paintPicks;
     private replaceBody;
 }

package/dist/tui/view.js

@@ -1,5 +1,9 @@
-import { BoxRenderable, ScrollBoxRenderable, TextRenderable, } from '@opentui/core';
-import { approvalLines, chatText, footerText, helpLines, readOnlyText, toolText, } from './screen.js';
+import { BoxRenderable, MarkdownRenderable, ScrollBoxRenderable, SyntaxStyle, TextRenderable, dim as dimText, reverse, t, } from '@opentui/core';
+import { splitAtCursor } from './editor.js';
+import { childLines } from './children.js';
+import { approvalLines, attachmentText, bannerLines, chatText, composerRows, draftHint, footerText, helpLines, pickText, readOnlyText, reasoningBlock, toolBlock, } from './screen.js';
+import { pageScrollLines } from './scroll.js';
+import { plainMarkdown } from './transcript.js';
 const canvas = '#16161e';
 const bar = '#24283b';
 const ink = '#c0caf5';
@@ -18,13 +22,28 @@ export class OpenTuiView {
     body;
     readOnly;
     overlay;
+    picks;
+    attached;
+    queued;
+    search;
+    banner;
+    composer;
     draft;
     status;
     footer;
     bodyKey = '';
     overlayKey = '';
+    picksKey = '';
+    syntax;
     constructor(renderer) {
         this.renderer = renderer;
+        try {
+            this.syntax = SyntaxStyle.create();
+        }
+        catch (error) {
+            void error;
+            this.syntax = null;
+        }
         const shell = new BoxRenderable(renderer, {
             width: '100%',
             height: '100%',
@@ -66,15 +85,38 @@ export class OpenTuiView {
             paddingRight: 1,
             visible: false,
         });
-        const input = new BoxRenderable(renderer, {
+        this.picks = new BoxRenderable(renderer, {
+            width: '100%',
+            border: true,
+            borderStyle: 'rounded',
+            borderColor: user,
+            backgroundColor: '#1a1b2e',
+            paddingLeft: 1,
+            paddingRight: 1,
+            visible: false,
+        });
+        this.attached = text(renderer, warn);
+        this.queued = text(renderer, warn);
+        this.queued.visible = false;
+        this.search = text(renderer, warn);
+        this.search.visible = false;
+        this.banner = text(renderer, warn);
+        this.banner.visible = false;
+        this.composer = new BoxRenderable(renderer, {
             width: '100%',
             height: 1,
+            flexShrink: 0,
             backgroundColor: bar,
             paddingLeft: 1,
             paddingRight: 1,
         });
-        this.draft = text(renderer, prompt);
-        input.add(this.draft);
+        this.draft = new TextRenderable(renderer, {
+            content: '',
+            fg: prompt,
+            width: '100%',
+            wrapMode: 'word',
+        });
+        this.composer.add(this.draft);
         this.status = text(renderer, warn);
         this.footer = text(renderer, dim);
         const footerBar = new BoxRenderable(renderer, {
@@ -89,20 +131,56 @@ export class OpenTuiView {
         shell.add(this.body);
         shell.add(this.readOnly);
         shell.add(this.overlay);
-        shell.add(input);
+        shell.add(this.picks);
+        shell.add(this.attached);
+        shell.add(this.banner);
+        shell.add(this.queued);
+        shell.add(this.search);
+        shell.add(this.composer);
         shell.add(this.status);
         shell.add(footerBar);
         renderer.root.add(shell);
     }
+    scrollPage(direction) {
+        const height = this.body.viewport.height;
+        this.body.scrollBy(pageScrollLines(typeof height === 'number' ? height : 0, direction));
+    }
+    scrollEdge(edge) {
+        if (edge === 'top')
+            this.body.scrollTo(0);
+        else
+            this.body.scrollTo(this.body.scrollHeight);
+    }
     apply(screen) {
         this.heading.content = `${screen.product}  ${screen.title}`;
         this.model.content = screen.modelName;
         this.readOnly.visible = screen.readOnly;
-        this.draft.content = `> ${screen.draft}`;
+        this.draft.content = draftContent(screen.draft, screen.cursor);
+        this.composer.height = composerRows(screen.draft, Math.max(1, this.renderer.width - 2));
         this.status.content = screen.status;
         this.status.visible = screen.status.length > 0;
         this.footer.content = footerText();
+        const attached = attachmentText(screen.attachments ?? []);
+        this.attached.content = attached;
+        this.attached.visible = attached.length > 0;
+        const queued = screen.queued ?? [];
+        this.queued.content = queued.map((item) => `排队 ${item}`).join('\n');
+        this.queued.visible = queued.length > 0;
+        this.queued.height = queued.length;
+        const search = screen.search ?? '';
+        this.search.content = search;
+        this.search.visible = search.length > 0;
+        this.search.height = search.length > 0 ? 1 : 0;
+        const banner = bannerLines(screen);
+        this.banner.content = banner.join('\n');
+        this.banner.visible = banner.length > 0;
+        this.banner.height = banner.length;
+        if (screen.scroll)
+            this.scrollEdge(screen.scroll);
+        if (typeof screen.searchFocus === 'number')
+            this.body.scrollChildIntoView(`line-${screen.searchFocus}`);
         this.paintOverlay(screen);
+        this.paintPicks(screen);
         const key = bodyKey(screen);
         if (key === this.bodyKey)
             return;
@@ -135,6 +213,28 @@ export class OpenTuiView {
             wrapMode: 'none',
         }));
     }
+    paintPicks(screen) {
+        const lines = (screen.picks ?? []).map(pickText);
+        const key = lines.join('\n');
+        if (key === this.picksKey)
+            return;
+        this.picksKey = key;
+        for (const child of this.picks.getChildren()) {
+            this.picks.remove(child);
+            child.destroyRecursively();
+        }
+        this.picks.visible = lines.length > 0;
+        this.picks.height = lines.length === 0 ? 0 : lines.length + 2;
+        if (lines.length === 0)
+            return;
+        this.picks.add(new TextRenderable(this.renderer, {
+            content: lines.join('\n'),
+            fg: ink,
+            width: '100%',
+            height: lines.length,
+            wrapMode: 'none',
+        }));
+    }
     replaceBody(screen) {
         for (const child of this.body.getChildren()) {
             this.body.remove(child);
@@ -160,20 +260,48 @@ export class OpenTuiView {
             }
             return;
         }
-        for (const line of screen.lines)
-            this.body.add(transcriptRow(renderer, line));
+        screen.lines.forEach((line, index) => {
+            this.body.add(transcriptRow(renderer, line, this.syntax, `line-${index}`));
+        });
+        for (const line of childLines(screen.children ?? []))
+            this.body.add(text(renderer, tool, line));
     }
 }
+function draftContent(draft, cursor) {
+    const { before, head, after } = splitAtCursor(draft, cursor);
+    const mark = reverse('▍');
+    if (draft.length === 0)
+        return t `> ${mark} ${dimText(draftHint())}`;
+    if (head.length === 0)
+        return t `> ${before}${mark}`;
+    return t `> ${before}${mark}${head}${after}`;
+}
 function bodyKey(screen) {
     return JSON.stringify({
         help: screen.help,
         chats: screen.chats,
         lines: screen.lines,
+        children: screen.children ?? [],
     });
 }
-function transcriptRow(renderer, line) {
+function transcriptRow(renderer, line, syntax, id) {
+    if (line.kind === 'reasoning') {
+        const card = new BoxRenderable(renderer, {
+            id,
+            width: '100%',
+            border: true,
+            borderStyle: 'rounded',
+            borderColor: warn,
+            paddingLeft: 1,
+            paddingRight: 1,
+        });
+        for (const row of reasoningBlock(line))
+            card.add(text(renderer, row.startsWith('  ') ? dim : warn, row));
+        return card;
+    }
     if (line.kind === 'tool') {
         const card = new BoxRenderable(renderer, {
+            id,
             width: '100%',
             border: true,
             borderStyle: 'rounded',
@@ -181,14 +309,27 @@ function transcriptRow(renderer, line) {
             paddingLeft: 1,
             paddingRight: 1,
         });
-        card.add(text(renderer, tool, toolText(line)));
+        for (const row of toolBlock(line))
+            card.add(text(renderer, row.startsWith('  ') ? dim : tool, row));
         return card;
     }
     if (line.kind === 'user') {
-        return text(renderer, user, `user ${line.text ?? ''}`);
+        return text(renderer, user, `user ${line.text ?? ''}`, id);
+    }
+    if (line.kind === 'assistant' && syntax) {
+        return new MarkdownRenderable(renderer, {
+            id,
+            content: line.text && line.text.length > 0 ? line.text : ' ',
+            syntaxStyle: syntax,
+            fg: ink,
+            conceal: true,
+            streaming: line.streaming === true,
+            width: '100%',
+        });
     }
-    return text(renderer, ink, line.text && line.text.length > 0 ? line.text : ' ');
+    const plain = plainMarkdown(line.text ?? '');
+    return text(renderer, ink, plain.length > 0 ? plain : ' ', id);
 }
-function text(renderer, fg, content = '') {
-    return new TextRenderable(renderer, { content, fg, wrapMode: 'word' });
+function text(renderer, fg, content = '', id) {
+    return new TextRenderable(renderer, { ...(id ? { id } : {}), content, fg, wrapMode: 'word' });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerable/agent-cli",
-  "version": "0.6.59",
+  "version": "0.6.61",
   "description": "Product-neutral command line for a Steerable host. Products supply the bin name and brand.",
   "license": "Apache-2.0",
   "homepage": "https://steerableframework.com/",
@@ -38,9 +38,9 @@
   "dependencies": {
     "@earendil-works/pi-tui": "0.87.1",
     "@opentui/core": "0.5.12",
-    "@steerable/agent-client": "0.6.59",
-    "@steerable/agent-protocol": "0.6.59",
-    "@steerable/agent-shell": "0.6.59"
+    "@steerable/agent-client": "0.6.61",
+    "@steerable/agent-protocol": "0.6.61",
+    "@steerable/agent-shell": "0.6.61"
   },
   "devDependencies": {
     "@types/node": "^22.10.5",