weacpx 0.4.5 → 0.4.6

package/README.md

@@ -169,7 +169,7 @@ weacpx restart
 | `weacpx status` | 查看后台状态、PID、配置路径、日志路径 |
 | `weacpx stop` | 停止后台实例 |
 | `weacpx restart` | 重启后台实例，让频道配置变更生效 |
-| `weacpx update [--all|<name>]` | 检查并更新 weacpx 与已安装插件；安装了插件时会交互式选择更新项 |
+| `weacpx update [--all\|<name>]` | 检查并更新 weacpx 与已安装插件；安装了插件时会交互式选择更新项 |
 | `weacpx channel list` | 查看已配置的消息频道 |
 | `weacpx plugin known` | 查看官方插件清单（飞书/元宝包名） |
 | `weacpx plugin add @ganglion/weacpx-channel-feishu && weacpx channel add feishu` | 安装并添加飞书频道，会提示输入飞书应用凭据 |
@@ -351,22 +351,15 @@ README 里只保留用户视角的最常用命令。
 | 命令 | 说明 |
 |------|------|
 | `/dg <agent> <task>` | 快速委派一个子任务 |
-| `/group new <title>` | 创建任务组 |
-| `/group add <groupId> <agent> <task>` | 往任务组里加子任务 |
-| `/groups` | 查看任务组列表 |
-| `/group <id>` | 查看单个任务组 |
-| `/group cancel <groupId>` | 取消组内未结束任务 |
 | `/tasks` | 查看当前主线下的任务 |
 | `/task <id>` | 查看单个任务详情 |
 | `/task approve <id>` | 批准 `needs_confirmation` 任务 |
-| `/task cancel <id>` | 取消任务 |
+| `/task cancel <id>` | 取消任务；取消一个尚未批准的任务等同于拒绝 |
 
 最常见例子：
 
 ```text
 /dg claude 审查当前方案的 3 个高风险点
-/group new review
-/group add review claude 审查接口设计
 /tasks
 /task approve task_123
 ```
@@ -376,9 +369,9 @@ README 里只保留用户视角的最常用命令。
 - 当前会话就是主控会话
 - 被委派出去的是独立子任务会话
 - agent 发起的委派请求默认需要人工确认
-- group 适合把 2~3 个独立子任务并行派出去，再把结果汇总回主线
+- 如果你在用外部 MCP host（Codex / Claude Code），用 `delegate_batch` 一次派发多个并行子任务：传一个 `tasks` 数组，底层自动建组，全部结果一次性回注，无需手动维护 groupId
 
-如果你想先理解什么时候该用 delegate、什么时候该开 group，请看：
+如果你想先理解什么时候该用 delegate、什么时候应该并行派出多个子任务，请看：
 
 - [docs/weacpx-group-usage-guide.md](./docs/weacpx-group-usage-guide.md)
 
@@ -387,7 +380,7 @@ README 里只保留用户视角的最常用命令。
 
 如果你想让 Codex、Claude Code 等外部 MCP host 直接使用 weacpx 的多 Agent 编排能力，可以把 `weacpx mcp-stdio` 配成一个 stdio MCP server。
 
-`delegate_request` 支持 MCP Tasks：支持该能力的 host 可以让委派请求立即返回原生 task handle，之后通过 `tasks/get` / `tasks/result` / `tasks/cancel` 获取状态、结果或取消任务；worker 输出的 `[PROGRESS] ...` 会显示在 `tasks/get` / `tasks/list` 的 `statusMessage` 里；`input_required` 状态下的 `tasks/result` 会返回下一步操作提示并结束本次 result stream，而不是长时间阻塞；client 按提示调用 `task_get` / `task_approve` / `coordinator_answer_question` 等工具后，再继续 `tasks/get` / `tasks/result` 轮询。不支持 MCP Tasks 的 host 仍可使用兼容工具 `task_get` / `task_wait` / `task_cancel`。
+`delegate_request` 支持 MCP Tasks：支持该能力的 host 可以让委派请求立即返回原生 task handle，之后通过 `tasks/get` / `tasks/result` / `tasks/cancel` 获取状态、结果或取消任务；worker 输出的 `[PROGRESS] ...` 会显示在 `tasks/get` / `tasks/list` 的 `statusMessage` 里；`input_required` 状态下的 `tasks/result` 会返回下一步操作提示并结束本次 result stream，而不是长时间阻塞；client 按提示调用 `task_get` / `task_approve` / `coordinator_answer_question` 等工具后，再继续 `tasks/get` / `tasks/result` 轮询。不支持 MCP Tasks 的 host 仍可使用兼容工具 `task_get` / `task_list` / `task_watch` / `task_cancel`。
 
 先启动 daemon：
 

package/dist/bridge/bridge-main.js

@@ -162,8 +162,12 @@ function extractJsonRpcErrorMessages(output) {
 `).map((line) => line.trim()).filter((line) => line.length > 0).flatMap((line) => {
     try {
       const payload = JSON.parse(line);
-      if (typeof payload.error?.message === "string" && payload.error.message.length > 0) {
-        return [payload.error.message];
+      const err = payload.error;
+      const dataMsg = typeof err?.data?.message === "string" && err.data.message.length > 0 ? err.data.message : undefined;
+      const baseMsg = typeof err?.message === "string" && err.message.length > 0 ? err.message : undefined;
+      const chosen = dataMsg && dataMsg !== baseMsg ? dataMsg : baseMsg;
+      if (chosen) {
+        return [chosen];
       }
     } catch {
       return [];

package/dist/cli.js

@@ -9617,11 +9617,9 @@ function readVersion(moduleUrl = import.meta.url) {
 var PACKAGE_NAME = "weacpx";
 var init_version = () => {};
 
-// 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, DEFAULT_TASK_WATCH_TIMEOUT_MS = 60000, MAX_TASK_WATCH_TIMEOUT_MS, DEFAULT_TASK_WATCH_POLL_INTERVAL_MS = 1000, MAX_TASK_WATCH_POLL_INTERVAL_MS = 1e4, TASK_WATCH_RPC_TIMEOUT_PADDING_MS = 5000;
-var init_task_wait_timeouts = __esm(() => {
-  DEFAULT_TASK_WAIT_TIMEOUT_MS = 5 * 60000;
-  MAX_TASK_WAIT_TIMEOUT_MS = 20 * 60000;
+// src/orchestration/task-watch-timeouts.ts
+var DEFAULT_TASK_WATCH_TIMEOUT_MS = 60000, MAX_TASK_WATCH_TIMEOUT_MS, DEFAULT_TASK_WATCH_POLL_INTERVAL_MS = 1000, MAX_TASK_WATCH_POLL_INTERVAL_MS = 1e4, TASK_WATCH_RPC_TIMEOUT_PADDING_MS = 5000;
+var init_task_watch_timeouts = __esm(() => {
   MAX_TASK_WATCH_TIMEOUT_MS = 20 * 60000;
 });
 
@@ -14019,7 +14017,7 @@ ${buildFinalHeadsUp({
         sendWeixinErrorNotice({
           to,
           contextToken,
-          message: `⚠️ 过程失败：${err instanceof Error ? err.message : JSON.stringify(err)}`,
+          message: `⚠️ 执行出错：${err instanceof Error ? err.message : JSON.stringify(err)}`,
           baseUrl: deps.baseUrl,
           token: deps.token,
           errLog: deps.errLog
@@ -15553,8 +15551,12 @@ function extractJsonRpcErrorMessages(output) {
 `).map((line) => line.trim()).filter((line) => line.length > 0).flatMap((line) => {
     try {
       const payload = JSON.parse(line);
-      if (typeof payload.error?.message === "string" && payload.error.message.length > 0) {
-        return [payload.error.message];
+      const err = payload.error;
+      const dataMsg = typeof err?.data?.message === "string" && err.data.message.length > 0 ? err.data.message : undefined;
+      const baseMsg = typeof err?.message === "string" && err.message.length > 0 ? err.message : undefined;
+      const chosen = dataMsg && dataMsg !== baseMsg ? dataMsg : baseMsg;
+      if (chosen) {
+        return [chosen];
       }
     } catch {
       return [];
@@ -17243,18 +17245,18 @@ function renderDelegateSuccess2(taskId, workerSession) {
   return [`已创建委派任务「${taskId}」`, `worker 会话：${workerSession}`].join(`
 `);
 }
-function renderGroupCreated2(group) {
+function renderGroupCreated(group) {
   return [`已创建任务组「${group.groupId}」`, `- 标题：${group.title}`].join(`
 `);
 }
-function renderGroupList2(groups) {
+function renderGroupList(groups) {
   if (groups.length === 0) {
     return "当前协调会话下还没有任务组。";
   }
-  return ["当前协调会话的任务组：", ...groups.map((group) => renderGroupListItem2(group))].join(`
+  return ["当前协调会话的任务组：", ...groups.map((group) => renderGroupListItem(group))].join(`
 `);
 }
-function renderGroupSummary2(summary) {
+function renderGroupSummary(summary) {
   const { group, tasks } = summary;
   const lines = [
     `任务组「${group.groupId}」`,
@@ -17286,7 +17288,7 @@ function renderGroupSummary2(summary) {
   return lines.join(`
 `);
 }
-function renderGroupCancelSuccess2(input) {
+function renderGroupCancelSuccess(input) {
   return [
     `任务组「${input.summary.group.groupId}」已发起取消`,
     `- 已请求取消：${input.cancelledTaskIds.length}`,
@@ -17369,7 +17371,7 @@ function renderTaskApprovalSuccess2(task) {
   return [`已批准任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
 `);
 }
-function renderTaskRejectionSuccess2(task) {
+function renderTaskRejectSuccess(task) {
   return [`已拒绝任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
 `);
 }
@@ -17403,7 +17405,7 @@ function renderTaskListItem2(task) {
   ].filter(Boolean).map((item) => `；${item}`).join("");
   return `- ${task.taskId} [${task.status}] ${task.targetAgent}${role} -> ${task.workerSession ?? "未分配"}${group}${source}${summary}${reliability}`;
 }
-function renderGroupListItem2(group) {
+function renderGroupListItem(group) {
   const reliability = [
     group.group.injectionPending ? "注入待重试" : ""
   ].filter(Boolean).map((item) => `；${item}`).join("");
@@ -17464,7 +17466,7 @@ async function handleGroupCreate(context, chatKey, title) {
     coordinatorSession: session.transportSession,
     title
   });
-  return { text: renderGroupCreated2(group) };
+  return { text: renderGroupCreated(group) };
 }
 async function handleGroupList(context, chatKey, filter) {
   const session = await getCurrentSession(context, chatKey);
@@ -17479,7 +17481,7 @@ async function handleGroupList(context, chatKey, filter) {
     coordinatorSession: session.transportSession,
     ...filter ?? {}
   });
-  return { text: renderGroupList2(groups) };
+  return { text: renderGroupList(groups) };
 }
 async function handleGroupGet(context, chatKey, groupId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17497,7 +17499,7 @@ async function handleGroupGet(context, chatKey, groupId) {
   if (!group) {
     return { text: GROUP_NOT_FOUND_TEXT };
   }
-  return { text: renderGroupSummary2(group) };
+  return { text: renderGroupSummary(group) };
 }
 async function handleGroupCancel(context, chatKey, groupId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17519,7 +17521,7 @@ async function handleGroupCancel(context, chatKey, groupId) {
     groupId,
     coordinatorSession: session.transportSession
   });
-  return { text: renderGroupCancelSuccess2(cancelled) };
+  return { text: renderGroupCancelSuccess(cancelled) };
 }
 async function handleGroupDelegate(context, chatKey, groupId, targetAgent, task, role, replyContextToken, accountId) {
   const session = await getCurrentSession(context, chatKey);
@@ -17607,11 +17609,11 @@ async function handleTaskReject(context, chatKey, taskId) {
   if (task.status !== "needs_confirmation") {
     return { text: renderTaskConfirmationUnavailable(task) };
   }
-  const rejected = await orchestration.rejectTask({
+  const rejected = await orchestration.cancelTask({
     taskId,
     coordinatorSession: session.transportSession
   });
-  return { text: renderTaskRejectionSuccess2(rejected) };
+  return { text: renderTaskRejectSuccess(rejected) };
 }
 async function handleTaskCancel(context, chatKey, taskId) {
   const session = await getCurrentSession(context, chatKey);
@@ -19309,8 +19311,6 @@ class OrchestrationServer {
         return await this.dispatchTaskGet(params);
       case "task.list":
         return await this.handlers.listTasks(this.parseTaskListFilter(params));
-      case "task.wait":
-        return await this.handlers.waitTask(this.parseWaitTaskInput(params));
       case "task.watch":
         return await this.handlers.watchTask(this.parseWatchTaskInput(params));
       case "task.approve":
@@ -19319,12 +19319,6 @@ class OrchestrationServer {
           taskId: requireString(params, "taskId"),
           coordinatorSession: requireString(params, "coordinatorSession")
         });
-      case "task.reject":
-        requireOnlyKeys(params, ["taskId", "coordinatorSession"], "params");
-        return await this.handlers.rejectTask({
-          taskId: requireString(params, "taskId"),
-          coordinatorSession: requireString(params, "coordinatorSession")
-        });
       case "task.cancel":
         return await this.handlers.cancelTask(this.parseCancelTaskInput(params));
       case "worker.reply":
@@ -19357,15 +19351,6 @@ class OrchestrationServer {
           ...expectedActivePackageId !== undefined ? { expectedActivePackageId } : {}
         });
       }
-      case "coordinator.follow_up_human_package":
-        requireOnlyKeys(params, ["coordinatorSession", "packageId", "priorMessageId", "taskQuestions", "promptText"], "params");
-        return await this.handlers.coordinatorFollowUpHumanPackage({
-          coordinatorSession: requireString(params, "coordinatorSession"),
-          packageId: requireString(params, "packageId"),
-          priorMessageId: requireString(params, "priorMessageId"),
-          taskQuestions: requireTaskQuestions(params, "taskQuestions"),
-          promptText: requireString(params, "promptText")
-        });
       case "coordinator.review_contested_result":
         requireOnlyKeys(params, ["coordinatorSession", "taskId", "reviewId", "decision"], "params");
         return await this.handlers.coordinatorReviewContestedResult({
@@ -19380,20 +19365,6 @@ class OrchestrationServer {
           coordinatorSession: requireString(params, "coordinatorSession"),
           title: requireString(params, "title")
         });
-      case "group.get":
-        requireOnlyKeys(params, ["coordinatorSession", "groupId"], "params");
-        return await this.handlers.getGroupSummary({
-          coordinatorSession: requireString(params, "coordinatorSession"),
-          groupId: requireString(params, "groupId")
-        });
-      case "group.list":
-        return await this.handlers.listGroupSummaries(this.parseGroupListFilter(params));
-      case "group.cancel":
-        requireOnlyKeys(params, ["coordinatorSession", "groupId"], "params");
-        return await this.handlers.cancelGroup({
-          coordinatorSession: requireString(params, "coordinatorSession"),
-          groupId: requireString(params, "groupId")
-        });
       default:
         throw new OrchestrationInvalidRequestError(`unsupported orchestration method: ${method}`);
     }
@@ -19488,17 +19459,6 @@ class OrchestrationServer {
       ...resultText !== undefined ? { resultText } : {}
     };
   }
-  parseWaitTaskInput(params) {
-    requireOnlyKeys(params, ["coordinatorSession", "taskId", "timeoutMs", "pollIntervalMs"], "params");
-    const timeoutMs = requireOptionalIntegerInRange(params, "timeoutMs", 0, MAX_TASK_WAIT_TIMEOUT_MS);
-    const pollIntervalMs = requireOptionalIntegerInRange(params, "pollIntervalMs", 1, MAX_TASK_WAIT_POLL_INTERVAL_MS);
-    return {
-      coordinatorSession: requireString(params, "coordinatorSession"),
-      taskId: requireString(params, "taskId"),
-      ...timeoutMs !== undefined ? { timeoutMs } : {},
-      ...pollIntervalMs !== undefined ? { pollIntervalMs } : {}
-    };
-  }
   parseWatchTaskInput(params) {
     requireOnlyKeys(params, ["coordinatorSession", "taskId", "afterSeq", "mode", "includeProgress", "timeoutMs", "pollIntervalMs"], "params");
     const afterSeq = requireOptionalIntegerInRange(params, "afterSeq", 0, Number.MAX_SAFE_INTEGER);
@@ -19526,20 +19486,6 @@ class OrchestrationServer {
       whatIsNeeded: requireString(params, "whatIsNeeded")
     };
   }
-  parseGroupListFilter(params) {
-    requireOnlyKeys(params, ["coordinatorSession", "status", "stuck", "sort", "order"], "params");
-    const status = requireOptionalEnum(params, "status", ["pending", "running", "terminal"]);
-    const stuck = requireOptionalBoolean(params, "stuck");
-    const sort = requireOptionalEnum(params, "sort", ["updatedAt", "createdAt"]);
-    const order = requireOptionalEnum(params, "order", ["asc", "desc"]);
-    return {
-      coordinatorSession: requireString(params, "coordinatorSession"),
-      ...status !== undefined ? { status } : {},
-      ...stuck !== undefined ? { stuck } : {},
-      ...sort !== undefined ? { sort } : {},
-      ...order !== undefined ? { order } : {}
-    };
-  }
   async cleanupEndpoint() {
     if (this.endpoint.kind !== "unix") {
       return;
@@ -19750,7 +19696,7 @@ function isServerNotRunningError(error2) {
 var OrchestrationInvalidRequestError, ORCHESTRATION_RPC_METHODS;
 var init_orchestration_server = __esm(() => {
   init_orchestration_ipc();
-  init_task_wait_timeouts();
+  init_task_watch_timeouts();
   OrchestrationInvalidRequestError = class OrchestrationInvalidRequestError extends Error {
   };
   ORCHESTRATION_RPC_METHODS = new Set([
@@ -19758,22 +19704,16 @@ var init_orchestration_server = __esm(() => {
     "delegate.request",
     "task.get",
     "task.list",
-    "task.wait",
     "task.watch",
     "task.approve",
-    "task.reject",
     "task.cancel",
     "worker.reply",
     "worker.raise_question",
     "coordinator.answer_question",
     "coordinator.retract_answer",
     "coordinator.request_human_input",
-    "coordinator.follow_up_human_package",
     "coordinator.review_contested_result",
-    "group.new",
-    "group.get",
-    "group.list",
-    "group.cancel"
+    "group.new"
   ]);
 });
 
@@ -19950,15 +19890,6 @@ class OrchestrationService {
     this.logEvent("orchestration.group.created", "group created", this.groupContext(group));
     return group;
   }
-  async getGroup(groupId) {
-    const state = await this.deps.loadState();
-    const group = this.ensureGroups(state)[groupId];
-    return group ? { ...group } : null;
-  }
-  async listGroups(coordinatorSession) {
-    const state = await this.deps.loadState();
-    return Object.values(this.ensureGroups(state)).filter((group) => coordinatorSession === undefined || group.coordinatorSession === coordinatorSession).sort((left, right) => left.createdAt.localeCompare(right.createdAt)).map((group) => ({ ...group }));
-  }
   async getGroupSummary(input) {
     const state = await this.deps.loadState();
     const group = this.ensureGroups(state)[input.groupId];
@@ -20597,30 +20528,6 @@ class OrchestrationService {
     const task = state.orchestration.tasks[taskId];
     return task ? { ...task } : null;
   }
-  async waitTask(input) {
-    const timeoutMs = clampWaitTimeout(input.timeoutMs);
-    const pollIntervalMs = clampPollInterval(input.pollIntervalMs);
-    const deadline = Date.now() + timeoutMs;
-    while (true) {
-      const state = await this.deps.loadState();
-      const task = state.orchestration.tasks[input.taskId];
-      if (!task || task.coordinatorSession !== input.coordinatorSession) {
-        return { status: "not_found", task: null };
-      }
-      const snapshot = { ...task };
-      if (isTerminalTaskStatus2(task.status) && task.reviewPending === undefined) {
-        return { status: "terminal", task: snapshot };
-      }
-      if (isAttentionRequiredTask(task)) {
-        return { status: "attention_required", task: snapshot };
-      }
-      const remainingMs = deadline - Date.now();
-      if (remainingMs <= 0) {
-        return { status: "timeout", task: snapshot };
-      }
-      await sleep2(Math.min(pollIntervalMs, remainingMs));
-    }
-  }
   async watchTask(input) {
     const timeoutMs = clampWatchTimeout(input.timeoutMs);
     const pollIntervalMs = clampWatchPollInterval(input.pollIntervalMs);
@@ -21039,88 +20946,6 @@ class OrchestrationService {
       queuedTaskIds: prepared.queuedTaskIds
     };
   }
-  async coordinatorFollowUpHumanPackage(input) {
-    const promptText = input.promptText.trim();
-    if (promptText.length === 0) {
-      throw new Error("promptText must be a non-empty string");
-    }
-    if (input.taskQuestions.length === 0) {
-      throw new Error("taskQuestions must contain at least one question");
-    }
-    const prepared = await this.mutate(async () => {
-      const state = await this.deps.loadState();
-      if (this.isExternalCoordinatorSession(state, input.coordinatorSession)) {
-        throw new Error("human input routing is not configured for external coordinator");
-      }
-      const coordinatorState = this.ensureCoordinatorQuestionState(state, input.coordinatorSession);
-      if (coordinatorState.activePackageId !== input.packageId) {
-        throw new Error(`package "${input.packageId}" is not the active package for coordinator "${input.coordinatorSession}"`);
-      }
-      const packageRecord = this.ensureHumanQuestionPackages(state)[input.packageId];
-      if (!packageRecord || packageRecord.status !== "active") {
-        throw new Error(`package "${input.packageId}" is not active`);
-      }
-      const latestMessage = packageRecord.messages.at(-1);
-      if (!latestMessage || latestMessage.messageId !== input.priorMessageId) {
-        throw new Error(`package "${input.packageId}" latest message is "${latestMessage?.messageId ?? ""}", not "${input.priorMessageId}"`);
-      }
-      if (!latestMessage.deliveredAt) {
-        throw new Error(`package "${input.packageId}" latest message "${latestMessage.messageId}" is not delivered yet`);
-      }
-      const tasks = input.taskQuestions.map(({ taskId, questionId }) => {
-        const task = state.orchestration.tasks[taskId];
-        if (!task) {
-          throw new Error(`task "${taskId}" does not exist`);
-        }
-        this.assertCoordinatorOwnership(task, input.coordinatorSession);
-        if (!packageRecord.openTaskIds.includes(taskId)) {
-          throw new Error(`task "${taskId}" does not belong to active package "${input.packageId}"`);
-        }
-        this.assertCoordinatorQuestionMatch(task, questionId);
-        return task;
-      });
-      const now = this.deps.now().toISOString();
-      const route = this.resolveFrozenPackageMessageRoute(latestMessage);
-      const messageId = this.deps.createId();
-      const message = {
-        messageId,
-        kind: "follow_up",
-        promptText,
-        createdAt: now,
-        taskQuestions: input.taskQuestions.map((entry) => ({ ...entry })),
-        ...route ? this.serializeFrozenDeliveryRoute(route) : {}
-      };
-      packageRecord.messages.push(message);
-      packageRecord.awaitingReplyMessageId = undefined;
-      packageRecord.updatedAt = now;
-      for (const task of tasks) {
-        task.status = "waiting_for_human";
-        task.openQuestion = {
-          ...task.openQuestion,
-          packageId: input.packageId
-        };
-        task.updatedAt = now;
-        this.appendTaskEvent(task, now, "attention_required", {
-          status: "waiting_for_human",
-          message: task.openQuestion.question
-        });
-        this.bumpGroupUpdated(state, task.groupId, now);
-      }
-      await this.deps.saveState(state);
-      return {
-        coordinatorSession: input.coordinatorSession,
-        packageId: input.packageId,
-        messageId,
-        promptText,
-        route
-      };
-    });
-    await this.deliverHumanQuestionPackageMessage(prepared);
-    return {
-      packageId: prepared.packageId,
-      messageId: prepared.messageId
-    };
-  }
   async retryHumanQuestionPackageDelivery(input) {
     const prepared = await this.mutate(async () => {
       const state = await this.deps.loadState();
@@ -21760,7 +21585,11 @@ class OrchestrationService {
         return { task: { ...task }, shouldPropagate, closedPackageId: undefined };
       }
       const closedPackageId = this.detachTaskFromQuestionFlows(state, task, now);
+      const wasNeedsConfirmation = task.status === "needs_confirmation";
       task.status = "cancelled";
+      if (wasNeedsConfirmation && task.summary.trim().length === 0) {
+        task.summary = "rejected";
+      }
       task.openQuestion = undefined;
       task.cancelRequestedAt = task.cancelRequestedAt ?? now;
       task.cancelCompletedAt = now;
@@ -21980,29 +21809,6 @@ class OrchestrationService {
     this.logEvent("orchestration.task.approved", "task approved", this.taskContext(prepared.task));
     return prepared.task;
   }
-  async rejectTask(input) {
-    const task = await this.mutate(async () => {
-      const state = await this.deps.loadState();
-      const task2 = state.orchestration.tasks[input.taskId];
-      if (!task2) {
-        throw new Error(`task "${input.taskId}" does not exist`);
-      }
-      this.assertCoordinatorOwnership(task2, input.coordinatorSession);
-      this.assertNeedsConfirmation(task2);
-      task2.status = "cancelled";
-      task2.summary = "rejected";
-      task2.updatedAt = this.deps.now().toISOString();
-      this.appendTaskEvent(task2, task2.updatedAt, "status_changed", {
-        status: "cancelled",
-        summary: "rejected",
-        message: "Task rejected"
-      });
-      await this.deps.saveState(state);
-      return { ...task2 };
-    });
-    this.logEvent("orchestration.task.rejected", "task rejected", this.taskContext(task));
-    return task;
-  }
   async resolveWorkerSession(input) {
     const role = this.normalizeRole(input.role);
     const reusable = await this.deps.findReusableWorkerSession?.({
@@ -22946,24 +22752,6 @@ function isTerminalTaskStatus2(status) {
 function isAttentionRequiredTask(task) {
   return task.reviewPending !== undefined || task.status === "needs_confirmation" || task.status === "blocked" || task.status === "waiting_for_human";
 }
-function clampWaitTimeout(timeoutMs) {
-  if (timeoutMs === undefined) {
-    return DEFAULT_TASK_WAIT_TIMEOUT_MS;
-  }
-  if (!Number.isFinite(timeoutMs) || timeoutMs < 0) {
-    return 0;
-  }
-  return Math.min(Math.floor(timeoutMs), MAX_TASK_WAIT_TIMEOUT_MS);
-}
-function clampPollInterval(pollIntervalMs) {
-  if (pollIntervalMs === undefined) {
-    return DEFAULT_TASK_WAIT_POLL_INTERVAL_MS;
-  }
-  if (!Number.isFinite(pollIntervalMs) || pollIntervalMs <= 0) {
-    return 1;
-  }
-  return Math.min(Math.floor(pollIntervalMs), MAX_TASK_WAIT_POLL_INTERVAL_MS);
-}
 async function sleep2(ms) {
   await new Promise((resolve3) => setTimeout(resolve3, ms));
 }
@@ -22973,7 +22761,7 @@ function isRequestDelegateInput(input) {
 var MAX_TASK_EVENTS_PER_TASK = 200;
 var init_orchestration_service = __esm(() => {
   init_quota_errors();
-  init_task_wait_timeouts();
+  init_task_watch_timeouts();
 });
 
 // src/orchestration/worker-prompts.ts
@@ -39387,9 +39175,8 @@ function requireHome(env) {
 }
 
 // src/mcp/weacpx-mcp-tools.ts
-init_task_wait_timeouts();
+init_task_watch_timeouts();
 init_quota_errors();
-var groupStatusSchema = exports_external.enum(["pending", "running", "terminal"]);
 var taskStatusSchema = exports_external.enum([
   "needs_confirmation",
   "running",
@@ -39412,7 +39199,7 @@ function buildWeacpxMcpToolRegistry(input) {
   const tools = [
     {
       name: "delegate_request",
-      description: `Delegate a subtask to another agent under the current coordinator. Pass an absolute workingDirectory for the worker. Supports MCP Tasks when the client requests task execution: the tool can return a native task handle immediately, then clients can use tasks/get, tasks/result, tasks/list, and tasks/cancel. For legacy clients, after this returns status=running, keep the returned taskId and use task_get/task_list for non-blocking progress snapshots; call task_wait only when the user explicitly wants you to wait/block until completion or attention is required. If status=needs_confirmation, wait for the user to approve (task_approve / task_reject) and do not call task_wait yet.${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. Supports MCP Tasks when the client requests task execution: the tool can return a native task handle immediately, then clients can use tasks/get, tasks/result, tasks/list, and tasks/cancel.${availableAgents && availableAgents.length > 0 ? ` Available agents: ${availableAgents.join(", ")}.` : ""}`,
       execution: { taskSupport: "optional" },
       inputSchema: exports_external.object({
         targetAgent: exports_external.string().min(1),
@@ -39432,66 +39219,41 @@ function buildWeacpxMcpToolRegistry(input) {
       })
     },
     {
-      name: "group_new",
-      description: "Create a new task group under the current coordinator. Use to batch multiple delegate_request calls together; pass the resulting groupId on each delegate so they share lifecycle and cancellation.",
-      inputSchema: exports_external.object({
-        title: exports_external.string().min(1)
-      }).strict(),
-      handler: async (args) => await asToolResult(async () => {
-        const group = await transport.createGroup({
-          coordinatorSession,
-          title: args.title
-        });
-        return createSuccessResult(renderGroupCreated(group), group);
-      })
-    },
-    {
-      name: "group_get",
-      description: "Fetch a single task-group summary under the current coordinator. Use to check aggregate progress when waiting on a batch of delegations.",
+      name: "delegate_batch",
+      description: `Delegate several subtasks at once. Pass a "tasks" array; when it holds 2+ tasks they are bound to one auto-created group, so their results are reported back to you together when the whole batch finishes — one handoff instead of one interruption per task. Use this whenever you have multiple parallel delegations. Returns one result per task in input order; a task that fails to start carries an "error" field and does not abort the rest. Legacy-style only: it does not support MCP task execution — use delegate_request for a single native task handle.`,
       inputSchema: exports_external.object({
-        groupId: exports_external.string().min(1)
+        title: exports_external.string().min(1).optional(),
+        tasks: exports_external.array(exports_external.object({
+          targetAgent: exports_external.string().min(1),
+          task: exports_external.string().min(1),
+          workingDirectory: exports_external.string().min(1).optional(),
+          role: exports_external.string().min(1).optional()
+        }).strict()).min(1)
       }).strict(),
       handler: async (args) => await asToolResult(async () => {
-        const summary = await transport.getGroup({
+        const { title, tasks } = args;
+        const groupId = tasks.length >= 2 ? (await transport.createGroup({
           coordinatorSession,
-          groupId: args.groupId
-        });
-        return createSuccessResult(summary ? renderGroupSummary(summary) : "Group not found.", { group: summary });
-      })
-    },
-    {
-      name: "group_list",
-      description: "List task groups under the current coordinator. Use to recover groupIds for an earlier batch.",
-      inputSchema: exports_external.object({
-        status: groupStatusSchema.optional(),
-        stuck: exports_external.boolean().optional(),
-        sort: sortSchema.optional(),
-        order: orderSchema.optional()
-      }).strict(),
-      handler: async (args) => await asToolResult(async () => {
-        const { status, stuck, sort, order } = args;
-        const summaries = await transport.listGroups({
-          coordinatorSession,
-          ...status !== undefined ? { status } : {},
-          ...stuck !== undefined ? { stuck } : {},
-          ...sort !== undefined ? { sort } : {},
-          ...order !== undefined ? { order } : {}
-        });
-        return createSuccessResult(renderGroupList(summaries), { groups: summaries });
-      })
-    },
-    {
-      name: "group_cancel",
-      description: "Cancel all unfinished tasks in a task group under the current coordinator. Use to abort a batch started via group_new + delegate_request.",
-      inputSchema: exports_external.object({
-        groupId: exports_external.string().min(1)
-      }).strict(),
-      handler: async (args) => await asToolResult(async () => {
-        const result = await transport.cancelGroup({
-          coordinatorSession,
-          groupId: args.groupId
-        });
-        return createSuccessResult(renderGroupCancelSuccess(result), result);
+          title: title ?? `Batch delegation (${tasks.length} tasks)`
+        })).groupId : undefined;
+        const results = [];
+        for (const [index, entry] of tasks.entries()) {
+          try {
+            const result = await transport.delegateRequest({
+              coordinatorSession,
+              ...sourceHandle ? { sourceHandle } : {},
+              targetAgent: entry.targetAgent,
+              task: entry.task,
+              ...entry.workingDirectory ? { workingDirectory: entry.workingDirectory } : {},
+              ...entry.role ? { role: entry.role } : {},
+              ...groupId ? { groupId } : {}
+            });
+            results.push({ index, taskId: result.taskId, status: result.status });
+          } catch (error2) {
+            results.push({ index, error: formatToolError(error2) });
+          }
+        }
+        return createSuccessResult(renderDelegateBatchSuccess(groupId, results), { ...groupId ? { groupId } : {}, tasks: results });
       })
     },
     {
@@ -39531,7 +39293,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_approve",
-      description: "Approve a pending task under the current coordinator. Use when delegate_request returned status=needs_confirmation and the user has authorized it; after approval, use task_get/task_list for snapshots or task_wait only if intentionally blocking.",
+      description: "Approve a task that delegate_request returned as needs_confirmation, once the user has authorized it. The task then starts running.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -39543,23 +39305,9 @@ function buildWeacpxMcpToolRegistry(input) {
         return createSuccessResult(renderTaskApprovalSuccess(task), task);
       })
     },
-    {
-      name: "task_reject",
-      description: "Reject a pending task under the current coordinator. Use when delegate_request returned status=needs_confirmation and the user declined; no task_wait is needed afterwards.",
-      inputSchema: exports_external.object({
-        taskId: exports_external.string().min(1)
-      }).strict(),
-      handler: async (args) => await asToolResult(async () => {
-        const task = await transport.rejectTask({
-          coordinatorSession,
-          taskId: args.taskId
-        });
-        return createSuccessResult(renderTaskRejectionSuccess(task), task);
-      })
-    },
     {
       name: "task_cancel",
-      description: "Request cancellation for a task under the current coordinator. Use to abort a running delegation; the task transitions to a terminal state shortly after.",
+      description: "Cancel a task under the current coordinator. Works in any non-terminal state: a running delegation is aborted, and a task still waiting for approval (needs_confirmation) is rejected. The task transitions to a terminal state shortly after.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -39571,25 +39319,9 @@ function buildWeacpxMcpToolRegistry(input) {
         return createSuccessResult(renderTaskCancelRequest(task), task);
       })
     },
-    {
-      name: "task_wait",
-      description: `Wait for a task to finish or require attention. This is a blocking legacy compatibility tool; do not call it automatically after delegate_request when the user only asked to start/delegate work. Use task_get/task_list for non-blocking progress snapshots; call task_wait when the user explicitly asks to wait, or when your next step truly depends on completion. Returns status=terminal (done; call task_get for the result), status=attention_required (call task_get first to read the task's current status, then branch: needs_confirmation -> task_approve or task_reject; blocked or waiting_for_human -> coordinator_answer_question; reviewPending set -> coordinator_review_contested_result; after resolving, use task_get/task_list snapshots or task_wait only if intentionally blocking), or status=timeout (still running; use task_get for a snapshot, or task_wait only if intentionally blocking). 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(),
-        pollIntervalMs: exports_external.number().int().min(1).max(MAX_TASK_WAIT_POLL_INTERVAL_MS).optional()
-      }).strict(),
-      handler: async (args) => await asToolResult(async () => {
-        const result = await transport.waitTask({
-          coordinatorSession,
-          ...args
-        });
-        return createSuccessResult(renderTaskWaitResult(result), result);
-      })
-    },
     {
       name: "task_watch",
-      description: `Long-poll a task for the next event, attention-required state, or terminal state. This is the recommended legacy way to watch a delegated task without repeatedly calling task_wait. For MCP-task-capable clients, request task execution for this tool to create a background watcher: the call returns a native task handle immediately, and tasks/result returns when the watch condition is met. The native watcher is single-shot: it runs one watch cycle then terminates, so to keep watching start another task_watch with afterSeq set to the returned nextAfterSeq. Defaults: timeout ${DEFAULT_TASK_WATCH_TIMEOUT_MS} ms, poll interval ${DEFAULT_TASK_WATCH_POLL_INTERVAL_MS} ms. Maximums: timeout ${MAX_TASK_WATCH_TIMEOUT_MS} ms, poll interval ${MAX_TASK_WATCH_POLL_INTERVAL_MS} ms.`,
+      description: `Long-poll a task for the next event, attention-required state, or terminal state. For MCP-task-capable clients, request task execution for this tool to create a background watcher: the call returns a native task handle immediately, and tasks/result returns when the watch condition is met. The native watcher is single-shot: it runs one watch cycle then terminates, so to keep watching start another task_watch with afterSeq set to the returned nextAfterSeq. Defaults: timeout ${DEFAULT_TASK_WATCH_TIMEOUT_MS} ms, poll interval ${DEFAULT_TASK_WATCH_POLL_INTERVAL_MS} ms. Maximums: timeout ${MAX_TASK_WATCH_TIMEOUT_MS} ms, poll interval ${MAX_TASK_WATCH_POLL_INTERVAL_MS} ms.`,
       execution: { taskSupport: "optional" },
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
@@ -39609,7 +39341,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "worker_raise_question",
-      description: "Raise a blocker question for the current bound worker session. Worker-side only: call this from inside a delegated task when you are blocked and need the coordinator's input. Coordinators waiting on a delegation should not call this; use task_get/task_list for snapshots, or task_wait only if intentionally blocking.",
+      description: "Raise a blocker question for the current bound worker session. Worker-side only: call this from inside a delegated task when you are blocked and need the coordinator's input.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         question: exports_external.string().min(1),
@@ -39629,7 +39361,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "coordinator_answer_question",
-      description: "Answer a blocked worker question under the current coordinator. Use when task_get shows a pending question; after answering, use task_get/task_list for snapshots or task_wait only if intentionally blocking for the worker to finish.",
+      description: "Answer a blocked worker question under the current coordinator. Use when task_get shows a pending question.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         questionId: exports_external.string().min(1),
@@ -39659,23 +39391,6 @@ function buildWeacpxMcpToolRegistry(input) {
         return createSuccessResult(renderCoordinatorRequestHumanInputSuccess(result), result);
       })
     },
-    {
-      name: "coordinator_follow_up_human_package",
-      description: "Append a follow-up message to the active human question package under the current coordinator. Use to clarify or add context to an in-flight package created via coordinator_request_human_input.",
-      inputSchema: exports_external.object({
-        packageId: exports_external.string().min(1),
-        priorMessageId: exports_external.string().min(1),
-        taskQuestions: exports_external.array(taskQuestionSchema).min(1),
-        promptText: exports_external.string().min(1)
-      }).strict(),
-      handler: async (args) => await asToolResult(async () => {
-        const result = await transport.coordinatorFollowUpHumanPackage({
-          coordinatorSession,
-          ...args
-        });
-        return createSuccessResult(renderCoordinatorFollowUpHumanPackageSuccess(result), result);
-      })
-    },
     {
       name: "coordinator_review_contested_result",
       description: "Review a contested result under the current coordinator. Use when a worker's result has been challenged and the coordinator must decide accept or discard.",
@@ -39697,8 +39412,7 @@ function buildWeacpxMcpToolRegistry(input) {
   ];
   if (isExternalCoordinator) {
     const externalCoordinatorIncompatibleTools = new Set([
-      "coordinator_request_human_input",
-      "coordinator_follow_up_human_package"
+      "coordinator_request_human_input"
     ]);
     return tools.filter((tool) => !externalCoordinatorIncompatibleTools.has(tool.name));
   }
@@ -39723,37 +39437,6 @@ async function asToolResult(action) {
     return createErrorResult(formatToolError(error2));
   }
 }
-function renderTaskWaitResult(result) {
-  if (result.status === "not_found") {
-    return "Task not found.";
-  }
-  if (!result.task) {
-    return `Task wait ${result.status.replace("_", " ")}; current state is unavailable.`;
-  }
-  if (result.status === "timeout") {
-    return [
-      `Task ${result.task.taskId} wait timed out; current state is ${result.task.status}.`,
-      `Next: call task_get for a snapshot, or call task_wait again only if you intentionally want to keep blocking.`
-    ].join(`
-`);
-  }
-  if (result.status === "attention_required") {
-    return [
-      `Task ${result.task.taskId} requires attention; current state is ${result.task.status}.`,
-      `Next: call task_get to read the task's current status and any reviewPending / openQuestion fields, then branch by what you see:`,
-      `  - status=needs_confirmation -> task_approve or task_reject`,
-      `  - status=blocked or waiting_for_human -> coordinator_answer_question`,
-      `  - reviewPending set -> coordinator_review_contested_result`,
-      `After resolving, use task_get/task_list for snapshots, or call task_wait again only if you intentionally want to keep blocking.`
-    ].join(`
-`);
-  }
-  return [
-    `Task ${result.task.taskId} reached terminal state ${result.task.status}.`,
-    `Next: call task_get to read the worker's final result before reporting back to the user.`
-  ].join(`
-`);
-}
 function renderTaskWatchResult(result) {
   if (result.status === "not_found" || !result.task) {
     return "Task not found.";
@@ -39787,72 +39470,16 @@ function createErrorResult(message) {
   };
 }
 function renderDelegateSuccess(result) {
-  const next = result.status === "needs_confirmation" ? `Next: this delegation requires user approval; do not call task_wait yet. Tell the user, then call task_approve or task_reject based on their response.` : `Next: task "${result.taskId}" is running. Return this taskId to the user, or call task_get/task_list for non-blocking progress snapshots (or task_watch to long-poll for the next event). Call task_wait only if the user explicitly asks you to wait/block until completion.`;
+  const next = result.status === "needs_confirmation" ? `Next: this delegation requires user approval. Tell the user, then call task_approve or task_cancel based on their response.` : `Next: task "${result.taskId}" is running. Return this taskId to the user, call task_get/task_list for non-blocking progress snapshots, or task_watch to long-poll for the next event or terminal state.`;
   return [`Delegation task "${result.taskId}" created.`, `- Status: ${result.status}`, next].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 renderDelegateBatchSuccess(groupId, results) {
+  const lines = results.map((entry) => entry.error ? `  - #${entry.index}: failed to start — ${entry.error}` : `  - #${entry.index}: task "${entry.taskId}" (${entry.status})`);
+  const started = results.filter((entry) => entry.taskId).length;
+  const header = groupId ? `Batch delegation created group "${groupId}" with ${started}/${results.length} tasks started.` : `Delegation: ${started}/${results.length} task started.`;
+  const next = started > 0 ? "Next: track the started tasks with task_get/task_list, or task_watch to long-poll. The group reports all results back together once every task is terminal." : "Next: every task failed to start — fix the errors above and retry.";
+  return [header, "- Tasks:", ...lines, next].join(`
 `);
 }
 function renderTaskList(tasks) {
@@ -39923,7 +39550,9 @@ function renderTaskSummary(task) {
     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(`
+  const isTerminal2 = task.status === "completed" || task.status === "failed" || task.status === "cancelled";
+  const next = isTerminal2 ? ["Next: summarize this result for the user."] : [];
+  return [...header, ...timeline, ...next].join(`
 `);
 }
 function renderTaskCancelRequest(task) {
@@ -39938,14 +39567,10 @@ function renderTaskApprovalSuccess(task) {
   return [
     `Task "${task.taskId}" approved.`,
     `- Current status: ${task.status}`,
-    `Next: use task_get/task_list for non-blocking progress snapshots, or call task_wait only if you intentionally want to block until the worker finishes; then task_get to read the final result.`
+    `Next: use task_get/task_list for non-blocking progress snapshots, or task_watch to long-poll until the worker finishes; then task_get to read the final result.`
   ].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(`
 `);
@@ -39959,10 +39584,6 @@ function renderCoordinatorRequestHumanInputSuccess(result) {
 `) : [`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(`
@@ -39980,7 +39601,7 @@ function formatToolError(error2) {
 
 // src/orchestration/orchestration-client.ts
 init_orchestration_ipc();
-init_task_wait_timeouts();
+init_task_watch_timeouts();
 import { randomUUID } from "node:crypto";
 import { createConnection } from "node:net";
 
@@ -40005,18 +39626,12 @@ class OrchestrationClient {
   async listTasks(filter) {
     return await this.request("task.list", { filter });
   }
-  async waitTask(input) {
-    return await this.request("task.wait", input, getWaitRequestTimeoutMs(input.timeoutMs, this.timeoutMs));
-  }
   async watchTask(input) {
     return await this.request("task.watch", input, getWatchRequestTimeoutMs(input.timeoutMs, this.timeoutMs));
   }
   async approveTask(input) {
     return await this.request("task.approve", input);
   }
-  async rejectTask(input) {
-    return await this.request("task.reject", input);
-  }
   async cancelTask(input) {
     return await this.request("task.cancel", input);
   }
@@ -40038,24 +39653,12 @@ class OrchestrationClient {
   async coordinatorRequestHumanInput(input) {
     return await this.request("coordinator.request_human_input", input);
   }
-  async coordinatorFollowUpHumanPackage(input) {
-    return await this.request("coordinator.follow_up_human_package", input);
-  }
   async coordinatorReviewContestedResult(input) {
     return await this.request("coordinator.review_contested_result", input);
   }
   async createGroup(input) {
     return await this.request("group.new", input);
   }
-  async getGroup(input) {
-    return await this.request("group.get", input);
-  }
-  async listGroups(input) {
-    return await this.request("group.list", input);
-  }
-  async cancelGroup(input) {
-    return await this.request("group.cancel", input);
-  }
   async request(method, params, timeoutMs = this.timeoutMs) {
     const id = this.createId();
     return await new Promise((resolve, reject) => {
@@ -40122,11 +39725,6 @@ class OrchestrationClient {
     });
   }
 }
-function getWaitRequestTimeoutMs(waitTimeoutMs, defaultTimeoutMs) {
-  const requestedWaitTimeoutMs = waitTimeoutMs === undefined ? undefined : Number.isFinite(waitTimeoutMs) ? waitTimeoutMs : 0;
-  const boundedWaitTimeoutMs = Math.min(Math.max(Math.floor(requestedWaitTimeoutMs ?? DEFAULT_TASK_WAIT_TIMEOUT_MS), 0), MAX_TASK_WAIT_TIMEOUT_MS);
-  return Math.max(defaultTimeoutMs, boundedWaitTimeoutMs + TASK_WAIT_RPC_TIMEOUT_PADDING_MS);
-}
 function getWatchRequestTimeoutMs(watchTimeoutMs, defaultTimeoutMs) {
   const requestedWatchTimeoutMs = watchTimeoutMs === undefined ? undefined : Number.isFinite(watchTimeoutMs) ? watchTimeoutMs : 0;
   const boundedWatchTimeoutMs = Math.min(Math.max(Math.floor(requestedWatchTimeoutMs ?? DEFAULT_TASK_WATCH_TIMEOUT_MS), 0), MAX_TASK_WATCH_TIMEOUT_MS);
@@ -40146,9 +39744,6 @@ function createOrchestrationTransport(endpoint, deps = {}) {
       ...input.groupId !== undefined ? { groupId: input.groupId } : {}
     }),
     createGroup: async (input) => await client.createGroup(input),
-    getGroup: async (input) => await client.getGroup(input),
-    listGroups: async (input) => await client.listGroups(input),
-    cancelGroup: async (input) => await client.cancelGroup(input),
     getTask: async (input) => await client.getTaskForCoordinator(input),
     listTasks: async (input) => await client.listTasks({
       coordinatorSession: input.coordinatorSession,
@@ -40158,9 +39753,7 @@ function createOrchestrationTransport(endpoint, deps = {}) {
       ...input.order !== undefined ? { order: input.order } : {}
     }),
     approveTask: async (input) => await client.approveTask(input),
-    rejectTask: async (input) => await client.rejectTask(input),
     cancelTask: async (input) => await client.cancelTaskForCoordinator(input),
-    waitTask: async (input) => await client.waitTask(input),
     watchTask: async (input) => await client.watchTask(input),
     workerRaiseQuestion: async (input) => {
       const sourceHandle = input.sourceHandle.trim();
@@ -40177,7 +39770,6 @@ function createOrchestrationTransport(endpoint, deps = {}) {
     },
     coordinatorAnswerQuestion: async (input) => await client.coordinatorAnswerQuestion(input),
     coordinatorRequestHumanInput: async (input) => await client.coordinatorRequestHumanInput(input),
-    coordinatorFollowUpHumanPackage: async (input) => await client.coordinatorFollowUpHumanPackage(input),
     coordinatorReviewContestedResult: async (input) => await client.coordinatorReviewContestedResult(input)
   };
 }
@@ -40189,32 +39781,12 @@ var WATCH_TASKS_CACHE_LIMIT = 256;
 var WEACPX_MCP_SERVER_INSTRUCTIONS = [
   "Use these tools to orchestrate work across other agents under your coordinator session.",
   "",
-  "Typical lifecycle for a single delegation:",
-  "Preferred MCP Tasks lifecycle (for clients that support task-augmented tools/call):",
-  "1. Call delegate_request with task execution requested. It returns a native MCP task handle immediately.",
-  "2. Use task_watch with MCP task execution to start a background watcher, or use tasks/get / tasks/list to poll status. Use tasks/result after terminal status, or on input_required to receive an actionable next-step package; use tasks/cancel to cancel.",
-  "   - When tasks/result returns input_required, that result stream is complete. Call the recommended tool, then resume polling with tasks/get / tasks/result.",
-  "3. Status mapping: working = running, input_required = needs_confirmation / blocked / waiting_for_human / contested review, completed / failed / cancelled are terminal.",
-  "",
-  "Legacy tool lifecycle for clients without MCP Tasks support:",
-  "1. delegate_request → returns { taskId, status }.",
-  "   - status=running: the worker has started. Return the taskId to the user, use task_get / task_list for non-blocking snapshots, or task_watch to long-poll for the next event; only go to step 2 when you intentionally want to block waiting.",
-  "   - status=needs_confirmation: tell the user, then call task_approve or task_reject based on their response. After task_approve, use task_get/task_list for snapshots or step 2 only if intentionally blocking. Do not call task_wait before approval.",
-  "2. Optional blocking wait: task_wait(taskId) → blocks until the task is done, needs attention, or times out. Do not call it automatically when the user asked to delegate and continue.",
-  "   - status=terminal: go to step 3.",
-  "   - status=attention_required: the task is in needs_confirmation / blocked / waiting_for_human, or has reviewPending set. Call task_get(taskId) to read the actual status and any openQuestion / reviewPending fields, then branch:",
-  "       * needs_confirmation -> task_approve or task_reject (after approval, use snapshots or optional blocking wait only if needed)",
-  "       * blocked or waiting_for_human -> coordinator_answer_question (the answer can come from you or be relayed from a human you consulted)",
-  "       * reviewPending set -> coordinator_review_contested_result with accept or discard",
-  "     After resolving, use task_get / task_list for snapshots, or step 2 only if intentionally blocking.",
-  "   - status=timeout: the task is still running. Use task_get for a snapshot, or call task_wait again only if you still intentionally want to block.",
-  "3. The task is terminal. Call task_get(taskId) to read the worker's final result, then summarize it for the user. Do not invent results that did not come from task_get.",
+  "Delegate with delegate_request (one task) or delegate_batch (several at once). Each returns a taskId and a status.",
+  "Then follow the task: clients that support MCP Tasks should request task execution on delegate_request / task_watch and poll with tasks/get / tasks/list / tasks/result; other clients use task_get / task_list for snapshots or task_watch to long-poll.",
   "",
-  "Batching: use group_new before a wave of delegate_request calls and pass groupId on each, then group_get / group_list / group_cancel to manage the batch.",
-  "Cancellation: task_cancel aborts a single running task; group_cancel aborts the whole batch.",
-  "Discovery: task_list / group_list recover taskIds and groupIds from earlier in the session.",
+  "Most tool results end with a 'Next:' line telling you the concrete next step — follow it when present. In short: status=needs_confirmation needs task_approve or task_cancel; a task that needs attention (blocked / waiting_for_human / a contested review) is resolved with coordinator_answer_question or coordinator_review_contested_result; a terminal task is read with task_get. Never report a result you did not read from task_get.",
   "",
-  "worker_raise_question is worker-side only — call it from inside a delegated task when you are blocked, not from the coordinator that is waiting on a delegation."
+  "worker_raise_question is worker-side only — call it from inside a delegated task when you are blocked, not from the coordinator waiting on a delegation."
 ].join(`
 `);
 function createWeacpxMcpServer(options) {
@@ -40627,7 +40199,7 @@ function renderInputRequiredTaskResult(task) {
 function inputRequiredActions(task) {
   const actions = [];
   if (task.status === "needs_confirmation") {
-    actions.push("task_approve", "task_reject");
+    actions.push("task_approve", "task_cancel");
   }
   if (task.status === "blocked" || task.status === "waiting_for_human" || task.openQuestion) {
     actions.push("coordinator_answer_question");

package/package.json

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