weacpx 0.4.1 → 0.4.3

package/dist/cli.js

@@ -2610,18 +2610,22 @@ class DaemonController {
   statusStore;
   startupPollIntervalMs;
   startupTimeoutMs;
+  onboardingStartupTimeoutMs;
   onStartupPoll;
   shutdownPollIntervalMs;
   shutdownTimeoutMs;
   onShutdownPoll;
+  now;
   constructor(paths, deps) {
     this.paths = paths;
     this.deps = deps;
     this.statusStore = new DaemonStatusStore(paths.statusFile);
     this.startupPollIntervalMs = deps.startupPollIntervalMs ?? 50;
     this.startupTimeoutMs = deps.startupTimeoutMs ?? 5000;
+    this.onboardingStartupTimeoutMs = deps.onboardingStartupTimeoutMs ?? 300000;
     this.shutdownPollIntervalMs = deps.shutdownPollIntervalMs ?? 50;
     this.shutdownTimeoutMs = deps.shutdownTimeoutMs ?? 5000;
+    this.now = deps.now ?? (() => Date.now());
     this.onStartupPoll = deps.onStartupPoll ?? (async () => {
       await new Promise((resolve) => setTimeout(resolve, this.startupPollIntervalMs));
     });
@@ -2659,7 +2663,7 @@ class DaemonController {
     await this.statusStore.clear();
     const pid = await this.deps.spawnDetached(options);
     await this.writePid(pid);
-    await this.waitForStartupMetadata(pid);
+    await this.waitForStartupMetadata(pid, options.firstRunOnboarding ? this.onboardingStartupTimeoutMs : this.startupTimeoutMs, options.startupWait);
     return { state: "started", pid };
   }
   async stop() {
@@ -2695,9 +2699,10 @@ class DaemonController {
     await rm2(this.paths.pidFile, { force: true });
     await this.statusStore.clear();
   }
-  async waitForStartupMetadata(pid) {
-    const deadline = Date.now() + this.startupTimeoutMs;
-    while (Date.now() < deadline) {
+  async waitForStartupMetadata(pid, timeoutMs, startupWait) {
+    const startedAt = this.now();
+    const deadline = startedAt + timeoutMs;
+    while (this.now() < deadline) {
       const status = await this.statusStore.load();
       if (status?.pid === pid) {
         return;
@@ -2706,9 +2711,17 @@ class DaemonController {
         await this.clearRuntimeFiles();
         throw new Error(`weacpx daemon exited before reporting ready state (pid ${pid})`);
       }
+      if (startupWait?.shouldStopWaiting?.()) {
+        return;
+      }
+      await startupWait?.onPoll?.({
+        elapsedMs: this.now() - startedAt,
+        timeoutMs,
+        pid
+      });
       await this.onStartupPoll();
     }
-    throw new Error(`weacpx daemon did not report ready state within ${this.startupTimeoutMs}ms (pid ${pid})`);
+    throw new Error(`weacpx daemon did not report ready state within ${timeoutMs}ms (pid ${pid})`);
   }
   async waitForShutdown(pid) {
     const deadline = Date.now() + this.shutdownTimeoutMs;
@@ -9542,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";
@@ -18191,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":
@@ -18396,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 {
@@ -18971,7 +18998,6 @@ class OrchestrationServer {
     }
     requireOnlyKeys(filter, ["coordinatorSession", "status", "stuck", "sort", "order"], "filter");
     const status = requireOptionalEnum(filter, "status", [
-      "pending",
       "needs_confirmation",
       "running",
       "blocked",
@@ -21368,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;
@@ -22223,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) {
@@ -26172,7 +26198,7 @@ init_create_daemon_controller();
 init_daemon_files();
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { homedir as homedir13 } from "node:os";
-import { sep } from "node:path";
+import { dirname as dirname13, join as join16, sep } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // src/daemon/daemon-runtime.ts
@@ -38611,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",
@@ -38628,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),
@@ -38652,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(),
@@ -38666,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(),
@@ -38680,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(),
@@ -38701,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(),
@@ -38715,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(),
@@ -38729,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(),
@@ -38750,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(),
@@ -38764,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(),
@@ -38778,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(),
@@ -38792,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(),
@@ -38808,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),
@@ -38828,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),
@@ -38844,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),
@@ -38860,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),
@@ -38877,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),
@@ -38894,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 {
@@ -38922,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 {
@@ -38942,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) {
@@ -39087,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) {
@@ -39322,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",
@@ -39329,7 +39407,8 @@ function createWeacpxMcpServer(options) {
   }, {
     capabilities: {
       tools: {}
-    }
+    },
+    instructions: WEACPX_MCP_SERVER_INSTRUCTIONS
   });
   let toolState = null;
   let toolStatePromise = null;
@@ -39348,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;
@@ -39397,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");
@@ -41139,6 +41220,79 @@ async function runRestart2(deps) {
   }
 }
 
+// src/cli/startup-wait-ui.ts
+var SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+var DEFAULT_SPINNER_FRAME = "⠋";
+var ENVIRONMENT_HINT_DELAY_MS = 20000;
+function renderStartupWaitLine(input) {
+  const elapsedSeconds = Math.floor(input.elapsedMs / 1000);
+  const timeoutSeconds = Math.ceil(input.timeoutMs / 1000);
+  const detail = input.elapsedMs >= ENVIRONMENT_HINT_DELAY_MS ? "，首次启动可能需要准备依赖和运行环境" : "";
+  return `${input.frame} 正在创建初始会话${detail} ${elapsedSeconds}s / ${timeoutSeconds}s，按 Ctrl+B 跳过等待`;
+}
+function createStartupWaitUi(input) {
+  const stdin2 = input.stdin ?? process.stdin;
+  const stdout2 = input.stdout ?? process.stdout;
+  if (!input.isInteractive() || !stdin2.isTTY || !stdout2.isTTY) {
+    return { stop: () => {} };
+  }
+  let skipped = false;
+  let interrupted = false;
+  let frameIndex = 0;
+  let rawModeEnabled = false;
+  let stopped = false;
+  const cleanup = () => {
+    if (stopped) {
+      return;
+    }
+    stopped = true;
+    stdin2.off("data", onData);
+    if (rawModeEnabled && typeof stdin2.setRawMode === "function") {
+      stdin2.setRawMode(false);
+    }
+    stdin2.pause();
+    stdout2.write("\r\x1B[2K");
+  };
+  const onData = (chunk) => {
+    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+    if (buffer.includes(2)) {
+      skipped = true;
+    }
+    if (buffer.includes(3)) {
+      interrupted = true;
+      cleanup();
+      (input.onInterrupt ?? (() => process.kill(process.pid, "SIGINT")))();
+    }
+  };
+  if (typeof stdin2.setRawMode === "function") {
+    stdin2.setRawMode(true);
+    rawModeEnabled = true;
+  }
+  stdin2.resume();
+  stdin2.on("data", onData);
+  const render = (poll) => {
+    const frame = SPINNER_FRAMES[frameIndex % SPINNER_FRAMES.length] ?? DEFAULT_SPINNER_FRAME;
+    frameIndex += 1;
+    stdout2.write(`\r\x1B[2K${renderStartupWaitLine({
+      elapsedMs: poll.elapsedMs,
+      timeoutMs: poll.timeoutMs,
+      frame
+    })}`);
+  };
+  return {
+    wait: {
+      onPoll: render,
+      shouldStopWaiting: () => {
+        if (interrupted) {
+          throw new Error("startup wait interrupted");
+        }
+        return skipped;
+      }
+    },
+    stop: cleanup
+  };
+}
+
 // src/cli.ts
 init_bootstrap();
 async function prepareMcpCoordinatorStartup(input) {
@@ -41193,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,
@@ -41202,7 +41356,8 @@ function createMcpStdioIdentityResolver(input) {
     });
     return {
       coordinatorSession: resolvedCoordinatorSession,
-      ...sourceHandle ? { sourceHandle } : {}
+      ...sourceHandle ? { sourceHandle } : {},
+      ...startup.kind === "external-coordinator" ? { isExternalCoordinator: true } : {}
     };
   };
 }
@@ -41363,6 +41518,7 @@ async function runCli(args, deps = {}) {
     case "start": {
       const controller = deps.controller ?? createDefaultController();
       try {
+        const isInteractive = deps.isInteractive ?? defaultIsInteractive;
         const status = await controller.getStatus();
         if (status.state === "running") {
           print("weacpx 已在后台运行");
@@ -41375,10 +41531,19 @@ async function runCli(args, deps = {}) {
         const onboarding2 = await runOnboardingBeforeStart({
           print,
           cwd: deps.cwd ?? (() => process.cwd()),
-          isInteractive: deps.isInteractive,
+          isInteractive,
           promptText: deps.promptText
         });
-        const result = await controller.start({ firstRunOnboarding: onboarding2 ?? undefined });
+        const startupWaitUi = onboarding2 ? createStartupWaitUi({ isInteractive }) : null;
+        let result;
+        try {
+          result = await controller.start({
+            firstRunOnboarding: onboarding2 ?? undefined,
+            ...startupWaitUi?.wait ? { startupWait: startupWaitUi.wait } : {}
+          });
+        } finally {
+          startupWaitUi?.stop();
+        }
         if (result.state === "already-running") {
           print("weacpx 已在后台运行");
           print(`PID: ${result.pid}`);
@@ -41389,9 +41554,7 @@ async function runCli(args, deps = {}) {
         return 0;
       } catch (error2) {
         print(`weacpx 启动失败：${describeFriendlyError(error2)}`);
-        const stderrPath = safeStderrLogPath();
-        if (stderrPath)
-          print(`请查看 Stderr: ${stderrPath}`);
+        printDaemonLogHints(print);
         return 1;
       }
     }
@@ -41434,9 +41597,7 @@ async function runCli(args, deps = {}) {
         return await restartDaemonCli(controller, print);
       } catch (error2) {
         print(`weacpx 重启失败：${describeFriendlyError(error2)}`);
-        const stderrPath = safeStderrLogPath();
-        if (stderrPath)
-          print(`请查看 Stderr: ${stderrPath}`);
+        printDaemonLogHints(print);
         return 1;
       }
     }
@@ -41454,7 +41615,7 @@ async function defaultUpdate(args, input) {
     saveConfig: async (config2) => await store.save(config2),
     readCurrentVersion: readVersion,
     print: input.print,
-    isInteractive: input.isInteractive ?? (() => Boolean(process.stdin.isTTY && process.stdout.isTTY)),
+    isInteractive: input.isInteractive ?? defaultIsInteractive,
     promptText: input.promptText ?? defaultPromptText,
     ...input.overrides
   };
@@ -41474,7 +41635,7 @@ async function runOnboardingBeforeStart(input) {
     deps: {
       print: input.print,
       cwd: input.cwd,
-      isInteractive: input.isInteractive ?? (() => Boolean(process.stdin.isTTY && process.stdout.isTTY)),
+      isInteractive: input.isInteractive ?? defaultIsInteractive,
       promptText: input.promptText ?? defaultPromptText
     }
   });
@@ -41741,7 +41902,7 @@ async function createChannelCliDeps(input) {
     saveConfig: async (config2) => await store.save(config2),
     print: input.print,
     stderr: input.stderr ?? ((text) => process.stderr.write(text)),
-    isInteractive: input.isInteractive ?? (() => Boolean(process.stdin.isTTY && process.stdout.isTTY)),
+    isInteractive: input.isInteractive ?? defaultIsInteractive,
     promptText: input.promptText ?? defaultPromptText,
     promptSecret: input.promptSecret ?? defaultPromptSecret,
     getDaemonStatus: async () => {
@@ -41763,7 +41924,7 @@ async function createPluginCliDeps(input) {
     loadConfig: async () => await store.load(),
     saveConfig: async (config2) => await store.save(config2),
     print: input.print,
-    isInteractive: input.isInteractive ?? (() => Boolean(process.stdin.isTTY && process.stdout.isTTY)),
+    isInteractive: input.isInteractive ?? defaultIsInteractive,
     promptText: input.promptText ?? defaultPromptText,
     getDaemonStatus: async () => {
       const status = await controller.getStatus();
@@ -41849,7 +42010,8 @@ function createDefaultController() {
     getStatus: () => controller.getStatus(),
     stop: () => controller.stop(),
     start: (options) => controller.start({
-      ...options?.firstRunOnboarding ? { firstRunOnboarding: encodeFirstRunOnboarding(options.firstRunOnboarding) } : {}
+      ...options?.firstRunOnboarding ? { firstRunOnboarding: encodeFirstRunOnboarding(options.firstRunOnboarding) } : {},
+      ...options?.startupWait ? { startupWait: options.startupWait } : {}
     })
   };
 }
@@ -41883,12 +42045,27 @@ function requireHome2() {
   }
   return home;
 }
+function defaultIsInteractive() {
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
 function describeFriendlyError(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
 }
-function safeStderrLogPath() {
+function printDaemonLogHints(print) {
+  const paths = safeDaemonLogPaths();
+  if (!paths)
+    return;
+  print(`请查看 App Log: ${paths.appLog}`);
+  print(`请查看 Stderr: ${paths.stderrLog}`);
+}
+function safeDaemonLogPaths() {
   try {
-    return resolveDaemonPaths({ home: requireHome2() }).stderrLog;
+    const configPath = process.env.WEACPX_CONFIG ?? `${requireHome2()}/.weacpx/config.json`;
+    const paths = resolveDaemonPaths({ home: requireHome2() });
+    return {
+      appLog: join16(dirname13(configPath), "runtime", "app.log"),
+      stderrLog: paths.stderrLog
+    };
   } catch {
     return null;
   }

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.1",
+  "version": "0.4.3",
   "description": "使用微信 ClawBot 随时随地通过 `acpx` 控制 Claude Code、Codex 等 Agents。",
   "keywords": [
     "acpx",