weacpx 0.4.0-beta.1 → 0.4.0-beta.3

package/dist/cli.js

@@ -9477,211 +9477,6 @@ function readVersion(moduleUrl = import.meta.url) {
 var PACKAGE_NAME = "weacpx";
 var init_version = () => {};
 
-// src/formatting/render-text.ts
-function renderAgents(config2) {
-  const names = Object.keys(config2.agents);
-  if (names.length === 0) {
-    return "还没有注册任何 Agent。";
-  }
-  return ["已注册的 Agent：", ...names.map((name) => `- ${name}`)].join(`
-`);
-}
-function renderWorkspaces(config2) {
-  const names = Object.entries(config2.workspaces);
-  if (names.length === 0) {
-    return "还没有注册任何工作区。";
-  }
-  return ["已注册的工作区：", ...names.map(([name, workspace]) => `- ${name}: ${workspace.cwd}`)].join(`
-`);
-}
-function renderOrchestrationUnavailable() {
-  return "当前未启用任务编排服务。";
-}
-function renderDelegateSuccess(taskId, workerSession) {
-  return [`已创建委派任务「${taskId}」`, `worker 会话：${workerSession}`].join(`
-`);
-}
-function renderGroupCreated(group) {
-  return [`已创建任务组「${group.groupId}」`, `- 标题：${group.title}`].join(`
-`);
-}
-function renderGroupList(groups) {
-  if (groups.length === 0) {
-    return "当前协调会话下还没有任务组。";
-  }
-  return ["当前协调会话的任务组：", ...groups.map((group) => renderGroupListItem(group))].join(`
-`);
-}
-function renderGroupSummary(summary) {
-  const { group, tasks } = summary;
-  const lines = [
-    `任务组「${group.groupId}」`,
-    `- 标题：${group.title}`,
-    `- 协调会话：${group.coordinatorSession}`,
-    `- 总任务数：${summary.totalTasks}`,
-    `- 待确认：${summary.pendingApprovalTasks}`,
-    `- 运行中：${summary.runningTasks}`,
-    `- 已完成：${summary.completedTasks}`,
-    `- 已失败：${summary.failedTasks}`,
-    `- 已取消：${summary.cancelledTasks}`,
-    `- 是否终态：${summary.terminal ? "是" : "否"}`
-  ];
-  if (group.injectionPending !== undefined) {
-    lines.push(`- 注入待处理：${group.injectionPending ? "是" : "否"}`);
-  }
-  if (group.injectionAppliedAt) {
-    lines.push(`- 注入完成时间：${group.injectionAppliedAt}`);
-  }
-  if (group.lastInjectionError) {
-    lines.push(`- 最近注入错误：${group.lastInjectionError}`);
-  }
-  if (tasks.length > 0) {
-    lines.push("- 成员：");
-    for (const task of tasks) {
-      lines.push(`  - ${task.taskId} [${task.status}] ${task.targetAgent}`);
-    }
-  }
-  return lines.join(`
-`);
-}
-function renderGroupCancelSuccess(input) {
-  return [
-    `任务组「${input.summary.group.groupId}」已发起取消`,
-    `- 已请求取消：${input.cancelledTaskIds.length}`,
-    `- 已跳过终态任务：${input.skippedTaskIds.length}`
-  ].join(`
-`);
-}
-function renderTaskList(tasks) {
-  if (tasks.length === 0) {
-    return "当前协调会话下还没有任务。";
-  }
-  return ["当前协调会话的任务：", ...tasks.map((task) => renderTaskListItem(task))].join(`
-`);
-}
-function renderTaskSummary(task) {
-  const header = [
-    `任务「${task.taskId}」`,
-    `- 状态：${task.status}`,
-    `- 协调会话：${task.coordinatorSession}`,
-    `- worker 会话：${task.workerSession ?? "未分配"}`,
-    `- 目标 Agent：${task.targetAgent}`
-  ];
-  if (task.role)
-    header.push(`- 角色：${task.role}`);
-  if (task.groupId)
-    header.push(`- 任务组：${task.groupId}`);
-  if (task.status === "needs_confirmation") {
-    header.push(`- 来源：${task.sourceKind} / ${task.sourceHandle}${task.role ? ` / ${task.role}` : ""}`);
-  }
-  header.push(`- 任务：${task.task}`);
-  if (task.summary.trim().length > 0)
-    header.push(`- 摘要：${task.summary}`);
-  if (task.resultText.trim().length > 0)
-    header.push(`- 结果：${task.resultText}`);
-  const events = [];
-  events.push({ at: task.createdAt, event: "created" });
-  if (task.workerSession && task.status !== "needs_confirmation") {
-    events.push({ at: task.createdAt, event: "dispatched", detail: task.workerSession });
-  }
-  if (task.lastProgressAt)
-    events.push({ at: task.lastProgressAt, event: "last_progress" });
-  if (task.cancelRequestedAt)
-    events.push({ at: task.cancelRequestedAt, event: "cancel_requested" });
-  if (task.cancelCompletedAt)
-    events.push({ at: task.cancelCompletedAt, event: "cancel_completed" });
-  if (task.lastCancelError)
-    events.push({ at: task.updatedAt, event: "cancel_failed", detail: task.lastCancelError });
-  if (task.status === "completed")
-    events.push({ at: task.updatedAt, event: "completed" });
-  if (task.status === "failed")
-    events.push({ at: task.updatedAt, event: "failed" });
-  if (task.noticeSentAt)
-    events.push({ at: task.noticeSentAt, event: "notice_sent", detail: task.deliveryAccountId });
-  if (task.lastNoticeError)
-    events.push({ at: task.updatedAt, event: "notice_failed", detail: task.lastNoticeError });
-  if (task.injectionAppliedAt)
-    events.push({ at: task.injectionAppliedAt, event: "injection_applied" });
-  if (task.lastInjectionError)
-    events.push({ at: task.updatedAt, event: "injection_failed", detail: task.lastInjectionError });
-  events.sort((a, b) => a.at.localeCompare(b.at));
-  const timeline = events.length > 0 ? ["- 时间线：", ...events.map((e) => `  - [${e.at}] ${e.event}${e.detail ? `: ${e.detail}` : ""}`)] : [];
-  return [...header, ...timeline].join(`
-`);
-}
-function renderTaskCancelSuccess(task) {
-  if (task.status === "completed" || task.status === "failed" || task.status === "cancelled") {
-    return [`任务「${task.taskId}」已结束。`, `- 当前状态：${task.status}`].join(`
-`);
-  }
-  if (task.cancelRequestedAt) {
-    return [`已请求取消任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
-`);
-  }
-  return [`任务「${task.taskId}」已取消。`, `- 当前状态：${task.status}`].join(`
-`);
-}
-function renderTaskApprovalSuccess(task) {
-  return [`已批准任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
-`);
-}
-function renderTaskRejectionSuccess(task) {
-  return [`已拒绝任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
-`);
-}
-function renderTaskConfirmationUnavailable(task) {
-  return [`任务「${task.taskId}」当前不是待确认状态。`, `- 当前状态：${task.status}`].join(`
-`);
-}
-function renderTasksCleanResult(removedTasks, removedBindings) {
-  if (removedTasks === 0 && removedBindings === 0) {
-    return "当前协调会话下没有可清理的任务。";
-  }
-  const lines = [];
-  if (removedTasks > 0) {
-    lines.push(`已清理 ${removedTasks} 个已结束的任务。`);
-  }
-  if (removedBindings > 0) {
-    lines.push(`已释放 ${removedBindings} 个无效的 worker 绑定。`);
-  }
-  return lines.join(`
-`);
-}
-function renderTaskListItem(task) {
-  const role = task.role ? ` / ${task.role}` : "";
-  const group = task.groupId ? `；组：${task.groupId}` : "";
-  const summary = task.summary.trim().length > 0 ? `：${task.summary}` : "";
-  const source = task.status === "needs_confirmation" ? `；来源：${task.sourceKind} / ${task.sourceHandle}${task.role ? ` / ${task.role}` : ""}` : "";
-  const reliability = [
-    task.noticePending ? "通知待重试" : "",
-    task.injectionPending ? "注入待重试" : "",
-    task.cancelRequestedAt && !task.cancelCompletedAt && task.status === "running" ? "取消中" : ""
-  ].filter(Boolean).map((item) => `；${item}`).join("");
-  return `- ${task.taskId} [${task.status}] ${task.targetAgent}${role} -> ${task.workerSession ?? "未分配"}${group}${source}${summary}${reliability}`;
-}
-function renderGroupListItem(group) {
-  const reliability = [
-    group.group.injectionPending ? "注入待重试" : ""
-  ].filter(Boolean).map((item) => `；${item}`).join("");
-  return [
-    `- ${group.group.groupId}`,
-    group.group.title,
-    `总计 ${group.totalTasks}`,
-    `待确认 ${group.pendingApprovalTasks}`,
-    `运行中 ${group.runningTasks}`,
-    `完成 ${group.completedTasks}`,
-    `失败 ${group.failedTasks}`,
-    `取消 ${group.cancelledTasks}${reliability}`
-  ].join(" | ");
-}
-function renderTaskProgress(task, summary) {
-  return `⏳ 任务「${task.taskId}」（${task.targetAgent}）：${summary}`;
-}
-function renderTaskHeartbeat(task, elapsedSeconds) {
-  const minutes = Math.floor(elapsedSeconds / 60);
-  return `⏳ 任务「${task.taskId}」已运行 ${minutes} 分钟，等待中...`;
-}
-
 // src/orchestration/task-wait-timeouts.ts
 var DEFAULT_TASK_WAIT_TIMEOUT_MS, MAX_TASK_WAIT_TIMEOUT_MS, DEFAULT_TASK_WAIT_POLL_INTERVAL_MS = 1000, MAX_TASK_WAIT_POLL_INTERVAL_MS = 1e4, TASK_WAIT_RPC_TIMEOUT_PADDING_MS = 5000;
 var init_task_wait_timeouts = __esm(() => {
@@ -14358,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) {
@@ -14445,7 +14240,7 @@ async function loadLockMetadata(path13) {
     return null;
   }
 }
-function defaultIsProcessRunning3(pid) {
+function defaultIsProcessRunning4(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -16774,8 +16569,10 @@ 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;
   const transportReply = effectiveReplyMode !== "final" ? reply : undefined;
   if (context.orchestration) {
     try {
@@ -16796,8 +16593,8 @@ 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 ? { chatKey, quota: context.quota } : undefined;
-    const result = await context.interaction.promptTransportSession(session, promptText, transportReply, replyContext, media, abortSignal);
+    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, onToolEvent);
     if (claimHumanReply) {
       try {
         await context.orchestration?.claimActiveHumanReply?.(claimHumanReply);
@@ -16817,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);
   }
@@ -16957,6 +16754,211 @@ var init_session_handler = __esm(() => {
   };
 });
 
+// src/formatting/render-text.ts
+function renderAgents(config2) {
+  const names = Object.keys(config2.agents);
+  if (names.length === 0) {
+    return "还没有注册任何 Agent。";
+  }
+  return ["已注册的 Agent：", ...names.map((name) => `- ${name}`)].join(`
+`);
+}
+function renderWorkspaces(config2) {
+  const names = Object.entries(config2.workspaces);
+  if (names.length === 0) {
+    return "还没有注册任何工作区。";
+  }
+  return ["已注册的工作区：", ...names.map(([name, workspace]) => `- ${name}: ${workspace.cwd}`)].join(`
+`);
+}
+function renderOrchestrationUnavailable() {
+  return "当前未启用任务编排服务。";
+}
+function renderDelegateSuccess2(taskId, workerSession) {
+  return [`已创建委派任务「${taskId}」`, `worker 会话：${workerSession}`].join(`
+`);
+}
+function renderGroupCreated2(group) {
+  return [`已创建任务组「${group.groupId}」`, `- 标题：${group.title}`].join(`
+`);
+}
+function renderGroupList2(groups) {
+  if (groups.length === 0) {
+    return "当前协调会话下还没有任务组。";
+  }
+  return ["当前协调会话的任务组：", ...groups.map((group) => renderGroupListItem2(group))].join(`
+`);
+}
+function renderGroupSummary2(summary) {
+  const { group, tasks } = summary;
+  const lines = [
+    `任务组「${group.groupId}」`,
+    `- 标题：${group.title}`,
+    `- 协调会话：${group.coordinatorSession}`,
+    `- 总任务数：${summary.totalTasks}`,
+    `- 待确认：${summary.pendingApprovalTasks}`,
+    `- 运行中：${summary.runningTasks}`,
+    `- 已完成：${summary.completedTasks}`,
+    `- 已失败：${summary.failedTasks}`,
+    `- 已取消：${summary.cancelledTasks}`,
+    `- 是否终态：${summary.terminal ? "是" : "否"}`
+  ];
+  if (group.injectionPending !== undefined) {
+    lines.push(`- 注入待处理：${group.injectionPending ? "是" : "否"}`);
+  }
+  if (group.injectionAppliedAt) {
+    lines.push(`- 注入完成时间：${group.injectionAppliedAt}`);
+  }
+  if (group.lastInjectionError) {
+    lines.push(`- 最近注入错误：${group.lastInjectionError}`);
+  }
+  if (tasks.length > 0) {
+    lines.push("- 成员：");
+    for (const task of tasks) {
+      lines.push(`  - ${task.taskId} [${task.status}] ${task.targetAgent}`);
+    }
+  }
+  return lines.join(`
+`);
+}
+function renderGroupCancelSuccess2(input) {
+  return [
+    `任务组「${input.summary.group.groupId}」已发起取消`,
+    `- 已请求取消：${input.cancelledTaskIds.length}`,
+    `- 已跳过终态任务：${input.skippedTaskIds.length}`
+  ].join(`
+`);
+}
+function renderTaskList2(tasks) {
+  if (tasks.length === 0) {
+    return "当前协调会话下还没有任务。";
+  }
+  return ["当前协调会话的任务：", ...tasks.map((task) => renderTaskListItem2(task))].join(`
+`);
+}
+function renderTaskSummary2(task) {
+  const header = [
+    `任务「${task.taskId}」`,
+    `- 状态：${task.status}`,
+    `- 协调会话：${task.coordinatorSession}`,
+    `- worker 会话：${task.workerSession ?? "未分配"}`,
+    `- 目标 Agent：${task.targetAgent}`
+  ];
+  if (task.role)
+    header.push(`- 角色：${task.role}`);
+  if (task.groupId)
+    header.push(`- 任务组：${task.groupId}`);
+  if (task.status === "needs_confirmation") {
+    header.push(`- 来源：${task.sourceKind} / ${task.sourceHandle}${task.role ? ` / ${task.role}` : ""}`);
+  }
+  header.push(`- 任务：${task.task}`);
+  if (task.summary.trim().length > 0)
+    header.push(`- 摘要：${task.summary}`);
+  if (task.resultText.trim().length > 0)
+    header.push(`- 结果：${task.resultText}`);
+  const events = [];
+  events.push({ at: task.createdAt, event: "created" });
+  if (task.workerSession && task.status !== "needs_confirmation") {
+    events.push({ at: task.createdAt, event: "dispatched", detail: task.workerSession });
+  }
+  if (task.lastProgressAt)
+    events.push({ at: task.lastProgressAt, event: "last_progress" });
+  if (task.cancelRequestedAt)
+    events.push({ at: task.cancelRequestedAt, event: "cancel_requested" });
+  if (task.cancelCompletedAt)
+    events.push({ at: task.cancelCompletedAt, event: "cancel_completed" });
+  if (task.lastCancelError)
+    events.push({ at: task.updatedAt, event: "cancel_failed", detail: task.lastCancelError });
+  if (task.status === "completed")
+    events.push({ at: task.updatedAt, event: "completed" });
+  if (task.status === "failed")
+    events.push({ at: task.updatedAt, event: "failed" });
+  if (task.noticeSentAt)
+    events.push({ at: task.noticeSentAt, event: "notice_sent", detail: task.deliveryAccountId });
+  if (task.lastNoticeError)
+    events.push({ at: task.updatedAt, event: "notice_failed", detail: task.lastNoticeError });
+  if (task.injectionAppliedAt)
+    events.push({ at: task.injectionAppliedAt, event: "injection_applied" });
+  if (task.lastInjectionError)
+    events.push({ at: task.updatedAt, event: "injection_failed", detail: task.lastInjectionError });
+  events.sort((a, b) => a.at.localeCompare(b.at));
+  const timeline = events.length > 0 ? ["- 时间线：", ...events.map((e) => `  - [${e.at}] ${e.event}${e.detail ? `: ${e.detail}` : ""}`)] : [];
+  return [...header, ...timeline].join(`
+`);
+}
+function renderTaskCancelSuccess(task) {
+  if (task.status === "completed" || task.status === "failed" || task.status === "cancelled") {
+    return [`任务「${task.taskId}」已结束。`, `- 当前状态：${task.status}`].join(`
+`);
+  }
+  if (task.cancelRequestedAt) {
+    return [`已请求取消任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
+`);
+  }
+  return [`任务「${task.taskId}」已取消。`, `- 当前状态：${task.status}`].join(`
+`);
+}
+function renderTaskApprovalSuccess2(task) {
+  return [`已批准任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
+`);
+}
+function renderTaskRejectionSuccess2(task) {
+  return [`已拒绝任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
+`);
+}
+function renderTaskConfirmationUnavailable(task) {
+  return [`任务「${task.taskId}」当前不是待确认状态。`, `- 当前状态：${task.status}`].join(`
+`);
+}
+function renderTasksCleanResult(removedTasks, removedBindings) {
+  if (removedTasks === 0 && removedBindings === 0) {
+    return "当前协调会话下没有可清理的任务。";
+  }
+  const lines = [];
+  if (removedTasks > 0) {
+    lines.push(`已清理 ${removedTasks} 个已结束的任务。`);
+  }
+  if (removedBindings > 0) {
+    lines.push(`已释放 ${removedBindings} 个无效的 worker 绑定。`);
+  }
+  return lines.join(`
+`);
+}
+function renderTaskListItem2(task) {
+  const role = task.role ? ` / ${task.role}` : "";
+  const group = task.groupId ? `；组：${task.groupId}` : "";
+  const summary = task.summary.trim().length > 0 ? `：${task.summary}` : "";
+  const source = task.status === "needs_confirmation" ? `；来源：${task.sourceKind} / ${task.sourceHandle}${task.role ? ` / ${task.role}` : ""}` : "";
+  const reliability = [
+    task.noticePending ? "通知待重试" : "",
+    task.injectionPending ? "注入待重试" : "",
+    task.cancelRequestedAt && !task.cancelCompletedAt && task.status === "running" ? "取消中" : ""
+  ].filter(Boolean).map((item) => `；${item}`).join("");
+  return `- ${task.taskId} [${task.status}] ${task.targetAgent}${role} -> ${task.workerSession ?? "未分配"}${group}${source}${summary}${reliability}`;
+}
+function renderGroupListItem2(group) {
+  const reliability = [
+    group.group.injectionPending ? "注入待重试" : ""
+  ].filter(Boolean).map((item) => `；${item}`).join("");
+  return [
+    `- ${group.group.groupId}`,
+    group.group.title,
+    `总计 ${group.totalTasks}`,
+    `待确认 ${group.pendingApprovalTasks}`,
+    `运行中 ${group.runningTasks}`,
+    `完成 ${group.completedTasks}`,
+    `失败 ${group.failedTasks}`,
+    `取消 ${group.cancelledTasks}${reliability}`
+  ].join(" | ");
+}
+function renderTaskProgress(task, summary) {
+  return `⏳ 任务「${task.taskId}」（${task.targetAgent}）：${summary}`;
+}
+function renderTaskHeartbeat(task, elapsedSeconds) {
+  const minutes = Math.floor(elapsedSeconds / 60);
+  return `⏳ 任务「${task.taskId}」已运行 ${minutes} 分钟，等待中...`;
+}
+
 // src/commands/handlers/orchestration-handler.ts
 async function handleDelegateRequest(context, chatKey, targetAgent, task, role, groupId, replyContextToken, accountId) {
   const session = await getCurrentSession(context, chatKey);
@@ -16980,7 +16982,7 @@ async function handleDelegateRequest(context, chatKey, targetAgent, task, role,
     ...replyContextToken ? { replyContextToken } : {},
     ...accountId ? { accountId } : {}
   });
-  return { text: renderDelegateSuccess(result.taskId, result.workerSession) };
+  return { text: renderDelegateSuccess2(result.taskId, result.workerSession) };
 }
 async function handleGroupCreate(context, chatKey, title) {
   const session = await getCurrentSession(context, chatKey);
@@ -16995,7 +16997,7 @@ async function handleGroupCreate(context, chatKey, title) {
     coordinatorSession: session.transportSession,
     title
   });
-  return { text: renderGroupCreated(group) };
+  return { text: renderGroupCreated2(group) };
 }
 async function handleGroupList(context, chatKey, filter) {
   const session = await getCurrentSession(context, chatKey);
@@ -17010,7 +17012,7 @@ async function handleGroupList(context, chatKey, filter) {
     coordinatorSession: session.transportSession,
     ...filter ?? {}
   });
-  return { text: renderGroupList(groups) };
+  return { text: renderGroupList2(groups) };
 }
 async function handleGroupGet(context, chatKey, groupId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17028,7 +17030,7 @@ async function handleGroupGet(context, chatKey, groupId) {
   if (!group) {
     return { text: GROUP_NOT_FOUND_TEXT };
   }
-  return { text: renderGroupSummary(group) };
+  return { text: renderGroupSummary2(group) };
 }
 async function handleGroupCancel(context, chatKey, groupId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17050,7 +17052,7 @@ async function handleGroupCancel(context, chatKey, groupId) {
     groupId,
     coordinatorSession: session.transportSession
   });
-  return { text: renderGroupCancelSuccess(cancelled) };
+  return { text: renderGroupCancelSuccess2(cancelled) };
 }
 async function handleGroupDelegate(context, chatKey, groupId, targetAgent, task, role, replyContextToken, accountId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17083,7 +17085,7 @@ async function handleTaskList(context, chatKey, filter) {
     coordinatorSession: session.transportSession,
     ...filter ?? {}
   });
-  return { text: renderTaskList(tasks) };
+  return { text: renderTaskList2(tasks) };
 }
 async function handleTaskGet(context, chatKey, taskId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17098,7 +17100,7 @@ async function handleTaskGet(context, chatKey, taskId) {
   if (!task || task.coordinatorSession !== session.transportSession) {
     return { text: TASK_NOT_FOUND_TEXT };
   }
-  return { text: renderTaskSummary(task) };
+  return { text: renderTaskSummary2(task) };
 }
 async function handleTaskApprove(context, chatKey, taskId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17120,7 +17122,7 @@ async function handleTaskApprove(context, chatKey, taskId) {
     taskId,
     coordinatorSession: session.transportSession
   });
-  return { text: renderTaskApprovalSuccess(approved) };
+  return { text: renderTaskApprovalSuccess2(approved) };
 }
 async function handleTaskReject(context, chatKey, taskId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17142,7 +17144,7 @@ async function handleTaskReject(context, chatKey, taskId) {
     taskId,
     coordinatorSession: session.transportSession
   });
-  return { text: renderTaskRejectionSuccess(rejected) };
+  return { text: renderTaskRejectionSuccess2(rejected) };
 }
 async function handleTaskCancel(context, chatKey, taskId) {
   const session = await getCurrentSession(context, chatKey);
@@ -18148,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", {
@@ -18262,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);
       }
     });
   }
@@ -18314,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() {
@@ -18477,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;
@@ -18514,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) {
@@ -18665,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);
@@ -22765,6 +22770,10 @@ function encodeBridgePromptSegmentEvent(event) {
   return `${JSON.stringify(event)}
 `;
 }
+function encodeBridgePromptToolEvent(event) {
+  return `${JSON.stringify(event)}
+`;
+}
 function encodeBridgeSessionProgressEvent(event) {
   return `${JSON.stringify(event)}
 `;
@@ -22832,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",
@@ -23155,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;
@@ -23177,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;
@@ -23191,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 });
@@ -23205,6 +23250,9 @@ class AcpxBridgeTransport {
       if (segmentError) {
         throw segmentError;
       }
+      if (toolEventError) {
+        throw toolEventError;
+      }
       return { text: summary ? `${summary}
 
 ${result.text}` : "" };
@@ -23212,6 +23260,9 @@ ${result.text}` : "" };
     if (segmentError) {
       throw segmentError;
     }
+    if (toolEventError) {
+      throw toolEventError;
+    }
     return result;
   }
   async setMode(session, modeId) {
@@ -23244,7 +23295,7 @@ ${result.text}` : "" };
       name: session.transportSession,
       mcpCoordinatorSession: session.mcpCoordinatorSession,
       mcpSourceHandle: session.mcpSourceHandle,
-      ...session.replyMode ? { replyMode: session.replyMode } : {}
+      replyMode: session.replyMode ?? "verbose"
     };
   }
 }
@@ -23398,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: [],
@@ -23407,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);
@@ -23444,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;
   }
@@ -23482,27 +23573,71 @@ function formatToolCallEvent(update, sessionUpdate) {
   const title = update.title ?? "";
   if (title.length === 0)
     return null;
-  const emoji2 = KIND_EMOJI[kind] ?? "\uD83D\uDD27";
-  const command = getToolDisplayCommand(update);
-  if (command) {
-    return `${emoji2} ${truncateToolDisplay(command)}`;
-  }
-  if (sessionUpdate === "tool_call_update" || isGenericToolTitle(kind, title))
+  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;
-  return `${emoji2} ${title}`;
+  if (!inputSummary && isGenericToolTitle(kind, title))
+    return null;
+  const summaryText = inputSummary && inputSummary !== title ? `: ${truncateToolDisplay(inputSummary)}` : "";
+  const statusText = status ? ` (${status})` : "";
+  return `${emoji2} ${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);
+  }
+  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) {
+    return [command, ...args ?? []].join(" ");
   }
-  const parsedCmd = update.rawInput?.parsed_cmd;
-  if (parsedCmd && parsedCmd.length > 0) {
+  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 (isRecord3(entry) && typeof entry.cmd === "string" && entry.cmd.length > 0) {
         parts.push(entry.cmd);
       }
     }
@@ -23510,7 +23645,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(record3, keys) {
+  for (const key of keys) {
+    const value = record3[key];
+    if (typeof value === "string" && value.trim().length > 0) {
+      return value.trim();
+    }
+  }
+  return;
+}
+function readFirstStringArray(record3, keys) {
+  for (const key of keys) {
+    const value = record3[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 isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function readString(rawInput, key) {
+  if (!isRecord3(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;
@@ -23528,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
@@ -23845,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";
@@ -23855,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, [
@@ -23873,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) {
-        const formatToolCalls = session.replyMode === "verbose";
-        const { result: result2, overflowCount } = await this.runStreamingPrompt(this.command, args, reply, 30000, formatToolCalls, replyContext, options?.onSegment);
+      if (reply || options?.onSegment || options?.onToolEvent) {
+        const formatToolCalls = (session.replyMode ?? "verbose") === "verbose";
+        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 };
@@ -24012,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 } : {}
@@ -24033,7 +24242,7 @@ ${baseText}` : "" };
           });
         }
         sink?.feedSegment(segment);
-        lastReplyAt = Date.now();
+        lastReplyAt = now();
       };
       const flushBuffer = () => {
         const remaining = state.buffer.trim();
@@ -24042,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);
@@ -24059,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);
@@ -24071,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) {
@@ -24082,6 +24292,10 @@ ${baseText}` : "" };
             reject(segmentError);
             return;
           }
+          if (toolEventError) {
+            reject(toolEventError);
+            return;
+          }
           resolve3({
             result: { code: code ?? 1, stdout: stdout2, stderr },
             overflowCount
@@ -25068,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();
@@ -25139,7 +25353,7 @@ async function checkDaemon(options = {}) {
     };
   }
 }
-function defaultIsProcessRunning4(pid) {
+function defaultIsProcessRunning5(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -38385,7 +38599,7 @@ function buildWeacpxMcpToolRegistry(input) {
   return [
     {
       name: "delegate_request",
-      description: `Delegate a subtask to another agent under the current coordinator.${availableAgents && availableAgents.length > 0 ? ` Available agents: ${availableAgents.join(", ")}.` : ""}`,
+      description: `Delegate a subtask to another agent under the current coordinator. Pass an absolute workingDirectory for the worker.${availableAgents && availableAgents.length > 0 ? ` Available agents: ${availableAgents.join(", ")}.` : ""}`,
       inputSchema: exports_external.object({
         targetAgent: exports_external.string().min(1),
         task: exports_external.string().min(1),
@@ -38400,12 +38614,12 @@ function buildWeacpxMcpToolRegistry(input) {
           ...sourceHandle ? { sourceHandle } : {},
           ...input2
         });
-        return createSuccessResult(`Delegation task ${result.taskId} is ${result.status}.`, result);
+        return createSuccessResult(renderDelegateSuccess(result), result);
       })
     },
     {
       name: "group_new",
-      description: "Create a new task group for the current coordinator.",
+      description: "Create a new task group under the current coordinator.",
       inputSchema: exports_external.object({
         title: exports_external.string().min(1)
       }).strict(),
@@ -38414,12 +38628,12 @@ function buildWeacpxMcpToolRegistry(input) {
           coordinatorSession,
           title: args.title
         });
-        return createSuccessResult(`Group ${group.groupId} created (title: ${group.title}).`, group);
+        return createSuccessResult(renderGroupCreated(group), group);
       })
     },
     {
       name: "group_get",
-      description: "Fetch a single task group summary for the current coordinator.",
+      description: "Fetch a single task-group summary under the current coordinator.",
       inputSchema: exports_external.object({
         groupId: exports_external.string().min(1)
       }).strict(),
@@ -38433,7 +38647,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "group_list",
-      description: "List task groups for the current coordinator.",
+      description: "List task groups under the current coordinator.",
       inputSchema: exports_external.object({
         status: groupStatusSchema.optional(),
         stuck: exports_external.boolean().optional(),
@@ -38454,7 +38668,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "group_cancel",
-      description: "Cancel all unfinished tasks in a task group for the current coordinator.",
+      description: "Cancel all unfinished tasks in a task group under the current coordinator.",
       inputSchema: exports_external.object({
         groupId: exports_external.string().min(1)
       }).strict(),
@@ -38468,7 +38682,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_get",
-      description: "Fetch a single orchestration task for the current coordinator.",
+      description: "Fetch a single task under the current coordinator.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -38482,7 +38696,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_list",
-      description: "List orchestration tasks for the current coordinator.",
+      description: "List tasks under the current coordinator.",
       inputSchema: exports_external.object({
         status: taskStatusSchema.optional(),
         stuck: exports_external.boolean().optional(),
@@ -38503,7 +38717,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_approve",
-      description: "Approve a pending orchestration task for the current coordinator.",
+      description: "Approve a pending task under the current coordinator.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -38517,7 +38731,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_reject",
-      description: "Reject a pending orchestration task for the current coordinator.",
+      description: "Reject a pending task under the current coordinator.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -38531,7 +38745,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_cancel",
-      description: "Request cancellation for an orchestration task under the current coordinator.",
+      description: "Request cancellation for a task under the current coordinator.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -38540,12 +38754,12 @@ function buildWeacpxMcpToolRegistry(input) {
           coordinatorSession,
           taskId: args.taskId
         });
-        return createSuccessResult(`任务「${task.taskId}」已请求取消。`, task);
+        return createSuccessResult(renderTaskCancelRequest(task), task);
       })
     },
     {
       name: "task_wait",
-      description: "Wait for an orchestration task to finish or require attention using a bounded timeout.",
+      description: `Wait for a task to finish or require attention. Defaults: timeout ${DEFAULT_TASK_WAIT_TIMEOUT_MS} ms, poll interval ${DEFAULT_TASK_WAIT_POLL_INTERVAL_MS} ms. Maximums: timeout ${MAX_TASK_WAIT_TIMEOUT_MS} ms, poll interval ${MAX_TASK_WAIT_POLL_INTERVAL_MS} ms.`,
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         timeoutMs: exports_external.number().int().min(0).max(MAX_TASK_WAIT_TIMEOUT_MS).optional(),
@@ -38561,7 +38775,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "worker_raise_question",
-      description: "Raise a blocker question for the current bound session.",
+      description: "Raise a blocker question for the current bound worker session.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         question: exports_external.string().min(1),
@@ -38576,8 +38790,7 @@ function buildWeacpxMcpToolRegistry(input) {
           sourceHandle,
           ...args
         });
-        return createSuccessResult([`任务「${result.taskId}」已提交 blocker 问题。`, `- questionId：${result.questionId}`].join(`
-`), result);
+        return createSuccessResult(renderWorkerRaiseQuestionSuccess(result), result);
       })
     },
     {
@@ -38593,8 +38806,7 @@ function buildWeacpxMcpToolRegistry(input) {
           coordinatorSession,
           ...args
         });
-        return createSuccessResult([`已回答任务「${task.taskId}」的 blocker 问题。`, `- 当前状态：${task.status}`].join(`
-`), task);
+        return createSuccessResult(renderCoordinatorAnswerQuestionSuccess(task), task);
       })
     },
     {
@@ -38610,10 +38822,7 @@ function buildWeacpxMcpToolRegistry(input) {
           coordinatorSession,
           ...args
         });
-        const text = result.packageId ? [`已创建 human question package「${result.packageId}」。`, `- 已排队任务：${result.queuedTaskIds.length}`].join(`
-`) : [`问题已加入当前 human question queue。`, `- 已排队任务：${result.queuedTaskIds.length}`].join(`
-`);
-        return createSuccessResult(text, result);
+        return createSuccessResult(renderCoordinatorRequestHumanInputSuccess(result), result);
       })
     },
     {
@@ -38630,13 +38839,12 @@ function buildWeacpxMcpToolRegistry(input) {
           coordinatorSession,
           ...args
         });
-        return createSuccessResult([`已追加 human package「${result.packageId}」跟进消息。`, `- messageId：${result.messageId}`].join(`
-`), result);
+        return createSuccessResult(renderCoordinatorFollowUpHumanPackageSuccess(result), result);
       })
     },
     {
       name: "coordinator_review_contested_result",
-      description: "Review a contested coordinator result under the current coordinator.",
+      description: "Review a contested result under the current coordinator.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         reviewId: exports_external.string().min(1),
@@ -38649,9 +38857,7 @@ function buildWeacpxMcpToolRegistry(input) {
           decision,
           ...rest
         });
-        const actionText = decision === "accept" ? "已接受" : "已丢弃";
-        return createSuccessResult([`${actionText}任务「${task.taskId}」的 contested result。`, `- 当前状态：${task.status}`].join(`
-`), task);
+        return createSuccessResult(renderCoordinatorReviewContestedResultSuccess(task, decision), task);
       })
     }
   ];
@@ -38702,10 +38908,185 @@ function createErrorResult(message) {
     isError: true
   };
 }
+function renderDelegateSuccess(result) {
+  return [`Delegation task "${result.taskId}" created.`, `- Status: ${result.status}`].join(`
+`);
+}
+function renderGroupCreated(group) {
+  return [`Task group "${group.groupId}" created.`, `- Title: ${group.title}`].join(`
+`);
+}
+function renderGroupSummary(summary) {
+  const { group, tasks } = summary;
+  const lines = [
+    `Task group "${group.groupId}"`,
+    `- Title: ${group.title}`,
+    `- Coordinator session: ${group.coordinatorSession}`,
+    `- Total tasks: ${summary.totalTasks}`,
+    `- Pending approval: ${summary.pendingApprovalTasks}`,
+    `- Running: ${summary.runningTasks}`,
+    `- Completed: ${summary.completedTasks}`,
+    `- Failed: ${summary.failedTasks}`,
+    `- Cancelled: ${summary.cancelledTasks}`,
+    `- Terminal: ${summary.terminal ? "yes" : "no"}`
+  ];
+  if (group.injectionPending !== undefined) {
+    lines.push(`- Injection pending: ${group.injectionPending ? "yes" : "no"}`);
+  }
+  if (group.injectionAppliedAt) {
+    lines.push(`- Injection completed at: ${group.injectionAppliedAt}`);
+  }
+  if (group.lastInjectionError) {
+    lines.push(`- Last injection error: ${group.lastInjectionError}`);
+  }
+  if (tasks.length > 0) {
+    lines.push("- Members:");
+    for (const task of tasks) {
+      lines.push(`  - ${task.taskId} [${task.status}] ${task.targetAgent}`);
+    }
+  }
+  return lines.join(`
+`);
+}
+function renderGroupList(groups) {
+  if (groups.length === 0) {
+    return "There are no task groups under the current coordinator.";
+  }
+  return ["Task groups for the current coordinator:", ...groups.map((group) => renderGroupListItem(group))].join(`
+`);
+}
+function renderGroupListItem(group) {
+  const reliability = group.group.injectionPending ? " | injection pending" : "";
+  return [
+    `- ${group.group.groupId}`,
+    group.group.title,
+    `total ${group.totalTasks}`,
+    `pending ${group.pendingApprovalTasks}`,
+    `running ${group.runningTasks}`,
+    `completed ${group.completedTasks}`,
+    `failed ${group.failedTasks}`,
+    `cancelled ${group.cancelledTasks}${reliability}`
+  ].join(" | ");
+}
+function renderGroupCancelSuccess(input) {
+  return [
+    `Task group "${input.summary.group.groupId}" cancellation requested.`,
+    `- Cancel requested: ${input.cancelledTaskIds.length}`,
+    `- Skipped terminal tasks: ${input.skippedTaskIds.length}`
+  ].join(`
+`);
+}
+function renderTaskList(tasks) {
+  if (tasks.length === 0) {
+    return "There are no tasks under the current coordinator.";
+  }
+  return ["Tasks for the current coordinator:", ...tasks.map((task) => renderTaskListItem(task))].join(`
+`);
+}
+function renderTaskListItem(task) {
+  const role = task.role ? ` / ${task.role}` : "";
+  const group = task.groupId ? `; group: ${task.groupId}` : "";
+  const summary = task.summary.trim().length > 0 ? `: ${task.summary}` : "";
+  const source = task.status === "needs_confirmation" ? `; source: ${task.targetAgent}${task.role ? ` / ${task.role}` : ""}` : "";
+  const reliability = [
+    task.noticePending ? "notice pending retry" : "",
+    task.injectionPending ? "injection pending retry" : "",
+    task.cancelRequestedAt && !task.cancelCompletedAt && task.status === "running" ? "cancelling" : ""
+  ].filter(Boolean).map((item) => `; ${item}`).join("");
+  return `- ${task.taskId} [${task.status}] ${task.targetAgent}${role} -> ${task.workerSession ?? "unassigned"}${group}${source}${summary}${reliability}`;
+}
+function renderTaskSummary(task) {
+  const header = [
+    `Task "${task.taskId}"`,
+    `- Status: ${task.status}`,
+    `- Coordinator session: ${task.coordinatorSession}`,
+    `- Worker session: ${task.workerSession ?? "unassigned"}`,
+    `- Target agent: ${task.targetAgent}`
+  ];
+  if (task.role)
+    header.push(`- Role: ${task.role}`);
+  if (task.groupId)
+    header.push(`- Group: ${task.groupId}`);
+  if (task.status === "needs_confirmation") {
+    header.push(`- Source: ${task.sourceKind} / ${task.sourceHandle}${task.role ? ` / ${task.role}` : ""}`);
+  }
+  header.push(`- Task: ${task.task}`);
+  if (task.summary.trim().length > 0)
+    header.push(`- Summary: ${task.summary}`);
+  if (task.resultText.trim().length > 0)
+    header.push(`- Result: ${task.resultText}`);
+  const events = [];
+  events.push({ at: task.createdAt, event: "created" });
+  if (task.workerSession && task.status !== "needs_confirmation") {
+    events.push({ at: task.createdAt, event: "dispatched", detail: task.workerSession });
+  }
+  if (task.lastProgressAt)
+    events.push({ at: task.lastProgressAt, event: "last progress" });
+  if (task.cancelRequestedAt)
+    events.push({ at: task.cancelRequestedAt, event: "cancel requested" });
+  if (task.cancelCompletedAt)
+    events.push({ at: task.cancelCompletedAt, event: "cancel completed" });
+  if (task.lastCancelError)
+    events.push({ at: task.updatedAt, event: "cancel failed", detail: task.lastCancelError });
+  if (task.status === "completed")
+    events.push({ at: task.updatedAt, event: "completed" });
+  if (task.status === "failed")
+    events.push({ at: task.updatedAt, event: "failed" });
+  if (task.noticeSentAt)
+    events.push({ at: task.noticeSentAt, event: "notice sent", detail: task.deliveryAccountId });
+  if (task.lastNoticeError)
+    events.push({ at: task.updatedAt, event: "notice failed", detail: task.lastNoticeError });
+  if (task.injectionAppliedAt)
+    events.push({ at: task.injectionAppliedAt, event: "injection applied" });
+  if (task.lastInjectionError)
+    events.push({ at: task.updatedAt, event: "injection failed", detail: task.lastInjectionError });
+  events.sort((a, b) => a.at.localeCompare(b.at));
+  const timeline = events.length > 0 ? ["- Timeline:", ...events.map((e) => `  - [${e.at}] ${e.event}${e.detail ? `: ${e.detail}` : ""}`)] : [];
+  return [...header, ...timeline].join(`
+`);
+}
+function renderTaskCancelRequest(task) {
+  if (task.status === "completed" || task.status === "failed" || task.status === "cancelled") {
+    return [`Task "${task.taskId}" has already finished.`, `- Current status: ${task.status}`].join(`
+`);
+  }
+  return [`Cancellation requested for task "${task.taskId}".`, `- Current status: ${task.status}`].join(`
+`);
+}
+function renderTaskApprovalSuccess(task) {
+  return [`Task "${task.taskId}" approved.`, `- Current status: ${task.status}`].join(`
+`);
+}
+function renderTaskRejectionSuccess(task) {
+  return [`Task "${task.taskId}" rejected.`, `- Current status: ${task.status}`].join(`
+`);
+}
+function renderWorkerRaiseQuestionSuccess(task) {
+  return [`Blocker question submitted for task "${task.taskId}".`, `- questionId: ${task.questionId}`].join(`
+`);
+}
+function renderCoordinatorAnswerQuestionSuccess(task) {
+  return [`Answered the blocker question for task "${task.taskId}".`, `- Current status: ${task.status}`].join(`
+`);
+}
+function renderCoordinatorRequestHumanInputSuccess(result) {
+  return result.packageId ? [`Created human question package "${result.packageId}".`, `- Queued tasks: ${result.queuedTaskIds.length}`].join(`
+`) : [`Queued the question in the current human question queue.`, `- Queued tasks: ${result.queuedTaskIds.length}`].join(`
+`);
+}
+function renderCoordinatorFollowUpHumanPackageSuccess(result) {
+  return [`Appended follow-up to human package "${result.packageId}".`, `- messageId: ${result.messageId}`].join(`
+`);
+}
+function renderCoordinatorReviewContestedResultSuccess(task, decision) {
+  const actionText = decision === "accept" ? "Accepted" : "Discarded";
+  return [`${actionText} contested result for task "${task.taskId}".`, `- Current status: ${task.status}`].join(`
+`);
+}
 function formatToolError(error2) {
   const message = error2 instanceof Error ? error2.message : String(error2);
   if (/ECONNREFUSED|ENOENT|server closed without a response|socket hang up|connect /i.test(message)) {
-    return `无法连接到 orchestration daemon：${message}`;
+    return `Failed to connect to the orchestration daemon: ${message}`;
   }
   return message;
 }
@@ -38925,6 +39306,9 @@ function createWeacpxMcpServer(options) {
       return await toolStatePromise;
     }
     toolStatePromise = resolveMcpIdentity(server, options).then((identity) => {
+      if (!options.transport) {
+        throw new Error("weacpx MCP transport is not configured");
+      }
       toolState = buildToolState({
         transport: options.transport,
         coordinatorSession: identity.coordinatorSession,
@@ -38983,8 +39367,84 @@ 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 = createOrchestrationTransport(options.endpoint ?? resolveDefaultOrchestrationEndpoint(process.env, process.platform));
+  const transport = options.transport ?? createOrchestrationTransport(options.endpoint ?? resolveDefaultOrchestrationEndpoint(process.env, process.platform));
   const server = createWeacpxMcpServer({
     transport,
     ...options.coordinatorSession ? { coordinatorSession: options.coordinatorSession } : {},
@@ -38993,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 {
@@ -39005,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) {
@@ -40765,6 +41233,7 @@ async function defaultMcpStdio(args, deps = {}) {
   let coordinatorSession;
   let sourceHandle;
   let endpoint;
+  let transport;
   let identityResolver;
   let availableAgents;
   try {
@@ -40773,6 +41242,7 @@ async function defaultMcpStdio(args, deps = {}) {
     const workspace = parseCoordinatorWorkspace(args, process.env);
     endpoint = resolveDefaultOrchestrationEndpoint(process.env, process.platform);
     const client = new OrchestrationClient(endpoint);
+    transport = createOrchestrationTransport(endpoint, { client });
     const runtimePaths = (await init_main().then(() => exports_main)).resolveRuntimePaths();
     await ensureConfigExists(runtimePaths.configPath);
     const config2 = await loadConfig(runtimePaths.configPath);
@@ -40786,7 +41256,7 @@ async function defaultMcpStdio(args, deps = {}) {
       state,
       client
     });
-    const eagerIdentity = parsedCoordinatorSession && workspace ? await resolveIdentity({ clientName: undefined, listRoots: async () => [] }) : null;
+    const eagerIdentity = parsedCoordinatorSession ? await resolveIdentity({ clientName: undefined, listRoots: async () => [] }) : null;
     coordinatorSession = eagerIdentity?.coordinatorSession ?? "";
     identityResolver = eagerIdentity ? undefined : resolveIdentity;
   } catch (error2) {
@@ -40795,11 +41265,16 @@ async function defaultMcpStdio(args, deps = {}) {
     return 2;
   }
   await runWeacpxMcpServer({
-    endpoint,
+    transport,
     ...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;
 }