weacpx 0.4.2 → 0.4.3

package/dist/cli.js

@@ -9555,7 +9555,7 @@ function isOptionalBoolean(value) {
   return value === undefined || typeof value === "boolean";
 }
 function isTaskStatus(value) {
-  return value === "pending" || value === "needs_confirmation" || value === "running" || value === "blocked" || value === "waiting_for_human" || value === "completed" || value === "failed" || value === "cancelled";
+  return value === "needs_confirmation" || value === "running" || value === "blocked" || value === "waiting_for_human" || value === "completed" || value === "failed" || value === "cancelled";
 }
 function isSourceKind(value) {
   return value === "human" || value === "coordinator" || value === "worker";
@@ -18204,6 +18204,7 @@ class CommandRouter {
       });
       return { text: renderCommandAccessDenied(command) };
     }
+    await this.refreshConfigFromStore();
     return await this.executeCommand(chatKey, command.kind, startedAt, async () => {
       switch (command.kind) {
         case "invalid":
@@ -18409,8 +18410,21 @@ class CommandRouter {
       ...channel,
       ...channel.options ? { options: { ...channel.options } } : {}
     }));
+    this.config.plugins = updated.plugins.map((plugin) => ({ ...plugin }));
     this.config.agents = { ...updated.agents };
     this.config.workspaces = { ...updated.workspaces };
+    this.config.orchestration = {
+      ...updated.orchestration,
+      allowedAgentRequestTargets: [...updated.orchestration.allowedAgentRequestTargets],
+      allowedAgentRequestRoles: [...updated.orchestration.allowedAgentRequestRoles]
+    };
+  }
+  async refreshConfigFromStore() {
+    if (!this.config || !this.configStore) {
+      return;
+    }
+    const updated = await this.configStore.load();
+    this.replaceConfig(updated);
   }
   async executeCommand(chatKey, kind, startedAt, operation) {
     try {
@@ -18984,7 +18998,6 @@ class OrchestrationServer {
     }
     requireOnlyKeys(filter, ["coordinatorSession", "status", "stuck", "sort", "order"], "filter");
     const status = requireOptionalEnum(filter, "status", [
-      "pending",
       "needs_confirmation",
       "running",
       "blocked",
@@ -21381,7 +21394,7 @@ class OrchestrationService {
   }
   buildGroupSummary(group, tasks) {
     const sortedTasks = tasks.slice().sort((left, right) => left.createdAt.localeCompare(right.createdAt)).map((task) => ({ ...task }));
-    const pendingApprovalTasks = sortedTasks.filter((task) => task.status === "pending" || task.status === "needs_confirmation").length;
+    const pendingApprovalTasks = sortedTasks.filter((task) => task.status === "needs_confirmation").length;
     const runningTasks = sortedTasks.filter((task) => task.status === "running").length;
     const completedTasks = sortedTasks.filter((task) => task.status === "completed").length;
     const failedTasks = sortedTasks.filter((task) => task.status === "failed").length;
@@ -22236,7 +22249,7 @@ function isTerminalTaskStatus2(status) {
   return status === "completed" || status === "failed" || status === "cancelled";
 }
 function isAttentionRequiredTask(task) {
-  return task.reviewPending !== undefined || task.status === "pending" || task.status === "needs_confirmation" || task.status === "blocked" || task.status === "waiting_for_human";
+  return task.reviewPending !== undefined || task.status === "needs_confirmation" || task.status === "blocked" || task.status === "waiting_for_human";
 }
 function clampWaitTimeout(timeoutMs) {
   if (timeoutMs === undefined) {
@@ -38624,7 +38637,6 @@ init_task_wait_timeouts();
 init_quota_errors();
 var groupStatusSchema = exports_external.enum(["pending", "running", "terminal"]);
 var taskStatusSchema = exports_external.enum([
-  "pending",
   "needs_confirmation",
   "running",
   "blocked",
@@ -38641,11 +38653,11 @@ var taskQuestionSchema = exports_external.object({
   questionId: exports_external.string().min(1)
 }).strict();
 function buildWeacpxMcpToolRegistry(input) {
-  const { transport, coordinatorSession, sourceHandle, availableAgents } = input;
-  return [
+  const { transport, coordinatorSession, sourceHandle, isExternalCoordinator, availableAgents } = input;
+  const tools = [
     {
       name: "delegate_request",
-      description: `Delegate a subtask to another agent under the current coordinator. Pass an absolute workingDirectory for the worker.${availableAgents && availableAgents.length > 0 ? ` Available agents: ${availableAgents.join(", ")}.` : ""}`,
+      description: `Delegate a subtask to another agent under the current coordinator. Pass an absolute workingDirectory for the worker. After this returns status=running, call task_wait with the returned taskId to wait for completion before reporting back to the user; 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(", ")}.` : ""}`,
       inputSchema: exports_external.object({
         targetAgent: exports_external.string().min(1),
         task: exports_external.string().min(1),
@@ -38665,7 +38677,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "group_new",
-      description: "Create a new task group under the current coordinator.",
+      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(),
@@ -38679,7 +38691,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "group_get",
-      description: "Fetch a single task-group summary under the current coordinator.",
+      description: "Fetch a single task-group summary under the current coordinator. Use to check aggregate progress when waiting on a batch of delegations.",
       inputSchema: exports_external.object({
         groupId: exports_external.string().min(1)
       }).strict(),
@@ -38693,7 +38705,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "group_list",
-      description: "List task groups under the current coordinator.",
+      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(),
@@ -38714,7 +38726,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "group_cancel",
-      description: "Cancel all unfinished tasks in a task group under the current coordinator.",
+      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(),
@@ -38728,7 +38740,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_get",
-      description: "Fetch a single task under the current coordinator.",
+      description: "Fetch a single task under the current coordinator, including the worker's final result and any pending question. Use after task_wait returns to read the actual output before summarizing it for the user, or to inspect a task that requires attention.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -38742,7 +38754,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_list",
-      description: "List tasks under the current coordinator.",
+      description: "List tasks under the current coordinator. Use to recover taskIds for in-flight delegations or to survey what is still running / blocked.",
       inputSchema: exports_external.object({
         status: taskStatusSchema.optional(),
         stuck: exports_external.boolean().optional(),
@@ -38763,7 +38775,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_approve",
-      description: "Approve a pending task under the current coordinator.",
+      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, call task_wait.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -38777,7 +38789,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_reject",
-      description: "Reject a pending task under the current coordinator.",
+      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(),
@@ -38791,7 +38803,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_cancel",
-      description: "Request cancellation for a task under the current coordinator.",
+      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.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -38805,7 +38817,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_wait",
-      description: `Wait for a task to finish or require attention. Defaults: timeout ${DEFAULT_TASK_WAIT_TIMEOUT_MS} ms, poll interval ${DEFAULT_TASK_WAIT_POLL_INTERVAL_MS} ms. Maximums: timeout ${MAX_TASK_WAIT_TIMEOUT_MS} ms, poll interval ${MAX_TASK_WAIT_POLL_INTERVAL_MS} ms.`,
+      description: `Wait for a task to finish or require attention. Call this immediately after delegate_request (when status=running) unless you intend a fire-and-forget. 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, call task_wait again), or status=timeout (still running; call task_wait again or task_get for a snapshot). 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(),
@@ -38821,7 +38833,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "worker_raise_question",
-      description: "Raise a blocker question for the current bound worker session.",
+      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_wait instead.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         question: exports_external.string().min(1),
@@ -38841,7 +38853,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "coordinator_answer_question",
-      description: "Answer a blocked worker question under the current coordinator.",
+      description: "Answer a blocked worker question under the current coordinator. Use after task_wait returns status=attention_required and task_get shows a pending question; after answering, call task_wait again to keep waiting for the worker to finish.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         questionId: exports_external.string().min(1),
@@ -38857,7 +38869,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "coordinator_request_human_input",
-      description: "Create or queue a human question package for blocked tasks under the current coordinator.",
+      description: "Create or queue a human question package for blocked tasks under the current coordinator. Use when answering a worker question requires real human input rather than your own judgement.",
       inputSchema: exports_external.object({
         taskQuestions: exports_external.array(taskQuestionSchema).min(1),
         promptText: exports_external.string().min(1),
@@ -38873,7 +38885,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "coordinator_follow_up_human_package",
-      description: "Append a follow-up message to the active human question package under the current coordinator.",
+      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),
@@ -38890,7 +38902,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "coordinator_review_contested_result",
-      description: "Review a contested result under the current coordinator.",
+      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.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         reviewId: exports_external.string().min(1),
@@ -38907,6 +38919,14 @@ function buildWeacpxMcpToolRegistry(input) {
       })
     }
   ];
+  if (isExternalCoordinator) {
+    const externalCoordinatorIncompatibleTools = new Set([
+      "coordinator_request_human_input",
+      "coordinator_follow_up_human_package"
+    ]);
+    return tools.filter((tool) => !externalCoordinatorIncompatibleTools.has(tool.name));
+  }
+  return tools;
 }
 async function asToolResult(action) {
   try {
@@ -38935,12 +38955,28 @@ function renderTaskWaitResult(result) {
     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}.`;
+    return [
+      `Task ${result.task.taskId} wait timed out; current state is ${result.task.status}.`,
+      `Next: call task_wait again with this taskId to keep waiting, or task_get for a snapshot.`
+    ].join(`
+`);
   }
   if (result.status === "attention_required") {
-    return `Task ${result.task.taskId} requires attention; current state is ${result.task.status}.`;
+    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, call task_wait again to keep waiting for the worker to finish.`
+    ].join(`
+`);
   }
-  return `Task ${result.task.taskId} reached terminal state ${result.task.status}.`;
+  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 createSuccessResult(text, structuredContent) {
   return {
@@ -38955,7 +38991,8 @@ function createErrorResult(message) {
   };
 }
 function renderDelegateSuccess(result) {
-  return [`Delegation task "${result.taskId}" created.`, `- Status: ${result.status}`].join(`
+  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: call task_wait with taskId="${result.taskId}" to wait for the worker to finish, then task_get to read the result before reporting back.`;
+  return [`Delegation task "${result.taskId}" created.`, `- Status: ${result.status}`, next].join(`
 `);
 }
 function renderGroupCreated(group) {
@@ -39100,7 +39137,11 @@ function renderTaskCancelRequest(task) {
 `);
 }
 function renderTaskApprovalSuccess(task) {
-  return [`Task "${task.taskId}" approved.`, `- Current status: ${task.status}`].join(`
+  return [
+    `Task "${task.taskId}" approved.`,
+    `- Current status: ${task.status}`,
+    `Next: call task_wait with taskId="${task.taskId}" to wait for the worker to finish, then task_get to read the result before reporting back.`
+  ].join(`
 `);
 }
 function renderTaskRejectionSuccess(task) {
@@ -39335,6 +39376,30 @@ function createOrchestrationTransport(endpoint, deps = {}) {
 }
 
 // src/mcp/weacpx-mcp-server.ts
+var WEACPX_MCP_SERVER_INSTRUCTIONS = [
+  "Use these tools to orchestrate work across other agents under your coordinator session.",
+  "",
+  "Typical lifecycle for a single delegation:",
+  "1. delegate_request → returns { taskId, status }.",
+  "   - status=running: the worker has started; go to step 2.",
+  "   - status=needs_confirmation: tell the user, then call task_approve or task_reject based on their response. After task_approve, return to step 2 to wait for the worker. Do not call task_wait before approval.",
+  "2. task_wait(taskId) → blocks until the task is done, needs attention, or times out.",
+  "   - 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, go back to step 2)",
+  "       * 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, call task_wait again to keep waiting.",
+  "   - status=timeout: the task is still running. Call task_wait again to keep waiting, or task_get for a snapshot.",
+  "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.",
+  "",
+  "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.",
+  "",
+  "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."
+].join(`
+`);
 function createWeacpxMcpServer(options) {
   const server = new Server({
     name: "weacpx-orchestration",
@@ -39342,7 +39407,8 @@ function createWeacpxMcpServer(options) {
   }, {
     capabilities: {
       tools: {}
-    }
+    },
+    instructions: WEACPX_MCP_SERVER_INSTRUCTIONS
   });
   let toolState = null;
   let toolStatePromise = null;
@@ -39361,6 +39427,7 @@ function createWeacpxMcpServer(options) {
         transport: options.transport,
         coordinatorSession: identity.coordinatorSession,
         ...identity.sourceHandle ? { sourceHandle: identity.sourceHandle } : {},
+        ...identity.isExternalCoordinator ? { isExternalCoordinator: true } : {},
         ...options.availableAgents ? { availableAgents: options.availableAgents } : {}
       });
       return toolState;
@@ -39410,7 +39477,8 @@ async function resolveMcpIdentity(server, options) {
   if (options.coordinatorSession) {
     return {
       coordinatorSession: options.coordinatorSession,
-      ...options.sourceHandle ? { sourceHandle: options.sourceHandle } : {}
+      ...options.sourceHandle ? { sourceHandle: options.sourceHandle } : {},
+      ...options.isExternalCoordinator ? { isExternalCoordinator: true } : {}
     };
   }
   throw new McpError(ErrorCode.InvalidRequest, "weacpx MCP identity is not configured; run through `weacpx mcp-stdio` or provide --coordinator-session");
@@ -41279,7 +41347,7 @@ function createMcpStdioIdentityResolver(input) {
       clientName: context.clientName,
       ...resolvedWorkspace ? { workspace: resolvedWorkspace } : { instanceId }
     });
-    await prepareMcpCoordinatorStartup({
+    const startup = await prepareMcpCoordinatorStartup({
       coordinatorSession: resolvedCoordinatorSession,
       ...resolvedWorkspace ? { workspace: resolvedWorkspace } : {},
       config: input.config,
@@ -41288,7 +41356,8 @@ function createMcpStdioIdentityResolver(input) {
     });
     return {
       coordinatorSession: resolvedCoordinatorSession,
-      ...sourceHandle ? { sourceHandle } : {}
+      ...sourceHandle ? { sourceHandle } : {},
+      ...startup.kind === "external-coordinator" ? { isExternalCoordinator: true } : {}
     };
   };
 }

package/dist/orchestration/orchestration-types.d.ts

@@ -1,4 +1,4 @@
-export type OrchestrationTaskStatus = "pending" | "needs_confirmation" | "running" | "blocked" | "waiting_for_human" | "completed" | "failed" | "cancelled";
+export type OrchestrationTaskStatus = "needs_confirmation" | "running" | "blocked" | "waiting_for_human" | "completed" | "failed" | "cancelled";
 export type OrchestrationSourceKind = "human" | "coordinator" | "worker";
 export interface OrchestrationOpenQuestionRecord {
     questionId: string;

package/package.json

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