weacpx 0.4.1 → 0.4.2

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;
@@ -26172,7 +26185,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
@@ -41139,6 +41152,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) {
@@ -41363,6 +41449,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 +41462,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 +41485,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 +41528,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 +41546,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 +41566,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 +41833,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 +41855,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 +41941,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 +41976,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/package.json

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