weacpx 0.4.0-beta.2 → 0.4.0-beta.3

package/dist/bridge/bridge-main.js

@@ -56,6 +56,10 @@ function encodeBridgePromptSegmentEvent(event) {
   return `${JSON.stringify(event)}
 `;
 }
+function encodeBridgePromptToolEvent(event) {
+  return `${JSON.stringify(event)}
+`;
+}
 function encodeBridgeSessionProgressEvent(event) {
   return `${JSON.stringify(event)}
 `;
@@ -343,8 +347,48 @@ var init_prompt_media = __esm(() => {
   };
 });
 
+// src/transport/tool-event-mode.ts
+function resolveToolEventMode(input) {
+  if (input?.toolEventMode !== undefined) {
+    return input.toolEventMode;
+  }
+  if (input?.onToolEvent !== undefined) {
+    return "structured";
+  }
+  return "text";
+}
+
+// src/transport/tool-kind-emoji.ts
+var TOOL_KIND_EMOJI, DEFAULT_TOOL_EMOJI;
+var init_tool_kind_emoji = __esm(() => {
+  TOOL_KIND_EMOJI = {
+    read: "\uD83D\uDCD6",
+    search: "\uD83D\uDD0D",
+    execute: "\uD83D\uDCBB",
+    edit: "✏️",
+    think: "\uD83E\uDDE0",
+    other: "\uD83D\uDD27"
+  };
+  DEFAULT_TOOL_EMOJI = TOOL_KIND_EMOJI.other;
+});
+
 // src/transport/streaming-prompt.ts
-function createStreamingPromptState(formatToolCalls = false) {
+function createStreamingPromptState(formatToolCalls = false, options) {
+  let toolEventMode;
+  let onToolEvent;
+  if (options === undefined) {
+    toolEventMode = "text";
+    onToolEvent = undefined;
+  } else if (typeof options === "function") {
+    onToolEvent = options;
+    toolEventMode = "structured";
+  } else {
+    onToolEvent = options.onToolEvent;
+    toolEventMode = resolveToolEventMode({
+      toolEventMode: options.mode,
+      onToolEvent
+    });
+  }
   return {
     buffer: "",
     segments: [],
@@ -352,6 +396,8 @@ function createStreamingPromptState(formatToolCalls = false) {
     pendingLine: "",
     formatToolCalls,
     emittedToolCallIds: new Set,
+    toolEventMode,
+    onToolEvent,
     finalize() {
       if (this.pendingLine.trim().length > 0) {
         parseStreamingChunks(this, this.pendingLine);
@@ -389,15 +435,24 @@ function parseStreamingChunks(state, line) {
   if (!update)
     return;
   if (state.formatToolCalls && (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update")) {
-    const formatted = formatToolCallEvent(update, update.sessionUpdate);
-    if (formatted) {
-      const toolCallId = update.toolCallId;
-      if (toolCallId) {
-        if (state.emittedToolCallIds.has(toolCallId))
-          return;
-        state.emittedToolCallIds.add(toolCallId);
+    const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
+    const wantsText = state.toolEventMode === "text" || state.toolEventMode === "both";
+    if (wantsStructured && state.onToolEvent) {
+      const toolEvent = buildToolUseEvent(update);
+      if (toolEvent)
+        state.onToolEvent(toolEvent);
+    }
+    if (wantsText) {
+      const formatted = formatToolCallEvent(update, update.sessionUpdate);
+      if (formatted) {
+        const toolCallId = update.toolCallId;
+        if (toolCallId) {
+          if (state.emittedToolCallIds.has(toolCallId))
+            return;
+          state.emittedToolCallIds.add(toolCallId);
+        }
+        state.segments.push(formatted);
       }
-      state.segments.push(formatted);
     }
     return;
   }
@@ -427,16 +482,51 @@ function formatToolCallEvent(update, sessionUpdate) {
   const title = update.title ?? "";
   if (title.length === 0)
     return null;
-  const emoji = KIND_EMOJI[kind] ?? "\uD83D\uDD27";
-  const inputSummary = summarizeToolInput(update.rawInput);
+  const emoji = TOOL_KIND_EMOJI[kind] ?? DEFAULT_TOOL_EMOJI;
+  const inputSummary = summarizeToolInput(update.rawInput, title);
   const status = readString(update, "status");
+  if (!inputSummary && status === "pending")
+    return null;
   if (!inputSummary && isGenericToolTitle(kind, title))
     return null;
-  const summaryText = inputSummary ? `: ${truncateToolDisplay(inputSummary)}` : "";
+  const summaryText = inputSummary && inputSummary !== title ? `: ${truncateToolDisplay(inputSummary)}` : "";
   const statusText = status ? ` (${status})` : "";
   return `${emoji} ${title}${statusText}${summaryText}`;
 }
-function summarizeToolInput(rawInput) {
+function buildToolUseEvent(update) {
+  if (!update)
+    return null;
+  const toolCallId = update.toolCallId;
+  if (!toolCallId)
+    return null;
+  const kindRaw = update.kind ?? "";
+  const kind = (() => {
+    switch (kindRaw) {
+      case "read":
+      case "search":
+      case "execute":
+      case "edit":
+      case "think":
+        return kindRaw;
+      default:
+        return "other";
+    }
+  })();
+  const title = (update.title ?? "").trim();
+  const toolName = title || "Tool";
+  const summaryRaw = summarizeToolInput(update.rawInput, title);
+  const summary = summaryRaw && summaryRaw !== title ? summaryRaw : undefined;
+  const statusRaw = readString(update, "status");
+  const status = statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : "running";
+  return {
+    toolCallId,
+    toolName,
+    kind,
+    ...summary ? { summary } : {},
+    status
+  };
+}
+function summarizeToolInput(rawInput, title = "") {
   if (rawInput == null)
     return;
   if (typeof rawInput === "string" || typeof rawInput === "number" || typeof rawInput === "boolean") {
@@ -444,6 +534,9 @@ function summarizeToolInput(rawInput) {
   }
   if (!isRecord(rawInput))
     return;
+  const taskSummary = summarizeTaskInput(rawInput, title);
+  if (taskSummary)
+    return taskSummary;
   const command = readFirstString(rawInput, ["command", "cmd", "program"]);
   const args = readFirstStringArray(rawInput, ["args", "arguments"]);
   if (command) {
@@ -466,6 +559,7 @@ function summarizeToolInput(rawInput) {
     "file",
     "filePath",
     "filepath",
+    "file_path",
     "target",
     "uri",
     "url",
@@ -477,6 +571,16 @@ function summarizeToolInput(rawInput) {
     "description"
   ]);
 }
+function summarizeTaskInput(rawInput, title) {
+  const subagentType = readFirstString(rawInput, ["subagent_type", "subagentType", "agent", "agentType"]);
+  const description = readFirstString(rawInput, ["description", "task", "summary"]);
+  if (subagentType && description) {
+    return description === title ? subagentType : `${subagentType}: ${description}`;
+  }
+  if (subagentType)
+    return subagentType;
+  return;
+}
 function readFirstString(record, keys) {
   for (const key of keys) {
     const value = record[key];
@@ -523,14 +627,8 @@ function isGenericToolTitle(kind, title) {
   }
   return false;
 }
-var KIND_EMOJI;
 var init_streaming_prompt = __esm(() => {
-  KIND_EMOJI = {
-    read: "\uD83D\uDCD6",
-    search: "\uD83D\uDD0D",
-    execute: "\uD83D\uDCBB",
-    edit: "✏️"
-  };
+  init_tool_kind_emoji();
 });
 
 // src/recovery/discover-parent-package-paths.ts
@@ -1123,8 +1221,12 @@ class BridgeRuntime {
       ...structuredPrompt ? ["--file", structuredPrompt.filePath] : [input.text]
     ]));
     const formatToolCalls = (input.replyMode ?? "verbose") === "verbose";
+    const toolEventMode = input.toolEventMode ?? (input.toolEvents === true ? "structured" : "text");
     try {
-      const result = onEvent ? await this.runPromptCommand(spawnSpec.command, spawnSpec.args, onEvent, { formatToolCalls }) : await this.run(spawnSpec.command, spawnSpec.args);
+      const result = onEvent ? await this.runPromptCommand(spawnSpec.command, spawnSpec.args, onEvent, {
+        formatToolCalls,
+        toolEventMode
+      }) : await this.run(spawnSpec.command, spawnSpec.args);
       return { text: getPromptText(result) };
     } finally {
       try {
@@ -1303,7 +1405,11 @@ async function runStreamingPrompt(command, args, onEvent, options = {}) {
     const child = spawnPrompt(command, args);
     let stdout = "";
     let stderr = "";
-    const state = createStreamingPromptState(options.formatToolCalls ?? false);
+    const toolEventMode = options.toolEventMode ?? "text";
+    const state = createStreamingPromptState(options.formatToolCalls ?? false, {
+      mode: toolEventMode,
+      ...onEvent && (toolEventMode === "structured" || toolEventMode === "both") ? { onToolEvent: (toolEvent) => onEvent({ type: "prompt.tool_event", event: toolEvent }) } : {}
+    });
     let lastReplyAt = now();
     const flushBuffer = () => {
       const remaining = state.buffer.trim();
@@ -1525,6 +1631,7 @@ class BridgeServer {
         });
       case "prompt":
         const media = asOptionalPromptMediaInput(params.media);
+        const resolvedToolEventMode = asOptionalToolEventMode(params.toolEventMode);
         return await this.runtime.prompt({
           agent: requireString(params, "agent"),
           agentCommand: asOptionalString(params.agentCommand),
@@ -1534,6 +1641,8 @@ class BridgeServer {
           mcpSourceHandle: asOptionalString(params.mcpSourceHandle),
           text: requirePromptText(params, media),
           replyMode: asOptionalReplyMode(params.replyMode),
+          toolEvents: params.toolEvents === true,
+          ...resolvedToolEventMode ? { toolEventMode: resolvedToolEventMode } : {},
           media
         }, (event) => {
           if (event.type === "prompt.segment") {
@@ -1542,6 +1651,12 @@ class BridgeServer {
               event: "prompt.segment",
               text: event.text
             }));
+          } else if (event.type === "prompt.tool_event") {
+            writeLine?.(encodeBridgePromptToolEvent({
+              id: requestId,
+              event: "prompt.tool_event",
+              toolEvent: event.event
+            }));
           }
         });
       case "setMode":
@@ -1707,6 +1822,13 @@ function asOptionalReplyMode(value) {
   }
   return value;
 }
+var VALID_TOOL_EVENT_MODES = new Set(["text", "structured", "both"]);
+function asOptionalToolEventMode(value) {
+  if (typeof value !== "string" || !VALID_TOOL_EVENT_MODES.has(value)) {
+    return;
+  }
+  return value;
+}
 
 // src/bridge/bridge-main.ts
 async function processBridgeInput(options) {

package/dist/channels/types.d.ts

@@ -59,3 +59,17 @@ export interface MessageChannelRuntime {
     notifyTaskProgress(task: OrchestrationTaskRecord, text: string): Promise<void>;
     sendCoordinatorMessage(input: CoordinatorMessageInput): Promise<void>;
 }
+export type ToolUseStatus = "running" | "success" | "error";
+export type ToolUseKind = "read" | "search" | "execute" | "edit" | "think" | "other";
+export interface ToolUseEvent {
+    toolCallId: string;
+    /** Free-form tool name from the agent (e.g. "Read File", "Bash"). */
+    toolName: string;
+    /** Coarse classifier produced by the transport from the agent's tool kind; channels use it to pick an icon. */
+    kind: ToolUseKind;
+    /** Best-effort one-line summary derived from `rawInput`. */
+    summary?: string;
+    status: ToolUseStatus;
+    /** Set when status transitions out of "running". */
+    durationMs?: number;
+}

package/dist/cli.js

@@ -14153,7 +14153,7 @@ import { dirname as dirname6, join as join3 } from "node:path";
 import { homedir as homedir3 } from "node:os";
 function createWeixinConsumerLock(options = {}) {
   const lockFilePath = options.lockFilePath ?? join3(homedir3(), ".weacpx", "runtime", "weixin-consumer.lock.json");
-  const isProcessRunning = options.isProcessRunning ?? defaultIsProcessRunning3;
+  const isProcessRunning = options.isProcessRunning ?? defaultIsProcessRunning4;
   const onDiagnostic = options.onDiagnostic;
   return {
     async acquire(meta2) {
@@ -14240,7 +14240,7 @@ async function loadLockMetadata(path13) {
     return null;
   }
 }
-function defaultIsProcessRunning3(pid) {
+function defaultIsProcessRunning4(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -16569,7 +16569,7 @@ async function handleSessionRemove(context, chatKey, alias) {
   return { text: lines.join(`
 `) };
 }
-async function promptWithSession(context, session, chatKey, text, reply, replyContextToken, accountId, media, abortSignal) {
+async function promptWithSession(context, session, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent) {
   const effectiveReplyMode = session.replyMode ?? context.config?.channel.replyMode ?? "verbose";
   if (!session.replyMode)
     session.replyMode = effectiveReplyMode;
@@ -16594,7 +16594,7 @@ async function promptWithSession(context, session, chatKey, text, reply, replyCo
   const { promptText, taskIds, groupIds, claimHumanReply } = await preparePromptWithFallback(context, session, chatKey, text, replyContextToken, accountId);
   try {
     const replyContext = transportReply && context.quota && getChannelIdFromChatKey(chatKey) === "weixin" ? { chatKey, quota: context.quota } : undefined;
-    const result = await context.interaction.promptTransportSession(session, promptText, transportReply, replyContext, media, abortSignal);
+    const result = await context.interaction.promptTransportSession(session, promptText, transportReply, replyContext, media, abortSignal, onToolEvent);
     if (claimHumanReply) {
       try {
         await context.orchestration?.claimActiveHumanReply?.(claimHumanReply);
@@ -16614,17 +16614,17 @@ async function promptWithSession(context, session, chatKey, text, reply, replyCo
     throw error2;
   }
 }
-async function handlePrompt(context, chatKey, text, reply, replyContextToken, accountId, media, abortSignal) {
+async function handlePrompt(context, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent) {
   const session = await context.sessions.getCurrentSession(chatKey);
   if (!session) {
     return { text: NO_CURRENT_SESSION_TEXT };
   }
   try {
-    return await promptWithSession(context, session, chatKey, text, reply, replyContextToken, accountId, media, abortSignal);
+    return await promptWithSession(context, session, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent);
   } catch (error2) {
     const recovered = await context.recovery.tryRecoverMissingSession(session, error2);
     if (recovered) {
-      return await promptWithSession(context, recovered, chatKey, text, reply, replyContextToken, accountId, media, abortSignal);
+      return await promptWithSession(context, recovered, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent);
     }
     return context.recovery.renderTransportError(session, error2);
   }
@@ -18150,7 +18150,7 @@ class CommandRouter {
     this.quota = quota;
     this.logger = logger2 ?? createNoopAppLogger();
   }
-  async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal) {
+  async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal, onToolEvent) {
     const startedAt = Date.now();
     const command = parseCommand(input);
     await this.logger.debug("command.parsed", "parsed inbound command", {
@@ -18264,7 +18264,7 @@ class CommandRouter {
         case "task.cancel":
           return await handleTaskCancel(this.createHandlerContext(), chatKey, command.taskId);
         case "prompt":
-          return await handlePrompt(this.createSessionHandlerContext(), chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal);
+          return await handlePrompt(this.createSessionHandlerContext(), chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent);
       }
     });
   }
@@ -18316,7 +18316,7 @@ class CommandRouter {
     return {
       setModeTransportSession: (session, modeId) => this.setModeTransportSession(session, modeId),
       cancelTransportSession: (session) => this.cancelTransportSession(session),
-      promptTransportSession: (session, text, reply, replyContext, media, abortSignal) => this.promptTransportSession(session, text, reply, replyContext, media, abortSignal)
+      promptTransportSession: (session, text, reply, replyContext, media, abortSignal, onToolEvent) => this.promptTransportSession(session, text, reply, replyContext, media, abortSignal, onToolEvent)
     };
   }
   createSessionRenderRecoveryOps() {
@@ -18479,7 +18479,7 @@ class CommandRouter {
   async checkTransportSession(session) {
     return await this.measureTransportCall("has_session", session, () => this.transport.hasSession(session));
   }
-  async promptTransportSession(session, text, reply, replyContext, media, abortSignal) {
+  async promptTransportSession(session, text, reply, replyContext, media, abortSignal, onToolEvent) {
     session.mcpCoordinatorSession ??= session.transportSession;
     let done = false;
     let cancelOnAbort;
@@ -18516,7 +18516,10 @@ class CommandRouter {
       abortSignal.addEventListener("abort", cancelOnAbort, { once: true });
     }
     try {
-      return await this.measureTransportCall("prompt", session, () => this.transport.prompt(session, text, reply, replyContext, media ? { media } : undefined));
+      return await this.measureTransportCall("prompt", session, () => this.transport.prompt(session, text, reply, replyContext, {
+        ...media ? { media } : {},
+        ...onToolEvent ? { onToolEvent } : {}
+      }));
     } finally {
       done = true;
       if (cancelOnAbort && abortSignal) {
@@ -18667,7 +18670,7 @@ class ConsoleAgent {
       mimeType: m.mimeType,
       ...m.fileName ? { fileName: m.fileName } : {}
     })) : undefined;
-    return await this.router.handle(request.conversationId, request.text, request.reply, request.replyContextToken, request.accountId, promptMedia, request.metadata, request.abortSignal);
+    return await this.router.handle(request.conversationId, request.text, request.reply, request.replyContextToken, request.accountId, promptMedia, request.metadata, request.abortSignal, request.onToolEvent);
   }
   isKnownCommand(text) {
     return isKnownWeacpxCommandText(text);
@@ -22767,6 +22770,10 @@ function encodeBridgePromptSegmentEvent(event) {
   return `${JSON.stringify(event)}
 `;
 }
+function encodeBridgePromptToolEvent(event) {
+  return `${JSON.stringify(event)}
+`;
+}
 function encodeBridgeSessionProgressEvent(event) {
   return `${JSON.stringify(event)}
 `;
@@ -22834,6 +22841,11 @@ class AcpxBridgeClient {
           type: "prompt.segment",
           text: message.text
         });
+      } else if (message.event === "prompt.tool_event") {
+        pending.onEvent?.({
+          type: "prompt.tool_event",
+          event: message.toolEvent
+        });
       } else if (message.event === "session.progress") {
         pending.onEvent?.({
           type: "session.progress",
@@ -23157,6 +23169,17 @@ var init_quota_gated_reply_sink = __esm(() => {
   ADAPTIVE_WINDOW_SCHEDULE_MS = [3000, 6000, 12000, 24000, 48000, 60000];
 });
 
+// src/transport/tool-event-mode.ts
+function resolveToolEventMode(input) {
+  if (input?.toolEventMode !== undefined) {
+    return input.toolEventMode;
+  }
+  if (input?.onToolEvent !== undefined) {
+    return "structured";
+  }
+  return "text";
+}
+
 // src/transport/acpx-bridge/acpx-bridge-transport.ts
 class AcpxBridgeTransport {
   client;
@@ -23179,10 +23202,18 @@ class AcpxBridgeTransport {
     }) : null;
     let segmentError;
     let segmentChain = Promise.resolve();
+    let toolEventError;
+    let toolEventChain = Promise.resolve();
+    let toolEventMode = resolveToolEventMode(options);
+    if ((toolEventMode === "structured" || toolEventMode === "both") && !options?.onToolEvent) {
+      toolEventMode = "text";
+    }
     const result = await this.client.request("prompt", {
       ...this.toParams(session),
       text,
-      ...options?.media ? { media: options.media } : {}
+      ...options?.media ? { media: options.media } : {},
+      ...toolEventMode === "structured" || toolEventMode === "both" ? { toolEvents: true } : {},
+      toolEventMode
     }, (event) => {
       if (event.type === "prompt.segment") {
         const onSegment = options?.onSegment;
@@ -23193,9 +23224,21 @@ class AcpxBridgeTransport {
           });
         }
         sink?.feedSegment(event.text);
+        return;
+      }
+      if (event.type === "prompt.tool_event") {
+        const onToolEvent = options?.onToolEvent;
+        if (onToolEvent) {
+          const toolEvent = event.event;
+          toolEventChain = toolEventChain.then(() => onToolEvent(toolEvent)).catch((error2) => {
+            toolEventError ??= error2;
+          });
+        }
+        return;
       }
     });
     await segmentChain;
+    await toolEventChain;
     if (sink) {
       const { overflowCount } = sink.finalize();
       await sink.drain({ timeoutMs: 30000 });
@@ -23207,6 +23250,9 @@ class AcpxBridgeTransport {
       if (segmentError) {
         throw segmentError;
       }
+      if (toolEventError) {
+        throw toolEventError;
+      }
       return { text: summary ? `${summary}
 
 ${result.text}` : "" };
@@ -23214,6 +23260,9 @@ ${result.text}` : "" };
     if (segmentError) {
       throw segmentError;
     }
+    if (toolEventError) {
+      throw toolEventError;
+    }
     return result;
   }
   async setMode(session, modeId) {
@@ -23400,8 +23449,37 @@ var init_prompt_media = __esm(() => {
   };
 });
 
+// src/transport/tool-kind-emoji.ts
+var TOOL_KIND_EMOJI, DEFAULT_TOOL_EMOJI;
+var init_tool_kind_emoji = __esm(() => {
+  TOOL_KIND_EMOJI = {
+    read: "\uD83D\uDCD6",
+    search: "\uD83D\uDD0D",
+    execute: "\uD83D\uDCBB",
+    edit: "✏️",
+    think: "\uD83E\uDDE0",
+    other: "\uD83D\uDD27"
+  };
+  DEFAULT_TOOL_EMOJI = TOOL_KIND_EMOJI.other;
+});
+
 // src/transport/streaming-prompt.ts
-function createStreamingPromptState(formatToolCalls = false) {
+function createStreamingPromptState(formatToolCalls = false, options) {
+  let toolEventMode;
+  let onToolEvent;
+  if (options === undefined) {
+    toolEventMode = "text";
+    onToolEvent = undefined;
+  } else if (typeof options === "function") {
+    onToolEvent = options;
+    toolEventMode = "structured";
+  } else {
+    onToolEvent = options.onToolEvent;
+    toolEventMode = resolveToolEventMode({
+      toolEventMode: options.mode,
+      onToolEvent
+    });
+  }
   return {
     buffer: "",
     segments: [],
@@ -23409,6 +23487,8 @@ function createStreamingPromptState(formatToolCalls = false) {
     pendingLine: "",
     formatToolCalls,
     emittedToolCallIds: new Set,
+    toolEventMode,
+    onToolEvent,
     finalize() {
       if (this.pendingLine.trim().length > 0) {
         parseStreamingChunks(this, this.pendingLine);
@@ -23446,15 +23526,24 @@ function parseStreamingChunks(state, line) {
   if (!update)
     return;
   if (state.formatToolCalls && (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update")) {
-    const formatted = formatToolCallEvent(update, update.sessionUpdate);
-    if (formatted) {
-      const toolCallId = update.toolCallId;
-      if (toolCallId) {
-        if (state.emittedToolCallIds.has(toolCallId))
-          return;
-        state.emittedToolCallIds.add(toolCallId);
+    const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
+    const wantsText = state.toolEventMode === "text" || state.toolEventMode === "both";
+    if (wantsStructured && state.onToolEvent) {
+      const toolEvent = buildToolUseEvent(update);
+      if (toolEvent)
+        state.onToolEvent(toolEvent);
+    }
+    if (wantsText) {
+      const formatted = formatToolCallEvent(update, update.sessionUpdate);
+      if (formatted) {
+        const toolCallId = update.toolCallId;
+        if (toolCallId) {
+          if (state.emittedToolCallIds.has(toolCallId))
+            return;
+          state.emittedToolCallIds.add(toolCallId);
+        }
+        state.segments.push(formatted);
       }
-      state.segments.push(formatted);
     }
     return;
   }
@@ -23484,16 +23573,51 @@ function formatToolCallEvent(update, sessionUpdate) {
   const title = update.title ?? "";
   if (title.length === 0)
     return null;
-  const emoji2 = KIND_EMOJI[kind] ?? "\uD83D\uDD27";
-  const inputSummary = summarizeToolInput(update.rawInput);
+  const emoji2 = TOOL_KIND_EMOJI[kind] ?? DEFAULT_TOOL_EMOJI;
+  const inputSummary = summarizeToolInput(update.rawInput, title);
   const status = readString(update, "status");
+  if (!inputSummary && status === "pending")
+    return null;
   if (!inputSummary && isGenericToolTitle(kind, title))
     return null;
-  const summaryText = inputSummary ? `: ${truncateToolDisplay(inputSummary)}` : "";
+  const summaryText = inputSummary && inputSummary !== title ? `: ${truncateToolDisplay(inputSummary)}` : "";
   const statusText = status ? ` (${status})` : "";
   return `${emoji2} ${title}${statusText}${summaryText}`;
 }
-function summarizeToolInput(rawInput) {
+function buildToolUseEvent(update) {
+  if (!update)
+    return null;
+  const toolCallId = update.toolCallId;
+  if (!toolCallId)
+    return null;
+  const kindRaw = update.kind ?? "";
+  const kind = (() => {
+    switch (kindRaw) {
+      case "read":
+      case "search":
+      case "execute":
+      case "edit":
+      case "think":
+        return kindRaw;
+      default:
+        return "other";
+    }
+  })();
+  const title = (update.title ?? "").trim();
+  const toolName = title || "Tool";
+  const summaryRaw = summarizeToolInput(update.rawInput, title);
+  const summary = summaryRaw && summaryRaw !== title ? summaryRaw : undefined;
+  const statusRaw = readString(update, "status");
+  const status = statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : "running";
+  return {
+    toolCallId,
+    toolName,
+    kind,
+    ...summary ? { summary } : {},
+    status
+  };
+}
+function summarizeToolInput(rawInput, title = "") {
   if (rawInput == null)
     return;
   if (typeof rawInput === "string" || typeof rawInput === "number" || typeof rawInput === "boolean") {
@@ -23501,6 +23625,9 @@ function summarizeToolInput(rawInput) {
   }
   if (!isRecord3(rawInput))
     return;
+  const taskSummary = summarizeTaskInput(rawInput, title);
+  if (taskSummary)
+    return taskSummary;
   const command = readFirstString(rawInput, ["command", "cmd", "program"]);
   const args = readFirstStringArray(rawInput, ["args", "arguments"]);
   if (command) {
@@ -23523,6 +23650,7 @@ function summarizeToolInput(rawInput) {
     "file",
     "filePath",
     "filepath",
+    "file_path",
     "target",
     "uri",
     "url",
@@ -23534,6 +23662,16 @@ function summarizeToolInput(rawInput) {
     "description"
   ]);
 }
+function summarizeTaskInput(rawInput, title) {
+  const subagentType = readFirstString(rawInput, ["subagent_type", "subagentType", "agent", "agentType"]);
+  const description = readFirstString(rawInput, ["description", "task", "summary"]);
+  if (subagentType && description) {
+    return description === title ? subagentType : `${subagentType}: ${description}`;
+  }
+  if (subagentType)
+    return subagentType;
+  return;
+}
 function readFirstString(record3, keys) {
   for (const key of keys) {
     const value = record3[key];
@@ -23580,14 +23718,8 @@ function isGenericToolTitle(kind, title) {
   }
   return false;
 }
-var KIND_EMOJI;
 var init_streaming_prompt = __esm(() => {
-  KIND_EMOJI = {
-    read: "\uD83D\uDCD6",
-    search: "\uD83D\uDD0D",
-    execute: "\uD83D\uDCBB",
-    edit: "✏️"
-  };
+  init_tool_kind_emoji();
 });
 
 // src/transport/acpx-cli/node-pty-helper.ts
@@ -23897,7 +24029,8 @@ class AcpxCliTransport {
   runCommand;
   runPtyCommand;
   queueOwnerLauncher;
-  constructor(options, runCommand = defaultRunner, runPtyCommand = defaultPtyRunner, queueOwnerLauncher) {
+  streamingHooks;
+  constructor(options, runCommand = defaultRunner, runPtyCommand = defaultPtyRunner, queueOwnerLauncher, streamingHooks = {}) {
     this.command = options.command ?? "acpx";
     this.sessionInitTimeoutMs = options.sessionInitTimeoutMs ?? 120000;
     this.permissionMode = options.permissionMode ?? "approve-all";
@@ -23907,6 +24040,7 @@ class AcpxCliTransport {
     this.queueOwnerLauncher = queueOwnerLauncher ?? new AcpxQueueOwnerLauncher({
       acpxCommand: this.command
     });
+    this.streamingHooks = streamingHooks;
   }
   async ensureSession(session, _onProgress) {
     const args = this.buildArgs(session, [
@@ -23925,9 +24059,13 @@ class AcpxCliTransport {
     const structuredPrompt = await createStructuredPromptFile(text, options?.media);
     const args = this.buildPromptArgs(session, text, structuredPrompt?.filePath);
     try {
-      if (reply || options?.onSegment) {
+      if (reply || options?.onSegment || options?.onToolEvent) {
         const formatToolCalls = (session.replyMode ?? "verbose") === "verbose";
-        const { result: result2, overflowCount } = await this.runStreamingPrompt(this.command, args, reply, 30000, formatToolCalls, replyContext, options?.onSegment);
+        let toolEventMode = resolveToolEventMode(options);
+        if ((toolEventMode === "structured" || toolEventMode === "both") && !options?.onToolEvent) {
+          toolEventMode = "text";
+        }
+        const { result: result2, overflowCount } = await this.runStreamingPrompt(this.command, args, reply, formatToolCalls, toolEventMode, replyContext, options?.onSegment, options?.onToolEvent);
         const baseText = getPromptText(result2);
         if (!reply) {
           return { text: baseText };
@@ -24064,16 +24202,35 @@ ${baseText}` : "" };
       })
     ]);
   }
-  async runStreamingPrompt(command, args, reply, maxSegmentWaitMs = 30000, formatToolCalls = false, replyContext, onSegment) {
+  async runStreamingPrompt(command, args, reply, formatToolCalls = false, toolEventMode = "text", replyContext, onSegment, onToolEvent) {
+    const hooks = this.streamingHooks;
+    const doSpawn = hooks.spawnPrompt ?? ((cmd, spawnArgs) => spawn8(cmd, spawnArgs, { stdio: ["ignore", "pipe", "pipe"] }));
+    const setIntervalFn = hooks.setIntervalFn ?? ((fn, delay) => setInterval(fn, delay));
+    const clearIntervalFn = hooks.clearIntervalFn ?? ((timer) => clearInterval(timer));
+    const maxSegmentWaitMs = hooks.maxSegmentWaitMs ?? 30000;
+    const flushCheckIntervalMs = hooks.flushCheckIntervalMs ?? 5000;
+    const now = hooks.now ?? (() => Date.now());
     return await new Promise((resolve3, reject) => {
       const spawnSpec = resolveSpawnCommand(command, args);
-      const child = spawn8(spawnSpec.command, spawnSpec.args, { stdio: ["ignore", "pipe", "pipe"] });
+      const child = doSpawn(spawnSpec.command, spawnSpec.args);
       let stdout2 = "";
       let stderr = "";
-      const state = createStreamingPromptState(formatToolCalls);
-      let lastReplyAt = Date.now();
+      let lastReplyAt = now();
       let segmentChain = Promise.resolve();
       let segmentError;
+      let toolEventChain = Promise.resolve();
+      let toolEventError;
+      const userOnToolEvent = onToolEvent;
+      const state = createStreamingPromptState(formatToolCalls, {
+        mode: toolEventMode,
+        ...userOnToolEvent ? {
+          onToolEvent: (event) => {
+            toolEventChain = toolEventChain.then(() => userOnToolEvent(event)).catch((error2) => {
+              toolEventError ??= error2;
+            });
+          }
+        } : {}
+      });
       const sink = reply ? createQuotaGatedReplySink({
         reply,
         ...replyContext ? { replyContext } : {}
@@ -24085,7 +24242,7 @@ ${baseText}` : "" };
           });
         }
         sink?.feedSegment(segment);
-        lastReplyAt = Date.now();
+        lastReplyAt = now();
       };
       const flushBuffer = () => {
         const remaining = state.buffer.trim();
@@ -24094,11 +24251,11 @@ ${baseText}` : "" };
           feedSegment(remaining);
         }
       };
-      const timer = setInterval(() => {
-        if (state.buffer.trim().length > 0 && Date.now() - lastReplyAt >= maxSegmentWaitMs) {
+      const timer = setIntervalFn(() => {
+        if (state.buffer.trim().length > 0 && now() - lastReplyAt >= maxSegmentWaitMs) {
           flushBuffer();
         }
-      }, 5000);
+      }, flushCheckIntervalMs);
       child.stdout.setEncoding("utf8");
       child.stdout.on("data", (chunk) => {
         stdout2 += String(chunk);
@@ -24111,11 +24268,11 @@ ${baseText}` : "" };
         stderr += String(chunk);
       });
       child.on("error", (err) => {
-        clearInterval(timer);
+        clearIntervalFn(timer);
         reject(err);
       });
       child.on("close", (code) => {
-        clearInterval(timer);
+        clearIntervalFn(timer);
         const remaining = state.finalize();
         if (remaining.length > 0) {
           feedSegment(remaining);
@@ -24123,7 +24280,8 @@ ${baseText}` : "" };
         const { overflowCount } = sink?.finalize() ?? { overflowCount: 0 };
         Promise.all([
           sink?.drain({ timeoutMs: 30000 }) ?? Promise.resolve(),
-          segmentChain
+          segmentChain,
+          toolEventChain
         ]).then(() => {
           const deferred = sink?.getPendingError();
           if (deferred) {
@@ -24134,6 +24292,10 @@ ${baseText}` : "" };
             reject(segmentError);
             return;
           }
+          if (toolEventError) {
+            reject(toolEventError);
+            return;
+          }
           resolve3({
             result: { code: code ?? 1, stdout: stdout2, stderr },
             overflowCount
@@ -25120,7 +25282,7 @@ async function checkDaemon(options = {}) {
     cliEntryPath: options.cliEntryPath ?? resolveCliEntryPath(),
     cwd: options.cwd ?? process.cwd(),
     env: options.env ?? process.env,
-    isProcessRunning: options.isProcessRunning ?? defaultIsProcessRunning4
+    isProcessRunning: options.isProcessRunning ?? defaultIsProcessRunning5
   });
   try {
     const status = await controller.getStatus();
@@ -25191,7 +25353,7 @@ async function checkDaemon(options = {}) {
     };
   }
 }
-function defaultIsProcessRunning4(pid) {
+function defaultIsProcessRunning5(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -39205,6 +39367,82 @@ async function resolveMcpIdentity(server, options) {
   }
   throw new McpError(ErrorCode.InvalidRequest, "weacpx MCP identity is not configured; run through `weacpx mcp-stdio` or provide --coordinator-session");
 }
+function installMcpStdioShutdownHooks(options) {
+  const platform = options.platform ?? process.platform;
+  const signalSource = options.signalSource ?? process;
+  const isProcessRunning = options.isProcessRunning ?? defaultIsProcessRunning3;
+  const setIntervalFn = options.setIntervalFn ?? ((callback, ms) => setInterval(callback, ms));
+  const clearIntervalFn = options.clearIntervalFn ?? ((handle) => clearInterval(handle));
+  const parentPid = options.parentPid ?? process.ppid;
+  const parentCheckIntervalMs = options.parentCheckIntervalMs ?? parseParentCheckIntervalMs(process.env.WEACPX_MCP_PARENT_CHECK_INTERVAL_MS);
+  let disposed = false;
+  const triggerShutdown = (reason, context) => {
+    if (disposed)
+      return;
+    options.onDiagnostic?.("mcp.stdio.shutdown", { reason, ...context ?? {} });
+    options.shutdown();
+  };
+  const onStreamEnd = () => triggerShutdown("stdin.end");
+  const onStreamClose = () => triggerShutdown("stdin.close");
+  const onStdinError = (error2) => triggerShutdown("stdin.error", errorContext(error2));
+  const onStdoutError = (error2) => triggerShutdown("stdout.error", errorContext(error2));
+  const onSignal = (signal) => triggerShutdown("signal", { signal });
+  options.stdin.on("end", onStreamEnd);
+  options.stdin.on("close", onStreamClose);
+  options.stdin.on("error", onStdinError);
+  options.stdout.on("error", onStdoutError);
+  const signals = platform === "win32" ? ["SIGINT", "SIGTERM", "SIGBREAK"] : ["SIGINT", "SIGTERM", "SIGHUP"];
+  const signalListeners = signals.map((signal) => ({ signal, listener: () => onSignal(signal) }));
+  for (const { signal, listener } of signalListeners) {
+    signalSource.on(signal, listener);
+  }
+  let parentTimer;
+  if (parentPid > 1 && parentCheckIntervalMs > 0) {
+    parentTimer = setIntervalFn(() => {
+      if (!isProcessRunning(parentPid)) {
+        triggerShutdown("parent_dead", { parentPid });
+      }
+    }, parentCheckIntervalMs);
+    parentTimer.unref?.();
+  }
+  return () => {
+    if (disposed)
+      return;
+    disposed = true;
+    options.stdin.off("end", onStreamEnd);
+    options.stdin.off("close", onStreamClose);
+    options.stdin.off("error", onStdinError);
+    options.stdout.off("error", onStdoutError);
+    for (const { signal, listener } of signalListeners) {
+      signalSource.off(signal, listener);
+    }
+    if (parentTimer) {
+      clearIntervalFn(parentTimer);
+    }
+  };
+}
+function parseParentCheckIntervalMs(raw) {
+  if (raw === undefined || raw.trim().length === 0)
+    return 5000;
+  const parsed = Number(raw);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : 5000;
+}
+function errorContext(error2) {
+  const record3 = error2;
+  return {
+    ...typeof record3?.code === "string" ? { code: record3.code } : {},
+    ...typeof record3?.message === "string" ? { message: record3.message } : {}
+  };
+}
+function defaultIsProcessRunning3(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error2) {
+    const code = error2?.code;
+    return code !== "ESRCH";
+  }
+}
 async function runWeacpxMcpServer(options) {
   const transport = options.transport ?? createOrchestrationTransport(options.endpoint ?? resolveDefaultOrchestrationEndpoint(process.env, process.platform));
   const server = createWeacpxMcpServer({
@@ -39215,11 +39453,14 @@ async function runWeacpxMcpServer(options) {
     ...options.availableAgents ? { availableAgents: options.availableAgents } : {}
   });
   const stdio = new StdioServerTransport(stdin, stdout);
+  let cleanupShutdownHooks;
   let shuttingDown = false;
   const shutdown = async () => {
     if (shuttingDown)
       return;
     shuttingDown = true;
+    cleanupShutdownHooks?.();
+    options.onDiagnostic?.("mcp.stdio.stopping");
     const forceExit = setTimeout(() => process.exit(0), 3000);
     forceExit.unref();
     try {
@@ -39227,11 +39468,16 @@ async function runWeacpxMcpServer(options) {
       await stdio.close();
     } catch {}
     clearTimeout(forceExit);
+    options.onDiagnostic?.("mcp.stdio.stopped");
     process.exit(0);
   };
-  stdin.on("end", () => void shutdown());
-  process.on("SIGTERM", () => void shutdown());
-  process.on("SIGINT", () => void shutdown());
+  options.onDiagnostic?.("mcp.stdio.start", { parentPid: process.ppid, platform: process.platform });
+  cleanupShutdownHooks = installMcpStdioShutdownHooks({
+    stdin,
+    stdout,
+    shutdown,
+    onDiagnostic: options.onDiagnostic
+  });
   await server.connect(stdio);
 }
 function normalizeInputSchemaJson(schema) {
@@ -41023,7 +41269,12 @@ async function defaultMcpStdio(args, deps = {}) {
     ...coordinatorSession ? { coordinatorSession } : {},
     ...sourceHandle ? { sourceHandle } : {},
     ...identityResolver ? { resolveIdentity: identityResolver } : {},
-    ...availableAgents ? { availableAgents } : {}
+    ...availableAgents ? { availableAgents } : {},
+    onDiagnostic: (event, context) => {
+      const suffix = context && Object.keys(context).length > 0 ? ` ${JSON.stringify(context)}` : "";
+      (deps.stderr ?? ((text) => process.stderr.write(text)))(`[weacpx:mcp] ${event}${suffix}
+`);
+    }
   });
   return 0;
 }

package/dist/plugin-api.d.ts

@@ -1,6 +1,6 @@
 export type { ChannelPluginDefinition } from "./channels/plugin.js";
 export type { ChannelFactory, CreateChannelDeps } from "./channels/create-channel.js";
-export type { ChannelStartInput, ConsumerLock, ConsumerLockMetadata, ConsumerLockOptions, CoordinatorMessageInput, MessageChannelRuntime, OrchestrationDeliveryCallbacks, OutboundQuota, } from "./channels/types.js";
+export type { ChannelStartInput, ConsumerLock, ConsumerLockMetadata, ConsumerLockOptions, CoordinatorMessageInput, MessageChannelRuntime, OrchestrationDeliveryCallbacks, OutboundQuota, ToolUseEvent, ToolUseKind, ToolUseStatus, } from "./channels/types.js";
 export type { ChannelCliInput, ChannelCliIo, ChannelCliParseResult, ChannelCliProvider, ChannelCliValidationIssue, } from "./channels/cli/provider.js";
 export type { ChannelRuntimeConfig } from "./config/types.js";
 export type { AppLogger } from "./logging/app-logger.js";

package/dist/weixin/agent/interface.d.ts

@@ -1,4 +1,5 @@
 import type { ChannelMediaAttachment, OutboundChannelMedia } from "../../channels/media-types.js";
+import type { ToolUseEvent } from "../../channels/types.js";
 /**
  * Agent interface — any AI backend that can handle a chat message.
  *
@@ -42,6 +43,8 @@ export interface ChatRequest {
      * output produced after abort.
      */
     abortSignal?: AbortSignal;
+    /** Structured tool-use side-channel; see PromptOptions.onToolEvent. */
+    onToolEvent?: (event: ToolUseEvent) => void | Promise<void>;
 }
 export interface ChatRequestMetadata {
     channel?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weacpx",
-  "version": "0.4.0-beta.2",
+  "version": "0.4.0-beta.3",
   "description": "使用微信 ClawBot 随时随地通过 `acpx` 控制 Claude Code、Codex 等 Agents。",
   "keywords": [
     "acpx",