@vincentbanana/bananacli 0.6.1 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -54,7 +54,6 @@ export async function runTurn(deps, messages, input, images) {
54
54
  allowOutsideWorkspace: deps.allowOutsideWorkspace,
55
55
  permissions: deps.permissions,
56
56
  todos,
57
- onOutput: deps.onToolOutput,
58
57
  recordChange: deps.recordChange,
59
58
  };
60
59
  const tryCompact = async (aggressive) => {
@@ -141,13 +140,17 @@ export async function runTurn(deps, messages, input, images) {
141
140
  ok: false,
142
141
  content: `未知工具 "${call.name}"。可用工具: ${[...tools.keys()].join(', ')}。请改用已有工具。`,
143
142
  };
144
- deps.onToolEnd?.(call.name, result);
143
+ deps.onToolEnd?.(call.name, result, call.id);
145
144
  convo.push({ role: 'tool', toolCallId: call.id, name: call.name, content: result.content, isError: true });
146
145
  continue;
147
146
  }
148
- deps.onToolStart?.(call.name, input);
149
- const toolResult = await runTool(tool, input, toolContext, permissionFor(deps.permissions, tool));
150
- deps.onToolEnd?.(call.name, toolResult);
147
+ deps.onToolStart?.(call.name, input, call.id);
148
+ const callContext = {
149
+ ...toolContext,
150
+ onOutput: (chunk, stream) => deps.onToolOutput?.(chunk, stream, call.id),
151
+ };
152
+ const toolResult = await runTool(tool, input, callContext, permissionFor(deps.permissions, tool));
153
+ deps.onToolEnd?.(call.name, toolResult, call.id);
151
154
  convo.push({
152
155
  role: 'tool',
153
156
  toolCallId: call.id,
@@ -894,14 +894,22 @@ export async function startUiServer(options) {
894
894
  onText: (chunk) => send('text', { chunk }),
895
895
  onReasoning: (chunk) => send('reasoning', { chunk }),
896
896
  onStep: (step) => send('step', { step }),
897
- onToolStart: (name, input) => {
898
- toolStartedAt.set(name, Date.now());
899
- send('tool_start', { name, detail: summarizeInput(input) });
897
+ onToolStart: (name, input, id) => {
898
+ if (id)
899
+ toolStartedAt.set(id, Date.now());
900
+ send('tool_start', {
901
+ id: id ?? name,
902
+ name,
903
+ detail: summarizeInput(input),
904
+ input,
905
+ });
900
906
  },
901
- onToolEnd: (name, toolResult) => {
902
- const began = toolStartedAt.get(name);
903
- toolStartedAt.delete(name);
907
+ onToolEnd: (name, toolResult, id) => {
908
+ const key = id ?? name;
909
+ const began = toolStartedAt.get(key);
910
+ toolStartedAt.delete(key);
904
911
  send('tool_end', {
912
+ id: key,
905
913
  name,
906
914
  ok: toolResult.ok,
907
915
  ms: began ? Date.now() - began : undefined,
@@ -911,6 +919,14 @@ export async function startUiServer(options) {
911
919
  detail: toolResult.content.slice(0, 8000),
912
920
  });
913
921
  },
922
+ onToolOutput: (chunk, stream, id) => {
923
+ if (!id)
924
+ return;
925
+ // 实时输出直接进 DOM,先去掉 ANSI 颜色/光标控制符
926
+ const clean = chunk.replace(/\u001b\[[0-9;?]*[ -/]*[@-~]/g, '').replace(/\r/g, '');
927
+ if (clean)
928
+ send('tool_output', { id, chunk: clean, stream });
929
+ },
914
930
  onNotice: (message) => send('status', { message }),
915
931
  onCompact: () => send('status', { message: '已压缩历史对话' }),
916
932
  onRetry: (info) => send('status', { message: `网络重试 ${info.attempt}:${info.reason}` }),