agent-relay-server 0.35.2 → 0.35.3

package/docs/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Agent Relay API",
-    "version": "0.35.2",
+    "version": "0.35.3",
     "description": "Real-time message bus for inter-agent communication. Agent-first: this spec is designed for machine consumption — agents can self-discover the full API surface via GET /api/spec.",
     "license": {
       "name": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-server",
-  "version": "0.35.2",
+  "version": "0.35.3",
   "description": "Lightweight HTTP message relay for inter-agent communication across machines",
   "module": "src/index.ts",
   "type": "module",

package/runner/src/adapter.ts

@@ -154,7 +154,9 @@ export interface ProviderAdapter {
   probeActivity?(process: ManagedProcess): Promise<"busy" | "idle" | "unknown">;
   terminalAttachSpec?(process: ManagedProcess): Promise<TerminalAttachSpec>;
   respondToPermissionDecision?(process: ManagedProcess, input: ProviderPermissionDecisionInput): Promise<Record<string, unknown> | void>;
-  deliverInitialPrompt?(process: ManagedProcess, prompt: string): Promise<void>;
+  // `options.readyTimeoutMs` lets the runner widen the provider-ready wait for the
+  // first (cold-start) delivery vs. a fast re-attempt after a ready signal (#329).
+  deliverInitialPrompt?(process: ManagedProcess, prompt: string, options?: { readyTimeoutMs?: number }): Promise<void>;
   deliver(process: ManagedProcess, messages: Message[]): Promise<void>;
   onStatusChange(cb: (status: ProviderStatusUpdate) => void): void;
   // Subscribe to session-mirror events from providers that emit them directly

package/src/mcp.ts

@@ -50,7 +50,7 @@ import type { ActivityKind, AgentCard, ArtifactKind, ArtifactSensitivity, Attach
 import { LAND_STRATEGIES, applyWorkspaceAction, waitForWorkspaceStatus, type WorkspaceAction } from "./workspace-actions";
 import { describeWorkspacePhase, landReceipt, readyContract, worktreeMcpInstructions } from "./workspace-phase";
 import { type ProviderEffort } from "agent-relay-sdk/provider-catalog";
-import { errMessage, isRecord, SPAWN_PROVIDERS, APPROVAL_MODES, VALID_EFFORTS, VALID_WORKSPACE_MODES } from "agent-relay-sdk";
+import { errMessage, isRecord, stringValue, SPAWN_PROVIDERS, APPROVAL_MODES, VALID_EFFORTS, VALID_WORKSPACE_MODES } from "agent-relay-sdk";
 import { runnerRuntimeTokenEnv } from "./runtime-tokens";
 
 type JsonRpcId = string | number | null;
@@ -257,11 +257,11 @@ const TOOLS: ToolDefinition[] = [
       properties: {
         provider: { type: "string", enum: SPAWN_PROVIDERS },
         orchestratorId: { type: "string", description: "Target host. Defaults to the host that owns cwd, else YOUR OWN host — only set it to spawn onto a different machine." },
-        cwd: { type: "string", description: "Working directory for the agent. Must resolve within the target orchestrator's base directory (enforced server-side)." },
+        cwd: { type: "string", description: "Working directory for the agent. Defaults to YOUR OWN cwd (the repo you're working in) when omitted, else the orchestrator's base dir. Must resolve within the target orchestrator's base directory (enforced server-side). NOTE: workspaceMode `isolated` requires a git repo — the resolved cwd must be inside one or the spawn is rejected." },
         label: { type: "string" },
         model: { type: "string" },
         effort: { type: "string", enum: VALID_EFFORTS },
-        approvalMode: { type: "string", enum: APPROVAL_MODES },
+        approvalMode: { type: "string", enum: APPROVAL_MODES, description: "Permission posture for the worker. Defaults to YOUR OWN approval mode when omitted (a headless `guarded` worker wedges on the first approval prompt), so a coordinator running `open` spawns workers that can act autonomously. Pass an explicit value to narrow a child (e.g. `read-only` reviewer)." },
         prompt: { type: "string", description: "Initial task/message delivered to the agent on launch — spawn and hand it its first instruction in one call (no separate follow-up message needed)." },
         systemPromptAppend: { type: "string" },
         profile: { type: "string", description: "Agent profile name to apply (env, instructions, permissions, MCP/skills, spawn quota)." },
@@ -791,16 +791,37 @@ async function relaySpawnAgent(auth: McpAuthContext, args: Record<string, unknow
   const provider = enumField(args.provider, "provider", SPAWN_PROVIDERS) as SpawnProvider;
   const cwd = optionalString(args.cwd, "cwd", 500);
   const callerId = callerAgentId(auth);
-  const preferHost = callerId ? getAgent(callerId)?.machine : undefined;
+  // One caller-record lookup, reused for host preference (#221), the cwd default (#328) and the
+  // approvalMode default (#331) — an agent spawning a helper inherits its own context instead of
+  // falling back to hardcoded values.
+  const caller = callerId ? getAgent(callerId) : undefined;
+  const preferHost = caller?.machine;
   const orchestrator = selectSpawnOrchestrator(provider, optionalString(args.orchestratorId, "orchestratorId", 200), cwd, preferHost);
-  const resolvedCwd = cwd || orchestrator.baseDir;
+  // #328 — default cwd to the caller's OWN cwd (the repo it's working in), not the orchestrator
+  // base dir, so "agent spawns a helper for its current task" Just Works — especially isolated mode,
+  // which needs a git repo (the base dir usually isn't one, so it silently downgraded to shared).
+  // Only adopt the caller's cwd when it resolves within the TARGET host's base dir (preferHost
+  // already biases the target to the caller's host; a cross-host path may not exist there). Non-agent
+  // callers (no caller record) keep the base-dir fallback. Precedence: explicit cwd > caller cwd > base dir.
+  const callerCwd = stringValue(caller?.meta?.cwd);
+  const inheritedCwd = callerCwd && isPathWithinBase(callerCwd, orchestrator.baseDir) ? callerCwd : undefined;
+  const resolvedCwd = cwd || inheritedCwd || orchestrator.baseDir;
   // #308 §3 — cwd must resolve within the TARGET host's base dir. A path valid on your own host
   // may not exist on a different orchestrator, so validate against the chosen host and say which.
   if (cwd && !isPathWithinBase(cwd, orchestrator.baseDir)) {
     throw new ValidationError(`cwd '${cwd}' is not within ${orchestrator.id} (host ${orchestrator.hostname})'s base dir '${orchestrator.baseDir}' — a path valid on your host may not exist on the target. Pass a cwd under that base dir, or omit cwd to default to it.`);
   }
   const selection = providerSelection(provider, args);
-  const approvalMode = optionalEnum(args.approvalMode, "approvalMode", APPROVAL_MODES) as SpawnApprovalMode | undefined ?? "guarded";
+  // #331 — default the child's approval mode to the CALLER's, not a hardcoded `guarded`. A headless
+  // `guarded` child wedges on the first tool-call approval prompt (no human at the TUI — it can't even
+  // read its own spawn message). A trusted coordinator running `open` spawns workers that can actually
+  // work in their isolated worktrees; an explicit arg always wins and can NARROW a child (e.g. a
+  // read-only reviewer); non-agent/admin callers (no caller record) keep the safe `guarded` default.
+  // Precedence: explicit approvalMode > caller mode > guarded.
+  const callerApprovalMode = optionalEnum(stringValue(caller?.meta?.approvalMode), "approvalMode", APPROVAL_MODES) as SpawnApprovalMode | undefined;
+  const approvalMode = (optionalEnum(args.approvalMode, "approvalMode", APPROVAL_MODES) as SpawnApprovalMode | undefined)
+    ?? callerApprovalMode
+    ?? "guarded";
   const spawnRequestId = optionalString(args.spawnRequestId, "spawnRequestId", 160) ?? generateSpawnRequestId();
   const label = optionalString(args.label, "label", 120);
   const policyName = optionalString(args.policyName, "policyName", 120);
@@ -815,8 +836,7 @@ async function relaySpawnAgent(auth: McpAuthContext, args: Record<string, unknow
   // granted only to agents whose profile sets maxSpawnedAgents>0 and never to children).
   // Server/admin tokens have no caller identity → unrestricted by design.
   if (callerId) {
-    const me = getAgent(callerId);
-    if (me?.spawnedBy) {
+    if (caller?.spawnedBy) {
       throw new McpAuthError("spawned agents cannot spawn further agents (no grandchildren)");
     }
     const quota = auth.component?.constraints?.maxSpawnedAgents ?? 0;