agent-relay-server 0.125.0 → 0.126.0

package/public/index.html

@@ -12,36 +12,36 @@
   <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Crect width='32' height='32' rx='6' fill='%2309090b'/%3E%3Ccircle cx='16' cy='16' r='4.5' fill='%2358a6ff'/%3E%3Ccircle cx='6' cy='8' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='26' cy='8' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='6' cy='24' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='26' cy='24' r='2.5' fill='%233fb950'/%3E%3Cline x1='8' y1='9.5' x2='13' y2='14' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='24' y1='9.5' x2='19' y2='14' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='8' y1='22.5' x2='13' y2='18' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='24' y1='22.5' x2='19' y2='18' stroke='%2330363d' stroke-width='1.5'/%3E%3C/svg%3E">
   <link rel="manifest" href="manifest.webmanifest">
   <link rel="apple-touch-icon" href="icons/agent-relay-192.png">
-  <script type="module" crossorigin src="./assets/index-De1tR7J4.js"></script>
+  <script type="module" crossorigin src="./assets/index-CgH1BZwq.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/chunk-CilyBKbf.js">
   <link rel="modulepreload" crossorigin href="./assets/preload-helper-C_JMBXql.js">
-  <link rel="modulepreload" crossorigin href="./assets/lucide-react-CoU_Xts2.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-C5z05Vkz.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-B8tD9ZcR.js">
-  <link rel="modulepreload" crossorigin href="./assets/react-dom-BQICbUuF.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-V3wu3BHw.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-CFtFIhu3.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-CGaHpxnN.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-DKmTXfpP.js">
+  <link rel="modulepreload" crossorigin href="./assets/lucide-react-NXHPIMsX.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-BFDfbfNC.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-BNB3fTO-.js">
+  <link rel="modulepreload" crossorigin href="./assets/react-dom-8yaD9iJG.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-BD4Xc13v.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-CHKra2JV.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-D5w04z0l.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-C_VOBSaK.js">
   <link rel="modulepreload" crossorigin href="./assets/dist-BiLuYU6G.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-BJaV2BD4.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-CjyfQThq.js">
-  <link rel="modulepreload" crossorigin href="./assets/es2015-5DTJe35n.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-r8wyUTkK.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-4VwhnLtj.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-CrUl2aQp.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-f6MW74eX.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-BJKxqIQd.js">
+  <link rel="modulepreload" crossorigin href="./assets/es2015-a6fysEVz.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-CQMQ5iku.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-DG75bvPp.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-G8YBD-wp.js">
   <link rel="modulepreload" crossorigin href="./assets/types-BqeSkWrv.js">
   <link rel="modulepreload" crossorigin href="./assets/display-aTnwsqQh.js">
-  <link rel="modulepreload" crossorigin href="./assets/store-Dl9Z8YUS.js">
-  <link rel="modulepreload" crossorigin href="./assets/agent-type-icon-B3i0rndK.js">
-  <link rel="modulepreload" crossorigin href="./assets/button-C3CQSr4p.js">
-  <link rel="modulepreload" crossorigin href="./assets/copy-button-Bil2CjzT.js">
-  <link rel="modulepreload" crossorigin href="./assets/formatted-body-BuLfVMeD.js">
-  <link rel="modulepreload" crossorigin href="./assets/task-chip-BHM-e3I8.js">
-  <link rel="modulepreload" crossorigin href="./assets/badge-XEru6wto.js">
-  <link rel="modulepreload" crossorigin href="./assets/input-CXMbJ848.js">
+  <link rel="modulepreload" crossorigin href="./assets/store-D-Frk_EC.js">
+  <link rel="modulepreload" crossorigin href="./assets/agent-type-icon-BmBR-9CH.js">
+  <link rel="modulepreload" crossorigin href="./assets/button-DyHjsHY3.js">
+  <link rel="modulepreload" crossorigin href="./assets/copy-button-C67FUG3E.js">
+  <link rel="modulepreload" crossorigin href="./assets/formatted-body-jjhFXTap.js">
+  <link rel="modulepreload" crossorigin href="./assets/task-chip-CeujtXYT.js">
+  <link rel="modulepreload" crossorigin href="./assets/badge-BCvp7LK3.js">
+  <link rel="modulepreload" crossorigin href="./assets/input-Rc4oWv4q.js">
   <link rel="modulepreload" crossorigin href="./assets/themes-DjSwmAZN.js">
-  <link rel="stylesheet" crossorigin href="./assets/index-C9X_0QBt.css">
+  <link rel="stylesheet" crossorigin href="./assets/index-DHzXsQot.css">
 </head>
 <body class="bg-background text-foreground antialiased">
   <div id="root"></div>

package/runner/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.125.0",
+  "version": "0.126.0",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/runner/src/adapters/codex-agent-message-capture.ts

@@ -45,17 +45,16 @@ export class CodexAgentMessageCapture {
     this.currentSegment = [];
   }
 
-  // Deterministic turn-final response: the TRAILING agentMessage run only — all items after
-  // the LAST non-message item (tool call, file change, reasoning...) in the turn (design
-  // #1079 §3.2). Earlier agentMessage segments are mid-work narration, already mirrored live
-  // via `emit`, and must not be re-injected into the final (#1083 Finding 2). Codex's own
-  // phase:"commentary" tag (see completeItem above) still trims commentary items out of
-  // whichever segment they land in, but is not the sole guard against leading narration.
+  // Deterministic turn-final response: prefer the trailing structured report span, not a generic
+  // post-handoff coda. The original #1079/#1086 trailing-run rule correctly kept early narration
+  // out, but it over-trimmed Codex turns shaped "summary -> workspace ready -> Landed..." and made
+  // report-up deliver only the coda (#1136). We still drop leading narration; we just let structured
+  // report markers beat a terse final status line.
   finish(emit: EmitAgentMessage): string | undefined {
     this.closeSegment(emit);
-    const trailingSegment = this.segments.at(-1);
+    const trailingSegment = selectFinalResponseSegments(this.segments);
     this.segments = [];
-    const text = trailingSegment ? segmentBody(trailingSegment) : undefined;
+    const text = trailingSegment ? trailingSegment.map(segmentBody).join("\n\n").trim() : undefined;
     return truncateCapturedResponse(text);
   }
 
@@ -105,6 +104,37 @@ function segmentBody(segment: ResponseEntry[]): string {
   return segment.map((entry) => entry.body).join("\n\n").trim();
 }
 
+function selectFinalResponseSegments(segments: ResponseEntry[][]): ResponseEntry[][] | undefined {
+  const bodies = segments.map(segmentBody).filter(Boolean);
+  if (!bodies.length) return undefined;
+  let end = bodies.length - 1;
+  while (end > 0 && isGenericFinalCoda(bodies[end]!) && bodies.slice(0, end).some(isSubstantiveReportSegment)) end--;
+  const firstReport = bodies.slice(0, end + 1).findIndex(isReportBoundarySegment);
+  if (firstReport >= 0) return segments.slice(firstReport, end + 1);
+  for (let i = end; i >= 0; i--) {
+    if (isSubstantiveReportSegment(bodies[i]!)) return [segments[i]!];
+  }
+  return [segments[end]!];
+}
+
+const REPORT_BOUNDARY = /(^|\n)(#{1,6}\s|\*\*(summary|what changed|rca|fix|tests?|gates?|verification|risk)\b|(?:summary|what changed|rca|fix|tests?|gates?|verification|risk):)/i;
+const REPORT_STRUCTURE = /(^|\n)\s*[-*]\s+\S|`[^`]+`|\b(typecheck|bun test|tests? pass(?:ed)?|gates? green|rca|verified|implemented)\b/i;
+const GENERIC_FINAL_CODA = /^(?:done|landed(?: on main)?|committed|merged|ready|no further action|nothing further|all set)\b|(?:\bno further action needed\b|\bnothing further needed\b)$/i;
+
+function isReportBoundarySegment(body: string): boolean {
+  return REPORT_BOUNDARY.test(body.trim());
+}
+
+function isSubstantiveReportSegment(body: string): boolean {
+  const trimmed = body.trim();
+  return !isGenericFinalCoda(trimmed) && (trimmed.length >= 120 || isReportBoundarySegment(trimmed) || REPORT_STRUCTURE.test(trimmed));
+}
+
+function isGenericFinalCoda(body: string): boolean {
+  const trimmed = body.trim();
+  return trimmed.length <= 180 && GENERIC_FINAL_CODA.test(trimmed) && !isReportBoundarySegment(trimmed);
+}
+
 function truncateCapturedResponse(text: string | undefined): string | undefined {
   if (!text || text.length <= MAX_CAPTURED_RESPONSE_CHARS) return text;
   return `${text.slice(0, MAX_CAPTURED_RESPONSE_CHARS).trimEnd()}\n\n${TRUNCATION_MARKER_PREFIX} showing first ${MAX_CAPTURED_RESPONSE_CHARS} of ${text.length} chars]`;

package/runner/src/runner-core.ts

@@ -51,7 +51,7 @@ import {
   runnerAgentStatus,
   runnerBusErrorAction,
   runnerMessageMatches,
-  runnerMessageShouldDirtyObligations,
+  runnerMessageShouldDirtyObligations, restartOptionsFromCommand,
   runnerShouldResolveProviderExit,
   runnerShouldRestartUnexpectedProviderExit,
   runtimeProviderCapabilities,
@@ -60,7 +60,7 @@ import {
   shouldLogDeliveryFailure,
   stripRunnerClaimedGuidance,
   taskIdFromMessage,
-  type ProbeModelInfo,
+  type ProbeModelInfo, type RestartProviderOptions,
 } from "./runner-helpers";
 
 // Pre-destroy work is best-effort and must never hang teardown. Capping it keeps a slow
@@ -69,6 +69,7 @@ import {
 // short so a wedged/down server can't stall an operator-requested shutdown for long; a
 // row that still can't land is logged, not silently dropped.
 const OUTBOX_FLUSH_TIMEOUT_MS = 3_000;
+const STALE_PROVIDER_TURN_BUSY_MS = 10 * 60_000;
 
 interface RunnerOptions {
   provider: string;
@@ -535,7 +536,7 @@ export class AgentRunner {
     return mode === "isolated";
   }
 
-  private async spawnProvider(opts: { resumeId?: string; suppressPrompt?: boolean } = {}): Promise<ManagedProcess> {
+  private async spawnProvider(opts: RestartProviderOptions = {}): Promise<ManagedProcess> {
     this.providerSessionId = crypto.randomUUID();
     this.lastTranscriptPath = undefined;
     const includeProviderGlobals = profileUsesProviderHostGlobals(this.options);
@@ -586,7 +587,7 @@ export class AgentRunner {
       ...(this.options.profile ? { profile: this.options.profile } : {}),
       ...(this.options.agentProfile ? { agentProfile: this.options.agentProfile } : {}),
       ...(this.options.prompt && !opts.resumeId && !opts.suppressPrompt ? { prompt: this.options.prompt } : {}),
-      ...(this.options.systemPromptAppend ? { systemPromptAppend: this.options.systemPromptAppend } : {}),
+      ...((opts.systemPromptAppend ?? this.options.systemPromptAppend) ? { systemPromptAppend: opts.systemPromptAppend ?? this.options.systemPromptAppend } : {}),
       ...(this.options.tmuxSession ? { tmuxSession: this.options.tmuxSession } : {}),
       providerArgs: opts.resumeId ? [...this.options.providerArgs, "--resume", opts.resumeId] : this.options.providerArgs,
       providerConfig: this.options.providerConfig,
@@ -604,7 +605,7 @@ export class AgentRunner {
     };
     const launchSeededPrompt = this.options.adapter.seedsInitialPromptAtLaunch && !opts.resumeId && !opts.suppressPrompt ? this.options.prompt?.trim() : ""; if (launchSeededPrompt) this.recordInjectedPrompt(launchSeededPrompt);
     const managedProcess = await this.options.adapter.spawn(config);
-    const injectionEvents = runnerLaunchInjectionSessionEvents({ carried: this.options.relayInjectionEvents, provider: this.options.provider, config, providerConfig: this.options.providerConfig, agentId: this.agentId, providerSessionId: this.providerSessionId });
+    const injectionEvents = runnerLaunchInjectionSessionEvents({ carried: opts.relayInjectionEvents ?? this.options.relayInjectionEvents, provider: this.options.provider, config, providerConfig: this.options.providerConfig, agentId: this.agentId, providerSessionId: this.providerSessionId });
     for (const event of injectionEvents) {
       this.publishSessionEvent(event);
     }
@@ -777,7 +778,7 @@ export class AgentRunner {
       else this.lifecycleAction = undefined;
       this.publishStatus();
       let providerResult: Record<string, unknown> | void = undefined;
-      if (type === "agent.restart") await this.restartProvider();
+      if (type === "agent.restart") await this.restartProvider(restartOptionsFromCommand(params));
       else if (type === "agent.reconnect") this.publishStatus();
       else if (type === "agent.compact") {
         if (!this.options.adapter.compact || !this.process) throw new Error("provider does not support compact");
@@ -927,7 +928,7 @@ export class AgentRunner {
     return attachmentText ? `${body}\n\n${attachmentText}` : body;
   }
 
-  private async restartProvider(opts: { resumeId?: string; suppressPrompt?: boolean } = {}): Promise<void> {
+  private async restartProvider(opts: RestartProviderOptions = {}): Promise<void> {
     this.restartInProgress = true;
     try {
       if (this.process) {
@@ -1204,7 +1205,7 @@ export class AgentRunner {
     const providerSessionId = typeof update === "string" ? undefined : update.providerSessionId;
     if (providerSessionId && providerSessionId !== this.providerSessionId) return;
     const reason = typeof update === "string" ? "provider-turn" : update.reason ?? "provider-turn";
-    const id = typeof update === "string" ? reason : update.id ?? reason;
+    let id = typeof update === "string" ? reason : update.id ?? reason;
     if (typeof update !== "string" && update.timeline) {
       this.pendingTimelineEvent = {
         status: update.timeline.status,
@@ -1300,8 +1301,10 @@ export class AgentRunner {
         this.compactionMidTurn = false;
         this.sessionLog(`turn started (turn ${this.currentTurnId})`);
       }
+      id = this.currentTurnId;
       this.busyReconciler.arm();
     } else if (status === "idle" && reason === "provider-turn") {
+      id = typeof update !== "string" && update.id ? update.id : this.currentTurnId ?? reason;
       if (this.currentTurnId) { this.completedProviderTurns += 1; this.sessionLog(`turn ended via provider idle (turn ${this.currentTurnId})`); }
       this.currentTurnId = undefined;
       this.currentTurnStartedAt = undefined;
@@ -1346,7 +1349,8 @@ export class AgentRunner {
       }
     } else if (status === "idle") {
       this.claims.clearTerminalStatus();
-      this.claims.finishWork(reason, id);
+      if (reason === "provider-turn") this.claims.clearWorkKind("provider-turn");
+      else this.claims.finishWork(reason, id);
       if (reason === "provider-turn") void this.completeObservedTaskClaims();
     }
     else if (status === "offline" || status === "error") this.claims.setTerminalStatus(status);
@@ -2007,15 +2011,25 @@ export class AgentRunner {
     });
   }
 
+  private isStaleProviderTurnOnlyBusy(
+    status: SemanticStatus,
+    activeWork: Array<{ kind: string }>,
+    busyReasons: string[],
+    liveness: { hasLiveWork: boolean; lastProgressAt: number },
+  ): boolean {
+    if (status !== "busy") return false;
+    if (activeWork.length === 0 || activeWork.some((work) => work.kind !== "provider-turn")) return false;
+    if (busyReasons.some((reason) => reason !== "provider-turn")) return false;
+    if (liveness.hasLiveWork || !liveness.lastProgressAt) return false;
+    return Date.now() - liveness.lastProgressAt >= STALE_PROVIDER_TURN_BUSY_MS;
+  }
+
   private publishStatus(): void {
     this.claims.expire();
     const status = this.claims.currentStatus();
-    const agentStatus = runnerAgentStatus(status);
     const activeWork = this.claims.activeWork();
     const activeSubagents = activeWork.filter((item) => item.kind === "subagent");
     const terminalFailure = this.terminalFailure;
-    const providerState = terminalFailure?.providerState ?? this.rateLimitHold ?? providerStateFromActiveWork(activeWork);
-    this.bus.setSemanticStatus(status === "offline" || status === "error" ? "idle" : status);
     const timelineEvent = this.pendingTimelineEvent;
     this.pendingTimelineEvent = undefined;
     // §4.1 Runner↔provider liveness contract (#725 / #746): fold the raw transport/timeline/
@@ -2031,6 +2045,12 @@ export class AgentRunner {
     const liveness = this.options.adapter.liveness
       ? this.options.adapter.liveness(livenessInputs)
       : computeLivenessSignal(livenessInputs);
+    const busyReasons = this.claims.reasons();
+    const staleProviderTurnBusy = this.isStaleProviderTurnOnlyBusy(status, activeWork, busyReasons, liveness);
+    const effectiveStatus = staleProviderTurnBusy ? "idle" : status;
+    const agentStatus = runnerAgentStatus(effectiveStatus);
+    const providerState = terminalFailure?.providerState ?? this.rateLimitHold ?? (staleProviderTurnBusy ? null : providerStateFromActiveWork(activeWork));
+    this.bus.setSemanticStatus(effectiveStatus === "offline" || effectiveStatus === "error" ? "idle" : effectiveStatus);
     this.bus.status({
       agentStatus,
       ready: agentStatus !== "offline" && !this.stopped,
@@ -2062,7 +2082,7 @@ export class AgentRunner {
             ? { lastError: `Claude provider exited; resume id ${this.terminalProviderExit.claudeResumeId} captured for manual recovery` }
             : { lastError: "Claude provider exited; manual intervention required" }),
         } : {}),
-        busyReasons: this.claims.reasons(),
+        busyReasons: staleProviderTurnBusy ? busyReasons.filter((reason) => reason !== "provider-turn") : busyReasons,
         completedProviderTurns: this.completedProviderTurns,
         activeWork,
         activeSubagents,

package/runner/src/runner-helpers.ts

@@ -5,6 +5,7 @@ import { getManifest } from "agent-relay-providers";
 import type { BooleanCapabilityDefault, ProviderCapabilityCondition } from "agent-relay-providers";
 import { targetMatchesAgentIdentity } from "agent-relay-sdk/agent-target";
 import type { ProviderAdapter, ProviderConfig, RunnerSpawnConfig, SemanticStatus } from "./adapter";
+import type { RunnerRelayInjectionEvent } from "./relay-injection-events";
 import { agentProfileProjectionReport } from "./profile-projection";
 import { assembleLaunch } from "./launch-assembly";
 
@@ -27,6 +28,13 @@ export interface ProbeModelInfo {
   effort?: string;
 }
 
+export interface RestartProviderOptions {
+  resumeId?: string;
+  suppressPrompt?: boolean;
+  systemPromptAppend?: string;
+  relayInjectionEvents?: RunnerRelayInjectionEvent[];
+}
+
 export function runnerMessageMatches(message: Pick<Message, "to" | "resolvedToAgent">, target: {
   agentId: string;
   label?: string;
@@ -62,6 +70,29 @@ export function stripRunnerClaimedGuidance(body: string): string {
   return body.replace(RUNNER_CLAIMED_GUIDANCE_RE, "");
 }
 
+const RELAY_INJECTION_CATEGORIES = new Set(["memory", "instructions", "tools", "comms", "knowledge", "context"]);
+
+function relayInjectionEventsFromParam(value: unknown): RunnerRelayInjectionEvent[] | undefined {
+  if (!Array.isArray(value)) return undefined;
+  const events = value.flatMap((item): RunnerRelayInjectionEvent[] => {
+    if (!item || typeof item !== "object" || Array.isArray(item)) return [];
+    const record = item as Record<string, unknown>;
+    const detail = record.detail;
+    if (typeof record.category !== "string" || !RELAY_INJECTION_CATEGORIES.has(record.category)) return [];
+    if (typeof record.summary !== "string" || !record.summary.trim()) return [];
+    if (!detail || typeof detail !== "object" || Array.isArray(detail)) return [];
+    return [{ category: record.category as RunnerRelayInjectionEvent["category"], summary: record.summary, detail: detail as Record<string, unknown> }];
+  });
+  return events.length ? events : undefined;
+}
+
+export function restartOptionsFromCommand(params: Record<string, unknown>): RestartProviderOptions {
+  return {
+    systemPromptAppend: typeof params.systemPromptAppend === "string" ? params.systemPromptAppend : undefined,
+    relayInjectionEvents: relayInjectionEventsFromParam(params.relayInjectionEvents),
+  };
+}
+
 // Bound a runner's INITIAL relay registration. `connect` resolves on the first `registered`
 // frame and otherwise loops forever, so a token the relay rejects (401 at the WS upgrade)
 // hangs here silently. Race it against `timeoutMs`; on timeout, surface a fatal reason, tear

package/src/db/messages.ts

@@ -479,7 +479,7 @@ export function flushWorkFinalReports(childId: string, source: MessageWorkFinali
   const recencyCutoff = markedAt - LINEAGE_FINAL_GROUP_RECENCY_MS;
   const forwarded: Array<{ message: Message; created: boolean }> = [];
   const finalizedOriginals: Message[] = [];
-  let groupOrder = 0;
+  const held: Array<{ original: Message; session: Record<string, unknown> }> = [];
   for (const messageId of queue) {
     const original = getMessage(messageId);
     if (!original) continue;
@@ -488,17 +488,53 @@ export function flushWorkFinalReports(childId: string, source: MessageWorkFinali
     if ((original.occurredAt ?? original.createdAt) < recencyCutoff) continue;
     const session = sessionMeta(original);
     if (!session) continue;
+    held.push({ original, session });
+  }
+  const selected = source === "edge-fallback" ? selectEdgeFallbackLineageReports(held) : held;
+  let groupOrder = 0;
+  for (const { original, session } of selected) {
     const finality: MessageWorkFinality = { windowId, source, groupOrder, markedAt };
     const result = forwardLineageStreamCapture(original, session, "responses", child, parent, finality);
     if (!result) continue;
     groupOrder++;
     forwarded.push(result);
-    const finalizedOriginal = setMessageWorkFinality(messageId, finality);
+    const finalizedOriginal = setMessageWorkFinality(original.id, finality);
     if (finalizedOriginal) finalizedOriginals.push(finalizedOriginal);
   }
   return { forwarded, finalizedOriginals };
 }
 
+function selectEdgeFallbackLineageReports<T extends { original: Message }>(held: T[]): T[] {
+  if (held.length <= 1) return held;
+  let bestIndex = -1;
+  let bestScore = -Infinity;
+  for (let i = 0; i < held.length; i++) {
+    const score = edgeFallbackReportScore(held[i]!.original.body);
+    if (score > bestScore || (score === bestScore && i > bestIndex)) {
+      bestScore = score;
+      bestIndex = i;
+    }
+  }
+  return bestScore > 0 && bestIndex >= 0 ? [held[bestIndex]!] : [held.at(-1)!];
+}
+
+const EDGE_FALLBACK_REPORT_BOUNDARY = /(^|\n)(#{1,6}\s|\*\*(summary|what changed|rca|fix|tests?|gates?|verification|risk)\b|(?:summary|what changed|rca|fix|tests?|gates?|verification|risk):)/i;
+const EDGE_FALLBACK_REPORT_STRUCTURE = /(^|\n)\s*[-*]\s+\S|`[^`]+`|\b(typecheck|bun test|tests? pass(?:ed)?|gates? green|rca|verified|implemented)\b/i;
+const EDGE_FALLBACK_GENERIC_CODA = /^(?:done|landed(?: on main)?|committed|merged|ready|no further action|nothing further|all set)\b|(?:\bno further action needed\b|\bnothing further needed\b)$/i;
+const EDGE_FALLBACK_NARRATION = /^(?:i(?:'|’)ll|i(?:'|’)m|let me|checking|running|reading|found\b|now\b)/i;
+
+function edgeFallbackReportScore(body: string): number {
+  const trimmed = body.trim();
+  if (!trimmed) return -10;
+  if (trimmed.length <= 180 && EDGE_FALLBACK_GENERIC_CODA.test(trimmed) && !EDGE_FALLBACK_REPORT_BOUNDARY.test(trimmed)) return -5;
+  let score = 0;
+  if (trimmed.length >= 120) score += 2;
+  if (EDGE_FALLBACK_REPORT_BOUNDARY.test(trimmed)) score += 6;
+  if (EDGE_FALLBACK_REPORT_STRUCTURE.test(trimmed)) score += 3;
+  if (EDGE_FALLBACK_NARRATION.test(trimmed)) score -= 3;
+  return score;
+}
+
 /**
  * #1040/#1041 — the persisted turn-final response captures needed to rebuild the in-memory held
  * group after a relay restart. Bounded by a recency window (a report is only ever held while its

package/src/routes/agent-sessions.ts

@@ -2,7 +2,7 @@
 import { RELAY_TOKEN_HEADER, isRecord, isSpawnProvider } from "agent-relay-sdk";
 import { VALID_AGENT_ACTIONS, agentControlActionIcon, auditEvent, authAuditMetadata, authorizeAgentRoute, authorizeRoute, canViewAgentRoute, cleanAttachmentRefs, dashboardAttribution, emitCommand, error, json, metaString, parseBody, requestUserAddress, requestUserId, spawnRequestId, type AgentControlAction, type Handler } from "./_shared";
 import { arbitrateDrive, currentDriver, drivingMessage, releaseDrive, type DriveArbitration } from "../agent-drive-arbiter";
-import { ValidationError, getAgent, getAgentTimeline, getOrchestrator, markReady, mergeAgentMeta, readSpawnCallerSystemPromptAppend, resolveAgentOwnership, sendMessage, withResolvedProvisioning } from "../db";
+import { ValidationError, getAgent, getAgentTimeline, getOrchestrator, markReady, mergeAgentMeta, sendMessage, withResolvedProvisioning } from "../db";
 import { announcePresence, viewersForAgent } from "../dashboard-presence";
 import { buildManagedSpawnParams } from "../managed-policy";
 import { buildSpawnCommand, generateSpawnRequestId, resolveSpawnModelParams } from "../spawn-command";
@@ -19,8 +19,8 @@ import { ShutdownAuthError, ShutdownTargetError, shutdownAgent } from "../servic
 import { type AgentCard, type SpawnApprovalMode } from "../types";
 import { type ProviderEffort } from "agent-relay-sdk/provider-catalog";
 import { getManifest } from "agent-relay-providers";
-import { composeProfileSpawnInstructions } from "../project-instructions";
 import { relayToken } from "../config";
+import { restartInstructionParamsForAgent } from "../services/restart-instructions";
 
 // 409 when a second human tries to drive an agent another user is already driving (#394). The
 // blocked driver learns who holds the wheel so the UI can show "X is driving" + offer "request".
@@ -133,6 +133,7 @@ export function restartSpawnParamsForAgent(
   const agentProfile = resolvedProfile ? applyDefaultSharedMcp(resolvedProfile) : undefined;
   const workspaceMode = metaString(agent.meta, "workspaceMode") ?? "inherit";
   const resolvedModel = resolveSpawnModelParams(provider, model, effort, { onError: "passthrough", skipDefaultWhenEmpty: true });
+  const projectedInstructions = restartInstructionParamsForAgent(agent, { spawnRequestId, cwd }) ?? {};
   // #1052-v2 — a dashboard-spawned agent has NO spawn policy, so its restart skips the
   // `buildManagedSpawnParams` policy branch above and lands here. Re-project the profile role
   // charter / project knowledge / scoped memory (the SAME projection a fresh spawn gets) so the
@@ -152,8 +153,6 @@ export function restartSpawnParamsForAgent(
   // params — the SAME field a fresh agent.spawn stashes it in, see spawn-agent.ts). The reader then
   // recovers it from either the original agent.spawn row OR a later agent.restart row, so each
   // generation has its own recoverable copy and the brief follows the agent across every rotation.
-  const callerAppend = readSpawnCallerSystemPromptAppend(spawnRequestId);
-  const composed = composeProfileSpawnInstructions({ cwd, operatorId: resolveAgentOwnership(agent.id).ownerUserId, ...(profileName ? { profileName } : {}), ...(agentProfile ? { profile: agentProfile } : {}), ...(callerAppend ? { callerSystemPromptAppend: callerAppend } : {}) });
   const params = buildSpawnCommand({
     provider,
     modelParams: resolvedModel,
@@ -168,12 +167,12 @@ export function restartSpawnParamsForAgent(
     approvalMode: approvalMode ?? "guarded",
     permissionMode: approvalMode ?? "guarded",
     providerArgs: providerArgs.length ? providerArgs : undefined,
-    ...(composed.systemPromptAppend ? { systemPromptAppend: composed.systemPromptAppend } : {}),
+    ...(typeof projectedInstructions.systemPromptAppend === "string" ? { systemPromptAppend: projectedInstructions.systemPromptAppend } : {}),
     // #1067 — re-persist the RAW brief (pre-composition) under this restart's fresh spawnRequestId so
     // the NEXT restart, whose predecessor id is this fresh id, can recover it. Without this the brief
     // survives only one restart (the original agent.spawn row is keyed on the very first id).
-    ...(callerAppend ? { callerSystemPromptAppend: callerAppend } : {}),
-    ...(composed.relayInjectionEvents.length ? { relayInjectionEvents: composed.relayInjectionEvents } : {}),
+    ...(typeof projectedInstructions.callerSystemPromptAppend === "string" ? { callerSystemPromptAppend: projectedInstructions.callerSystemPromptAppend } : {}),
+    ...(Array.isArray(projectedInstructions.relayInjectionEvents) ? { relayInjectionEvents: projectedInstructions.relayInjectionEvents } : {}),
     policyName: policyName || undefined,
     headless: true,
     spawnRequestId: requestId,
@@ -298,6 +297,9 @@ export const postAgentAction: Handler = async (req, params) => {
     const metaPolicyName = typeof agent.meta?.policyName === "string" ? agent.meta.policyName : undefined;
     const metaSpawnRequestId = typeof agent.meta?.spawnRequestId === "string" ? agent.meta.spawnRequestId : undefined;
     const resumeId = action === "resume" ? latestResumeIdForAgent(agent) : undefined;
+    const restartInstructions = action === "restart" || action === "resume"
+      ? restartInstructionParamsForAgent(agent, { spawnRequestId: metaSpawnRequestId, cwd: metaString(agent.meta, "cwd") ?? orchestrator?.baseDir })
+      : undefined;
     if (action === "resume" && !orchestrator) return error("no online orchestrator available to resume agent", 409);
     if (action === "resume" && !resumeId) return error("no resume id recorded for agent", 422);
     const denied = authorizeRoute(req, {
@@ -319,6 +321,7 @@ export const postAgentAction: Handler = async (req, params) => {
         ...(metaPolicyName ? { policyName: metaPolicyName } : {}),
         ...(metaSpawnRequestId ? { spawnRequestId: metaSpawnRequestId } : {}),
         ...(action === "restart" || action === "resume" ? { restartSpawn: restartSpawnParamsForAgent(agent, orchestrator, metaPolicyName, metaSpawnRequestId, { resumeId }) } : {}),
+        ...(restartInstructions ?? {}),
         ...(action === "compact" ? compactMemoryParams(agent) : {}),
         ...(resumeId ? { claudeResumeId: resumeId } : {}),
         requestedBy: "dashboard",

package/src/routes/orchestrator.ts

@@ -4,7 +4,7 @@ import { CONTRACT_VERSIONS, parseRuntimeCapabilities, parseRuntimeContracts, par
 import { notifyAgentOffline } from "../agent-lifecycle-events";
 import { diagnoseAgentDeath } from "../agent-death-diagnosis";
 import { VERSION } from "../config";
-import { ValidationError, deleteOrchestrator, getOrchestrator, listOrchestrators, orchestratorHeartbeat, recordAgentExitDiagnostics, setOrchestratorUpgradeState, updateManagedAgents, upsertOrchestrator } from "../db";
+import { ValidationError, deleteOrchestrator, getAgent, getOrchestrator, listOrchestrators, orchestratorHeartbeat, recordAgentExitDiagnostics, setOrchestratorUpgradeState, updateManagedAgents, upsertOrchestrator } from "../db";
 import { auditEvent, authAuditMetadata, authorizeRoute, cleanJsonArray, cleanSafeNumber, dashboardAttribution, emitCommand, error, isRootCredentialRequest, json, parseBody, spawnRequestId, type Handler } from "./_shared";
 import { cleanMeta, cleanString, cleanStringArray, cleanWorkspaceMetadata, optionalEnum } from "../validation";
 import { createCommand, updateCommand } from "../commands-db";
@@ -13,6 +13,7 @@ import { getLifecycleManager } from "../lifecycle-manager";
 import { issueOrchestratorRuntimeToken } from "../runtime-tokens";
 import { isOrchestratorRegistrationAuthorized } from "../security";
 import { type ManagedAgent, type ManagedSessionExitDiagnostics, type OrchestratorRuntimeInput, type RegisterOrchestratorInput, type SpawnApprovalMode, type SpawnProvider } from "../types";
+import { restartSpawnParamsForAgent } from "./agent-sessions";
 
 function cleanProtocolVersion(value: unknown): number | undefined {
   if (value === undefined) return undefined;
@@ -533,13 +534,15 @@ export const postOrchestratorAction: Handler = async (req, params) => {
       resource: { orchestratorId: orch.id, agentId, policyName, spawnRequestId },
     });
     if (denied) return denied;
+    const agent = action === "restart" && agentId ? getAgent(agentId) : undefined;
+    const restartSpawn = agent ? restartSpawnParamsForAgent(agent, orch, policyName, spawnRequestId) : undefined;
 
     const command = createCommand({
       type: action === "restart" ? "agent.restart" : "agent.shutdown",
       source: "system",
       target: orch.agentId,
       correlationId: spawnRequestId,
-      params: { action, agentId, policyName, spawnRequestId, sessionName, tmuxSession, reason, requestedBy: "dashboard", requestedAt: Date.now(), orchestratorId: orch.id },
+      params: { action, agentId, policyName, spawnRequestId, sessionName, tmuxSession, reason, ...(restartSpawn ? { restartSpawn } : {}), requestedBy: "dashboard", requestedAt: Date.now(), orchestratorId: orch.id },
     });
     emitCommand(command);
     auditEvent({

package/src/routes/settings.ts

@@ -10,7 +10,7 @@ import { isRequestAuthorizedFor } from "../security";
 import { cleanString } from "../validation";
 import { emitConfigChanged } from "../sse";
 import { error, json, normalizeConfigPathParam, parseBody, requestUserId, type Handler } from "./_shared";
-import { DEFAULT_USER_ID, isRecord, type ConfigEntry, type SettingDescriptor, type SettingEntry } from "agent-relay-sdk";
+import { DEFAULT_USER_ID, isRecord, type ConfigEntry, type JSONSchema, type SettingDescriptor, type SettingEntry } from "agent-relay-sdk";
 
 type SettingEnvelope = SettingEntry;
 
@@ -91,7 +91,10 @@ async function putSetting(req: Request, namespaceRaw: string | undefined, keyRaw
     if (!validation.valid) return json({ error: "invalid setting value", details: validation.errors }, 400);
     if (descriptor.tier === "user") {
       const userId = requestUserId(req);
-      const userEntry = setUserSetting(userId, namespace, key, parsed.body.value, updatedBy);
+      const valueToStore = descriptor.mergeMapKeys && isRecord(parsed.body.value)
+        ? mergeMapKeysIntoExisting(getUserSetting(userId, namespace, key)?.value, parsed.body.value, descriptor.schema)
+        : parsed.body.value;
+      const userEntry = setUserSetting(userId, namespace, key, valueToStore, updatedBy);
       emitConfigChanged(userEntry.namespace, userEntry.key, userEntry.version);
       return json(settingEnvelope(req, descriptor, userEntry), userEntry.version === 1 ? 201 : 200);
     }
@@ -156,3 +159,29 @@ function mergeSettingDefaults(defaults: unknown, value: unknown): unknown {
   }
   return merged;
 }
+
+// A `mergeMapKeys` descriptor (#1124) is a dictionary keyed by caller-chosen ids (e.g. one row
+// per conversation). A PUT only ever knows its own device's changed keys, never every other
+// device's, so overwriting the whole stored value like a normal setting would erase them — this
+// merges just the incoming keys on top of whatever is already stored instead. The merged result
+// is then capped at the schema's `maxProperties` (when set) so per-key merges from unboundedly
+// many devices can't grow the row forever; the entry with the OLDEST `updatedAt` is evicted first
+// (missing/non-numeric `updatedAt`, e.g. a pre-#1124 row, sorts as oldest: 0).
+function mergeMapKeysIntoExisting(existing: unknown, incoming: Record<string, unknown>, schema: JSONSchema): Record<string, unknown> {
+  const merged: Record<string, unknown> = isRecord(existing) ? { ...existing } : {};
+  for (const [key, item] of Object.entries(incoming)) merged[key] = item;
+
+  const cap = typeof schema.maxProperties === "number" ? schema.maxProperties : undefined;
+  const entries = Object.entries(merged);
+  if (cap !== undefined && entries.length > cap) {
+    entries.sort((a, b) => entryUpdatedAt(a[1]) - entryUpdatedAt(b[1]));
+    const overflow = entries.length - cap;
+    for (let i = 0; i < overflow; i += 1) delete merged[entries[i]![0]];
+  }
+  return merged;
+}
+
+function entryUpdatedAt(value: unknown): number {
+  if (isRecord(value) && typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt)) return value.updatedAt;
+  return 0;
+}

package/src/services/restart-instructions.ts

@@ -0,0 +1,36 @@
+import { isSpawnProvider } from "agent-relay-sdk";
+import { getAgentProfile } from "../config-store";
+import { readSpawnCallerSystemPromptAppend, resolveAgentOwnership, withResolvedProvisioning } from "../db";
+import { composeProfileSpawnInstructions } from "../project-instructions";
+import { applyDefaultSharedMcp } from "../shared-mcp";
+import type { AgentCard } from "../types";
+
+function metaString(meta: Record<string, unknown> | undefined, key: string): string | undefined {
+  const value = meta?.[key];
+  return typeof value === "string" ? value : undefined;
+}
+
+export function restartInstructionParamsForAgent(
+  agent: AgentCard,
+  opts: { spawnRequestId?: string; cwd?: string } = {},
+): Record<string, unknown> | undefined {
+  const provider = metaString(agent.meta, "provider");
+  if (!isSpawnProvider(provider)) return undefined;
+  const cwd = opts.cwd ?? metaString(agent.meta, "cwd");
+  const profileName = metaString(agent.meta, "profile");
+  const resolvedProfile = withResolvedProvisioning(profileName ? getAgentProfile(profileName)?.value : undefined, provider);
+  const agentProfile = resolvedProfile ? applyDefaultSharedMcp(resolvedProfile) : undefined;
+  const callerAppend = readSpawnCallerSystemPromptAppend(opts.spawnRequestId);
+  const composed = composeProfileSpawnInstructions({
+    ...(cwd ? { cwd } : {}),
+    operatorId: resolveAgentOwnership(agent.id).ownerUserId,
+    ...(profileName ? { profileName } : {}),
+    ...(agentProfile ? { profile: agentProfile } : {}),
+    ...(callerAppend ? { callerSystemPromptAppend: callerAppend } : {}),
+  });
+  return {
+    ...(composed.systemPromptAppend ? { systemPromptAppend: composed.systemPromptAppend } : {}),
+    ...(callerAppend ? { callerSystemPromptAppend: callerAppend } : {}),
+    ...(composed.relayInjectionEvents.length ? { relayInjectionEvents: composed.relayInjectionEvents } : {}),
+  };
+}