@steerable/agent-cli 0.7.2 → 0.7.4

package/dist/approve.d.ts

@@ -14,6 +14,8 @@ export declare function parseApprovePolicy(raw: string | undefined): ApprovePoli
 export declare function decisionFor(spec: ApprovalSpec, prompt: {
     mode?: string;
 }, surface: ApprovalSurface): ApprovalDecisionKind | 'prompt';
+/** The sidecar copies this reason onto the stored tool row as `approval.auto`. */
+export declare const UNATTENDED_APPROVAL_REASON = "unattended";
 export declare function unattendedAskText(): string;
 export declare function autoAnswer(questions: {
     id: string;

package/dist/approve.js

@@ -30,6 +30,8 @@ export function decisionFor(spec, prompt, surface) {
         return 'prompt';
     return 'deny_once';
 }
+/** The sidecar copies this reason onto the stored tool row as `approval.auto`. */
+export const UNATTENDED_APPROVAL_REASON = 'unattended';
 export function unattendedAskText() {
     return cliText('ask.unattended');
 }

package/dist/help.d.ts

@@ -16,7 +16,7 @@ export declare const COMMAND_NAME_TOKEN = "<product>";
  * A blank name, the token itself, or a name that is not a command token is left unchanged.
  *
  * @param text Help or protected-directory text.
- * @param commandName Bin name such as `aroli` or `steerable-cli`.
+ * @param commandName Bin name such as `agent` or `steerable-cli`.
  * @returns Text with the placeholder replaced when the name is usable.
  */
 export declare function renderCommandName(text: string, commandName: string | undefined): string;

package/dist/help.js

@@ -135,7 +135,7 @@ export const COMMAND_NAME_TOKEN = '<product>';
  * A blank name, the token itself, or a name that is not a command token is left unchanged.
  *
  * @param text Help or protected-directory text.
- * @param commandName Bin name such as `aroli` or `steerable-cli`.
+ * @param commandName Bin name such as `agent` or `steerable-cli`.
  * @returns Text with the placeholder replaced when the name is usable.
  */
 export function renderCommandName(text, commandName) {

package/dist/node-version.d.ts

@@ -11,7 +11,7 @@ export interface NodeVersionWriter {
 }
 /** @param current Installed version, with or without a leading `v`. @param required `major.minor.patch`. @returns Whether `current` is at least `required`. */
 export declare function satisfies(current: string, required: string): boolean;
-/** @param current Installed version. @param stderr Where the failure text is written. @param product Command name, such as `aroli`. @returns `0` when the version is new enough, otherwise `1`. */
+/** @param current Installed version. @param stderr Where the failure text is written. @param product Command name, such as `agent`. @returns `0` when the version is new enough, otherwise `1`. */
 export declare function ensureSupportedNode(current: string, stderr: NodeVersionWriter, product: string): number;
 /** @param current Installed version. @returns One doctor row, including whether it meets {@link REQUIRED_NODE}. */
 export declare function nodeDoctorLine(current: string): string;

package/dist/node-version.js

@@ -18,7 +18,7 @@ export function satisfies(current, required) {
     }
     return true;
 }
-/** @param current Installed version. @param stderr Where the failure text is written. @param product Command name, such as `aroli`. @returns `0` when the version is new enough, otherwise `1`. */
+/** @param current Installed version. @param stderr Where the failure text is written. @param product Command name, such as `agent`. @returns `0` when the version is new enough, otherwise `1`. */
 export function ensureSupportedNode(current, stderr, product) {
     if (satisfies(current, REQUIRED_NODE))
         return 0;

package/dist/run.js

@@ -1,4 +1,4 @@
-import { autoAnswer, decisionFor, denied } from './approve.js';
+import { autoAnswer, decisionFor, denied, UNATTENDED_APPROVAL_REASON } from './approve.js';
 import { cliText } from './copy.js';
 import { ruleStatusLine } from './rules.js';
 export async function runTurn(client, request, stdout, stderr, signal) {
@@ -253,7 +253,7 @@ function watchApprovals(client, spec, request, stdout, stderr, autoAnswered, str
                 if (!request.json && !request.streamJson && record.toolName === 'network_egress' && kind === 'allow_once') {
                     stderr.write(`${egressProgressLine(prompt.arguments)}\n`);
                 }
-                await client.decideApproval(prompt.requestId, kind);
+                await client.decideApproval(prompt.requestId, kind, kind === 'allow_once' ? UNATTENDED_APPROVAL_REASON : undefined);
             }
             else if (event.channel === 'ask-user:request') {
                 const prompt = event.payload;
@@ -261,10 +261,11 @@ function watchApprovals(client, spec, request, stdout, stderr, autoAnswered, str
                     continue;
                 if (spec.answerAsk) {
                     const questions = prompt.questions?.length ? prompt.questions : [{ id: 'answer' }];
-                    const record = { kind: 'ask_user', prompt: prompt.prompt ?? '' };
+                    const asked = questions.map((question) => question.text?.trim() ?? '').find((text) => text.length > 0) ?? '';
+                    const record = { kind: 'ask_user', prompt: (asked || prompt.prompt || prompt.intro || '').trim() };
                     autoAnswered.push(record);
                     writeAnswerBeforeTool(streamOrder, record, stdout, request.streamJson);
-                    await client.answerAsk(prompt.requestId, { answers: autoAnswer(questions) });
+                    await client.answerAsk(prompt.requestId, { answers: autoAnswer(questions), unattended: true });
                 }
                 else {
                     await client.answerAsk(prompt.requestId, {});
@@ -337,6 +338,10 @@ function writeToolProgress(event, stderr, printed) {
         if (!settled)
             continue;
         const name = typeof row.tool === 'string' ? row.tool : 'tool';
+        // The grant line is written when the approval is allowed. A later snapshot
+        // of the same grant must not print a second row.
+        if (name === 'network_egress')
+            continue;
         const key = typeof row.id === 'string' && row.id ? row.id : `${name}:${toolProgressLine(row)}`;
         if (printed.has(key))
             continue;

package/dist/tui/session.d.ts

@@ -126,6 +126,7 @@ export declare class AgentTui implements Component {
     private refreshGoal;
     private refreshLoops;
     private reloadMessages;
+    private transcriptFrom;
     private showList;
     private showTasks;
     private exportChat;

package/dist/tui/session.js

@@ -6,7 +6,7 @@ import path from 'node:path';
 import { getKeybindings } from '@earendil-works/pi-tui';
 import { listBusyChatIds } from '@steerable/agent-client';
 import { saveAttachmentFiles } from '@steerable/agent-shell/attachments';
-import { autoAnswer, decisionFor } from '../approve.js';
+import { autoAnswer, decisionFor, UNATTENDED_APPROVAL_REASON } from '../approve.js';
 import { cliText } from '../copy.js';
 import { applyChildEvent, childLines } from './children.js';
 import { readSystemClipboard, saveClipboardImage, writeSystemClipboard } from './clipboard.js';
@@ -21,7 +21,7 @@ import { searchHits, searchLabel } from './search.js';
 import { ruleStatusLine } from '../rules.js';
 import { transcriptEdge } from './scroll.js';
 import { todosFromAction } from './todos.js';
-import { formatDuration, historyRows, toolOutput, toolStatus } from './transcript.js';
+import { askRowSummary, formatDuration, historyRows, toolOutput, toolStatus } from './transcript.js';
 import { formatUsage } from './usage.js';
 export class AgentTui {
     client;
@@ -66,6 +66,7 @@ export class AgentTui {
     ensureEgressLine(args) {
         const target = egressTarget(args);
         const existing = [...this.lines].reverse().find((line) => line.kind === 'tool' && line.name === 'network_egress');
+        // Egress is an approval, not a tool result. The row is this grant.
         if (existing && !existing.auto) {
             if (!existing.args && target)
                 existing.args = target;
@@ -600,15 +601,7 @@ export class AgentTui {
         const records = messages.status === 200
             ? (messages.data.messages ?? [])
             : [];
-        this.todos = [];
-        this.lines = historyRows(records).map((row) => {
-            if (row.kind !== 'tool')
-                return { kind: row.kind, text: row.text };
-            const next = todosFromAction(row.action.tool, row.action.arguments, row.action.result);
-            if (next)
-                this.todos = next;
-            return toolLine(row.action);
-        });
+        this.lines = this.transcriptFrom(records);
         this.help = false;
         this.search = null;
         this.panel = null;
@@ -1052,7 +1045,9 @@ export class AgentTui {
             const duration = typeof payload.durationMs === 'number' ? formatDuration(payload.durationMs) : '';
             const mark = failed ? '✗' : '✓';
             const base = duration ? `${mark} ${duration}` : mark;
-            tool.status = tool.auto ? appendAuto(base) : base;
+            tool.status = !failed && tool.auto ? appendAuto(base) : base;
+            if (failed)
+                tool.auto = false;
             return;
         }
         if (String(event.type) === 'reasoning' && typeof event.content === 'string') {
@@ -1099,14 +1094,17 @@ export class AgentTui {
                     }
                     if (decision === 'allow_once' && payload.toolName)
                         this.markAutoTool(payload.toolName);
-                    void this.client.decideApproval(payload.requestId, decision);
+                    void this.client.decideApproval(payload.requestId, decision, decision === 'allow_once' ? UNATTENDED_APPROVAL_REASON : undefined);
                     this.touch();
                     continue;
                 }
+                const toolName = payload.toolName || 'tool';
                 this.approval = {
                     requestId: payload.requestId,
-                    toolName: payload.toolName || 'tool',
-                    summary: toolArgs(payload.arguments),
+                    toolName,
+                    summary: toolName === 'network_egress'
+                        ? (egressApprovalTarget(payload.arguments) || toolArgs(payload.arguments))
+                        : toolArgs(payload.arguments),
                 };
             }
             else if (event.channel === 'ask-user:request') {
@@ -1118,16 +1116,17 @@ export class AgentTui {
                     const questions = payload.questions?.length ? payload.questions : [{ id: 'answer' }];
                     void this.client.answerAsk(payload.requestId, {
                         answers: autoAnswer(questions.flatMap((question) => question.id ? [{ id: question.id }] : [])),
+                        unattended: true,
                     });
                     const asked = questions
                         .map((question) => question.text?.trim() ?? '')
                         .filter((text) => text.length > 0);
                     const answer = cliText('ask.unattended');
-                    const args = intro || asked[0] || '';
+                    const args = asked[0] || intro || '';
                     const output = [...asked.map((text) => `问 ${text}`), `答 ${answer}`].join('\n');
                     const line = this.latestAskLine();
                     if (line && !autoAnswerStatus(line.status)) {
-                        if (!line.args)
+                        if (args)
                             line.args = args;
                         line.status = autoAnswerMark();
                         line.output = output;
@@ -1188,20 +1187,29 @@ export class AgentTui {
                 : -1;
             if (index < 0 && next.name === 'ask_user')
                 index = this.unboundAskLine();
+            if (index < 0 && next.name === 'network_egress') {
+                index = this.lines.findIndex((line) => line.kind === 'tool'
+                    && line.name === 'network_egress'
+                    && !line.id
+                    && (line.args ?? '') === (next.args ?? ''));
+            }
             const prior = index >= 0 ? this.lines[index] : undefined;
             const keepAnswer = autoAnswerStatus(prior?.status);
+            const failed = next.status?.startsWith('✗') === true;
             const auto = prior?.auto === true || (!keepAnswer && this.takePendingAuto(next.name ?? ''));
-            if (auto) {
+            if (auto && !failed) {
                 next.auto = true;
                 next.status = appendAuto(next.status);
             }
             if (index >= 0) {
                 next.open = prior?.open;
-                if (keepAnswer && prior) {
+                if (keepAnswer && prior && !failed) {
                     next.status = autoAnswerMark();
                     if (prior.output)
                         next.output = prior.output;
-                    if (!next.args && prior.args)
+                    if (prior.args && !askRowSummary(action))
+                        next.args = prior.args;
+                    else if (!next.args && prior.args)
                         next.args = prior.args;
                 }
                 else if (prior?.output && !next.output) {
@@ -1293,8 +1301,13 @@ export class AgentTui {
         if (response.status !== 200)
             return;
         const records = response.data.messages ?? [];
+        const prior = this.lines;
+        this.lines = retainMissingEgress(prior, keepAutoMarks(prior, this.transcriptFrom(records)));
+        this.touch();
+    }
+    transcriptFrom(records) {
         this.todos = [];
-        this.lines = historyRows(records).map((row) => {
+        return historyRows(records).map((row) => {
             if (row.kind !== 'tool')
                 return { kind: row.kind, text: row.text };
             const next = todosFromAction(row.action.tool, row.action.arguments, row.action.result);
@@ -1302,7 +1315,6 @@ export class AgentTui {
                 this.todos = next;
             return toolLine(row.action);
         });
-        this.touch();
     }
     async showList(method, requestPath, key, format, empty, unavailable) {
         const listed = await this.client.request(method, requestPath, undefined);
@@ -1516,6 +1528,16 @@ function egressTarget(value) {
         return host;
     return `${host}:${port}`;
 }
+/** Approval prompt keeps the port. The settled tool row drops 80 and 443. */
+function egressApprovalTarget(value) {
+    if (!value || typeof value !== 'object')
+        return '';
+    const record = value;
+    const host = typeof record.host === 'string' ? record.host : '';
+    if (!host)
+        return '';
+    return typeof record.port === 'number' ? `${host}:${record.port}` : host;
+}
 function autoAnswerMark() {
     return `✓ ${cliText('tui.toolAutoAnswer')}`;
 }
@@ -1523,6 +1545,93 @@ function autoAnswerStatus(status) {
     const phrase = cliText('tui.toolAutoAnswer');
     return status === phrase || status === autoAnswerMark() || (status?.endsWith(` ${phrase}`) ?? false);
 }
+/**
+ * An egress grant is not a tool result, so reloaded history does not contain
+ * that row. Keep the live row when the saved transcript has no line for it.
+ */
+function retainMissingEgress(prior, next) {
+    const present = new Set(next
+        .filter((line) => line.kind === 'tool' && line.name === 'network_egress')
+        .map((line) => line.args ?? ''));
+    const missing = prior.filter((line) => {
+        if (line.kind !== 'tool' || line.name !== 'network_egress')
+            return false;
+        const host = line.args ?? '';
+        if (!host)
+            return present.size === 0;
+        return !present.has(host);
+    });
+    if (missing.length === 0)
+        return next;
+    const out = [...next];
+    for (const line of missing) {
+        const at = prior.indexOf(line);
+        let insertAt = out.length;
+        for (let index = at + 1; index < prior.length; index += 1) {
+            const found = findReloadedAnchor(out, prior[index]);
+            if (found >= 0) {
+                insertAt = found;
+                break;
+            }
+        }
+        out.splice(insertAt, 0, line);
+        present.add(line.args ?? '');
+    }
+    return out;
+}
+function findReloadedAnchor(lines, anchor) {
+    if (!anchor)
+        return -1;
+    if (anchor.kind === 'tool') {
+        if (anchor.id) {
+            const byId = lines.findIndex((line) => line.kind === 'tool' && line.id === anchor.id);
+            if (byId >= 0)
+                return byId;
+        }
+        const matches = lines.flatMap((line, index) => (line.kind === 'tool' && line.name === anchor.name ? [index] : []));
+        return matches.length === 1 ? matches[0] : -1;
+    }
+    if (!anchor.text)
+        return -1;
+    return lines.findIndex((line) => line.kind === anchor.kind && line.text === anchor.text);
+}
+function keepAutoMarks(prior, next) {
+    const byId = new Map();
+    const spare = new Map();
+    for (const line of prior) {
+        if (line.kind !== 'tool' || (!line.auto && !autoAnswerStatus(line.status)))
+            continue;
+        if (line.id)
+            byId.set(line.id, line);
+        else {
+            const name = line.name ?? '';
+            const queued = spare.get(name) ?? [];
+            queued.push(line);
+            spare.set(name, queued);
+        }
+    }
+    return next.map((line) => {
+        if (line.kind !== 'tool')
+            return line;
+        const queued = spare.get(line.name ?? '');
+        const match = (line.id ? byId.get(line.id) : undefined) ?? queued?.shift();
+        if (!match)
+            return line;
+        if (match.auto && !line.status?.startsWith('✗')) {
+            line.auto = true;
+            if (!autoAnswerStatus(line.status))
+                line.status = appendAuto(line.status);
+        }
+        if (autoAnswerStatus(match.status)) {
+            line.status = autoAnswerMark();
+            if (!line.output && match.output)
+                line.output = match.output;
+            if (!line.args && match.args)
+                line.args = match.args;
+        }
+        return line;
+    });
+}
 function appendAuto(status) {
     const auto = cliText('tui.toolAuto');
     const session = cliText('tui.toolSessionAllow');
@@ -1544,11 +1653,13 @@ function openToolStatus(status) {
 function toolLine(action) {
     const name = typeof action.tool === 'string' && action.tool ? action.tool : 'tool';
     const title = typeof action.view?.title === 'string' ? action.view.title : '';
+    const egress = name === 'network_egress' ? egressTarget(action.arguments) : '';
+    const asked = askRowSummary(action);
     return {
         kind: 'tool',
         id: typeof action.id === 'string' ? action.id : undefined,
         name,
-        args: title && title !== name ? title : toolArgs(action.arguments),
+        args: egress || asked || (title && title !== name ? title : toolArgs(action.arguments)),
         status: toolStatus(action),
         output: toolOutput(action),
         ...(diffOf(action) ? { diff: diffOf(action) } : {}),
@@ -1622,10 +1733,12 @@ async function editWithEditor(text) {
 function toolArgs(value) {
     if (typeof value === 'string')
         return value;
-    if (value && typeof value === 'object' && 'command' in value) {
-        const command = value.command;
-        if (typeof command === 'string')
-            return command;
+    if (value && typeof value === 'object') {
+        const record = value;
+        if (typeof record.command === 'string')
+            return record.command;
+        if (typeof record.url === 'string')
+            return record.url;
     }
     if (value === undefined)
         return '';

package/dist/tui/smoke-entry.js

@@ -24,6 +24,15 @@ const client = {
             return { status: 200, data: { model: 'demo-model' } };
         if (method === 'POST' && requestPath === '/api/v2/chats/new')
             return { status: 200, data: { chatId: 'chat-1' } };
+        if (method === 'POST' && requestPath === '/api/v2/projects/resolve') {
+            return {
+                status: 200,
+                data: {
+                    project: { id: 'proj-1', name: 'cli', folderPath: process.cwd() },
+                    created: false,
+                },
+            };
+        }
         if (method === 'GET' && requestPath.endsWith('/goal'))
             return { status: 200, data: { goal } };
         if (method === 'GET' && requestPath.endsWith('/loops'))

package/dist/tui/transcript.d.ts

@@ -12,11 +12,14 @@ export interface ToolAction {
     approval?: {
         kind?: string;
         cached?: boolean;
+        auto?: boolean;
     };
 }
 export declare function formatDuration(ms: number): string;
 export declare function toolStatus(action: ToolAction): string;
 export declare function toolOutput(action: ToolAction): string;
+/** First question, for the folded tool row. The intro stays out of that column. */
+export declare function askRowSummary(action: ToolAction): string;
 export declare function plainMarkdown(source: string): string;
 export interface StoredMessage {
     role?: string;

package/dist/tui/transcript.js

@@ -11,20 +11,133 @@ 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 failed = action.success === false || action.error != null;
+    if (!failed && askUserReplay(action)?.auto)
+        return `✓ ${cliText('tui.toolAutoAnswer')}`;
+    const mark = failed ? '✗' : '✓';
     const duration = typeof action.durationMs === 'number' ? formatDuration(action.durationMs) : '';
     const base = duration ? `${mark} ${duration}` : mark;
     if (action.approval?.kind === 'allow_for_session' && action.approval.cached === true) {
         return `${base} ${cliText('tui.toolSessionAllow')}`;
     }
+    if (!failed && action.approval?.auto === true)
+        return `${base} ${cliText('tui.toolAuto')}`;
     return base;
 }
 export function toolOutput(action) {
     const error = textOf(action.error);
     if (error)
         return clip(error);
+    // A reopened chat only has the stored result object, which has no string field the generic extractor reads.
+    const replay = askUserReplay(action);
+    if (replay)
+        return clip(replay.lines);
     return clip(textOf(action.result));
 }
+/** First question, for the folded tool row. The intro stays out of that column. */
+export function askRowSummary(action) {
+    if (action.tool !== 'ask_user')
+        return '';
+    return firstQuestionText(action.result) || firstQuestionText(action.arguments);
+}
+function askUserReplay(action) {
+    if (action.tool !== 'ask_user')
+        return null;
+    const record = unwrapAsk(action.result);
+    if (!record)
+        return null;
+    const answers = record.answers;
+    const asked = [];
+    const rendered = [];
+    for (const question of record.questions) {
+        if (!question || typeof question !== 'object')
+            continue;
+        const row = question;
+        const text = typeof row.text === 'string' ? row.text.trim() : '';
+        if (!text)
+            continue;
+        asked.push(text);
+        const id = typeof row.id === 'string' ? row.id : '';
+        rendered.push(id ? answerText(answers[id]) : '');
+    }
+    if (asked.length === 0)
+        return null;
+    const phrase = cliText('ask.unattended');
+    const filled = rendered.filter((value) => value.length > 0);
+    const first = filled[0];
+    const shared = first !== undefined && filled.length === asked.length && filled.every((value) => value === first);
+    const auto = record.unattended === true || (shared && first === phrase);
+    const lines = shared
+        ? [...asked.map((text) => `问 ${text}`), `答 ${first}`].join('\n')
+        : asked.map((text, index) => {
+            const answer = rendered[index] ?? '';
+            return answer ? `问 ${text}\n答 ${answer}` : `问 ${text}`;
+        }).join('\n');
+    return { lines, auto };
+}
+function unwrapAsk(result) {
+    if (typeof result === 'string') {
+        const trimmed = result.trim();
+        if (!trimmed.startsWith('{'))
+            return null;
+        try {
+            const parsed = JSON.parse(trimmed);
+            return unwrapAsk(parsed);
+        }
+        catch {
+            return null;
+        }
+    }
+    if (!result || typeof result !== 'object' || Array.isArray(result))
+        return null;
+    const record = result;
+    if (Array.isArray(record.questions) && record.answers && typeof record.answers === 'object' && !Array.isArray(record.answers)) {
+        return {
+            questions: record.questions,
+            answers: record.answers,
+            ...(record.unattended === true ? { unattended: true } : {}),
+        };
+    }
+    if (record.value && typeof record.value === 'object') {
+        const inner = unwrapAsk(record.value);
+        if (inner)
+            return record.unattended === true ? { ...inner, unattended: true } : inner;
+    }
+    if (record.data && typeof record.data === 'object') {
+        const inner = unwrapAsk(record.data);
+        if (inner)
+            return record.unattended === true ? { ...inner, unattended: true } : inner;
+    }
+    return null;
+}
+function firstQuestionText(value) {
+    const unwrapped = unwrapAsk(value);
+    const questions = unwrapped?.questions ?? questionList(value);
+    for (const question of questions) {
+        if (!question || typeof question !== 'object')
+            continue;
+        const text = question.text;
+        if (typeof text === 'string' && text.trim())
+            return text.trim();
+    }
+    return '';
+}
+function questionList(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return [];
+    const questions = value.questions;
+    return Array.isArray(questions) ? questions : [];
+}
+function answerText(value) {
+    if (typeof value === 'string')
+        return value.trim();
+    if (!Array.isArray(value))
+        return '';
+    return value
+        .filter((item) => typeof item === 'string' && item.trim().length > 0)
+        .map((item) => item.trim())
+        .join('、');
+}
 export function plainMarkdown(source) {
     const out = [];
     let fence = false;

package/package.json

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