agent-relay-server 0.8.1 → 0.10.0

package/src/types.ts

@@ -1,488 +1 @@
-export type AgentKind = "provider" | "channel" | "orchestrator" | "system" | "user";
-
-export interface AgentCard {
-  id: string;
-  name: string;
-  kind: AgentKind;
-  label?: string; // human-friendly alias; acts as a fan-out target ("label:foo")
-  tags: string[];
-  machine?: string;
-  rig?: string;
-  capabilities: string[];
-  ready: boolean;
-  status: "online" | "idle" | "busy" | "offline";
-  instanceId?: string;
-  epoch: number;
-  meta?: Record<string, unknown>;
-  lastSeen: number;
-  createdAt: number;
-}
-
-export type MessageKind =
-  | "chat"
-  | "channel.event"
-  | "task"
-  | "pair"
-  | "control"
-  | "system";
-
-export interface Message {
-  id: number;
-  from: string;
-  to: string; // agent-id | "tag:<name>" | "broadcast" | "cap:<name>"
-  kind: MessageKind;
-  channel?: string;
-  subject?: string;
-  body: string;
-  threadId?: number;
-  replyTo?: number;
-  claimable?: boolean;
-  claimedBy?: string;
-  claimedAt?: number;
-  claimExpiresAt?: number;
-  idempotencyKey?: string;
-  payload: Record<string, unknown>;
-  meta?: Record<string, unknown>;
-  readBy: string[];
-  createdAt: number;
-}
-
-export interface SendMessageInput {
-  from: string;
-  to: string;
-  kind?: MessageKind;
-  channel?: string;
-  subject?: string;
-  body: string;
-  replyTo?: number;
-  claimable?: boolean;
-  idempotencyKey?: string;
-  payload?: Record<string, unknown>;
-  meta?: Record<string, unknown>;
-}
-
-export type ConnectorKind = "channel" | "event" | "provider" | "orchestrator";
-export type ConnectorAction = "install" | "uninstall" | "enable" | "disable" | "start" | "stop" | "restart" | "status" | "doctor";
-
-export interface ConnectorManifest {
-  schema: "agent-relay.connector.v1";
-  id: string;
-  kind: ConnectorKind;
-  packageName?: string;
-  binary: string;
-  displayName: string;
-  description?: string;
-  version: string;
-  capabilities: string[];
-  commands: Partial<Record<ConnectorAction, string[]>>;
-  configSchema?: Record<string, unknown>;
-}
-
-interface ConnectorRuntime {
-  installed: boolean;
-  enabled?: boolean;
-  running?: boolean;
-  status?: "ok" | "warn" | "error" | "unknown";
-  detail?: string;
-  updatedAt?: string;
-  raw?: unknown;
-}
-
-export interface ConnectorSummary {
-  id: string;
-  kind: ConnectorKind;
-  displayName: string;
-  description?: string;
-  version: string;
-  packageName?: string;
-  binary: string;
-  capabilities: string[];
-  registryPath: string;
-  manifest: ConnectorManifest;
-  config?: Record<string, unknown>;
-  state?: Record<string, unknown>;
-  runtime: ConnectorRuntime;
-}
-
-export interface ConnectorActionResult {
-  connectorId: string;
-  action: ConnectorAction;
-  command?: string[];
-  ok: boolean;
-  exitCode?: number | null;
-  stdout?: string;
-  stderr?: string;
-  parsed?: unknown;
-}
-
-export type PairStatus = "pending" | "active" | "ended" | "rejected" | "expired";
-
-export interface PairSession {
-  id: string;
-  requesterId: string;
-  targetId: string;
-  status: PairStatus;
-  objective?: string;
-  createdAt: number;
-  updatedAt: number;
-  expiresAt: number;
-  acceptedAt?: number;
-  endedAt?: number;
-  endedBy?: string;
-  lastMessageAt?: number;
-  meta: Record<string, unknown>;
-}
-
-export interface CreatePairInput {
-  from: string;
-  target: string;
-  objective?: string;
-  ttlMs?: number;
-  meta?: Record<string, unknown>;
-}
-
-export interface PairActionInput {
-  agentId: string;
-  reason?: string;
-}
-
-export interface PairMessageInput {
-  from: string;
-  body: string;
-  subject?: string;
-}
-
-export interface PollQuery {
-  for: string; // agent-id
-  since?: number; // unix ms (createdAt cursor)
-  sinceId?: number; // monotonic message id cursor (preferred — avoids same-ms collisions)
-  unread?: boolean;
-  channel?: string;
-  limit?: number;
-}
-
-export interface RegisterAgentInput {
-  id: string;
-  name: string;
-  kind?: AgentKind;
-  label?: string | null;
-  tags?: string[];
-  machine?: string;
-  rig?: string;
-  capabilities?: string[];
-  ready?: boolean;
-  status?: AgentCard["status"];
-  instanceId?: string;
-  meta?: Record<string, unknown>;
-}
-
-export interface AgentSessionGuard {
-  instanceId?: string;
-  epoch?: number;
-}
-
-export type TaskSeverity = "info" | "warning" | "critical";
-export type TaskStatus =
-  | "open"
-  | "claimed"
-  | "in_progress"
-  | "blocked"
-  | "done"
-  | "failed"
-  | "canceled";
-
-export interface Task {
-  id: number;
-  source: string;
-  title: string;
-  body: string;
-  severity: TaskSeverity;
-  status: TaskStatus;
-  target: string;
-  channel?: string;
-  dedupeKey?: string;
-  externalUrl?: string;
-  occurrenceCount: number;
-  claimedBy?: string;
-  claimedAt?: number;
-  claimExpiresAt?: number;
-  messageId?: number;
-  result?: string;
-  metadata: Record<string, unknown>;
-  createdAt: number;
-  updatedAt: number;
-  lastSeenAt: number;
-}
-
-export interface TaskEvent {
-  id: number;
-  taskId: number;
-  source: string;
-  type: string;
-  severity: TaskSeverity;
-  title: string;
-  body: string;
-  metadata: Record<string, unknown>;
-  createdAt: number;
-}
-
-export interface IntegrationEventInput {
-  source?: string;
-  type?: string;
-  severity?: TaskSeverity;
-  status?: TaskStatus | "resolved";
-  title: string;
-  body: string;
-  target: string;
-  channel?: string;
-  dedupeKey?: string;
-  externalUrl?: string;
-  metadata?: Record<string, unknown>;
-}
-
-export interface IntegrationTaskStats {
-  source: string;
-  tasks: number;
-  openTasks: number;
-  waitingTasks: number;
-  failedTasks: number;
-  lastSeenAt?: number;
-  lastUpdatedAt?: number;
-}
-
-export interface IntegrationSummary {
-  name: string;
-  configured: boolean;
-  observed: boolean;
-  scopes: string[];
-  targets: string[];
-  channels: string[];
-  callbackHost?: string;
-  callbackConfigured: boolean;
-  rateLimit: {
-    limitPerMinute: number;
-    currentWindowCount: number;
-    windowStartedAt?: number;
-  };
-  taskStats: IntegrationTaskStats;
-}
-
-export type ChannelDirection = "inbound" | "outbound" | "bidirectional";
-
-export type ChannelRouteTarget =
-  | { type: "agent"; id: string }
-  | { type: "label"; id: string }
-  | { type: "tag"; id: string }
-  | { type: "capability"; id: string }
-  | { type: "broadcast" }
-  | { type: "orchestrator"; id: string };
-
-export type ChannelBindingMode = "exclusive" | "claimable" | "broadcast";
-
-export interface ChannelBinding {
-  id: string;
-  channelId: string;
-  conversationId?: string;
-  target: ChannelRouteTarget;
-  mode: ChannelBindingMode;
-  priority: number;
-  createdAt: number;
-  updatedAt: number;
-}
-
-export interface ChannelTargetHealth {
-  status: "ok" | "warning" | "error";
-  detail: string;
-  target: ChannelRouteTarget;
-  matches: Array<{
-    id: string;
-    name: string;
-    status: AgentCard["status"];
-    ready: boolean;
-    lastSeen: number;
-    label?: string;
-    tags: string[];
-    capabilities: string[];
-  }>;
-}
-
-export interface ChannelSummary {
-  id: string;
-  name: string;
-  type: string;
-  transport: string;
-  agentId: string;
-  accountId: string;
-  status: AgentCard["status"];
-  ready: boolean;
-  direction: ChannelDirection;
-  target?: string;
-  binding?: ChannelBinding;
-  targetHealth?: ChannelTargetHealth;
-  topicChannels: string[];
-  capabilities: string[];
-  tags: string[];
-  lastSeen: number;
-  meta?: Record<string, unknown>;
-}
-
-export interface TaskStatusInput {
-  status: TaskStatus;
-  agentId?: string;
-  instanceId?: string;
-  epoch?: number;
-  result?: string;
-  body?: string;
-  metadata?: Record<string, unknown>;
-}
-
-export interface InboxThreadState {
-  operatorId: string;
-  peerId: string;
-  readCursorMessageId?: number;
-  archivedAtMessageId?: number;
-  updatedAt: number;
-}
-
-export interface InboxDraft {
-  operatorId: string;
-  peerId: string;
-  body: string;
-  subject?: string;
-  channel?: string;
-  updatedAt: number;
-}
-
-export interface InboxState {
-  operatorId: string;
-  threads: InboxThreadState[];
-  drafts: InboxDraft[];
-}
-
-export type ActivityKind = "message" | "reply" | "question" | "operator" | "pair" | "task" | "state";
-
-export interface ActivityEvent {
-  id: number;
-  operatorId?: string;
-  clientId?: string;
-  kind: ActivityKind;
-  title: string;
-  body?: string;
-  meta?: string;
-  icon?: string;
-  view?: string;
-  peer?: string;
-  messageId?: number;
-  pairId?: string;
-  taskId?: number;
-  agentId?: string;
-  metadata: Record<string, unknown>;
-  createdAt: number;
-}
-
-export interface ActivityEventInput {
-  operatorId?: string;
-  clientId?: string;
-  kind: ActivityKind;
-  title: string;
-  body?: string;
-  meta?: string;
-  icon?: string;
-  view?: string;
-  peer?: string;
-  messageId?: number;
-  pairId?: string;
-  taskId?: number;
-  agentId?: string;
-  metadata?: Record<string, unknown>;
-}
-
-// --- Orchestrators ---
-
-export type OrchestratorStatus = "online" | "offline";
-export type SpawnProvider = "claude" | "codex";
-export type SpawnApprovalMode = "open" | "guarded" | "read-only";
-
-export interface Orchestrator {
-  id: string;
-  hostname: string;
-  status: OrchestratorStatus;
-  agentId: string; // relay agent id for messaging
-  providers: SpawnProvider[];
-  baseDir: string;
-  envKeys: string[]; // names only, never values
-  version?: string;
-  protocolVersion?: number;
-  gitSha?: string;
-  health?: OrchestratorHealth;
-  meta: Record<string, unknown>;
-  managedAgents: ManagedAgent[];
-  lastSeen: number;
-  createdAt: number;
-}
-
-export interface OrchestratorHealth {
-  status: "ok" | "warn" | "error";
-  restartRequired: boolean;
-  issues: Array<{
-    code: "missing-version" | "outdated" | "protocol-mismatch" | "restart-required";
-    detail: string;
-  }>;
-}
-
-export interface ManagedAgent {
-  agentId: string;
-  provider: SpawnProvider;
-  tmuxSession: string;
-  cwd: string;
-  label?: string;
-  approvalMode: SpawnApprovalMode;
-  pid?: number;
-  startedAt: number;
-}
-
-export interface RegisterOrchestratorInput {
-  id: string;
-  hostname: string;
-  providers: SpawnProvider[];
-  baseDir: string;
-  envKeys?: string[];
-  version?: string;
-  protocolVersion?: number;
-  gitSha?: string;
-  meta?: Record<string, unknown>;
-}
-
-export interface OrchestratorSpawnInput {
-  provider: SpawnProvider;
-  cwd?: string;
-  label?: string;
-  approvalMode?: SpawnApprovalMode;
-  prompt?: string;
-  env?: Record<string, string>;
-}
-
-export interface OrchestratorSpawnResult {
-  orchestratorId: string;
-  provider: SpawnProvider;
-  tmuxSession: string;
-  cwd: string;
-  label?: string;
-  approvalMode: SpawnApprovalMode;
-  pid?: number;
-  startedAt: number;
-}
-
-export interface HealthCheck {
-  name: string;
-  status: "ok" | "warn" | "error";
-  detail?: string;
-  count?: number;
-}
-
-export interface HealthReport {
-  status: "ok" | "degraded" | "error";
-  version: string;
-  generatedAt: number;
-  checks: HealthCheck[];
-}
+export * from "agent-relay-sdk/types";

package/src/upgrade.ts

@@ -28,6 +28,7 @@ export type UpgradeSnapshot = {
   targetVersion: string;
   serverPackage?: InstalledPackage;
   codexPackage?: InstalledPackage;
+  runnerPackage?: InstalledPackage;
   orchestratorPackage?: InstalledPackage;
   codexCopiedPackage?: InstalledPackage;
   claudePluginInstalls: ClaudePluginInstall[];
@@ -71,9 +72,9 @@ export async function detectUpgradeSnapshot(options: UpgradeOptions = {}): Promi
   const codexCopiedPackage = readPackageVersion(join(homeDir(), ".agent-relay", "codex", "package", "package.json"));
   const claudePluginInstalls = readClaudePluginInstalls(join(homeDir(), ".claude", "plugins", "installed_plugins.json"));
 
-  const packageManager = bunPackages.has("agent-relay-server") || bunPackages.has("agent-relay-codex") || bunPackages.has("agent-relay-orchestrator")
+  const packageManager = bunPackages.has("agent-relay-server") || bunPackages.has("agent-relay-runner") || bunPackages.has("agent-relay-codex") || bunPackages.has("agent-relay-orchestrator")
     ? "bun"
-    : npmPackages.has("agent-relay-server") || npmPackages.has("agent-relay-codex") || npmPackages.has("agent-relay-orchestrator")
+    : npmPackages.has("agent-relay-server") || npmPackages.has("agent-relay-runner") || npmPackages.has("agent-relay-codex") || npmPackages.has("agent-relay-orchestrator")
       ? "npm"
       : commandExists("bun")
         ? "bun"
@@ -85,12 +86,13 @@ export async function detectUpgradeSnapshot(options: UpgradeOptions = {}): Promi
     targetVersion,
     serverPackage: installedPackage("agent-relay-server", bunPackages, npmPackages),
     codexPackage: installedPackage("agent-relay-codex", bunPackages, npmPackages),
+    runnerPackage: installedPackage("agent-relay-runner", bunPackages, npmPackages),
     orchestratorPackage: installedPackage("agent-relay-orchestrator", bunPackages, npmPackages),
     codexCopiedPackage: codexCopiedPackage
       ? { version: codexCopiedPackage, source: "copied", path: join(homeDir(), ".agent-relay", "codex", "package") }
       : undefined,
     claudePluginInstalls,
-    hasCodexCommand: commandExists("agent-relay-codex") || commandExists("codex-relay") || existsSync(join(homeDir(), ".agent-relay", "codex", "package")),
+    hasCodexCommand: commandExists("codex-relay") || commandExists("agent-relay-runner"),
     hasOrchestratorCommand: commandExists("agent-relay-orchestrator"),
     hasClaudeCommand: commandExists("claude"),
     hasSystemdUserService: hasSystemdUserService("agent-relay.service"),
@@ -108,6 +110,7 @@ export function createUpgradePlan(snapshot: UpgradeSnapshot, options: UpgradeOpt
   const codexRequested = providerSet.has("all") || providerSet.has("codex") || (providerSet.has("auto") && isCodexDetected(snapshot));
   const claudeRequested = providerSet.has("all") || providerSet.has("claude") || (providerSet.has("auto") && isClaudeRelayDetected(snapshot));
   const orchestratorRequested = providerSet.has("all") || providerSet.has("orchestrator") || (providerSet.has("auto") && isOrchestratorDetected(snapshot));
+  const runnerRequested = codexRequested || claudeRequested;
   const actions: UpgradeAction[] = [];
   const warnings: string[] = [];
 
@@ -115,7 +118,7 @@ export function createUpgradePlan(snapshot: UpgradeSnapshot, options: UpgradeOpt
     warnings.push("No supported global package manager found. Install Bun or npm, then rerun `agent-relay upgrade`.");
   } else {
     const packages = [`agent-relay-server@${targetVersion}`];
-    if (codexRequested) packages.push(`agent-relay-codex@${targetVersion}`);
+    if (runnerRequested) packages.push(`agent-relay-runner@${targetVersion}`);
     if (orchestratorRequested) packages.push(`agent-relay-orchestrator@${targetVersion}`);
     const command = snapshot.packageManager === "bun"
       ? ["bun", "add", "-g", ...packages]
@@ -123,39 +126,21 @@ export function createUpgradePlan(snapshot: UpgradeSnapshot, options: UpgradeOpt
     actions.push({
       label: "Upgrade global packages",
       command,
-      reason: `Update server${codexRequested ? ", Codex integration" : ""}${orchestratorRequested ? ", and orchestrator" : ""} packages to ${targetVersion}.`,
+      reason: `Update server${runnerRequested ? ", provider runner" : ""}${orchestratorRequested ? ", and orchestrator" : ""} packages to ${targetVersion}.`,
       mutates: true,
     });
   }
 
-  if (codexRequested) {
-    actions.push({
-      label: "Refresh Codex relay install",
-      command: ["agent-relay-codex", "install", "--alias"],
-      reason: "Refresh copied Codex package, launcher shims, hooks, and plugin marketplace files.",
-      mutates: true,
-    });
-  } else if (providerSet.has("auto") && !isCodexDetected(snapshot)) {
+  if (!codexRequested && providerSet.has("auto") && !isCodexDetected(snapshot)) {
     warnings.push("Codex provider not detected; skipping Codex integration upgrade.");
   }
 
   if (claudeRequested) {
-    if (snapshot.hasClaudeCommand && snapshot.claudePluginInstalls.length > 0) {
-      for (const scope of uniqueStrings(snapshot.claudePluginInstalls.map((install) => install.scope || "user"))) {
-        actions.push({
-          label: `Update Claude plugin (${scope})`,
-          command: ["claude", "plugin", "update", "agent-relay@agent-relay", "--scope", scope],
-          reason: "Update installed Claude Code Agent Relay plugin.",
-          mutates: true,
-        });
-      }
-    } else if (!snapshot.hasClaudeCommand) {
+    if (!snapshot.hasClaudeCommand) {
       warnings.push("Claude Code command not detected; skipping Claude plugin upgrade.");
-    } else {
-      warnings.push("Claude Code detected, but agent-relay@agent-relay plugin is not installed; skipping Claude plugin upgrade.");
     }
   } else if (providerSet.has("auto") && !isClaudeRelayDetected(snapshot)) {
-    warnings.push("Claude Agent Relay plugin not detected; skipping Claude plugin upgrade.");
+    warnings.push("Claude runner not detected; skipping Claude runner upgrade.");
   }
 
   if (!orchestratorRequested && providerSet.has("auto") && !isOrchestratorDetected(snapshot)) {
@@ -248,6 +233,7 @@ export function formatUpgradePlan(plan: UpgradePlan, options: { dryRun?: boolean
     `- server package: ${formatPackage(plan.snapshot.serverPackage)}`,
     `- running server: ${plan.snapshot.runningServerVersion ?? "unknown"}`,
     `- codex package: ${formatPackage(plan.snapshot.codexPackage)}`,
+    `- runner package: ${formatPackage(plan.snapshot.runnerPackage)}`,
     `- codex copied package: ${formatPackage(plan.snapshot.codexCopiedPackage)}`,
     `- orchestrator package: ${formatPackage(plan.snapshot.orchestratorPackage)}`,
     `- running orchestrators: ${formatRunningOrchestrators(plan.snapshot.runningOrchestrators)}`,
@@ -273,11 +259,11 @@ export function formatUpgradePlan(plan: UpgradePlan, options: { dryRun?: boolean
 }
 
 function isCodexDetected(snapshot: UpgradeSnapshot): boolean {
-  return Boolean(snapshot.codexPackage || snapshot.codexCopiedPackage || snapshot.hasCodexCommand);
+  return Boolean(snapshot.runnerPackage || snapshot.codexPackage || snapshot.hasCodexCommand);
 }
 
 function isClaudeRelayDetected(snapshot: UpgradeSnapshot): boolean {
-  return snapshot.claudePluginInstalls.length > 0;
+  return Boolean(snapshot.runnerPackage || snapshot.hasClaudeCommand);
 }
 
 function isOrchestratorDetected(snapshot: UpgradeSnapshot): boolean {