weacpx 0.4.0-beta.1 → 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,27 +482,71 @@ function formatToolCallEvent(update, sessionUpdate) {
   const title = update.title ?? "";
   if (title.length === 0)
     return null;
-  const emoji = KIND_EMOJI[kind] ?? "\uD83D\uDD27";
-  const command = getToolDisplayCommand(update);
-  if (command) {
-    return `${emoji} ${truncateToolDisplay(command)}`;
-  }
-  if (sessionUpdate === "tool_call_update" || isGenericToolTitle(kind, title))
+  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;
-  return `${emoji} ${title}`;
+  const summaryText = inputSummary && inputSummary !== title ? `: ${truncateToolDisplay(inputSummary)}` : "";
+  const statusText = status ? ` (${status})` : "";
+  return `${emoji} ${title}${statusText}${summaryText}`;
 }
-function getToolDisplayCommand(update) {
+function buildToolUseEvent(update) {
   if (!update)
     return null;
-  const command = update.rawInput?.command;
-  if (typeof command === "string" && command.length > 0) {
-    return command;
+  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") {
+    return String(rawInput);
   }
-  const parsedCmd = update.rawInput?.parsed_cmd;
-  if (parsedCmd && parsedCmd.length > 0) {
+  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) {
+    return [command, ...args ?? []].join(" ");
+  }
+  const parsedCmd = rawInput.parsed_cmd;
+  if (Array.isArray(parsedCmd) && parsedCmd.length > 0) {
     const parts = [];
     for (const entry of parsedCmd) {
-      if (entry && typeof entry.cmd === "string" && entry.cmd.length > 0) {
+      if (isRecord(entry) && typeof entry.cmd === "string" && entry.cmd.length > 0) {
         parts.push(entry.cmd);
       }
     }
@@ -455,7 +554,62 @@ function getToolDisplayCommand(update) {
       return parts.join(" ");
     }
   }
-  return null;
+  return readFirstString(rawInput, [
+    "path",
+    "file",
+    "filePath",
+    "filepath",
+    "file_path",
+    "target",
+    "uri",
+    "url",
+    "query",
+    "pattern",
+    "text",
+    "search",
+    "name",
+    "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];
+    if (typeof value === "string" && value.trim().length > 0) {
+      return value.trim();
+    }
+  }
+  return;
+}
+function readFirstStringArray(record, keys) {
+  for (const key of keys) {
+    const value = record[key];
+    if (!Array.isArray(value))
+      continue;
+    const entries = value.map((entry) => typeof entry === "string" && entry.trim().length > 0 ? entry.trim() : undefined).filter((entry) => entry !== undefined);
+    if (entries.length > 0) {
+      return entries;
+    }
+  }
+  return;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function readString(rawInput, key) {
+  if (!isRecord(rawInput))
+    return;
+  const value = rawInput[key];
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
 function truncateToolDisplay(text) {
   return text.length > 60 ? `${text.slice(0, 57)}...` : text;
@@ -473,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
@@ -1072,9 +1220,13 @@ class BridgeRuntime {
       input.name,
       ...structuredPrompt ? ["--file", structuredPrompt.filePath] : [input.text]
     ]));
-    const formatToolCalls = input.replyMode === "verbose";
+    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 {
@@ -1253,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();
@@ -1475,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),
@@ -1484,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") {
@@ -1492,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":
@@ -1657,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;
+}