agent-relay-orchestrator 0.11.3 → 0.11.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-orchestrator",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "Agent Relay orchestrator — manages agent lifecycle across hosts",
   "type": "module",
   "bin": {
@@ -16,7 +16,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "agent-relay-sdk": "0.2.2"
+    "agent-relay-sdk": "0.2.3"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/control.ts

@@ -163,10 +163,10 @@ export function spawnOptionsFromControl(ctrl: Record<string, any>, config: Orche
     profile: typeof ctrl.profile === "string" ? ctrl.profile : undefined,
     workspaceMode: workspaceMode(ctrl.workspaceMode),
     agentProfile: isRecord(ctrl.agentProfile) ? ctrl.agentProfile : undefined,
-    label: ctrl.label,
+    label: typeof ctrl.label === "string" ? ctrl.label : undefined,
     agentId: typeof ctrl.agentId === "string" ? ctrl.agentId : undefined,
-    approvalMode: ctrl.approvalMode || "guarded",
-    prompt: ctrl.prompt,
+    approvalMode: typeof ctrl.approvalMode === "string" ? ctrl.approvalMode : "guarded",
+    prompt: typeof ctrl.prompt === "string" ? ctrl.prompt : undefined,
     systemPromptAppend: typeof ctrl.systemPromptAppend === "string" ? ctrl.systemPromptAppend : undefined,
     tags: stringArray(ctrl.tags),
     capabilities: stringArray(ctrl.capabilities),
@@ -183,6 +183,7 @@ export function spawnOptionsFromRestartSource(restartSource: Record<string, any>
   return {
     provider: restartSource.provider === "codex" ? "codex" : "claude",
     cwd: typeof restartSource.cwd === "string" ? restartSource.cwd : config.baseDir,
+    rig: typeof restartSource.rig === "string" ? restartSource.rig : undefined,
     model: modelFromControl(restartSource),
     effort: typeof restartSource.effort === "string" ? restartSource.effort : undefined,
     profile: typeof restartSource.profile === "string" ? restartSource.profile : undefined,

package/src/index.ts

@@ -17,12 +17,19 @@ if (args[0] === "init") {
   process.exit(0);
 }
 
+if (args[0] === "--version" || args[0] === "-v") {
+  const { VERSION } = await import("./version");
+  console.log(VERSION);
+  process.exit(0);
+}
+
 if (args[0] === "--help" || args[0] === "-h") {
   console.log(`agent-relay-orchestrator — manage agent lifecycle across hosts
 
 Usage:
-  agent-relay-orchestrator          Start the orchestrator daemon
-  agent-relay-orchestrator init     Create default config file
+  agent-relay-orchestrator              Start the orchestrator daemon
+  agent-relay-orchestrator init         Create default config file
+  agent-relay-orchestrator --version    Print version and exit
 
 Environment:
   AGENT_RELAY_URL                   Relay server URL (default: http://localhost:4850)

package/src/self-upgrade.ts

@@ -1,8 +1,7 @@
-import { existsSync } from "node:fs";
 import { join } from "node:path";
 import type { OrchestratorConfig } from "./config";
 import type { RelayClient, RelayCommand } from "./relay";
-import { detectSelfSupervision } from "./self-supervision";
+import { detectSelfSupervision, type SelfSupervision } from "./self-supervision";
 
 const VALID_PROVIDERS = new Set(["auto", "all", "codex", "claude", "orchestrator"]);
 const SEMVER_RE = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
@@ -36,7 +35,6 @@ export interface SelfUpgradePlan {
   providers: string[];
   unit: string;
   runtimePrefix?: string;
-  binary: string;
   installCmd: string[];
   restartCmd: string[];
   /** restart runs decoupled from this process's cgroup (transient unit) */
@@ -63,16 +61,7 @@ export function planSelfUpgrade(
     throw new Error("orchestrator is not under systemd or launchd; remote self-upgrade requires a managed service");
   }
   const unit = supervision.selfUnit;
-  const binary = resolveBinary(supervision.runtimePrefix);
-
-  const installCmd = [
-    binary, "upgrade",
-    "--version", targetVersion,
-    "--providers", providers.join(","),
-    "--no-restart",
-    "--yes",
-  ];
-  if (supervision.runtimePrefix) installCmd.push("--runtime-prefix", supervision.runtimePrefix);
+  const installCmd = buildInstallCommand(targetVersion, providers, supervision, runner);
 
   let restartDetached: boolean;
   let restartCmd: string[];
@@ -93,7 +82,7 @@ export function planSelfUpgrade(
       : ["setsid", "systemctl", "--user", "restart", unit];
   }
 
-  return { targetVersion, providers, unit, runtimePrefix: supervision.runtimePrefix, binary, installCmd, restartCmd, restartDetached };
+  return { targetVersion, providers, unit, runtimePrefix: supervision.runtimePrefix, installCmd, restartCmd, restartDetached };
 }
 
 /**
@@ -145,10 +134,56 @@ function normalizeProviders(value: unknown): string[] {
   return [...new Set(providers)];
 }
 
-function resolveBinary(runtimePrefix?: string): string {
-  if (runtimePrefix) {
-    const local = join(runtimePrefix, "node_modules", ".bin", "agent-relay");
-    if (existsSync(local)) return local;
+function buildInstallCommand(
+  targetVersion: string,
+  providers: string[],
+  supervision: SelfSupervision,
+  runner: SelfUpgradeRunner,
+): string[] {
+  if (supervision.runtimePrefix) {
+    if (!runner.commandExists("npm")) {
+      throw new Error("npm is required for runtime-prefix self-upgrade");
+    }
+    return [
+      "npm",
+      "install",
+      "--prefix",
+      supervision.runtimePrefix,
+      ...packagesForProviders(targetVersion, providers),
+    ];
+  }
+
+  if (runner.commandExists("agent-relay")) {
+    return [
+      "agent-relay", "upgrade",
+      "--version", targetVersion,
+      "--providers", providers.join(","),
+      "--no-restart",
+      "--yes",
+    ];
+  }
+
+  throw new Error("agent-relay CLI is not available and no runtime prefix was detected; self-upgrade cannot install packages");
+}
+
+function packagesForProviders(targetVersion: string, providers: string[]): string[] {
+  const selected = new Set(providers);
+  const packages = new Set<string>();
+  const includeAll = selected.has("all");
+  const includeAuto = selected.has("auto");
+
+  if (includeAll || includeAuto || selected.has("orchestrator")) {
+    packages.add("agent-relay-orchestrator");
   }
-  return "agent-relay";
+  if (includeAll || selected.has("codex")) {
+    packages.add("agent-relay-runner");
+    packages.add("agent-relay-codex");
+  }
+  if (includeAll || selected.has("claude")) {
+    packages.add("agent-relay-runner");
+    packages.add("agent-relay-plugin");
+  }
+
+  if (packages.size === 0) packages.add("agent-relay-orchestrator");
+  return [...packages].map((pkg) => `${pkg}@${targetVersion}`);
 }

package/src/version.ts

@@ -21,6 +21,7 @@ export const CONTRACTS = {
 export const RUNTIME_CAPABILITIES = {
   directoryBrowse: true,
   relayCommandBus: true,
+  selfUpgrade: true,
   authenticatedLogProxy: true,
   artifactProxy: true,
   managedAgentReports: true,