agent-relay-runner 0.10.5 → 0.10.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-runner",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "description": "Unified provider lifecycle runner for Agent Relay",
   "type": "module",
   "bin": {

package/plugins/claude/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.10.5"
+  "version": "0.10.7"
 }

package/plugins/claude/skills/disconnect/SKILL.md

@@ -0,0 +1,16 @@
+---
+name: disconnect
+description: End the current Agent Relay pair session. Use when the user invokes /disconnect or asks to hang up, unpair, or disconnect from a paired agent.
+argument-hint: "[PAIR_ID]"
+allowed-tools: [Bash]
+---
+
+# Agent Relay Disconnect
+
+Run:
+
+```bash
+agent-relay /disconnect $ARGUMENTS
+```
+
+If no pair id is supplied, the CLI ends the active pair for this session. Report the result briefly.

package/plugins/claude/skills/label/SKILL.md

@@ -0,0 +1,23 @@
+---
+name: label
+description: Read, set, or clear the current Agent Relay agent label. Use when the user invokes /label or asks to rename this relay agent.
+argument-hint: "[LABEL|--clear]"
+allowed-tools: [Bash]
+---
+
+# Agent Relay Label
+
+Run:
+
+```bash
+agent-relay /label $ARGUMENTS
+```
+
+Examples:
+
+```bash
+agent-relay /label backend-fixer
+agent-relay /label --clear
+```
+
+Report the new label or current label briefly.

package/plugins/claude/skills/message/SKILL.md

@@ -0,0 +1,24 @@
+---
+name: message
+description: Send a normal Agent Relay message to another agent, label, tag, capability, or broadcast target. Use when the user invokes /message or asks to send a one-off relay message.
+argument-hint: "<target> <message> [--subject TEXT] [--channel NAME]"
+allowed-tools: [Bash]
+---
+
+# Agent Relay Message
+
+Run:
+
+```bash
+agent-relay /message $ARGUMENTS
+```
+
+Examples:
+
+```bash
+agent-relay /message codex "Can you look at that failing action?"
+agent-relay /message tag:backend "Does anyone see the regression?"
+agent-relay /message broadcast "Standup in five minutes"
+```
+
+Report the sent message id briefly.

package/plugins/claude/skills/pair/SKILL.md

@@ -0,0 +1,26 @@
+---
+name: pair
+description: Start, inspect, accept, reject, or send messages in an Agent Relay two-agent pair session. Use when the user invokes /pair or asks to pair this agent with Codex, Claude, or another relay agent.
+argument-hint: "<target|status|accept|reject|send> [args]"
+allowed-tools: [Bash]
+---
+
+# Agent Relay Pair
+
+Run the Agent Relay CLI with the user's arguments:
+
+```bash
+agent-relay /pair $ARGUMENTS
+```
+
+Use this for pair-session commands such as:
+
+```bash
+agent-relay /pair codex "Debug flaky tests"
+agent-relay /pair status
+agent-relay /pair accept PAIR_ID
+agent-relay /pair reject PAIR_ID
+agent-relay /pair send PAIR_ID "What do you see?"
+```
+
+Report the command output briefly. If the CLI cannot detect this session's agent id, rerun with `--agent AGENT_ID` or `--from AGENT_ID` using the Agent Relay ID shown in session context.

package/plugins/claude/skills/reply/SKILL.md

@@ -0,0 +1,25 @@
+---
+name: reply
+description: Reply to an Agent Relay message by ID. Auto-routes to the sender and inherits channel context — no target needed. Use when the user invokes /reply or asks to reply to a specific relay message.
+argument-hint: "<messageId> <message>"
+allowed-tools: [Bash]
+---
+
+# Agent Relay Reply
+
+Run:
+
+```bash
+agent-relay /reply $ARGUMENTS
+```
+
+The server auto-routes the reply to the original sender and inherits the channel (Telegram, Slack, etc.) if applicable. No target or channel ID needed.
+
+Examples:
+
+```bash
+agent-relay /reply 206 "Sounds good, I'll take a look"
+agent-relay /reply 42 "Done — the fix is in commit abc123"
+```
+
+Report the sent message id and resolved target briefly.

package/plugins/claude/skills/send-claimable/SKILL.md

@@ -0,0 +1,24 @@
+---
+name: send-claimable
+description: Send a claimable Agent Relay work item so one matching agent can claim and handle it. Use when the user invokes /send-claimable or wants to enqueue work for another agent.
+argument-hint: "<target> <message> [--subject TEXT] [--channel NAME]"
+allowed-tools: [Bash]
+---
+
+# Agent Relay Send Claimable
+
+Run:
+
+```bash
+agent-relay /send-claimable $ARGUMENTS
+```
+
+Examples:
+
+```bash
+agent-relay /send-claimable codex "Claim this and inspect the failing action"
+agent-relay /send-claimable tag:backend "Fix the failing API test"
+agent-relay /send-claimable cap:review "Review the migration patch"
+```
+
+Report the sent claimable message id briefly.

package/plugins/claude/skills/status/SKILL.md

@@ -0,0 +1,16 @@
+---
+name: status
+description: Show Agent Relay status for this session, including relay health, current agent id, label, tags, readiness, and active pair state. Use when the user invokes /status or asks for relay connection status.
+argument-hint: "[--json]"
+allowed-tools: [Bash]
+---
+
+# Agent Relay Status
+
+Run:
+
+```bash
+agent-relay /status $ARGUMENTS
+```
+
+Summarize the current relay connection, agent identity, label, tags, and active pair state.

package/plugins/claude/skills/tags/SKILL.md

@@ -0,0 +1,25 @@
+---
+name: tags
+description: List or update Agent Relay tags for the current session. Use when the user invokes /tags or asks to set, add, remove, or inspect relay tags.
+argument-hint: "[TAG ...|--list|--add TAGS|--remove TAGS]"
+allowed-tools: [Bash]
+---
+
+# Agent Relay Tags
+
+Run:
+
+```bash
+agent-relay /tags $ARGUMENTS
+```
+
+Examples:
+
+```bash
+agent-relay /tags
+agent-relay /tags backend tests urgent
+agent-relay /tags --add backend,tests
+agent-relay /tags --remove urgent
+```
+
+Report the resulting tags briefly.

package/src/adapter.ts

@@ -26,6 +26,7 @@ export interface RunnerSpawnConfig {
   headless: boolean;
   approvalMode: string;
   label?: string;
+  rig?: string;
   prompt?: string;
   providerArgs: string[];
   providerConfig: ProviderConfig;

package/src/adapters/claude.ts

@@ -36,7 +36,10 @@ export class ClaudeAdapter implements ProviderAdapter {
   buildSpawnArgs(config: RunnerSpawnConfig, providerConfig: ProviderConfig): SpawnArgs {
     const pluginRoot = resolve(import.meta.dir, "../../plugins/claude");
     const pluginDirs = [...new Set([pluginRoot, ...providerConfig.pluginDirs])];
+    const isClaudeRig = /claude-rig/.test(providerConfig.command);
+    const rigPrefix = isClaudeRig && config.rig ? ["launch", config.rig] : [];
     const args = [
+      ...rigPrefix,
       ...pluginDirs.flatMap((dir) => ["--plugin-dir", dir]),
       ...providerConfig.defaultArgs,
       ...config.providerArgs,

package/src/config.ts

@@ -24,7 +24,7 @@ function providersDir(home = agentRelayHome()): string {
 }
 
 export function defaultProviderConfig(provider: string): ProviderConfig {
-  const command = provider === "claude" ? "claude-rig" : provider;
+  const command = provider === "claude" ? "claude" : provider;
   return {
     command,
     defaultArgs: provider === "claude" ? ["--dangerously-skip-permissions"] : [],

package/src/index.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env bun
 import { basename } from "node:path";
+import { isatty } from "node:tty";
 import { ClaudeAdapter } from "./adapters/claude";
 import { CodexAdapter } from "./adapters/codex";
 import { AgentRunner } from "./runner";
@@ -8,7 +9,9 @@ import { loadGlobalConfig, loadProviderConfig, resolveCwd, runnerId } from "./co
 interface CliOptions {
   provider: "claude" | "codex";
   headless: boolean;
+  interactive: boolean;
   cwd?: string;
+  rig?: string;
   relayUrl?: string;
   token?: string;
   approvalMode?: string;
@@ -25,6 +28,12 @@ export async function main(argv = process.argv): Promise<void> {
   const cwd = resolveCwd(opts.cwd, globalConfig.defaultCwd);
   const id = runnerId(opts.provider, cwd, opts.label);
   const adapter = opts.provider === "claude" ? new ClaudeAdapter() : new CodexAdapter();
+
+  let exitResolve: ((code: number) => void) | undefined;
+  const exitPromise = opts.interactive
+    ? new Promise<number>((resolve) => { exitResolve = resolve; })
+    : undefined;
+
   const runner = new AgentRunner({
     provider: opts.provider,
     runnerId: id,
@@ -36,17 +45,26 @@ export async function main(argv = process.argv): Promise<void> {
     headless: opts.headless,
     approvalMode: opts.approvalMode ?? providerConfig.defaultApprovalMode,
     label: opts.label,
+    rig: opts.rig,
     prompt: opts.prompt,
     providerArgs: opts.providerArgs,
     providerConfig,
     adapter,
+    onProviderExit: exitResolve ? (code) => exitResolve!(code ?? 1) : undefined,
   });
   await runner.run();
-  await waitForShutdown(() => runner.stop());
+
+  if (opts.interactive && exitPromise) {
+    const code = await Promise.race([exitPromise, signalPromise()]);
+    await runner.stop();
+    process.exit(code);
+  } else {
+    await waitForShutdown(() => runner.stop());
+  }
 }
 
 function parseArgs(argv: string[]): CliOptions {
-  const bin = basename(argv[1] || "");
+  const bin = [argv[1], process.env._].map((s) => basename(s || "")).join(" ");
   let provider: "claude" | "codex" = bin.includes("claude") ? "claude" : "codex";
   const relayArgs = argv.slice(2);
   const providerSep = relayArgs.indexOf("--");
@@ -54,6 +72,7 @@ function parseArgs(argv: string[]): CliOptions {
   const providerArgs = providerSep >= 0 ? relayArgs.slice(providerSep + 1) : [];
   let headless = false;
   let cwd: string | undefined;
+  let rig: string | undefined;
   let relayUrl: string | undefined;
   let token: string | undefined;
   let approvalMode: string | undefined;
@@ -66,6 +85,7 @@ function parseArgs(argv: string[]): CliOptions {
     if (arg === "claude" || arg === "codex") provider = arg;
     else if (arg === "--headless") headless = true;
     else if (arg === "--cwd" && ownArgs[i + 1]) cwd = ownArgs[++i];
+    else if (arg === "--rig" && ownArgs[i + 1]) rig = ownArgs[++i];
     else if (arg === "--relay-url" && ownArgs[i + 1]) relayUrl = ownArgs[++i];
     else if (arg === "--token" && ownArgs[i + 1]) token = ownArgs[++i];
     else if ((arg === "--approval" || arg === "--approval-mode") && ownArgs[i + 1]) approvalMode = ownArgs[++i];
@@ -80,11 +100,19 @@ function parseArgs(argv: string[]): CliOptions {
     }
   }
 
-  return { provider, headless, cwd, relayUrl, token, approvalMode, label, agentId, prompt, providerArgs };
+  const interactive = !headless && isatty(0);
+  return { provider, headless, interactive, cwd, rig, relayUrl, token, approvalMode, label, agentId, prompt, providerArgs };
 }
 
 function printHelp(provider: string): void {
-  console.log(`${provider}-relay [--headless] [--cwd PATH] [--relay-url URL] [--approval MODE] [--label NAME] [--agent-id ID] [-- provider-args...]`);
+  console.log(`${provider}-relay [--headless] [--rig NAME] [--cwd PATH] [--relay-url URL] [--approval MODE] [--label NAME] [--agent-id ID] [-- provider-args...]`);
+}
+
+function signalPromise(): Promise<number> {
+  return new Promise<number>((resolve) => {
+    process.on("SIGINT", () => resolve(130));
+    process.on("SIGTERM", () => resolve(143));
+  });
 }
 
 async function waitForShutdown(stop: () => Promise<void>): Promise<void> {

package/src/runner.ts

@@ -16,10 +16,12 @@ interface RunnerOptions {
   headless: boolean;
   approvalMode: string;
   label?: string;
+  rig?: string;
   prompt?: string;
   providerArgs: string[];
   providerConfig: ProviderConfig;
   adapter: ProviderAdapter;
+  onProviderExit?: (code: number | null) => void;
 }
 
 export class AgentRunner {
@@ -77,7 +79,10 @@ export class AgentRunner {
 
   async run(): Promise<void> {
     this.control = startControlServer({ onStatus: (status) => this.setProviderStatus(status) });
-    this.options.adapter.onStatusChange((status) => this.setProviderStatus(status));
+    this.options.adapter.onStatusChange((status) => {
+      this.setProviderStatus(status);
+      if (status === "offline" || status === "error") this.options.onProviderExit?.(status === "offline" ? 0 : 1);
+    });
     this.bus.on("message.new", (message) => this.enqueueMessage(message as Message));
     this.bus.on("command", (type, params, commandId, command) => {
       void this.handleCommand(type, params, commandId, command);
@@ -123,6 +128,7 @@ export class AgentRunner {
       headless: this.options.headless,
       approvalMode: this.options.approvalMode,
       ...(this.options.label ? { label: this.options.label } : {}),
+      ...(this.options.rig ? { rig: this.options.rig } : {}),
       ...(this.options.prompt ? { prompt: this.options.prompt } : {}),
       providerArgs: this.options.providerArgs,
       providerConfig: this.options.providerConfig,