agent-relay-orchestrator 0.91.3 → 0.91.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-orchestrator",
-  "version": "0.91.3",
+  "version": "0.91.4",
   "description": "Agent Relay orchestrator — manages agent lifecycle across hosts",
   "type": "module",
   "bin": {
@@ -9,6 +9,7 @@
   "files": [
     "src/**/*.ts",
     "!src/**/*.test.ts",
+    "vendor/**",
     "README.md"
   ],
   "scripts": {
@@ -16,7 +17,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "agent-relay-sdk": "0.2.70"
+    "agent-relay-sdk": "0.2.71"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/shared-callmux.ts

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, isAbsolute, join } from "node:path";
+import { dirname, isAbsolute, join, resolve } from "node:path";
 import { errMessage, isRecord } from "agent-relay-sdk";
 import type { OrchestratorConfig } from "./config";
 import { agentRelayHome } from "./config";
@@ -54,6 +54,15 @@ export interface SharedCallmuxSupervisorDeps {
   setTimeout(fn: () => void, ms: number): Timer;
   clearTimeout(timer: Timer): void;
   log(message: string): void;
+  report(snapshot: SharedCallmuxHealthSnapshot): void;
+}
+
+export interface SharedCallmuxHealthSnapshot {
+  state: "disabled" | "missing" | "starting" | "running" | "unhealthy" | "restarting" | "stopped";
+  url: string;
+  command?: string;
+  reason?: string;
+  pid?: number;
 }
 
 export function sharedCallmuxOptionsFromEnv(env: Record<string, string | undefined> = process.env): SharedCallmuxOptions {
@@ -63,14 +72,13 @@ export function sharedCallmuxOptionsFromEnv(env: Record<string, string | undefin
   const port = numberEnv(env[SHARED_CALLMUX_PORT_ENV]) ?? parsed?.port ?? DEFAULT_SHARED_CALLMUX_PORT;
   const url = explicitUrl ?? `http://${host}:${port}/mcp`;
   return {
-    // PATH/env-resolved callmux must be >=0.21.0; generated config uses exposeMetaTools.
-    command: env[SHARED_CALLMUX_COMMAND_ENV] || "callmux",
+    command: env[SHARED_CALLMUX_COMMAND_ENV] || bundledCallmuxCommand() || "callmux",
     host,
     port,
     url,
     configPath: env[SHARED_CALLMUX_CONFIG_ENV] || join(agentRelayHome(), "callmux", "shared-listener.json"),
     sourceConfigPath: env[SHARED_CALLMUX_SOURCE_CONFIG_ENV] || env.CALLMUX_CONFIG || join(homedir(), ".config", "callmux", "config.json"),
-    enabled: env[SHARED_CALLMUX_ENABLE_ENV] === "1",
+    enabled: !envOff(env[SHARED_CALLMUX_ENABLE_ENV]),
   };
 }
 
@@ -118,14 +126,17 @@ export class SharedCallmuxSupervisor {
 
   start(): void {
     if (!this.opts.enabled) {
-      this.deps.log("[orchestrator] shared callmux listener disabled (set AGENT_RELAY_SHARED_CALLMUX_ENABLE=1 to enable)");
+      this.deps.log("[orchestrator] shared callmux listener disabled by AGENT_RELAY_SHARED_CALLMUX_ENABLE=0");
+      this.report("disabled", "global kill-switch");
       return;
     }
     this.deps.log(`[orchestrator] Shared callmux listener: ${this.opts.url}`);
     if (!this.deps.which(this.opts.command)) {
       this.deps.log("[orchestrator] shared callmux not found — shared listener dormant");
+      this.report("missing", "command not found");
       return;
     }
+    this.report("starting");
     this.spawn();
     this.healthTimer = this.deps.setInterval(() => {
       void this.checkHealth();
@@ -156,9 +167,11 @@ export class SharedCallmuxSupervisor {
     }
     if (ok) {
       this.backoffMs = this.timing.restartBaseMs ?? 1_000;
+      this.report("running", undefined, this.proc?.pid);
       return true;
     }
     this.deps.log(`[orchestrator] Shared callmux readiness failed at ${readyUrl}; restarting`);
+    this.report("unhealthy", "readiness failed", this.proc?.pid);
     this.restart("readiness failed");
     return false;
   }
@@ -177,20 +190,24 @@ export class SharedCallmuxSupervisor {
       proc = this.deps.spawn(this.opts.command, args, { env, cwd: homedir() });
     } catch (err) {
       this.deps.log(`[orchestrator] Shared callmux listener failed to start: ${errMessage(err)}; scheduling restart`);
+      this.report("restarting", errMessage(err));
       this.scheduleRestart();
       return;
     }
     this.proc = proc;
     this.deps.log(`[orchestrator] Started shared callmux listener pid=${proc.pid ?? "unknown"}`);
+    this.report("running", undefined, proc.pid);
     proc.exited.then((code) => {
       if (this.proc !== proc || this.stopping) return;
       this.proc = null;
       this.deps.log(`[orchestrator] Shared callmux listener exited (${code ?? "signal"}); scheduling restart`);
+      this.report("restarting", `exited ${code ?? "signal"}`);
       this.scheduleRestart();
     }).catch((err) => {
       if (this.proc !== proc || this.stopping) return;
       this.proc = null;
       this.deps.log(`[orchestrator] Shared callmux listener exit watcher failed: ${err}`);
+      this.report("restarting", errMessage(err));
       this.scheduleRestart();
     });
   }
@@ -201,9 +218,20 @@ export class SharedCallmuxSupervisor {
       this.proc.kill("SIGTERM");
       this.proc = null;
     }
+    this.report("restarting", reason);
     this.scheduleRestart();
   }
 
+  private report(state: SharedCallmuxHealthSnapshot["state"], reason?: string, pid?: number): void {
+    this.deps.report({
+      state,
+      url: this.opts.url,
+      command: this.opts.command,
+      ...(reason ? { reason } : {}),
+      ...(pid ? { pid } : {}),
+    });
+  }
+
   private scheduleRestart(): void {
     if (this.stopping || this.restartTimer) return;
     const delay = this.backoffMs;
@@ -238,15 +266,26 @@ function defaultDeps(): SharedCallmuxSupervisorDeps {
     setTimeout: (fn, ms) => setTimeout(fn, ms),
     clearTimeout: (timer) => clearTimeout(timer),
     log: (message) => console.error(message),
+    report: (snapshot) => console.error(`[orchestrator] shared callmux status ${snapshot.state}${snapshot.reason ? `: ${snapshot.reason}` : ""}`),
   };
 }
 
+export function bundledCallmuxCommand(): string | null {
+  const candidate = resolve(import.meta.dir, "../vendor/callmux/bin/callmux.js");
+  return existsSync(candidate) ? candidate : null;
+}
+
 function resolveCommand(command: string): string | null {
   if (isAbsolute(command)) return existsSync(command) ? command : null;
   if (command.includes("/")) return existsSync(command) ? command : null;
   return Bun.which(command);
 }
 
+function envOff(value: string | undefined): boolean {
+  if (value === undefined || value === null || value === "") return false;
+  return ["0", "false", "off", "no"].includes(value.trim().toLowerCase());
+}
+
 function readJsonObject(path: string): Record<string, unknown> {
   if (!existsSync(path)) return {};
   const parsed = JSON.parse(readFileSync(path, "utf8"));