agent-relay-runner 0.36.2 → 0.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-runner",
-  "version": "0.36.2",
+  "version": "0.38.0",
   "description": "Unified provider lifecycle runner for Agent Relay",
   "type": "module",
   "bin": {
@@ -20,7 +20,7 @@
     "directory": "runner"
   },
   "dependencies": {
-    "agent-relay-sdk": "0.2.22"
+    "agent-relay-sdk": "0.2.23"
   },
   "devDependencies": {
     "@types/bun": "latest",

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

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.36.2",
+  "version": "0.38.0",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/adapter.ts

@@ -157,6 +157,13 @@ export interface ProviderAdapter {
   // `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>;
+  // When true, the adapter seeds the spawn-time initial prompt as a launch argument
+  // (Claude's positional `claude "<prompt>"`), so it's already delivered the instant the
+  // session starts. The runner must then NOT also deliver it post-launch via
+  // deliverInitialPrompt — that would double-deliver and re-introduce the send-keys
+  // onboarding race (#352). deliverInitialPrompt stays available for mid-session injection
+  // (dashboard chat box) and ongoing message delivery, which have no launch-arg equivalent.
+  seedsInitialPromptAtLaunch?: boolean;
   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/adapters/claude.ts

@@ -15,6 +15,9 @@ import { claudeProviderMessageText } from "./claude-delivery";
 
 export class ClaudeAdapter implements ProviderAdapter {
   readonly provider = "claude";
+  // #352: initial prompt is seeded as Claude's positional launch arg (buildSpawnArgs) — reliable,
+  // no send-keys/onboarding race; tells the runner to skip the redundant post-launch delivery.
+  readonly seedsInitialPromptAtLaunch = true;
   private statusCb: (status: ProviderStatusUpdate) => void = () => {};
   private tmuxWatcher?: Timer;
   private turnWatcher?: Timer;
@@ -226,7 +229,11 @@ export class ClaudeAdapter implements ProviderAdapter {
       ...providerArgs,
     ];
     if (config.model) args.push("--model", config.model);
-    if (config.prompt && !config.headless) args.push(String(config.prompt));
+    // #352: seed the prompt as Claude's positional arg for ALL launches (headless included) —
+    // `claude "<prompt>"` seeds the first turn via Claude's own input handling, immune to the
+    // send-keys/onboarding race that silently dropped headless spawns. Long/special-char briefs
+    // are shell-safe (shellEscape + launcher-script externalization in buildTmuxArgs).
+    if (config.prompt) args.push(String(config.prompt));
     return {
       command,
       args,

package/src/runner.ts

@@ -250,6 +250,7 @@ export class AgentRunner {
   // Session-mirror: a synthesized id grouping a turn's reasoning/tool steps and
   // its final response. Set when a provider-turn starts, cleared when it ends.
   private currentTurnId?: string;
+  private currentTurnStartedAt?: number;
   // Prompt-echo dedup: a short, time-bounded queue of prompts the runner itself
   // injected (chat box or initial prompt) that are still awaiting their matching
   // UserPromptSubmit echo. A single slot dropped earlier entries when several prompts
@@ -600,7 +601,13 @@ export class AgentRunner {
 
   private async deliverInitialPrompt(): Promise<void> {
     const prompt = this.options.prompt?.trim();
-    if (prompt) await this.attemptInitialPromptDelivery(prompt, INITIAL_PROMPT_FIRST_READY_TIMEOUT_MS);
+    if (!prompt) return;
+    // #352: adapters that seed the prompt as a launch arg (Claude's positional prompt) already
+    // delivered it at session start. Returning BEFORE attemptInitialPromptDelivery avoids a
+    // double-delivery AND leaves pendingInitialPrompt unset, so the #329 ready-signal retry never
+    // arms — one prompt, one turn. Mid-session injectPrompt + message delivery are unaffected.
+    if (this.options.adapter.seedsInitialPromptAtLaunch) return;
+    await this.attemptInitialPromptDelivery(prompt, INITIAL_PROMPT_FIRST_READY_TIMEOUT_MS);
   }
 
   // Deliver the spawn-time first prompt, surviving a cold-start TUI that isn't input-ready yet
@@ -1088,12 +1095,14 @@ export class AgentRunner {
     if (status === "busy" && reason === "provider-turn") {
       if (!this.currentTurnId) {
         this.currentTurnId = typeof update !== "string" && update.id ? update.id : crypto.randomUUID();
+        this.currentTurnStartedAt = Date.now();
         this.sessionLog(`turn started (turn ${this.currentTurnId})`);
       }
       this.armBusyReconciler();
     } else if (status === "idle" && reason === "provider-turn") {
       if (this.currentTurnId) this.sessionLog(`turn ended via provider idle (turn ${this.currentTurnId})`);
       this.currentTurnId = undefined;
+      this.currentTurnStartedAt = undefined;
       this.disarmBusyReconciler();
       this.stopReasoningTail();
     }
@@ -1318,7 +1327,10 @@ export class AgentRunner {
   // deliveries) so those aren't double-posted.
   private async handleUserPrompt(input: { prompt: string; transcriptPath?: string }): Promise<void> {
     if (input.transcriptPath) this.lastTranscriptPath = input.transcriptPath;
-    if (!this.currentTurnId) this.currentTurnId = crypto.randomUUID();
+    if (!this.currentTurnId) {
+      this.currentTurnId = crypto.randomUUID();
+      this.currentTurnStartedAt = Date.now();
+    }
     const text = input.prompt.trim();
     if (text && !this.isRunnerInjectedPrompt(text)) {
       this.sessionLog(`prompt echoed from terminal (${text.length} chars)`);
@@ -1476,7 +1488,7 @@ export class AgentRunner {
       if (pendingPrompt) {
         replyToMessageId = pendingPrompt;
         this.pendingPromptMessageId = undefined;
-      } else if (this.obligationCache.get().some((o) => o.from === "user")) {
+      } else if (this.obligationCache.get().some((o) => o.from === "user" && this.obligationPredatesCurrentTurn(o))) {
         // The agent will answer the relay obligation itself — don't double-post (#196).
         return;
       }
@@ -1528,6 +1540,10 @@ export class AgentRunner {
     return false;
   }
 
+  private obligationPredatesCurrentTurn(obligation: { createdAt: number }): boolean {
+    return this.currentTurnStartedAt === undefined || obligation.createdAt <= this.currentTurnStartedAt;
+  }
+
   // --- Busy-state reconciler (item 2) -------------------------------------------------
   // A safety net for turns that end out of band (interrupted from the web terminal,
   // a hook that never fired) where the runner would otherwise stay stuck "busy".
@@ -1662,6 +1678,7 @@ export class AgentRunner {
   }
 
   private publishStatus(): void {
+    this.claims.expire();
     const status = this.claims.currentStatus();
     const agentStatus = runnerAgentStatus(status);
     const activeWork = this.claims.activeWork();