agent-relay-server 0.16.0 → 0.18.0

package/src/mcp.ts

@@ -1,8 +1,8 @@
 import { Buffer } from "node:buffer";
-import { randomUUID } from "node:crypto";
-import { isAbsolute, relative, resolve } from "node:path";
 import { getArtifactStorage, maxArtifactBytes, normalizeDigest } from "./artifact-storage";
 import { createCommand } from "./commands-db";
+import { buildSpawnCommand, generateSpawnRequestId, resolveSpawnModelParams, type SpawnModelParams } from "./spawn-command";
+import { isPathWithinBase } from "./utils";
 import { MAX_BODY_BYTES, VERSION } from "./config";
 import { getManagedAgentState, getSpawnPolicy, listSpawnPolicies } from "./config-store";
 import {
@@ -33,7 +33,8 @@ import {
   isIntegrationAllowed,
 } from "./security";
 import type { ActivityKind, AgentCard, ArtifactKind, ArtifactSensitivity, AttachmentRef, Command, SendMessageInput, Message, SpawnApprovalMode, SpawnProvider } from "./types";
-import { resolveProviderSelection, type ProviderEffort } from "agent-relay-sdk/provider-catalog";
+import { type ProviderEffort } from "agent-relay-sdk/provider-catalog";
+import { isRecord, SPAWN_PROVIDERS, APPROVAL_MODES, VALID_EFFORTS } from "agent-relay-sdk";
 import { childRunnerRuntimeTokenEnv, runnerRuntimeTokenEnv } from "./runtime-tokens";
 
 type JsonRpcId = string | number | null;
@@ -66,9 +67,7 @@ const VALID_ARTIFACT_KINDS = ["image", "audio", "video", "document", "archive",
 const VALID_ARTIFACT_SENSITIVITIES = ["public", "normal", "sensitive", "secret"] as const;
 const VALID_ARTIFACT_ROLES = ["media", "patch", "report", "log", "output", "input"] as const;
 const VALID_ARTIFACT_ENTITY_TYPES = ["message", "task", "recipeRun", "recipeStep", "channelEvent"] as const;
-const VALID_SPAWN_PROVIDERS = ["claude", "codex"] as const;
-const VALID_SPAWN_APPROVALS = ["open", "guarded", "read-only"] as const;
-const VALID_PROVIDER_EFFORTS = ["low", "medium", "high", "xhigh", "max"] as const;
+
 
 const TOOLS: ToolDefinition[] = [
   {
@@ -201,13 +200,13 @@ const TOOLS: ToolDefinition[] = [
     inputSchema: {
       type: "object",
       properties: {
-        provider: { type: "string", enum: VALID_SPAWN_PROVIDERS },
+        provider: { type: "string", enum: SPAWN_PROVIDERS },
         orchestratorId: { type: "string" },
         cwd: { type: "string" },
         label: { type: "string" },
         model: { type: "string" },
-        effort: { type: "string", enum: VALID_PROVIDER_EFFORTS },
-        approvalMode: { type: "string", enum: VALID_SPAWN_APPROVALS },
+        effort: { type: "string", enum: VALID_EFFORTS },
+        approvalMode: { type: "string", enum: APPROVAL_MODES },
         prompt: { type: "string" },
         systemPromptAppend: { type: "string" },
         tags: { type: "array", items: { type: "string" } },
@@ -519,16 +518,16 @@ function relayAgentStatus(args: Record<string, unknown>): Record<string, unknown
 }
 
 function relaySpawnAgent(auth: McpAuthContext, args: Record<string, unknown>): Record<string, unknown> {
-  const provider = enumField(args.provider, "provider", VALID_SPAWN_PROVIDERS) as SpawnProvider;
+  const provider = enumField(args.provider, "provider", SPAWN_PROVIDERS) as SpawnProvider;
   const cwd = optionalString(args.cwd, "cwd", 500);
   const orchestrator = selectSpawnOrchestrator(provider, optionalString(args.orchestratorId, "orchestratorId", 200), cwd);
   const resolvedCwd = cwd || orchestrator.baseDir;
-  if (cwd && !pathWithinBase(cwd, orchestrator.baseDir)) {
+  if (cwd && !isPathWithinBase(cwd, orchestrator.baseDir)) {
     throw new ValidationError(`cwd must be within orchestrator base directory: ${orchestrator.baseDir}`);
   }
   const selection = providerSelection(provider, args);
-  const approvalMode = optionalEnum(args.approvalMode, "approvalMode", VALID_SPAWN_APPROVALS) as SpawnApprovalMode | undefined ?? "guarded";
-  const spawnRequestId = optionalString(args.spawnRequestId, "spawnRequestId", 160) ?? `sp_${randomUUID()}`;
+  const approvalMode = optionalEnum(args.approvalMode, "approvalMode", APPROVAL_MODES) as SpawnApprovalMode | undefined ?? "guarded";
+  const spawnRequestId = optionalString(args.spawnRequestId, "spawnRequestId", 160) ?? generateSpawnRequestId();
   const label = optionalString(args.label, "label", 120);
   const policyName = optionalString(args.policyName, "policyName", 120);
   assertComponentResourceAllowed(auth, {
@@ -558,12 +557,9 @@ function relaySpawnAgent(auth: McpAuthContext, args: Record<string, unknown>): R
     source: "system",
     target: orchestrator.agentId,
     correlationId: spawnRequestId,
-    params: {
-      action: "spawn",
+    params: buildSpawnCommand({
       provider,
-      model: selection.model,
-      providerModel: selection.providerModel,
-      effort: selection.effort,
+      modelParams: selection,
       cwd: resolvedCwd,
       label,
       tags: optionalStringArray(args.tags, "tags") ?? [],
@@ -580,7 +576,7 @@ function relaySpawnAgent(auth: McpAuthContext, args: Record<string, unknown>): R
       requestedVia: "mcp",
       requestedAt: Date.now(),
       orchestratorId: orchestrator.id,
-    },
+    }),
   });
   emitCommand(command);
   return { ok: true, orchestratorId: orchestrator.id, provider, command };
@@ -714,7 +710,7 @@ function selectSpawnOrchestrator(provider: SpawnProvider, orchestratorId?: strin
   }
   const candidates = listOrchestrators().filter((item) => item.status === "online" && item.providers.includes(provider));
   if (cwd) {
-    const match = candidates.find((item) => pathWithinBase(cwd, item.baseDir));
+    const match = candidates.find((item) => isPathWithinBase(cwd, item.baseDir));
     if (match) return match;
   }
   const orchestrator = candidates[0];
@@ -771,26 +767,10 @@ function findManagedOrchestrator(input: {
   )) ?? null;
 }
 
-function providerSelection(provider: SpawnProvider, args: Record<string, unknown>): { model?: string; effort?: ProviderEffort; providerModel?: string } {
+function providerSelection(provider: SpawnProvider, args: Record<string, unknown>): SpawnModelParams {
   const model = optionalString(args.model, "model", 120);
-  const effort = optionalEnum(args.effort, "effort", VALID_PROVIDER_EFFORTS) as ProviderEffort | undefined;
-  try {
-    const resolved = resolveProviderSelection({ provider, model, effort });
-    return {
-      model: resolved.modelAlias,
-      providerModel: resolved.providerModel,
-      effort: resolved.effort,
-    };
-  } catch (error) {
-    throw new ValidationError(error instanceof Error ? error.message : String(error));
-  }
-}
-
-function pathWithinBase(path: string, baseDir: string): boolean {
-  const base = resolve(baseDir);
-  const target = resolve(path);
-  const rel = relative(base, target);
-  return rel === "" || (!!rel && !rel.startsWith("..") && !isAbsolute(rel));
+  const effort = optionalEnum(args.effort, "effort", VALID_EFFORTS) as ProviderEffort | undefined;
+  return resolveSpawnModelParams(provider, model, effort);
 }
 
 function bytesToStream(bytes: Uint8Array): ReadableStream<Uint8Array> {
@@ -937,10 +917,6 @@ function auditToolCall(
   }
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 function recordField(value: unknown, field: string): Record<string, unknown> {
   if (!isRecord(value)) throw new ValidationError(`${field} must be an object`);
   return value;

package/src/memory-broker-smoke.ts

@@ -1,3 +1,5 @@
+import { RELAY_TOKEN_HEADER } from "agent-relay-sdk";
+
 interface MemoryBrokerSmokeOptions {
   baseUrl?: string;
   token?: string;
@@ -39,7 +41,7 @@ export async function runMemoryBrokerSmoke(options: MemoryBrokerSmokeOptions = {
 
   const request = async <T>(method: string, path: string, body?: unknown): Promise<T> => {
     const headers: Record<string, string> = {};
-    if (token) headers["X-Agent-Relay-Token"] = token;
+    if (token) headers[RELAY_TOKEN_HEADER] = token;
     if (body !== undefined) headers["Content-Type"] = "application/json";
     const response = await fetchImpl(new URL(path, baseUrl), {
       method,

package/src/memory-command-broker.ts

@@ -20,6 +20,7 @@ import {
   normalizeMemorySearchResult,
 } from "./memory-broker-contract";
 import { normalizeContextPackage } from "./memory-http-broker";
+import { isRecord } from "agent-relay-sdk";
 
 const DEFAULT_TIMEOUT_MS = 10_000;
 
@@ -155,7 +156,3 @@ function numberField(value: unknown, field: string): number {
   if (typeof value !== "number" || !Number.isFinite(value)) throw new MemoryBrokerContractError(`${field} must be a number`);
   return value;
 }
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}

package/src/memory-http-broker.ts

@@ -19,6 +19,7 @@ import {
   normalizeMemoryBrokerCapabilities,
   normalizeMemorySearchResult,
 } from "./memory-broker-contract";
+import { isRecord } from "agent-relay-sdk";
 
 const DEFAULT_TIMEOUT_MS = 10_000;
 
@@ -182,7 +183,3 @@ function requireRecord(value: unknown, field: string): Record<string, unknown> {
   if (!isRecord(value)) throw new MemoryBrokerContractError(`${field} must be an object`);
   return value;
 }
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}

package/src/memory-service.ts

@@ -1,5 +1,6 @@
 import { createCommand } from "./commands-db";
 import { getAgent, ValidationError } from "./db";
+import { isRecord } from "agent-relay-sdk";
 import { assembleContextPackage, contextBudgetForAgent, estimateMemoryTokens } from "./memory-broker";
 import { createMemoryBrokerRegistry, memoryBrokerConfigFromEnv } from "./memory-broker-registry";
 import { filterMemoriesForInjection, formatUntrustedMemoryBlock } from "./memory-broker-contract";
@@ -349,7 +350,3 @@ function stringArray(value: unknown): string[] | undefined {
 function isPositiveInteger(value: unknown): value is number {
   return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
 }
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}

package/src/memory-sqlite-broker.ts

@@ -1,6 +1,7 @@
 import { randomUUID } from "node:crypto";
 import type { Database } from "bun:sqlite";
 import { getDb, ValidationError } from "./db";
+import { parseJson } from "./utils";
 import type {
   ActiveMemoryClearReason,
   ContextPackage,
@@ -327,14 +328,6 @@ function rowToMemory(row: MemoryRow): Memory {
   });
 }
 
-function parseJson<T>(raw: string, fallback: T): T {
-  try {
-    return JSON.parse(raw) as T;
-  } catch {
-    return fallback;
-  }
-}
-
 function tagOverlap(tags: string[], queryTags: Set<string>): number {
   if (queryTags.size === 0) return 0;
   const memoryTags = new Set(tags.map((tag) => tag.toLowerCase()));

package/src/provider-catalog-store.ts

@@ -3,10 +3,10 @@ import {
   type ProviderCatalogEntry,
   type ProviderModelCatalogEntry,
 } from "agent-relay-sdk/provider-catalog";
+import { SPAWN_PROVIDERS } from "agent-relay-sdk";
 import type { SpawnProvider } from "./types";
 import { getDb, ValidationError } from "./db";
-
-const VALID_PROVIDERS: SpawnProvider[] = ["claude", "codex"];
+import { parseJson } from "./utils";
 
 interface ProviderModelOverrideRow {
   provider: SpawnProvider;
@@ -111,7 +111,7 @@ export function mergeProviderCatalog(
 }
 
 function normalizeOverrideInput(input: ProviderModelOverrideInput): ProviderModelOverrideInput {
-  if (!VALID_PROVIDERS.includes(input.provider)) throw new ValidationError("provider must be claude or codex");
+  if (!SPAWN_PROVIDERS.includes(input.provider)) throw new ValidationError("provider must be claude or codex");
   const alias = input.alias.trim();
   if (!alias) throw new ValidationError("model alias is required");
   if (input.entry.alias !== alias) throw new ValidationError("model entry alias must match override alias");
@@ -154,11 +154,3 @@ function cloneProviderEntry(entry: ProviderCatalogEntry): ProviderCatalogEntry {
 function cloneModelEntry(entry: ProviderModelCatalogEntry): ProviderModelCatalogEntry {
   return JSON.parse(JSON.stringify(entry)) as ProviderModelCatalogEntry;
 }
-
-function parseJson<T>(raw: string, fallback: T): T {
-  try {
-    return JSON.parse(raw) as T;
-  } catch {
-    return fallback;
-  }
-}

package/src/recipe-loader.ts

@@ -2,6 +2,7 @@ import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { basename, join, resolve } from "node:path";
 import { validateRecipe } from "./recipe-validator";
 import type { Recipe } from "./types";
+import { isRecord } from "agent-relay-sdk";
 
 interface LoadedRecipe {
   name: string;
@@ -113,7 +114,3 @@ function parseScalar(value: string): unknown {
   if (/^\d+$/.test(trimmed)) return Number(trimmed);
   return trimmed.replace(/^["']|["']$/g, "");
 }
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}

package/src/recipe-validator.ts

@@ -1,5 +1,6 @@
 import type { MemoryType, Recipe, RecipeAgent, RecipeMemoryPolicy } from "./types";
 import { resolveProviderSelection, type ProviderEffort } from "agent-relay-sdk/provider-catalog";
+import { isRecord } from "agent-relay-sdk";
 
 class RecipeValidationError extends Error {}
 
@@ -131,7 +132,3 @@ function optionalPositiveInteger(value: unknown, field: string): number | undefi
   if (typeof value !== "number" || !Number.isSafeInteger(value) || value <= 0) throw new RecipeValidationError(`${field} must be a positive integer`);
   return value;
 }
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}