weacpx 0.4.5 → 0.4.8

package/dist/cli.js

@@ -2201,6 +2201,11 @@ function parseConfig(raw, options = {}) {
   if ("nonInteractivePermissions" in transport && transport.nonInteractivePermissions !== "deny" && transport.nonInteractivePermissions !== "fail") {
     throw new Error("transport.nonInteractivePermissions must be deny or fail");
   }
+  if ("permissionPolicy" in transport && transport.permissionPolicy !== undefined) {
+    if (typeof transport.permissionPolicy !== "string" || transport.permissionPolicy.trim().length === 0) {
+      throw new Error("transport.permissionPolicy must be a non-empty string");
+    }
+  }
   if (!isRecord(raw.agents)) {
     throw new Error("agents must be an object");
   }
@@ -2294,6 +2299,7 @@ function parseConfig(raw, options = {}) {
     transport: {
       ...typeof transport.command === "string" ? { command: transport.command } : {},
       ...typeof transport.sessionInitTimeoutMs === "number" ? { sessionInitTimeoutMs: transport.sessionInitTimeoutMs } : {},
+      ...typeof transport.permissionPolicy === "string" ? { permissionPolicy: transport.permissionPolicy } : {},
       type: transportType,
       permissionMode,
       nonInteractivePermissions
@@ -3096,7 +3102,7 @@ var init_orchestration_ipc = () => {};
 // src/daemon/daemon-files.ts
 import { dirname as dirname4, join as join2 } from "node:path";
 function resolveDaemonPaths(options) {
-  const runtimeDir = options.runtimeDir ?? join2(options.home, ".weacpx", "runtime");
+  const runtimeDir = options.runtimeDir ?? (options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : join2(options.home, ".weacpx", "runtime"));
   return {
     runtimeDir,
     pidFile: join2(runtimeDir, "daemon.pid"),
@@ -9617,11 +9623,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;
 });
 
@@ -10046,6 +10050,31 @@ function resolveWeixinStateDir() {
 function resolveAccountIndexPath() {
   return path4.join(resolveWeixinStateDir(), "accounts.json");
 }
+function listAccountFileIds() {
+  const dir = resolveAccountsDir();
+  try {
+    if (!fs3.existsSync(dir))
+      return [];
+    return fs3.readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => ({
+      id: entry.name.slice(0, -5),
+      data: readAccountFile(path4.join(dir, entry.name))
+    })).filter((entry) => entry.id.trim() !== "" && Boolean(entry.data?.token?.trim())).map((entry) => entry.id).sort();
+  } catch {
+    return [];
+  }
+}
+function uniqueAccountIds(ids) {
+  const seen = new Set;
+  const result = [];
+  for (const raw of ids) {
+    const id = raw.trim();
+    if (!id || seen.has(id))
+      continue;
+    seen.add(id);
+    result.push(id);
+  }
+  return result;
+}
 function listIndexedWeixinAccountIds() {
   const filePath = resolveAccountIndexPath();
   try {
@@ -10055,7 +10084,7 @@ function listIndexedWeixinAccountIds() {
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed))
       return [];
-    return parsed.filter((id) => typeof id === "string" && id.trim() !== "");
+    return uniqueAccountIds(parsed.filter((id) => typeof id === "string" && id.trim() !== ""));
   } catch {
     return [];
   }
@@ -10130,7 +10159,10 @@ function clearWeixinAccount(accountId) {
   } catch {}
 }
 function clearAllWeixinAccounts() {
-  const ids = listIndexedWeixinAccountIds();
+  const ids = uniqueAccountIds([
+    ...listIndexedWeixinAccountIds(),
+    ...listAccountFileIds()
+  ]);
   for (const id of ids) {
     clearWeixinAccount(id);
   }
@@ -10171,7 +10203,10 @@ function loadConfigRouteTag(accountId) {
   }
 }
 function listWeixinAccountIds() {
-  return listIndexedWeixinAccountIds();
+  const indexed = listIndexedWeixinAccountIds();
+  if (indexed.length > 0)
+    return indexed;
+  return listAccountFileIds();
 }
 function resolveWeixinAccount(accountId) {
   const raw = accountId?.trim();
@@ -14019,7 +14054,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 +15588,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 [];
@@ -15670,6 +15709,18 @@ function parseCommand(input) {
     return { kind: "workspaces" };
   if (command === "/session" && parts[1] === "reset" && parts.length === 2)
     return { kind: "session.reset" };
+  if (command === "/session" && parts[1] === "tail") {
+    if (parts.length === 2) {
+      return { kind: "session.tail" };
+    }
+    if (parts.length === 3) {
+      const lines = parsePositiveInt(parts[2]);
+      if (lines !== null) {
+        return { kind: "session.tail", lines };
+      }
+    }
+    return { kind: "invalid", text: trimmed, recognizedCommand: "/session" };
+  }
   if (command === "/session" && parts[1] === "rm" && parts[2] && parts.length === 3) {
     return { kind: "session.rm", alias: parts[2] };
   }
@@ -15979,6 +16030,16 @@ function tokenizeCommand(input) {
   }
   return tokens;
 }
+function parsePositiveInt(value) {
+  if (!value)
+    return null;
+  if (!/^\d+$/.test(value))
+    return null;
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed) || parsed <= 0)
+    return null;
+  return parsed;
+}
 function parseListFilterFlags(parts, validStatuses) {
   const filter = {};
   let i = 1;
@@ -16102,6 +16163,7 @@ var init_command_policy = __esm(() => {
     "agents",
     "workspaces",
     "sessions",
+    "session.tail",
     "status",
     "mode.show",
     "replymode.show",
@@ -16118,6 +16180,7 @@ var init_command_policy = __esm(() => {
   COMMAND_KIND_TO_LABEL = {
     "session.reset": "/clear",
     "session.rm": "/session rm",
+    "session.tail": "/session tail",
     "replymode.set": "/replymode",
     "replymode.reset": "/replymode reset",
     "mode.set": "/mode",
@@ -16254,7 +16317,7 @@ async function handleConfigSet(context, path13, rawValue) {
     return { text: result.error };
   }
   await context.configStore.save(updated);
-  if (path13 === "transport.permissionMode" || path13 === "transport.nonInteractivePermissions") {
+  if (path13 === "transport.permissionMode" || path13 === "transport.nonInteractivePermissions" || path13 === "transport.permissionPolicy") {
     try {
       await context.transport.updatePermissionPolicy?.(updated.transport);
     } catch (error2) {
@@ -16301,6 +16364,11 @@ function applySupportedConfigUpdate(config2, path13, rawValue) {
       config2.transport.nonInteractivePermissions = parsed;
       return { renderedValue: parsed };
     }
+    case "transport.permissionPolicy":
+      if (!rawValue.trim())
+        return { error: "transport.permissionPolicy 不能为空。" };
+      config2.transport.permissionPolicy = rawValue;
+      return { renderedValue: rawValue };
     case "logging.level": {
       const parsed = parseEnum(rawValue, ["error", "info", "debug"]);
       if (!parsed)
@@ -16410,6 +16478,7 @@ var init_config_handler = __esm(() => {
     "transport.sessionInitTimeoutMs",
     "transport.permissionMode",
     "transport.nonInteractivePermissions",
+    "transport.permissionPolicy",
     "logging.level",
     "logging.maxSizeBytes",
     "logging.maxFiles",
@@ -16964,6 +17033,15 @@ async function handleCancel(context, chatKey) {
 async function handleSessionReset(context, chatKey) {
   return await context.lifecycle.resetCurrentSession(chatKey);
 }
+async function handleSessionTail(context, chatKey, lines) {
+  const session = await context.sessions.getCurrentSession(chatKey);
+  if (!session) {
+    return { text: NO_CURRENT_SESSION_TEXT };
+  }
+  const resolvedLines = Math.min(Math.max(lines ?? DEFAULT_SESSION_TAIL_LINES, 1), MAX_SESSION_TAIL_LINES);
+  const result = await context.transport.tailSessionHistory(session, resolvedLines);
+  return { text: result.text };
+}
 async function handleSessionRemove(context, chatKey, alias) {
   const internalAlias = await context.sessions.resolveAliasForChat(chatKey, alias);
   const session = await context.sessions.getSession(internalAlias);
@@ -17034,7 +17112,7 @@ async function handleSessionRemove(context, chatKey, alias) {
   return { text: lines.join(`
 `) };
 }
-async function promptWithSession(context, session, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, perfSpan) {
+async function promptWithSession(context, session, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan) {
   const effectiveReplyMode = session.replyMode ?? context.config?.channel.replyMode ?? "verbose";
   if (!session.replyMode)
     session.replyMode = effectiveReplyMode;
@@ -17059,7 +17137,7 @@ async function promptWithSession(context, session, chatKey, text, reply, replyCo
   const { promptText, taskIds, groupIds, claimHumanReply } = await preparePromptWithFallback(context, session, chatKey, text, replyContextToken, accountId);
   try {
     const replyContext = transportReply && context.quota && getChannelIdFromChatKey(chatKey) === "weixin" ? { chatKey, quota: context.quota } : undefined;
-    const result = await context.interaction.promptTransportSession(session, promptText, transportReply, replyContext, media, abortSignal, onToolEvent, perfSpan);
+    const result = await context.interaction.promptTransportSession(session, promptText, transportReply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpan);
     if (claimHumanReply) {
       try {
         await context.orchestration?.claimActiveHumanReply?.(claimHumanReply);
@@ -17079,17 +17157,17 @@ async function promptWithSession(context, session, chatKey, text, reply, replyCo
     throw error2;
   }
 }
-async function handlePrompt(context, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, perfSpan) {
+async function handlePrompt(context, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan) {
   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, onToolEvent, perfSpan);
+    return await promptWithSession(context, session, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan);
   } catch (error2) {
     const recovered = await context.recovery.tryRecoverMissingSession(session, error2);
     if (recovered) {
-      return await promptWithSession(context, recovered, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, perfSpan);
+      return await promptWithSession(context, recovered, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan);
     }
     return context.recovery.renderTransportError(session, error2);
   }
@@ -17156,7 +17234,7 @@ async function markCoordinatorResultsInjectionFailed(context, taskIds, groupIds,
     });
   }
 }
-var NO_CURRENT_SESSION_TEXT = "当前还没有选中的会话。请先执行 /session new ... 或 /use <alias>。", sessionHelp, modeHelp, replyModeHelp, statusHelp, cancelHelp;
+var NO_CURRENT_SESSION_TEXT = "当前还没有选中的会话。请先执行 /session new ... 或 /use <alias>。", DEFAULT_SESSION_TAIL_LINES = 50, MAX_SESSION_TAIL_LINES = 500, sessionHelp, modeHelp, replyModeHelp, statusHelp, cancelHelp;
 var init_session_handler = __esm(() => {
   init_build_coordinator_prompt();
   init_channel_scope();
@@ -17171,6 +17249,7 @@ var init_session_handler = __esm(() => {
       { usage: "/ss new <agent> (-d <path> | --ws <name>)", description: "强制新建会话" },
       { usage: "/ss new <alias> -a <name> --ws <name>", description: "按指定配置新建会话" },
       { usage: "/ss attach <alias> -a <name> --ws <name> --name <transport-session>", description: "绑定已有会话" },
+      { usage: "/session tail [N]", description: "补拉当前会话的历史输出（默认 50 行）" },
       { usage: "/session rm <alias>", description: "删除逻辑会话" },
       { usage: "/use <alias>", description: "切换当前会话" },
       { usage: "/session reset 或 /clear", description: "重置当前会话上下文" }
@@ -17243,18 +17322,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 +17365,7 @@ function renderGroupSummary2(summary) {
   return lines.join(`
 `);
 }
-function renderGroupCancelSuccess2(input) {
+function renderGroupCancelSuccess(input) {
   return [
     `任务组「${input.summary.group.groupId}」已发起取消`,
     `- 已请求取消：${input.cancelledTaskIds.length}`,
@@ -17369,7 +17448,7 @@ function renderTaskApprovalSuccess2(task) {
   return [`已批准任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
 `);
 }
-function renderTaskRejectionSuccess2(task) {
+function renderTaskRejectSuccess(task) {
   return [`已拒绝任务「${task.taskId}」。`, `- 当前状态：${task.status}`].join(`
 `);
 }
@@ -17403,7 +17482,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 +17543,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 +17558,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 +17576,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 +17598,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 +17686,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);
@@ -18593,7 +18672,7 @@ class CommandRouter {
     this.quota = quota;
     this.logger = logger2 ?? createNoopAppLogger();
   }
-  async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal, onToolEvent, perfSpan) {
+  async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal, onToolEvent, onThought, perfSpan) {
     const startedAt = Date.now();
     const command = parseCommand(input);
     await this.logger.debug("command.parsed", "parsed inbound command", {
@@ -18683,6 +18762,8 @@ class CommandRouter {
           return await handleCancel(this.createSessionHandlerContext(undefined, perfSpan), chatKey);
         case "session.reset":
           return await handleSessionReset(this.createSessionHandlerContext(reply, perfSpan), chatKey);
+        case "session.tail":
+          return await handleSessionTail(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command.lines);
         case "session.rm":
           return await handleSessionRemove(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command.alias);
         case "groups":
@@ -18710,7 +18791,7 @@ class CommandRouter {
         case "task.cancel":
           return await handleTaskCancel(this.createHandlerContext(), chatKey, command.taskId);
         case "prompt":
-          return await handlePrompt(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, perfSpan);
+          return await handlePrompt(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan);
       }
     });
   }
@@ -18763,7 +18844,7 @@ class CommandRouter {
     return {
       setModeTransportSession: (session, modeId) => this.setModeTransportSession(session, modeId),
       cancelTransportSession: (session) => this.cancelTransportSession(session),
-      promptTransportSession: (session, text, reply, replyContext, media, abortSignal, onToolEvent, perfSpanOverride) => this.promptTransportSession(session, text, reply, replyContext, media, abortSignal, onToolEvent, perfSpanOverride ?? perfSpan)
+      promptTransportSession: (session, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpanOverride) => this.promptTransportSession(session, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpanOverride ?? perfSpan)
     };
   }
   createSessionRenderRecoveryOps() {
@@ -18941,7 +19022,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, onToolEvent, perfSpan) {
+  async promptTransportSession(session, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpan) {
     session.mcpCoordinatorSession ??= session.transportSession;
     let done = false;
     let abortRequested = false;
@@ -18997,7 +19078,8 @@ class CommandRouter {
       return await this.measureTransportCall("prompt", session, () => this.transport.prompt(session, text, reply, replyContext, {
         ...media ? { media } : {},
         ...reply ? { onSegment } : {},
-        ...onToolEvent ? { onToolEvent } : {}
+        ...onToolEvent ? { onToolEvent } : {},
+        ...onThought ? { onThought } : {}
       }));
     } catch (error2) {
       localOutcome = isAbortError2(error2) || abortRequested ? "aborted" : "error";
@@ -19163,7 +19245,7 @@ class ConsoleAgent {
       ...m.fileName ? { fileName: m.fileName } : {}
     })) : undefined;
     request.perfSpan?.mark("agent.dispatched");
-    return await this.router.handle(request.conversationId, request.text, request.reply, request.replyContextToken, request.accountId, promptMedia, request.metadata, request.abortSignal, request.onToolEvent, request.perfSpan);
+    return await this.router.handle(request.conversationId, request.text, request.reply, request.replyContextToken, request.accountId, promptMedia, request.metadata, request.abortSignal, request.onToolEvent, request.onThought, request.perfSpan);
   }
   isKnownCommand(text) {
     return isKnownWeacpxCommandText(text);
@@ -19309,8 +19391,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 +19399,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 +19431,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 +19445,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 +19539,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 +19566,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 +19776,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 +19784,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 +19970,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 +20608,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 +21026,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 +21665,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 +21889,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 +22832,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 +22841,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
@@ -23545,6 +23413,10 @@ function encodeBridgePromptToolEvent(event) {
   return `${JSON.stringify(event)}
 `;
 }
+function encodeBridgePromptThoughtEvent(event) {
+  return `${JSON.stringify(event)}
+`;
+}
 function encodeBridgeSessionProgressEvent(event) {
   return `${JSON.stringify(event)}
 `;
@@ -23617,6 +23489,11 @@ class AcpxBridgeClient {
           type: "prompt.tool_event",
           event: message.toolEvent
         });
+      } else if (message.event === "prompt.thought") {
+        pending.onEvent?.({
+          type: "prompt.thought",
+          text: message.text
+        });
       } else if (message.event === "session.progress") {
         pending.onEvent?.({
           type: "session.progress",
@@ -23966,6 +23843,12 @@ class AcpxBridgeTransport {
       }
     } : undefined);
   }
+  async tailSessionHistory(session, lines) {
+    return await this.client.request("tailSessionHistory", {
+      ...this.toParams(session),
+      lines
+    });
+  }
   async prompt(session, text, reply, replyContext, options) {
     const sink = reply ? createQuotaGatedReplySink({
       reply,
@@ -23975,6 +23858,8 @@ class AcpxBridgeTransport {
     let segmentChain = Promise.resolve();
     let toolEventError;
     let toolEventChain = Promise.resolve();
+    let thoughtError;
+    let thoughtChain = Promise.resolve();
     let toolEventMode = resolveToolEventMode(options);
     if ((toolEventMode === "structured" || toolEventMode === "both") && !options?.onToolEvent) {
       toolEventMode = "text";
@@ -24007,9 +23892,20 @@ class AcpxBridgeTransport {
         }
         return;
       }
+      if (event.type === "prompt.thought") {
+        const onThought = options?.onThought;
+        if (onThought) {
+          const thoughtText = event.text;
+          thoughtChain = thoughtChain.then(() => onThought(thoughtText)).catch((error2) => {
+            thoughtError ??= error2;
+          });
+        }
+        return;
+      }
     });
     await segmentChain;
     await toolEventChain;
+    await thoughtChain;
     if (sink) {
       const { overflowCount } = sink.finalize();
       await sink.drain({ timeoutMs: 30000 });
@@ -24024,6 +23920,9 @@ class AcpxBridgeTransport {
       if (toolEventError) {
         throw toolEventError;
       }
+      if (thoughtError) {
+        throw thoughtError;
+      }
       return { text: summary ? `${summary}
 
 ${result.text}` : "" };
@@ -24034,6 +23933,9 @@ ${result.text}` : "" };
     if (toolEventError) {
       throw toolEventError;
     }
+    if (thoughtError) {
+      throw thoughtError;
+    }
     return result;
   }
   async setMode(session, modeId) {
@@ -24238,6 +24140,7 @@ var init_tool_kind_emoji = __esm(() => {
 function createStreamingPromptState(formatToolCalls = false, options) {
   let toolEventMode;
   let onToolEvent;
+  let onThought;
   if (options === undefined) {
     toolEventMode = "text";
     onToolEvent = undefined;
@@ -24246,6 +24149,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     toolEventMode = "structured";
   } else {
     onToolEvent = options.onToolEvent;
+    onThought = options.onThought;
     toolEventMode = resolveToolEventMode({
       toolEventMode: options.mode,
       onToolEvent
@@ -24260,6 +24164,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     emittedToolCallIds: new Set,
     toolEventMode,
     onToolEvent,
+    onThought,
     finalize() {
       if (this.pendingLine.trim().length > 0) {
         parseStreamingChunks(this, this.pendingLine);
@@ -24318,6 +24223,14 @@ function parseStreamingChunks(state, line) {
     }
     return;
   }
+  const isThoughtChunk = update.sessionUpdate === "agent_thought_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
+  if (isThoughtChunk) {
+    const chunk2 = update.content.text;
+    if (chunk2.length > 0) {
+      state.onThought?.(chunk2);
+    }
+    return;
+  }
   const isMessageChunk = update.sessionUpdate === "agent_message_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
   if (!isMessageChunk)
     return;
@@ -24345,7 +24258,7 @@ function formatToolCallEvent(update, sessionUpdate) {
   if (title.length === 0)
     return null;
   const emoji2 = TOOL_KIND_EMOJI[kind] ?? DEFAULT_TOOL_EMOJI;
-  const inputSummary = summarizeToolInput(update.rawInput, title);
+  const inputSummary = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
   const status = readString(update, "status");
   if (!inputSummary && status === "pending")
     return null;
@@ -24376,15 +24289,23 @@ function buildToolUseEvent(update) {
   })();
   const title = (update.title ?? "").trim();
   const toolName = title || "Tool";
-  const summaryRaw = summarizeToolInput(update.rawInput, title);
+  const summaryRaw = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, 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";
+  const rawInput = update.rawInput;
+  const content = update.content;
+  const rawOutput = update.rawOutput;
+  const locations = update.locations;
   return {
     toolCallId,
     toolName,
     kind,
     ...summary ? { summary } : {},
+    ...rawInput !== undefined ? { rawInput } : {},
+    ...content !== undefined ? { content } : {},
+    ...rawOutput !== undefined ? { rawOutput } : {},
+    ...locations !== undefined ? { locations } : {},
     status
   };
 }
@@ -24545,6 +24466,8 @@ function buildQueueOwnerPayload(input) {
     nonInteractivePermissions: input.nonInteractivePermissions,
     ttlMs: input.ttlMs ?? 300000,
     maxQueueDepth: input.maxQueueDepth ?? 16,
+    ...Number.isFinite(input.promptRetries) ? { promptRetries: input.promptRetries } : {},
+    ...input.sessionOptions ? { sessionOptions: input.sessionOptions } : {},
     mcpServers: input.mcpServers
   };
 }
@@ -24797,6 +24720,7 @@ class AcpxCliTransport {
   sessionInitTimeoutMs;
   permissionMode;
   nonInteractivePermissions;
+  permissionPolicy;
   runCommand;
   runPtyCommand;
   queueOwnerLauncher;
@@ -24806,6 +24730,7 @@ class AcpxCliTransport {
     this.sessionInitTimeoutMs = options.sessionInitTimeoutMs ?? 120000;
     this.permissionMode = options.permissionMode ?? "approve-all";
     this.nonInteractivePermissions = options.nonInteractivePermissions ?? "deny";
+    this.permissionPolicy = options.permissionPolicy;
     this.runCommand = runCommand;
     this.runPtyCommand = runPtyCommand;
     this.queueOwnerLauncher = queueOwnerLauncher ?? new AcpxQueueOwnerLauncher({
@@ -24825,18 +24750,38 @@ class AcpxCliTransport {
       timeoutMs: this.sessionInitTimeoutMs
     });
   }
+  async tailSessionHistory(session, lines) {
+    const candidates = [
+      ["sessions", "history", "quiet", "-s", session.transportSession, String(lines)],
+      ["sessions", "history", "quiet", session.transportSession, String(lines)],
+      ["sessions", "history", "-s", session.transportSession, "--tail", String(lines)],
+      ["sessions", "history", session.transportSession, "--tail", String(lines)],
+      ["sessions", "history", "--name", session.transportSession, "--tail", String(lines)]
+    ];
+    let lastResult;
+    for (const tail2 of candidates) {
+      const args = this.buildArgs(session, tail2);
+      const result = await this.runCommandWithTimeout(this.runCommand, args);
+      if (result.code === 0) {
+        return { text: result.stdout.trimEnd() };
+      }
+      lastResult = result;
+    }
+    const detail = lastResult ? normalizeCommandError(lastResult) ?? `command failed with exit code ${lastResult.code}` : "command failed";
+    throw new Error(detail);
+  }
   async prompt(session, text, reply, replyContext, options) {
     await this.launchMcpQueueOwnerIfNeeded(session);
     const structuredPrompt = await createStructuredPromptFile(text, options?.media);
     const args = this.buildPromptArgs(session, text, structuredPrompt?.filePath);
     try {
-      if (reply || options?.onSegment || options?.onToolEvent) {
+      if (reply || options?.onSegment || options?.onToolEvent || options?.onThought) {
         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 { result: result2, overflowCount } = await this.runStreamingPrompt(this.command, args, reply, formatToolCalls, toolEventMode, replyContext, options?.onSegment, options?.onToolEvent, options?.onThought);
         const baseText = getPromptText(result2);
         if (!reply) {
           return { text: baseText };
@@ -24876,6 +24821,7 @@ ${baseText}` : "" };
   async updatePermissionPolicy(policy) {
     this.permissionMode = policy.permissionMode;
     this.nonInteractivePermissions = policy.nonInteractivePermissions;
+    this.permissionPolicy = policy.permissionPolicy;
   }
   async removeSession(session) {
     const result = await this.runCommand(this.command, this.buildArgs(session, [
@@ -24973,7 +24919,7 @@ ${baseText}` : "" };
       })
     ]);
   }
-  async runStreamingPrompt(command, args, reply, formatToolCalls = false, toolEventMode = "text", replyContext, onSegment, onToolEvent) {
+  async runStreamingPrompt(command, args, reply, formatToolCalls = false, toolEventMode = "text", replyContext, onSegment, onToolEvent, onThought) {
     const hooks = this.streamingHooks;
     const doSpawn = hooks.spawnPrompt ?? ((cmd, spawnArgs) => spawn9(cmd, spawnArgs, { stdio: ["ignore", "pipe", "pipe"] }));
     const setIntervalFn = hooks.setIntervalFn ?? ((fn, delay) => setInterval(fn, delay));
@@ -24991,7 +24937,10 @@ ${baseText}` : "" };
       let segmentError;
       let toolEventChain = Promise.resolve();
       let toolEventError;
+      let thoughtChain = Promise.resolve();
+      let thoughtError;
       const userOnToolEvent = onToolEvent;
+      const userOnThought = onThought;
       const state = createStreamingPromptState(formatToolCalls, {
         mode: toolEventMode,
         ...userOnToolEvent ? {
@@ -25000,6 +24949,13 @@ ${baseText}` : "" };
               toolEventError ??= error2;
             });
           }
+        } : {},
+        ...userOnThought ? {
+          onThought: (chunk) => {
+            thoughtChain = thoughtChain.then(() => userOnThought(chunk)).catch((error2) => {
+              thoughtError ??= error2;
+            });
+          }
         } : {}
       });
       const sink = reply ? createQuotaGatedReplySink({
@@ -25052,7 +25008,8 @@ ${baseText}` : "" };
         Promise.all([
           sink?.drain({ timeoutMs: 30000 }) ?? Promise.resolve(),
           segmentChain,
-          toolEventChain
+          toolEventChain,
+          thoughtChain
         ]).then(() => {
           const deferred = sink?.getPendingError();
           if (deferred) {
@@ -25067,6 +25024,10 @@ ${baseText}` : "" };
             reject(toolEventError);
             return;
           }
+          if (thoughtError) {
+            reject(thoughtError);
+            return;
+          }
           resolve3({
             result: { code: code ?? 1, stdout: stdout2, stderr },
             overflowCount
@@ -25107,7 +25068,11 @@ ${baseText}` : "" };
   }
   buildPermissionArgs() {
     const modeFlag = permissionModeToFlag(this.permissionMode);
-    return [modeFlag, "--non-interactive-permissions", this.nonInteractivePermissions];
+    const args = [modeFlag, "--non-interactive-permissions", this.nonInteractivePermissions];
+    if (typeof this.permissionPolicy === "string" && this.permissionPolicy.trim().length > 0) {
+      args.push("--permission-policy", this.permissionPolicy);
+    }
+    return args;
   }
 }
 function isMissingAcpxSessionError(stderr, stdout2) {
@@ -26088,7 +26053,11 @@ import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { homedir as homedir10 } from "node:os";
 async function checkDaemon(options = {}) {
   const home = options.home ?? process.env.HOME ?? homedir10();
-  const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({ home });
+  const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
+  const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
+    home,
+    ...runtimeDir ? { runtimeDir } : {}
+  });
   const controller = createDaemonController(paths, {
     processExecPath: options.processExecPath ?? process.execPath,
     cliEntryPath: options.cliEntryPath ?? resolveCliEntryPath(),
@@ -26240,7 +26209,11 @@ import { dirname as dirname14 } from "node:path";
 import { homedir as homedir11 } from "node:os";
 async function checkRuntime(options = {}) {
   const home = options.home ?? process.env.HOME ?? homedir11();
-  const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({ home });
+  const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
+  const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
+    home,
+    ...runtimeDir ? { runtimeDir } : {}
+  });
   const probe = options.probe ?? createRuntimeFsProbe();
   const platform = options.platform ?? process.platform;
   const checks3 = [
@@ -26803,10 +26776,12 @@ async function runDoctor(options = {}, deps = {}) {
     resolveRuntimePaths: () => runtimePaths
   }));
   checks3.push(await (deps.checkRuntime ?? checkRuntime)({
-    home
+    home,
+    configPath: runtimePaths.configPath
   }));
   checks3.push(await (deps.checkDaemon ?? checkDaemon)({
-    home
+    home,
+    configPath: runtimePaths.configPath
   }));
   checks3.push(await (deps.checkWechat ?? checkWechat)({
     verbose: options.verbose
@@ -39387,9 +39362,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 +39386,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 +39406,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 +39480,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 +39492,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 +39506,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 +39528,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 +39548,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 +39578,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 +39599,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 +39624,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 +39657,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 +39737,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 +39754,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 +39771,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 +39788,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 +39813,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 +39840,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 +39912,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 +39931,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 +39940,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 +39957,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 +39968,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 +40386,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");
@@ -42739,7 +42498,7 @@ async function runCli(args, deps = {}) {
     case "mcp-stdio":
       return await (deps.mcpStdio ?? ((subArgs) => defaultMcpStdio(subArgs, { stderr: deps.stderr })))(args.slice(1));
     case "start": {
-      const controller = deps.controller ?? createDefaultController();
+      const controller = deps.controller ?? createDefaultController(deps);
       try {
         const isInteractive = deps.isInteractive ?? defaultIsInteractive;
         const status = await controller.getStatus();
@@ -42782,7 +42541,7 @@ async function runCli(args, deps = {}) {
       }
     }
     case "status": {
-      const controller = deps.controller ?? createDefaultController();
+      const controller = deps.controller ?? createDefaultController(deps);
       const status = await controller.getStatus();
       if (status.state === "indeterminate") {
         print("weacpx 进程仍在运行，但状态元数据缺失");
@@ -42805,7 +42564,7 @@ async function runCli(args, deps = {}) {
       return 0;
     }
     case "stop": {
-      const controller = deps.controller ?? createDefaultController();
+      const controller = deps.controller ?? createDefaultController(deps);
       const result = await controller.stop();
       if (result.detail === "not-running") {
         print("weacpx 未运行");
@@ -42815,7 +42574,7 @@ async function runCli(args, deps = {}) {
       return 0;
     }
     case "restart": {
-      const controller = deps.controller ?? createDefaultController();
+      const controller = deps.controller ?? createDefaultController(deps);
       try {
         return await restartDaemonCli(controller, print);
       } catch (error2) {
@@ -43028,8 +42787,18 @@ async function agentRemove(rawName, print) {
   print(`Agent「${name}」已删除`);
   return 0;
 }
+function resolveConfigPathForCurrentEnv() {
+  return process.env.WEACPX_CONFIG ?? `${requireHome2()}/.weacpx/config.json`;
+}
+function resolveDaemonPathsForCurrentConfig() {
+  const configPath = resolveConfigPathForCurrentEnv();
+  return resolveDaemonPaths({
+    home: requireHome2(),
+    runtimeDir: resolveRuntimeDirFromConfigPath(configPath)
+  });
+}
 async function createCliConfigStore() {
-  const configPath = process.env.WEACPX_CONFIG ?? `${requireHome2()}/.weacpx/config.json`;
+  const configPath = resolveConfigPathForCurrentEnv();
   await ensureConfigExists(configPath);
   return new ConfigStore(configPath);
 }
@@ -43064,7 +42833,7 @@ async function defaultRun(options = {}) {
   await loadConfiguredPlugins2({ plugins: config2.plugins });
   const { createMessageChannels: createMessageChannels2 } = await Promise.resolve().then(() => (init_create_channel(), exports_create_channel));
   const { MessageChannelRegistry: MessageChannelRegistry2 } = await Promise.resolve().then(() => (init_channel_registry(), exports_channel_registry));
-  const daemonPaths = resolveDaemonPaths({ home: requireHome2() });
+  const daemonPaths = resolveDaemonPathsForCurrentConfig();
   const daemonRuntime = new DaemonRuntime(daemonPaths, { pid: process.pid });
   const { channelDeps } = await prepareChannelMedia2(runtimePaths.configPath, config2);
   const channelRegistry = new MessageChannelRegistry2(createMessageChannels2(config2.channels, channelDeps));
@@ -43310,13 +43079,14 @@ async function defaultPromptSecret(message) {
     process.stdin.on("data", onData);
   });
 }
-function createDefaultController() {
-  const daemonPaths = resolveDaemonPaths({ home: requireHome2() });
+function createDefaultController(deps = {}) {
+  const daemonPaths = resolveDaemonPathsForCurrentConfig();
   const controller = createDaemonController(daemonPaths, {
     processExecPath: process.execPath,
     cliEntryPath: resolveCliEntryPath2(),
     cwd: process.cwd(),
-    env: process.env
+    env: process.env,
+    ...deps.isProcessRunning ? { isProcessRunning: deps.isProcessRunning } : {}
   });
   return {
     getStatus: () => controller.getStatus(),
@@ -43372,8 +43142,8 @@ function printDaemonLogHints(print) {
 }
 function safeDaemonLogPaths() {
   try {
-    const configPath = process.env.WEACPX_CONFIG ?? `${requireHome2()}/.weacpx/config.json`;
-    const paths = resolveDaemonPaths({ home: requireHome2() });
+    const configPath = resolveConfigPathForCurrentEnv();
+    const paths = resolveDaemonPathsForCurrentConfig();
     return {
       appLog: join16(dirname15(configPath), "runtime", "app.log"),
       stderrLog: paths.stderrLog