@ganglion/xacpx 0.17.0-beta.4 → 0.17.0-beta.6

package/README.md

@@ -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

@@ -3426,18 +3426,6 @@ var init_acpx_queue_owner_launcher = __esm(() => {
   init_i18n();
 });
 
-// src/transport/permission-mode-flag.ts
-function permissionModeToFlag(permissionMode) {
-  switch (permissionMode) {
-    case "approve-reads":
-      return "--approve-reads";
-    case "deny-all":
-      return "--deny-all";
-    case "approve-all":
-      return "--approve-all";
-  }
-}
-
 // src/util/path.ts
 import path2 from "node:path";
 import { homedir as homedir3 } from "node:os";
@@ -3698,6 +3686,133 @@ async function deleteAcpxSessionFiles(options) {
 }
 var init_acpx_session_files = () => {};
 
+// src/transport/command-timeouts.ts
+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) {
+  switch (permissionMode) {
+    case "approve-reads":
+      return "--approve-reads";
+    case "deny-all":
+      return "--deny-all";
+    case "approve-all":
+      return "--approve-all";
+  }
+}
+
+// src/transport/acpx-command-builder.ts
+function buildPermissionArgs(input) {
+  const args = [permissionModeToFlag(input.permissionMode), "--non-interactive-permissions", input.nonInteractivePermissions];
+  if (typeof input.permissionPolicy === "string" && input.permissionPolicy.trim().length > 0) {
+    args.push("--permission-policy", input.permissionPolicy);
+  }
+  return args;
+}
+function buildQueueOwnerTtlArgs(queueOwnerTtlSeconds) {
+  if (typeof queueOwnerTtlSeconds !== "number" || !Number.isFinite(queueOwnerTtlSeconds))
+    return [];
+  return ["--ttl", String(queueOwnerTtlSeconds)];
+}
+function buildModelArgs(model) {
+  const trimmed = model?.trim();
+  return trimmed ? ["--model", trimmed] : [];
+}
+function appendAgentAndTail(prefix, input, tail) {
+  if (input.agentCommand)
+    return [...prefix, "--agent", input.agentCommand, ...tail];
+  return [...prefix, input.agent, ...tail];
+}
+function buildSessionArgs(input, tail, options = {}) {
+  const prefix = [
+    "--format",
+    options.format ?? "quiet",
+    "--cwd",
+    input.cwd,
+    ...buildPermissionArgs(input.permission),
+    ...buildModelArgs(input.model)
+  ];
+  if (options.verbose)
+    prefix.push("--verbose");
+  return appendAgentAndTail(prefix, input, tail);
+}
+function buildPromptArgs(input, tail) {
+  const prefix = [
+    "--format",
+    "json",
+    "--json-strict",
+    "--cwd",
+    input.cwd,
+    ...buildPermissionArgs(input.permission),
+    ...buildModelArgs(input.model),
+    ...buildQueueOwnerTtlArgs(input.queueOwnerTtlSeconds)
+  ];
+  return appendAgentAndTail(prefix, input, tail);
+}
+function buildAgentQueryArgs(input, format, tail) {
+  const prefix = ["--format", format, "--cwd", input.cwd, ...buildPermissionArgs(input.permission)];
+  return appendAgentAndTail(prefix, input, tail);
+}
+function isMissingAcpxSessionError(stderr, stdout) {
+  const combined = `${stderr}
+${stdout}`.toLowerCase();
+  return combined.includes("no named session") || combined.includes("no cwd session") || combined.includes("session not found") || combined.includes("unknown session") || combined.includes("no acpx session found");
+}
+function parseAcpxSessionRecordId(stdout) {
+  try {
+    const parsed = JSON.parse(stdout);
+    const acpxRecordId = typeof parsed.acpxRecordId === "string" ? parsed.acpxRecordId : typeof parsed.id === "string" ? parsed.id : undefined;
+    const agentSessionId = typeof parsed.agentSessionId === "string" ? parsed.agentSessionId : undefined;
+    if (acpxRecordId && /^[\w.:-]+$/.test(acpxRecordId) && acpxRecordId.length >= 8) {
+      return { acpxRecordId, agentSessionId };
+    }
+  } catch {
+    const firstLine = stdout.trim().split(/\r?\n/, 1)[0];
+    if (firstLine && /^[\w.:-]+$/.test(firstLine) && firstLine.length >= 8) {
+      return { acpxRecordId: firstLine };
+    }
+  }
+  return;
+}
+var DEFAULT_PERMISSION_MODE = "approve-all", DEFAULT_NON_INTERACTIVE = "deny";
+var init_acpx_command_builder = () => {};
+
 // src/bridge/bridge-main.ts
 import { createInterface } from "node:readline";
 
@@ -3794,6 +3909,9 @@ 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;
   data;
@@ -3804,20 +3922,6 @@ class EnsureSessionFailedError extends Error {
     this.data = data;
   }
 }
-var DEFAULT_SESSION_INIT_TIMEOUT_MS = 120000;
-
-class CommandTimeoutError extends Error {
-  timeoutMs;
-  constructor(timeoutMs, command) {
-    super(`acpx command timed out after ${timeoutMs / 1000}s: ${command}`);
-    this.timeoutMs = timeoutMs;
-    this.name = "CommandTimeoutError";
-  }
-}
-function modelArgs(model) {
-  const trimmed = model?.trim();
-  return trimmed ? ["--model", trimmed] : [];
-}
 
 class BridgeRuntime {
   command;
@@ -3856,7 +3960,7 @@ class BridgeRuntime {
           ...includeFilterCwd && input.filterCwd ? ["--filter-cwd", input.filterCwd] : [],
           ...input.cursor ? ["--cursor", input.cursor] : []
         ], { format: "json" }));
-        return await this.run(spec.command, spec.args);
+        return await this.run(spec.command, spec.args, { timeoutMs: this.sessionInitTimeoutMs() });
       },
       formatError: (result) => result.stderr || result.stdout || `sessions list failed with exit code ${result.code}`,
       isSubagentSession: (input.driver ?? input.agent) === CODEX_AGENT_NAME ? codexSubagentPredicate() : undefined
@@ -3890,27 +3994,39 @@ class BridgeRuntime {
     const value = this.options.sessionInitTimeoutMs;
     return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : DEFAULT_SESSION_INIT_TIMEOUT_MS;
   }
+  managementCommandTimeoutMs() {
+    const value = this.options.managementCommandTimeoutMs;
+    return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : DEFAULT_MANAGEMENT_COMMAND_TIMEOUT_MS;
+  }
   async hasSession(input) {
     const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
       "sessions",
       "show",
       input.name
     ]));
-    const result = await this.run(spawnSpec.command, spawnSpec.args);
+    const result = await this.run(spawnSpec.command, spawnSpec.args, {
+      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)],
       ["sessions", "history", input.name, "--tail", String(input.lines)],
       ["sessions", "history", "--name", input.name, "--tail", String(input.lines)]
     ];
+    const deadline = Date.now() + this.managementCommandTimeoutMs();
     let lastResult;
     for (const tailArgs of candidates) {
       const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, tailArgs));
-      const result = await this.run(spawnSpec.command, spawnSpec.args);
+      const result = await this.run(spawnSpec.command, spawnSpec.args, {
+        timeoutMs: Math.max(deadline - Date.now(), 1),
+        stage: "session-history"
+      });
       if (result.code === 0) {
         return { text: result.stdout.trimEnd() };
       }
@@ -4077,28 +4193,16 @@ class BridgeRuntime {
       "show",
       input.name
     ]));
-    const result = await this.run(spawnSpec.command, spawnSpec.args);
+    const result = await this.run(spawnSpec.command, spawnSpec.args, {
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "read-session-record"
+    });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "sessions show failed");
     }
-    try {
-      const parsed = JSON.parse(result.stdout);
-      let acpxRecordId;
-      if (typeof parsed.acpxRecordId === "string") {
-        acpxRecordId = parsed.acpxRecordId;
-      } else if (typeof parsed.id === "string") {
-        acpxRecordId = parsed.id;
-      }
-      const agentSessionId = typeof parsed.agentSessionId === "string" ? parsed.agentSessionId : undefined;
-      if (acpxRecordId && /^[\w.:-]+$/.test(acpxRecordId) && acpxRecordId.length >= 8) {
-        return { acpxRecordId, agentSessionId };
-      }
-    } catch {
-      const firstLine = result.stdout.trim().split(/\r?\n/, 1)[0];
-      if (firstLine && /^[\w.:-]+$/.test(firstLine) && firstLine.length >= 8) {
-        return { acpxRecordId: firstLine };
-      }
-    }
+    const record = parseAcpxSessionRecordId(result.stdout);
+    if (record)
+      return record;
     throw new Error("failed to resolve acpx session record id");
   }
   async getAgentSessionId(input) {
@@ -4112,7 +4216,10 @@ class BridgeRuntime {
       input.name,
       input.modeId
     ]));
-    const result = await this.run(spawnSpec.command, spawnSpec.args);
+    const result = await this.run(spawnSpec.command, spawnSpec.args, {
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "set-mode"
+    });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "set-mode failed");
     }
@@ -4126,7 +4233,10 @@ class BridgeRuntime {
       "model",
       input.modelId
     ]));
-    const result = await this.run(spawnSpec.command, spawnSpec.args);
+    const result = await this.run(spawnSpec.command, spawnSpec.args, {
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "set-model"
+    });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "set-model failed");
     }
@@ -4138,7 +4248,10 @@ class BridgeRuntime {
       "-s",
       input.name
     ], { format: "json" }));
-    const result = await this.run(spawnSpec.command, spawnSpec.args);
+    const result = await this.run(spawnSpec.command, spawnSpec.args, {
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "get-session-model"
+    });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "status failed");
     }
@@ -4158,7 +4271,10 @@ class BridgeRuntime {
       "-s",
       input.name
     ]));
-    const result = await this.run(spawnSpec.command, spawnSpec.args);
+    const result = await this.run(spawnSpec.command, spawnSpec.args, {
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "cancel"
+    });
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "cancel failed");
     }
@@ -4173,11 +4289,14 @@ class BridgeRuntime {
       "close",
       input.name
     ]));
-    const result = await this.run(spawnSpec.command, spawnSpec.args);
+    const result = await this.run(spawnSpec.command, spawnSpec.args, {
+      timeoutMs: this.managementCommandTimeoutMs(),
+      stage: "remove-session"
+    });
     if (result.code === 0) {
       return {};
     }
-    if (isMissingBridgeSessionError(result.stderr, result.stdout)) {
+    if (isMissingAcpxSessionError(result.stderr, result.stdout)) {
       return {};
     }
     throw new Error(result.stderr || result.stdout || "sessions close failed");
@@ -4207,54 +4326,30 @@ class BridgeRuntime {
     return {};
   }
   buildSessionArgs(input, tail, options = {}) {
-    const prefix = [
-      "--format",
-      options.format ?? "quiet",
-      "--cwd",
-      input.cwd,
-      ...this.buildPermissionArgs(),
-      ...modelArgs(input.model)
-    ];
-    if (options.verbose) {
-      prefix.push("--verbose");
-    }
-    if (input.agentCommand) {
-      return [...prefix, "--agent", input.agentCommand, ...tail];
-    }
-    return [...prefix, input.agent, ...tail];
+    return buildSessionArgs({
+      agent: input.agent,
+      agentCommand: input.agentCommand,
+      cwd: input.cwd,
+      model: input.model,
+      permission: this.permissionInput()
+    }, tail, options);
   }
   buildPromptArgs(input, tail) {
-    const prefix = [
-      "--format",
-      "json",
-      "--json-strict",
-      "--cwd",
-      input.cwd,
-      ...this.buildPermissionArgs(),
-      ...modelArgs(input.model),
-      ...this.buildQueueOwnerTtlArgs()
-    ];
-    if (input.agentCommand) {
-      return [...prefix, "--agent", input.agentCommand, ...tail];
-    }
-    return [...prefix, input.agent, ...tail];
-  }
-  buildQueueOwnerTtlArgs() {
-    const ttl = this.options.queueOwnerTtlSeconds;
-    if (typeof ttl !== "number" || !Number.isFinite(ttl)) {
-      return [];
-    }
-    return ["--ttl", String(ttl)];
-  }
-  buildPermissionArgs() {
-    const permissionMode = this.options.permissionMode ?? "approve-all";
-    const nonInteractivePermissions = this.options.nonInteractivePermissions ?? "deny";
-    const modeFlag = permissionModeToFlag(permissionMode);
-    const args = [modeFlag, "--non-interactive-permissions", nonInteractivePermissions];
-    if (typeof this.options.permissionPolicy === "string" && this.options.permissionPolicy.trim().length > 0) {
-      args.push("--permission-policy", this.options.permissionPolicy);
-    }
-    return args;
+    return buildPromptArgs({
+      agent: input.agent,
+      agentCommand: input.agentCommand,
+      cwd: input.cwd,
+      model: input.model,
+      permission: this.permissionInput(),
+      queueOwnerTtlSeconds: this.options.queueOwnerTtlSeconds
+    }, tail);
+  }
+  permissionInput() {
+    return {
+      permissionMode: this.options.permissionMode ?? DEFAULT_PERMISSION_MODE,
+      nonInteractivePermissions: this.options.nonInteractivePermissions ?? DEFAULT_NON_INTERACTIVE,
+      permissionPolicy: this.options.permissionPolicy
+    };
   }
 }
 function spawnCapture(command, args, options) {
@@ -4269,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);
@@ -4425,11 +4524,6 @@ function isUnknownVerboseOption(stderr, stdout) {
 ${stdout}`;
   return /(unknown|unrecognized)\b[^\n]*--verbose/i.test(combined);
 }
-function isMissingBridgeSessionError(stderr, stdout) {
-  const combined = `${stderr}
-${stdout}`.toLowerCase();
-  return combined.includes("no named session") || combined.includes("no cwd session") || combined.includes("session not found") || combined.includes("unknown session") || combined.includes("no acpx session found");
-}
 
 // src/bridge/bridge-server.ts
 class BridgeInvalidRequestError extends Error {
@@ -4491,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,
@@ -4498,7 +4601,8 @@ class BridgeServer {
           code: error instanceof BridgeInvalidRequestError ? "BRIDGE_INVALID_REQUEST" : "BRIDGE_INTERNAL_ERROR",
           message,
           ...ensureSessionFields,
-          ...promptDetails
+          ...promptDetails,
+          ...timeoutDetails
         }
       })}
 `;