neoctl 0.2.31 → 0.2.32

package/dist/tools/tool-catalog.js

@@ -0,0 +1,64 @@
+export const BUILTIN_TOOL_NAMES = {
+    fileEdit: "file_edit",
+    fileWrite: "file_write",
+    fileRead: "file_read",
+    fileList: "file_list",
+    fileSearch: "file_search",
+    terminalRun: "terminal_run",
+    terminalControl: "terminal_control",
+    webSearch: "web_search",
+    imageCreate: "image_create",
+    imageInspect: "image_inspect",
+    imageNote: "image_note",
+    planUpdate: "plan_update",
+    subagentRun: "subagent_run",
+    subagentOutput: "subagent_output",
+    subagentList: "subagent_list",
+    subagentGet: "subagent_get",
+    subagentStop: "subagent_stop",
+    subagentMessage: "subagent_message",
+    subagentResume: "subagent_resume",
+    subagentReport: "subagent_report",
+    secretList: "secret_list",
+    secretInfo: "secret_info",
+    secretRequest: "secret_request",
+};
+const BUILTIN_PRESENTATION = {
+    file_edit: { family: "filesystem", action: "edit", label: "编辑文件", visibility: "primary" },
+    file_write: { family: "filesystem", action: "write", label: "写入文件", visibility: "primary" },
+    file_read: { family: "filesystem", action: "read", label: "读取文件", visibility: "primary" },
+    file_list: { family: "filesystem", action: "list", label: "列出文件", visibility: "primary" },
+    file_search: { family: "filesystem", action: "search", label: "搜索文本", visibility: "primary" },
+    terminal_run: { family: "terminal", action: "run", label: "执行命令", visibility: "primary" },
+    terminal_control: { family: "terminal", action: "control", label: "终端交互", visibility: "nested" },
+    web_search: { family: "web", action: "search", label: "网络搜索", visibility: "primary" },
+    image_create: { family: "image", action: "create", label: "图片生成", visibility: "primary" },
+    image_inspect: { family: "image", action: "inspect", label: "读取图片", visibility: "primary" },
+    image_note: { family: "image", action: "note", label: "记录图片", visibility: "nested" },
+    plan_update: { family: "planning", action: "update", label: "任务计划", visibility: "primary" },
+    subagent_run: { family: "subagent", action: "run", label: "子任务", visibility: "primary" },
+    subagent_output: { family: "subagent", action: "output", label: "读取子任务输出", visibility: "nested" },
+    subagent_list: { family: "subagent", action: "list", label: "子任务列表", visibility: "hidden" },
+    subagent_get: { family: "subagent", action: "get", label: "查看子任务", visibility: "hidden" },
+    subagent_stop: { family: "subagent", action: "stop", label: "停止子任务", visibility: "nested" },
+    subagent_message: { family: "subagent", action: "message", label: "发送子任务消息", visibility: "nested" },
+    subagent_resume: { family: "subagent", action: "resume", label: "恢复子任务", visibility: "nested" },
+    subagent_report: { family: "subagent", action: "report", label: "子任务报告", visibility: "hidden" },
+    secret_list: { family: "secrets", action: "list", label: "密钥列表", visibility: "primary" },
+    secret_info: { family: "secrets", action: "info", label: "查看密钥", visibility: "primary" },
+    secret_request: { family: "secrets", action: "request", label: "申请密钥", visibility: "primary" },
+};
+export function builtinToolPresentation(name) {
+    return BUILTIN_PRESENTATION[name];
+}
+export function toolPresentationForSource(name, source = "unknown") {
+    const builtin = builtinToolPresentation(name);
+    if (builtin)
+        return builtin;
+    if (source === "plugin")
+        return { family: "plugin", action: name, label: name, visibility: "primary" };
+    if (source === "external")
+        return { family: "external", action: name, label: name, visibility: "primary" };
+    return { family: "other", action: name, label: name, visibility: "primary" };
+}
+//# sourceMappingURL=tool-catalog.js.map

package/dist/tools/tool-catalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-catalog.js","sourceRoot":"","sources":["../../src/tools/tool-catalog.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,QAAQ,EAAE,WAAW;IACrB,SAAS,EAAE,YAAY;IACvB,QAAQ,EAAE,WAAW;IACrB,QAAQ,EAAE,WAAW;IACrB,UAAU,EAAE,aAAa;IACzB,WAAW,EAAE,cAAc;IAC3B,eAAe,EAAE,kBAAkB;IACnC,SAAS,EAAE,YAAY;IACvB,WAAW,EAAE,cAAc;IAC3B,YAAY,EAAE,eAAe;IAC7B,SAAS,EAAE,YAAY;IACvB,UAAU,EAAE,aAAa;IACzB,WAAW,EAAE,cAAc;IAC3B,cAAc,EAAE,iBAAiB;IACjC,YAAY,EAAE,eAAe;IAC7B,WAAW,EAAE,cAAc;IAC3B,YAAY,EAAE,eAAe;IAC7B,eAAe,EAAE,kBAAkB;IACnC,cAAc,EAAE,iBAAiB;IACjC,cAAc,EAAE,iBAAiB;IACjC,UAAU,EAAE,aAAa;IACzB,UAAU,EAAE,aAAa;IACzB,aAAa,EAAE,gBAAgB;CACvB,CAAC;AAIX,MAAM,oBAAoB,GAAwD;IAChF,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IACzF,UAAU,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IAC3F,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IACzF,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IACzF,WAAW,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IAC7F,YAAY,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IACzF,gBAAgB,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE;IAChG,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IACrF,YAAY,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IACzF,aAAa,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IAC3F,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE;IACpF,WAAW,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IAC3F,YAAY,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE;IACxF,eAAe,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE;IACjG,aAAa,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC3F,YAAY,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE;IACzF,aAAa,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC3F,gBAAgB,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE;IACnG,eAAe,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC/F,eAAe,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC/F,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IACxF,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;IACxF,cAAc,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;CAC/F,CAAC;AAEF,MAAM,UAAU,uBAAuB,CAAC,IAAY;IAClD,OAAO,oBAAoB,CAAC,IAAuB,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,IAAY,EACZ,SAAwD,SAAS;IAEjE,MAAM,OAAO,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAC5B,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IACvG,IAAI,MAAM,KAAK,UAAU;QAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAC3G,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AAC/E,CAAC"}

package/dist/tools/tool-orchestration.d.ts

@@ -1,15 +1,32 @@
 import type { Message, ToolUseRequest } from "../types/messages.js";
-import { type RunToolUseOptions } from "./run-tool-use.js";
-import type { Tool, ToolUseContext } from "./tool.js";
+import { type RunToolUseOptions, type ToolMessageUpdate } from "./run-tool-use.js";
+import type { Tool, ToolProgressEvent, ToolUseContext } from "./tool.js";
 export interface RunToolsResult {
     messages: Message[];
     context: ToolUseContext;
 }
+export type RunToolsEvent = {
+    type: "progress";
+    index: number;
+    total: number;
+    request: ToolUseRequest;
+    progress: ToolProgressEvent;
+} | {
+    type: "settled";
+    index: number;
+    total: number;
+    request: ToolUseRequest;
+    updates: ToolMessageUpdate[];
+    ok: boolean;
+};
+export interface RunToolsOptions extends RunToolUseOptions {
+    onEvent?: (event: RunToolsEvent) => void;
+}
 interface ParsedToolCall {
     request: ToolUseRequest;
     tool?: Tool;
     concurrencySafe: boolean;
 }
-export declare function runTools(requests: readonly ToolUseRequest[], context: ToolUseContext, options?: RunToolUseOptions): Promise<RunToolsResult>;
+export declare function runTools(requests: readonly ToolUseRequest[], context: ToolUseContext, options?: RunToolsOptions): Promise<RunToolsResult>;
 export declare function partitionToolCalls(requests: readonly ToolUseRequest[], context: ToolUseContext): ParsedToolCall[][];
 export {};

package/dist/tools/tool-orchestration.js

@@ -2,15 +2,18 @@ import { runToolUse } from "./run-tool-use.js";
 export async function runTools(requests, context, options = {}) {
     let currentContext = context;
     const messages = [];
+    const indexes = new Map(requests.map((request, index) => [request.id, index]));
     for (const batch of partitionToolCalls(requests, currentContext)) {
         if (batch.length === 1 && !batch[0].concurrencySafe) {
-            const updates = await runToolUse(batch[0].request, currentContext, options);
+            const item = batch[0];
+            const updates = await runToolUseWithEvents(item, currentContext, options, indexes.get(item.request.id) ?? 0, requests.length);
+            options.onEvent?.({ type: "settled", index: indexes.get(item.request.id) ?? 0, total: requests.length, request: item.request, updates, ok: updatesOk(updates) });
             const applied = applyUpdates(updates, currentContext);
             currentContext = applied.context;
             messages.push(...applied.messages);
             continue;
         }
-        const batchResults = await runToolsConcurrently(batch, currentContext, options);
+        const batchResults = await runToolsConcurrently(batch, currentContext, options, indexes, requests.length);
         for (const item of batch) {
             const updates = batchResults.get(item.request.id) ?? [];
             const applied = applyUpdates(updates, currentContext);
@@ -44,7 +47,7 @@ export function partitionToolCalls(requests, context) {
         batches.push(concurrentBatch);
     return batches;
 }
-async function runToolsConcurrently(batch, context, options) {
+async function runToolsConcurrently(batch, context, options, indexes, total) {
     const maxConcurrency = maxToolConcurrency();
     const results = new Map();
     let cursor = 0;
@@ -52,12 +55,34 @@ async function runToolsConcurrently(batch, context, options) {
         while (cursor < batch.length) {
             const item = batch[cursor];
             cursor += 1;
-            results.set(item.request.id, await runToolUse(item.request, context, options));
+            const index = indexes.get(item.request.id) ?? 0;
+            const updates = await runToolUseWithEvents(item, context, options, index, total);
+            results.set(item.request.id, updates);
+            options.onEvent?.({ type: "settled", index, total, request: item.request, updates, ok: updatesOk(updates) });
         }
     }
     await Promise.all(Array.from({ length: Math.min(maxConcurrency, batch.length) }, () => worker()));
     return results;
 }
+async function runToolUseWithEvents(item, context, options, index, total) {
+    let sequence = 0;
+    const contextWithEvents = {
+        ...context,
+        emit(progress) {
+            if (progress.sequence !== undefined)
+                sequence = Math.max(sequence, progress.sequence);
+            else
+                sequence += 1;
+            const normalized = { ...progress, toolUseId: progress.toolUseId ?? item.request.id, sequence };
+            options.onEvent?.({ type: "progress", index, total, request: item.request, progress: normalized });
+            context.emit(normalized);
+        },
+    };
+    return runToolUse(item.request, contextWithEvents, options);
+}
+function updatesOk(updates) {
+    return updates.every((update) => update.message.blocks.every((block) => block.type !== "tool_result" || block.ok));
+}
 function applyUpdates(updates, context) {
     let currentContext = context;
     const messages = [];

package/dist/tools/tool-orchestration.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-orchestration.js","sourceRoot":"","sources":["../../src/tools/tool-orchestration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-orchestration.js","sourceRoot":"","sources":["../../src/tools/tool-orchestration.ts"],"names":[],"mappings":"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"}

package/dist/tools/tool.d.ts

@@ -33,11 +33,24 @@ export interface ToolMetadata {
     /** Strip unknown top-level object fields before JSON schema validation. Use only for simple, non-destructive tools. */
     ignoreUnknownInputProperties?: boolean;
 }
+export type ToolStreamChannel = "state" | "item" | "stdout" | "stderr" | "patch" | "artifact" | "metric";
+export type ToolStreamOperation = "replace" | "append" | "upsert" | "remove";
 export interface ToolProgressEvent {
     toolName: string;
     toolUseId?: string;
     message: string;
     data?: unknown;
+    channel?: ToolStreamChannel;
+    operation?: ToolStreamOperation;
+    key?: string;
+    phase?: string;
+    sequence?: number;
+    progress?: {
+        current?: number;
+        total?: number;
+        unit?: string;
+    };
+    transient?: boolean;
 }
 export type ValidationResult<TInput> = {
     ok: true;

package/dist/tools/tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/tools/tool.ts"],"names":[],"mappings":"AA+JA,MAAM,UAAU,sBAAsB,CAAC,IAAU,EAAE,OAAwB;IACzE,OAAO,OAAO,IAAI,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;AAC1G,CAAC"}
+{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/tools/tool.ts"],"names":[],"mappings":"AA6KA,MAAM,UAAU,sBAAsB,CAAC,IAAU,EAAE,OAAwB;IACzE,OAAO,OAAO,IAAI,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;AAC1G,CAAC"}

package/dist/types/events.d.ts

@@ -1,6 +1,7 @@
 import type { CompactionReport } from "../context/compaction.js";
 import type { TerminalReason } from "../core/state.js";
 import type { ModelUsage } from "../model/model-gateway.js";
+import type { ToolProgressEvent } from "../tools/tool.js";
 import type { Message, ToolUseRequest } from "./messages.js";
 export interface PromptCacheSectionMetric {
     name: string;
@@ -73,10 +74,32 @@ export type AgentEvent = {
 } | {
     type: "tool.started";
     toolUse: ToolUseRequest;
+    index?: number;
+    total?: number;
+} | {
+    type: "tool.progress";
+    toolUse: ToolUseRequest;
+    progress: ToolProgressEvent;
+    index?: number;
+    total?: number;
+} | {
+    type: "tool.result.available";
+    toolUse: ToolUseRequest;
+    ok: boolean;
+    messages: Message[];
+    index?: number;
+    total?: number;
 } | {
     type: "tool.finished";
     toolUse: ToolUseRequest;
     ok: boolean;
+    index?: number;
+    total?: number;
+} | {
+    type: "tool.batch.completed";
+    total: number;
+    succeeded: number;
+    failed: number;
 } | {
     type: "usage";
     usage: ModelUsage;

package/dist/web/index.d.ts

@@ -7,6 +7,7 @@ import { CommunicationLogger, LoggingModelGateway } from "../model/communication
 import type { ModelUsage, ReasoningConfig } from "../model/model-gateway.js";
 import { ToolRegistry } from "../tools/registry.js";
 import type { Tool } from "../tools/tool.js";
+import { type ToolPresentation } from "../tools/tool-catalog.js";
 import { ExecProcessManager } from "../tools/builtins/exec-process-manager.js";
 import { type AgentToolRuntime } from "../agents/agent-tool.js";
 import { TaskStore } from "../tasks/task-store.js";
@@ -48,6 +49,7 @@ interface WebRuntimePluginSupport {
 interface WebRuntimeToolCatalogItem {
     name: string;
     source: "builtin" | "external" | "plugin";
+    presentation: ToolPresentation;
     pluginId?: string;
     pluginName?: string;
 }
@@ -116,12 +118,42 @@ interface UiToolDisplay {
     facts: UiToolFact[];
     previews: UiToolPreview[];
 }
+interface UiToolStreamStep {
+    key: string;
+    message: string;
+    toolName?: string;
+    toolLabel?: string;
+    status: "running" | "completed" | "failed";
+    phase?: string;
+    sequence?: number;
+}
+interface UiToolStreamChunk {
+    sequence: number;
+    stream: "stdout" | "stderr" | "output";
+    text: string;
+}
+interface UiToolStream {
+    message?: string;
+    phase?: string;
+    channel?: string;
+    sequence?: number;
+    current?: number;
+    total?: number;
+    unit?: string;
+    stdout?: string;
+    stderr?: string;
+    output?: string;
+    chunks?: UiToolStreamChunk[];
+    steps?: UiToolStreamStep[];
+    expanded?: boolean;
+}
 interface UiLine {
     id: number;
     kind: "system" | "user" | "assistant" | "thinking" | "tool" | "error" | "meta";
     text: string;
     messageId?: string;
     toolName?: string;
+    toolPresentation?: ToolPresentation;
     parentToolName?: string;
     toolUseId?: string;
     parentToolUseId?: string;
@@ -129,6 +161,7 @@ interface UiLine {
     bodyTitle?: string;
     titleStatus?: "success" | "failure";
     toolDisplay?: UiToolDisplay;
+    toolStream?: UiToolStream;
     format?: "markdown" | "ansi" | "plain" | "diff";
     previewStyle?: "summary";
     summaryMaxLines?: number;
@@ -411,6 +444,7 @@ export declare class WebRepl {
             configuredEnabled: boolean;
             name: string;
             source: "builtin" | "external" | "plugin";
+            presentation: ToolPresentation;
             pluginId?: string;
             pluginName?: string;
         }[];
@@ -425,6 +459,7 @@ export declare class WebRepl {
             effectiveEnabled: boolean;
             name: string;
             source: "builtin" | "external" | "plugin";
+            presentation: ToolPresentation;
             pluginId?: string;
             pluginName?: string;
         }[];
@@ -515,6 +550,10 @@ export declare class WebRepl {
     private finalizeLiveLine;
     private finalizeThinkingLine;
     private finalizeLiveToolLines;
+    private cancelLiveToolLines;
+    private patchLiveToolLine;
+    private applyToolProgress;
+    private applyAvailableToolResult;
     private handleEvent;
     private matchesPendingUserImageEcho;
     private handleCommandOrPrompt;