agent-relay-runner 0.68.0 → 0.69.0

package/package.json

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

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.68.0",
+  "version": "0.69.0",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/reply-obligation-cache.ts

@@ -27,6 +27,20 @@ export function obligationRequiresExplicitReply(obligation: ReplyObligation): bo
   return obligation.from !== "user";
 }
 
+export function responseCaptureReplyRoute(
+  obligations: ReplyObligation[],
+  currentTurnStartedAt?: number,
+  opts: { suppressUser?: boolean } = {},
+): { replyToMessageId?: number; to: string } | null {
+  const eligible = [...obligations].reverse()
+    .filter((o) => currentTurnStartedAt === undefined || o.createdAt <= currentTurnStartedAt);
+  const explicit = eligible.find(obligationRequiresExplicitReply);
+  if (explicit) return { replyToMessageId: explicit.messageId, to: explicit.from };
+  const user = eligible.find((o) => o.from === "user");
+  if (!user) return { to: "user" };
+  return opts.suppressUser ? null : { replyToMessageId: user.messageId, to: "user" };
+}
+
 type ReplyObligationFetch = () => Promise<ReplyObligation[]>;
 
 interface ReplyObligationCacheOptions {

package/src/runner-core.ts

@@ -10,7 +10,7 @@ import type { ManagedProcess, ProviderAdapter, ProviderConfig, ProviderPermissio
 import { messagesWithCachedAttachments } from "./attachment-cache";
 import { ClaimTracker } from "./claim-tracker";
 import { startControlServer, type ControlServer } from "./control-server";
-import { ReplyObligationCache, obligationRequiresExplicitReply } from "./reply-obligation-cache";
+import { ReplyObligationCache, obligationRequiresExplicitReply, responseCaptureReplyRoute } from "./reply-obligation-cache";
 import { Outbox, type OutboxRecord } from "./outbox";
 import { extractLastAssistantTurn, extractLastAssistantTurnAfterEntry, countTranscriptEntries, extractFinalAssistantMessage, extractFinalAssistantMessageAfterEntry, extractHookAssistantMessage, extractLatestTurnSteps, stepDedupKeys, transcriptLooksComplete } from "./adapters/claude-transcript";
 import { profileUsesHostProviderGlobals } from "./profile-home";
@@ -1336,7 +1336,7 @@ export class AgentRunner {
     const turnId = this.currentTurnId;
     this.stopReasoningTail();
     // Optional correlation for threading + obligation clearing — never a capture gate.
-    let replyToMessageId: number | undefined;
+    let replyToMessageId: number | undefined, replyTarget = "user";
     const pendingPrompt = this.pendingPromptMessageId;
     if (pendingPrompt) {
       replyToMessageId = pendingPrompt;
@@ -1344,8 +1344,8 @@ export class AgentRunner {
     } else {
       // Correlation-only (threading + obligation clearing) — the local snapshot is fresh
       // enough and never blocks the response-capture path (#196).
-      const obligation = [...this.obligationCache.get()].reverse().find((o) => o.from === "user");
-      replyToMessageId = obligation?.messageId;
+      const route = responseCaptureReplyRoute(this.obligationCache.get(), this.currentTurnStartedAt);
+      replyToMessageId = route?.replyToMessageId; replyTarget = route?.to ?? "user";
     }
 
     // Grab and reset the pre-flush cursor before extraction: the cursor may be
@@ -1391,7 +1391,7 @@ export class AgentRunner {
     this.sessionLog(`response captured for turn ${turnId ?? "?"} (${body.length} chars${replyToMessageId ? `, replyTo #${replyToMessageId}` : ", no replyTo"})`);
     await this.publishSessionEvent({
       from: this.agentId,
-      to: "user",
+      to: replyTarget,
       body,
       ...(replyToMessageId ? { replyTo: replyToMessageId } : {}),
       session: { type: "response", origin: "provider", ...(turnId ? { turnId } : {}) },
@@ -1600,20 +1600,21 @@ export class AgentRunner {
     }
     if (event.type === "response") {
       // Dashboard prompt injection is already answered by this captured App Server
-      // response. Other Relay inbox obligations still belong to the agent's explicit
-      // reply path, so those keep suppressing auto-capture to avoid duplicates.
-      let replyToMessageId: number | undefined;
+      // response. User obligations still belong to the session mirror; spawner
+      // obligations (#413) route to the spawn-parent with replyTo to clear the debt.
+      let replyToMessageId: number | undefined, replyTarget = "user";
       const pendingPrompt = this.pendingPromptMessageId;
       if (pendingPrompt) {
         replyToMessageId = pendingPrompt;
         this.pendingPromptMessageId = undefined;
-      } 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;
+      } else {
+        const route = responseCaptureReplyRoute(this.obligationCache.get(), this.currentTurnStartedAt, { suppressUser: true });
+        if (!route) return; // The session mirror will satisfy the user obligation; don't double-post (#196).
+        replyToMessageId = route.replyToMessageId; replyTarget = route.to;
       }
       await this.publishSessionEvent({
         from: this.agentId,
-        to: "user",
+        to: replyTarget,
         body,
         ...(replyToMessageId ? { replyTo: replyToMessageId } : {}),
         session: { type: "response", origin: event.origin ?? "provider", ...(turnId ? { turnId } : {}) },
@@ -1660,10 +1661,6 @@ export class AgentRunner {
     return false;
   }
 
-  private obligationPredatesCurrentTurn(obligation: { createdAt: number }): boolean {
-    return this.currentTurnStartedAt === undefined || obligation.createdAt <= this.currentTurnStartedAt;
-  }
-
   // Force-clear a stuck provider-turn claim directly. Unlike the idle status path
   // it does NOT depend on a matching claim id (the Stop hook keys busy as
   // provider-turn:provider-turn, but reconciliation has no specific id), and it