@ganglion/xacpx 0.17.0-beta.5 → 0.17.0-beta.7

package/README.md

@@ -29,7 +29,7 @@ If you need to code or work remotely on a temporary basis, `xacpx` gives you a f
 
 ### Prerequisites
 
-- Node.js 22+ or Bun
+- Node.js 22.12+ or Bun
 - A working agent CLI you intend to use, such as Codex / Claude Code / Gemini / OpenCode
 - A phone with WeChat, Feishu, or Yuanbao installed
 
@@ -182,7 +182,7 @@ xacpx-relay add token        # prints the access token once
 xacpx-relay start            # defaults: --host 0.0.0.0 --http-port 8787
 
 # On each instance host:
-xacpx plugin add @ganglion/xacpx-channel-relay   # requires xacpx >= 0.11.0
+xacpx plugin add @ganglion/xacpx-channel-relay   # requires xacpx >= 0.17.0-beta.6
 xacpx channel add relay --url wss://relay.example.com --token <access-token> --name my-box
 xacpx restart
 ```

package/dist/bridge/bridge-main.js

@@ -3687,7 +3687,43 @@ async function deleteAcpxSessionFiles(options) {
 var init_acpx_session_files = () => {};
 
 // src/transport/command-timeouts.ts
-var DEFAULT_MANAGEMENT_COMMAND_TIMEOUT_MS = 30000, DEFAULT_SESSION_INIT_TIMEOUT_MS = 120000, BRIDGE_REQUEST_TIMEOUT_GRACE_MS = 15000;
+function formatTimeout(timeoutMs) {
+  return timeoutMs >= 1000 ? `${timeoutMs / 1000}s` : `${timeoutMs}ms`;
+}
+function captureOutputTail(value) {
+  const normalized = value?.trim();
+  if (!normalized)
+    return;
+  return normalized.slice(-COMMAND_OUTPUT_TAIL_CHARS);
+}
+function isCommandTimeoutError(error) {
+  return error instanceof CommandTimeoutError;
+}
+var DEFAULT_MANAGEMENT_COMMAND_TIMEOUT_MS = 30000, DEFAULT_SESSION_INIT_TIMEOUT_MS = 120000, BRIDGE_REQUEST_TIMEOUT_GRACE_MS = 15000, COMMAND_OUTPUT_TAIL_CHARS = 2000, CommandTimeoutError;
+var init_command_timeouts = __esm(() => {
+  CommandTimeoutError = class CommandTimeoutError extends Error {
+    timeoutMs;
+    command;
+    stage;
+    stdoutTail;
+    stderrTail;
+    constructor(timeoutMs, command, detail = {}) {
+      const stdoutTail = captureOutputTail(detail.stdout);
+      const stderrTail = captureOutputTail(detail.stderr);
+      const output = [
+        stdoutTail ? `stdout tail: ${stdoutTail}` : "",
+        stderrTail ? `stderr tail: ${stderrTail}` : ""
+      ].filter(Boolean).join("; ");
+      super(`acpx command timed out${detail.stage ? ` during ${detail.stage}` : ""} after ${formatTimeout(timeoutMs)}: ${command}` + (output ? `; ${output}` : ""));
+      this.timeoutMs = timeoutMs;
+      this.command = command;
+      this.name = "CommandTimeoutError";
+      this.stage = detail.stage;
+      this.stdoutTail = stdoutTail;
+      this.stderrTail = stderrTail;
+    }
+  };
+});
 
 // src/transport/permission-mode-flag.ts
 function permissionModeToFlag(permissionMode) {
@@ -3873,6 +3909,8 @@ init_acpx_queue_owner_launcher();
 init_agent_session_list();
 init_codex_subagent_filter();
 init_acpx_session_files();
+init_command_timeouts();
+init_command_timeouts();
 init_acpx_command_builder();
 class EnsureSessionFailedError extends Error {
   kind;
@@ -3885,15 +3923,6 @@ class EnsureSessionFailedError extends Error {
   }
 }
 
-class CommandTimeoutError extends Error {
-  timeoutMs;
-  constructor(timeoutMs, command) {
-    super(`acpx command timed out after ${timeoutMs / 1000}s: ${command}`);
-    this.timeoutMs = timeoutMs;
-    this.name = "CommandTimeoutError";
-  }
-}
-
 class BridgeRuntime {
   command;
   run;
@@ -3976,12 +4005,14 @@ class BridgeRuntime {
       input.name
     ]));
     const result = await this.run(spawnSpec.command, spawnSpec.args, {
-      timeoutMs: this.managementCommandTimeoutMs()
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "has-session"
     });
     return { exists: result.code === 0 };
   }
   async tailSessionHistory(input) {
     const candidates = [
+      ["sessions", "history", input.name, "--limit", String(input.lines)],
       ["sessions", "history", "quiet", "-s", input.name, String(input.lines)],
       ["sessions", "history", "quiet", input.name, String(input.lines)],
       ["sessions", "history", "-s", input.name, "--tail", String(input.lines)],
@@ -3993,7 +4024,8 @@ class BridgeRuntime {
     for (const tailArgs of candidates) {
       const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, tailArgs));
       const result = await this.run(spawnSpec.command, spawnSpec.args, {
-        timeoutMs: Math.max(deadline - Date.now(), 1)
+        timeoutMs: Math.max(deadline - Date.now(), 1),
+        stage: "session-history"
       });
       if (result.code === 0) {
         return { text: result.stdout.trimEnd() };
@@ -4162,7 +4194,8 @@ class BridgeRuntime {
       input.name
     ]));
     const result = await this.run(spawnSpec.command, spawnSpec.args, {
-      timeoutMs: this.managementCommandTimeoutMs()
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "read-session-record"
     });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "sessions show failed");
@@ -4184,7 +4217,8 @@ class BridgeRuntime {
       input.modeId
     ]));
     const result = await this.run(spawnSpec.command, spawnSpec.args, {
-      timeoutMs: this.managementCommandTimeoutMs()
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "set-mode"
     });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "set-mode failed");
@@ -4200,7 +4234,8 @@ class BridgeRuntime {
       input.modelId
     ]));
     const result = await this.run(spawnSpec.command, spawnSpec.args, {
-      timeoutMs: this.managementCommandTimeoutMs()
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "set-model"
     });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "set-model failed");
@@ -4214,7 +4249,8 @@ class BridgeRuntime {
       input.name
     ], { format: "json" }));
     const result = await this.run(spawnSpec.command, spawnSpec.args, {
-      timeoutMs: this.managementCommandTimeoutMs()
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "get-session-model"
     });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "status failed");
@@ -4236,7 +4272,8 @@ class BridgeRuntime {
       input.name
     ]));
     const result = await this.run(spawnSpec.command, spawnSpec.args, {
-      timeoutMs: this.managementCommandTimeoutMs()
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "cancel"
     });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "cancel failed");
@@ -4253,7 +4290,8 @@ class BridgeRuntime {
       input.name
     ]));
     const result = await this.run(spawnSpec.command, spawnSpec.args, {
-      timeoutMs: this.managementCommandTimeoutMs()
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "remove-session"
     });
     if (result.code === 0) {
       return {};
@@ -4326,7 +4364,11 @@ function spawnCapture(command, args, options) {
     const timeoutId = typeof options?.timeoutMs === "number" && Number.isFinite(options.timeoutMs) && options.timeoutMs > 0 ? setTimeout(() => {
       const kill = options.killProcessTreeFn ?? ((pid) => terminateProcessTree(pid, { detachedProcessGroup: false }));
       kill(child.pid ?? 0);
-      reject(new CommandTimeoutError(options.timeoutMs, [command, ...args].join(" ")));
+      reject(new CommandTimeoutError(options.timeoutMs, [command, ...args].join(" "), {
+        stage: options.stage,
+        stdout,
+        stderr
+      }));
     }, options.timeoutMs) : undefined;
     child.stdout.on("data", (chunk) => {
       stdout += String(chunk);
@@ -4543,6 +4585,15 @@ class BridgeServer {
       const message = error instanceof Error ? error.message : String(error);
       const ensureSessionFields = error instanceof EnsureSessionFailedError ? { kind: error.kind, ...error.data ? { data: error.data } : {} } : {};
       const promptDetails = error instanceof PromptCommandError ? { details: { exitCode: error.exitCode, stdout: error.stdout, stderr: error.stderr } } : {};
+      const timeoutDetails = error instanceof CommandTimeoutError ? {
+        timeout: {
+          timeoutMs: error.timeoutMs,
+          command: error.command,
+          ...error.stage ? { stage: error.stage } : {},
+          ...error.stdoutTail ? { stdoutTail: error.stdoutTail } : {},
+          ...error.stderrTail ? { stderrTail: error.stderrTail } : {}
+        }
+      } : {};
       return `${JSON.stringify({
         id: requestId,
         ok: false,
@@ -4550,7 +4601,8 @@ class BridgeServer {
           code: error instanceof BridgeInvalidRequestError ? "BRIDGE_INVALID_REQUEST" : "BRIDGE_INTERNAL_ERROR",
           message,
           ...ensureSessionFields,
-          ...promptDetails
+          ...promptDetails,
+          ...timeoutDetails
         }
       })}
 `;