@piagent/platform 1.6.1 → 1.7.1

package/packages/piagent-webui/dist/client/index.html

@@ -7,8 +7,8 @@
     <meta name="csp-nonce" content="__PIAGENT_CSP_NONCE__" />
     <meta name="piagent-webui-mode" content="__PIAGENT_WEBUI_MODE__" />
     <title>Piagent WebUI</title>
-    <script type="module" crossorigin src="/assets/index-CgOEyRPG.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BV-_03yl.css">
+    <script type="module" crossorigin src="/assets/index-DiKRmCEP.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-DVahUVWy.css">
   </head>
   <body>
     <div id="root"></div>

package/packages/piagent-webui/extension/dispatch-user-entry.ts

@@ -0,0 +1,13 @@
+type BranchEntry = { id: string; parentId: string | null; type: string; message?: { role: string } };
+
+// Pi may persist system prompt updates before the user message in the same dispatch.
+// Do not cross any other entry kind or another user's/assistant's message.
+export function firstUserEntryAfter<T extends BranchEntry>(branch: readonly T[], parentId: string | null): T | null {
+  for (const entry of branch) {
+    if (entry.parentId !== parentId) continue;
+    if (entry.type !== "message") return null;
+    if (entry.message?.role === "system") { parentId = entry.id; continue; }
+    return entry.message?.role === "user" ? entry : null;
+  }
+  return null;
+}

package/packages/piagent-webui/extension/piagent-webui.ts

@@ -313,6 +313,7 @@ export default function piagentWebUiExtension(pi: ExtensionAPI): void {
       task: () => activeSessionTask(ctx.cwd, ctx.sessionManager.getSessionId()),
       activityEvents: () => readContextTelemetry(ctx.cwd, { limit: 5_000 }) as unknown[],
       currentActivity: () => [], sessionEntries: () => ctx.sessionManager.getBranch(), protectedPaths: () => protectedPaths(ctx),
+      sessionFile: () => ctx.sessionManager.getSessionFile(),
       documentReadRoots: () => documentReadRoots(ctx),
       contextUsage: () => ctx.getContextUsage(), model: () => ctx.model,
       thinkingLevel: () => ctx.thinkingLevel ?? pi.getThinkingLevel(),
@@ -455,8 +456,14 @@ export default function piagentWebUiExtension(pi: ExtensionAPI): void {
   pi.on("session_info_changed", (_event, ctx) => { currentContext = ctx; bridgeSoft(() => bridge.refresh(ctx)); });
   pi.on("model_select", (_event, ctx) => { currentContext = ctx; bridgeSoft(() => sessionOptions.observeHostOptionChange(ctx)); currentManager(ctx)?.provider.invalidate(); });
   pi.on("thinking_level_select", (_event, ctx) => { currentContext = ctx; bridgeSoft(() => sessionOptions.observeHostOptionChange(ctx)); currentManager(ctx)?.provider.invalidate(); });
-  pi.on("session_before_switch", () => { lifecycle.replacementPending(); bridgeSoft(() => bridge.replacementPending()); });
-  pi.on("session_before_fork", () => { lifecycle.replacementPending(); bridgeSoft(() => bridge.replacementPending()); });
+  pi.on("session_before_switch", (_event, ctx) => {
+    publishDrafts(ctx, stream.operationInterrupted(bridge.snapshot(), "session-replaced-before-tool-result"));
+    lifecycle.replacementPending(); bridgeSoft(() => bridge.replacementPending());
+  });
+  pi.on("session_before_fork", (_event, ctx) => {
+    publishDrafts(ctx, stream.operationInterrupted(bridge.snapshot(), "session-forked-before-tool-result"));
+    lifecycle.replacementPending(); bridgeSoft(() => bridge.replacementPending());
+  });
   pi.on("session_start", async (_event, ctx) => {
     currentContext = ctx; stream.reset(); queue.reset(); sessionOptions.reset(); attachments?.reset();
     if (!isGatewayRuntimeContext(ctx)) {
@@ -473,6 +480,7 @@ export default function piagentWebUiExtension(pi: ExtensionAPI): void {
     catch (error) { ctx.ui.notify(error instanceof Error ? error.message : "Piagent WebUI could not start", "error"); }
   });
   pi.on("session_shutdown", async (_event, ctx) => {
+    publishDrafts(ctx, stream.operationInterrupted(bridge.snapshot(), "session-shutdown-before-tool-result"));
     stream.reset(); queue.reset(); sessionOptions.reset(); attachments?.close(); eventReaders.delete(key(ctx));
     if (approvalBinding?.key === key(ctx)) { approvalBinding.unsubscribe(); approvalBinding.unbind(); approvalBinding = null; }
     lifecycle.shutdown();

package/packages/piagent-webui/extension/review-controller.ts

@@ -33,11 +33,19 @@ function exactKeys(value: unknown, keys: string[]): boolean { return Boolean(val
   && same(Object.keys(value as object).sort(), [...keys].sort())); }
 function timestamp(value: unknown): value is string { if (typeof value !== "string" || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value)) return false;
   const parsed = Date.parse(value); return Number.isFinite(parsed) && new Date(parsed).toISOString() === value; }
+function nullableRevision(value: unknown): value is string | null { return value === null || typeof value === "string" && REVISION.test(value); }
 function wireIdentity(value: BridgeIdentity): BridgeIdentity { return { projectRef: value.projectRef, runtimeInstanceId: value.runtimeInstanceId,
   sessionRef: value.sessionRef, taskId: value.taskId, taskRunId: value.taskRunId, agentOperationId: null, toolCallId: null }; }
 function wireRevisions(value: BridgeRevisions): BridgeRevisions { return { runtimeRevision: value.runtimeRevision, taskRevision: value.taskRevision,
   controlRevision: value.controlRevision, workspaceRevision: value.workspaceRevision, indexRevision: value.indexRevision,
   approvalRevision: value.approvalRevision, sessionOptionRevision: value.sessionOptionRevision, queueRevision: value.queueRevision }; }
+function replayIdentityDisposition(record: Pick<ReviewEvidenceRecord, "projectRef" | "runtimeInstanceId" | "sessionRef" | "taskId" | "taskRunId">,
+  identity: BridgeIdentity): "task-identity-mismatch" | "runtime-or-session-replaced" | null {
+  if (record.taskId !== identity.taskId || record.taskRunId !== identity.taskRunId) return "task-identity-mismatch";
+  if (record.projectRef !== identity.projectRef || record.runtimeInstanceId !== identity.runtimeInstanceId || record.sessionRef !== identity.sessionRef)
+    return "runtime-or-session-replaced";
+  return null;
+}
 
 function receiptFromRecord(record: ReviewEvidenceRecord, deduplicated: boolean): ReviewReceipt {
   return { schemaVersion: 1, version: "piagent-webui-control-v1", messageType: "receipt", commandId: record.commandId,
@@ -82,19 +90,32 @@ export class ReviewController {
     if (old) {
       if (old.commandId !== command.commandId || old.idempotencyKeyDigest !== keyDigest || old.actionDigest !== command.actionDigest)
         return this.#reject(command, "idempotency-payload-mismatch", "idempotency-payload-mismatch", false);
-      if (old.runtimeInstanceId !== identity.runtimeInstanceId || old.sessionRef !== identity.sessionRef || old.taskId !== identity.taskId || old.taskRunId !== identity.taskRunId)
-        return this.#reject(command, "identity-mismatch", "runtime-or-session-replaced", false);
+      const disposition = replayIdentityDisposition(old, identity);
+      if (disposition) return this.#reject(command, "identity-mismatch", disposition, false);
       return receiptFromRecord(old, true);
     }
     const now = this.#now().getTime();
     if (Date.parse(command.requestedAt) > now + 30_000) return this.#reject(command, "invalid-command", "requested-at-in-future", false);
     if (now > Date.parse(command.expiresAt)) return this.#reject(command, "expired", "command-expired", false);
     if (!same(command.identity, identity)) return this.#reject(command, "identity-mismatch", "identity-mismatch", false);
-    if (command.expectedRevisions.runtimeRevision !== revisions.runtimeRevision || command.expectedRevisions.taskRevision !== revisions.taskRevision)
-      return this.#reject(command, "stale-revision", "stale-source-revision", true);
+    if (command.expectedRevisions.runtimeRevision !== revisions.runtimeRevision || command.expectedRevisions.taskRevision !== revisions.taskRevision
+      || command.expectedRevisions.controlRevision !== revisions.controlRevision)
+      return this.#reject(command, "stale-revision", "stale-task-control-revision", true);
     let projection: ReviewStateProjection;
     try { projection = await this.#resolve(command.payload.view, command.payload.fileRef); }
     catch { return this.#reject(command, "capability-unavailable", "review-target-unavailable", true); }
+    const rebound = this.#bridge.snapshot();
+    if (rebound.state !== "ready" || !rebound.identity || !rebound.revisions)
+      return this.#reject(command, "resync-required", "review-binding-unavailable-after-target-resolution", true);
+    const reboundIdentity = wireIdentity(rebound.identity), reboundRevisions = wireRevisions(rebound.revisions);
+    if (!same(reboundIdentity, identity)) {
+      const taskChanged = reboundIdentity.taskId !== identity.taskId || reboundIdentity.taskRunId !== identity.taskRunId;
+      return this.#reject(command, "identity-mismatch", taskChanged ? "task-identity-mismatch" : "runtime-or-session-replaced", false);
+    }
+    if (command.expectedRevisions.runtimeRevision !== reboundRevisions.runtimeRevision
+      || command.expectedRevisions.taskRevision !== reboundRevisions.taskRevision
+      || command.expectedRevisions.controlRevision !== reboundRevisions.controlRevision)
+      return this.#reject(command, "stale-revision", "stale-task-control-revision-after-target-resolution", true);
     const target = projection.target;
     if (!target || projection.state === "unavailable") return this.#reject(command, "capability-unavailable", projection.reasonCode ?? "review-target-unavailable", true);
     if (!this.#matchesTarget(command, target)) return this.#reject(command, "stale-revision", "review-target-changed", true);
@@ -130,8 +151,10 @@ export class ReviewController {
     const revisionKeys = ["runtimeRevision", "taskRevision", "controlRevision", "workspaceRevision", "indexRevision", "approvalRevision",
       "sessionOptionRevision", "queueRevision", "workspacePreimage", "indexPreimage", "patchPreimage"];
     if (!exactKeys(command.expectedRevisions, revisionKeys) || !REVISION.test(command.expectedRevisions.runtimeRevision)
-      || !REVISION.test(command.expectedRevisions.taskRevision ?? "") || !REVISION.test(command.expectedRevisions.workspaceRevision ?? "")
-      || command.expectedRevisions.indexRevision !== null && !REVISION.test(command.expectedRevisions.indexRevision)
+      || !REVISION.test(command.expectedRevisions.taskRevision ?? "") || !REVISION.test(command.expectedRevisions.controlRevision ?? "")
+      || !REVISION.test(command.expectedRevisions.workspaceRevision ?? "")
+      || ![command.expectedRevisions.indexRevision, command.expectedRevisions.approvalRevision,
+        command.expectedRevisions.sessionOptionRevision, command.expectedRevisions.queueRevision].every(nullableRevision)
       || command.expectedRevisions.workspacePreimage !== null || command.expectedRevisions.indexPreimage !== null
       || !DIGEST.test(command.expectedRevisions.patchPreimage)) return "invalid-review-authority";
     if (!exactKeys(command.payload, ["view", "fileRef", "diffRef", "reviewState", "contentDigest"])

package/packages/piagent-webui/extension/same-session-bridge.ts

@@ -1,3 +1,4 @@
+import { firstUserEntryAfter } from "./dispatch-user-entry.ts";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash, randomBytes } from "node:crypto";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
@@ -98,8 +99,8 @@ function messageText(message: any): string {
 }
 function firstMessageText(message: any): string { return Array.isArray(message?.content) ? String(message.content.find((item: any) => item?.type === "text")?.text ?? "") : String(message?.content ?? ""); }
 function dispatchEntry(pending: PendingDispatch, ctx: ExtensionContext): any | null {
-  return ctx.sessionManager.getBranch().find((entry: any) => entry?.type === "message" && entry.parentId === pending.leafBefore
-    && entry.message?.role === "user" && messageText(entry.message) === pending.observedText) ?? null;
+  const entry = firstUserEntryAfter(ctx.sessionManager.getBranch(), pending.leafBefore) as any;
+  return entry && messageText(entry.message) === pending.observedText ? entry : null;
 }
 export function chatContentDigest(payload: Pick<NewOperationChatCommand["payload"], "text" | "attachmentRefs">): string {
   return sha(canonical({ text: payload.text, attachmentRefs: payload.attachmentRefs }));
@@ -168,7 +169,6 @@ export class SameSessionPiBridge {
     const branch = ctx.sessionManager.getBranch();
     if (!Array.isArray(branch) || branch.length > MAX_SESSION_ENTRIES) throw new Error("webui-bridge-receipt-history-unavailable");
     const requested = new Map<string, { receipt: ChatReceipt; messageRequestId: string; contentDigest: string; attachmentRefs: string[]; entryId: string }>();
-    const entriesById = new Map(branch.map((entry: any) => [entry?.id, entry]));
     for (const entry of branch) {
       if (entry?.type !== "custom" || entry.customType !== WEBUI_CONTROL_ENTRY_TYPE) continue;
       if (!exactKeys(entry.data, ["receipt"]) && !exactKeys(entry.data, ["receipt", "messageRequestId", "contentDigest"])
@@ -193,8 +193,8 @@ export class SameSessionPiBridge {
           || receipt.requestedAt !== prior.receipt.requestedAt || !same(receipt.observedRevisionsBefore, prior.receipt.observedRevisionsBefore)
           || !same(receipt.identity, prior.receipt.identity) || !same(attachmentRefs, prior.attachmentRefs)) throw new Error("webui-bridge-receipt-store-corrupt");
         if (receipt.resultCode === "dispatch-observed") {
-          const evidence = entriesById.get(receipt.settlementEvidenceRef as string) as any;
-          if (!evidence || evidence.type !== "message" || evidence.parentId !== prior.entryId || evidence.message?.role !== "user"
+          const evidence = firstUserEntryAfter(branch, prior.entryId) as any;
+          if (!evidence || evidence.id !== receipt.settlementEvidenceRef
             || chatContentDigest({ text: firstMessageText(evidence.message), attachmentRefs: prior.attachmentRefs }) !== prior.contentDigest) throw new Error("webui-bridge-receipt-store-corrupt");
         }
       }
@@ -310,8 +310,7 @@ export class SameSessionPiBridge {
   observeMessageStart(event: { message?: unknown }, ctx: ExtensionContext): void {
     if (!this.refresh(ctx) || this.#binding?.state !== "ready") return; const pending = this.#pending, message = event.message as any;
     const leaf = pending ? ctx.sessionManager.getLeafEntry?.() : null;
-    const leafObserved = Boolean(pending && leaf?.type === "message" && leaf.id !== pending.leafBefore && leaf.parentId === pending.leafBefore && leaf.message?.role === "user"
-      && messageText(leaf.message) === pending.observedText);
+    const leafObserved = Boolean(pending && leaf?.id && dispatchEntry(pending, ctx)?.id === leaf.id);
     if (pending && pending.inputObserved && leafObserved && message?.role === "user" && messageText(message) === pending.observedText)
       this.#settlePending("dispatch-observed", "settled", null, true, leaf.id);
   }

package/packages/piagent-webui/extension/session-stream-adapter.ts

@@ -10,13 +10,37 @@ const MAX_DELTA = 16_384;
 const MAX_MESSAGE_STREAM_EVENTS = 128;
 const STREAM_FLUSH_CHARS = 1_024;
 const STREAM_FLUSH_INTERVAL_MS = 100;
+const MAX_OBSERVED_UPDATES = 100_000;
+const UPDATE_KINDS = new Set(["start", "text_start", "text_delta", "text_end", "thinking_start", "thinking_delta",
+  "thinking_end", "toolcall_start", "toolcall_delta", "toolcall_end", "done", "error"]);
 const ANSI = /\u001b(?:[@-_]|\[[0-?]*[ -/]*[@-~])/g;
 const PRIVATE_KEY_BEGIN = /-----BEGIN [A-Z ]*PRIVATE KEY-----/;
 const PRIVATE_KEY_END = /-----END [A-Z ]*PRIVATE KEY-----/;
 
 type MessageRole = "user" | "assistant" | "tool-result";
+type StreamActivity = { schemaVersion: 1; boundary: "pi-message-update-hook"; observedUpdates: number;
+  textUpdates: number; thinkingUpdates: number; toolCallUpdates: number; otherUpdates: number;
+  lastUpdateKind: string | null; lastObservedAt: string | null; countersCapped: boolean };
 type ActiveMessage = { ref: string; role: MessageRole; rawBuffer: string; chunkSequence: number; truncated: boolean;
-  emittedEvents: number; lastFlushAt: number; thinking: Set<number>; thinkingStreaming: Set<number>; thinkingCompleted: Set<number> };
+  emittedEvents: number; lastFlushAt: number; thinking: Set<number>; thinkingStreaming: Set<number>; thinkingCompleted: Set<number>;
+  streamActivity: StreamActivity };
+
+function newStreamActivity(): StreamActivity {
+  return { schemaVersion: 1, boundary: "pi-message-update-hook", observedUpdates: 0, textUpdates: 0, thinkingUpdates: 0,
+    toolCallUpdates: 0, otherUpdates: 0, lastUpdateKind: null, lastObservedAt: null, countersCapped: false };
+}
+
+// This observes delivery to the Pi hook, not network traffic or provider usage.
+// Count before projection filtering; never retain an update payload or its text.
+function observeStreamActivity(activity: StreamActivity, kind: unknown, now: Date): void {
+  const known = typeof kind === "string" && UPDATE_KINDS.has(kind) ? kind : "other";
+  activity.lastUpdateKind = known; activity.lastObservedAt = now.toISOString();
+  if (activity.observedUpdates >= MAX_OBSERVED_UPDATES) { activity.countersCapped = true; return; }
+  activity.observedUpdates++;
+  const category = known.startsWith("text_") ? "textUpdates" : known.startsWith("thinking_") ? "thinkingUpdates"
+    : known.startsWith("toolcall_") ? "toolCallUpdates" : "otherUpdates";
+  activity[category]++;
+}
 
 function hash(value: string): string { return createHash("sha256").update(value).digest("hex"); }
 function opaque(prefix: string, value: unknown): string { return `${prefix}.${hash(JSON.stringify(value))}`; }
@@ -76,7 +100,7 @@ function redaction(applied = false, truncated = false) { return { applied, value
 function identityReady(identity: BridgeIdentity | null): identity is BridgeIdentity & { agentOperationId: string } {
   return Boolean(identity?.agentOperationId);
 }
-function activityPayload(state: "started" | "progress" | "finished" | "failed", activityRef: string, toolName: string,
+function activityPayload(state: "started" | "progress" | "finished" | "failed" | "aborted", activityRef: string, toolName: string,
   reasonCode: string | null = null) {
   return { state, activityType: "tool", activityRef, toolName, inputDigest: null, outputDigest: null, preview: null, previewKind: "none",
     outputBytes: null, outputLines: null, exitCode: null, isError: state === "finished" ? false : state === "failed" ? true : null,
@@ -90,13 +114,14 @@ export class PiSessionStreamAdapter {
   #activeByRole = new Map<MessageRole, ActiveMessage>();
   #lastMessageRef: string | null = null;
   #toolRefs = new Map<string, string>();
+  #toolNames = new Map<string, string>();
   #toolInputs = new Map<string, { command: string } | undefined>();
   #lastToolProgress = new Map<string, number>();
 
   constructor(options: { now?: () => Date } = {}) { this.#now = options.now ?? (() => new Date()); }
   reset(): void {
     this.#turnIndex = null; this.#messageCounter = 0; this.#activeByRole.clear(); this.#lastMessageRef = null;
-    this.#toolRefs.clear(); this.#toolInputs.clear(); this.#lastToolProgress.clear();
+    this.#toolRefs.clear(); this.#toolNames.clear(); this.#toolInputs.clear(); this.#lastToolProgress.clear();
   }
 
   #base(snapshot: BridgeSnapshot, sourceObservedAt?: unknown): Omit<RuntimeEventDraft, "kind" | "payload" | "evidence" | "redaction"> | null {
@@ -130,7 +155,7 @@ export class PiSessionStreamAdapter {
     const source = messageRole === "tool-result" ? "" : safe(text(message), MAX_STREAM_BUFFER).text;
     this.#activeByRole.set(messageRole, { ref: messageRef, role: messageRole, rawBuffer: "", chunkSequence: 0, truncated: false,
       emittedEvents: 0, lastFlushAt: this.#now().getTime(),
-      thinking: new Set(), thinkingStreaming: new Set(), thinkingCompleted: new Set() });
+      thinking: new Set(), thinkingStreaming: new Set(), thinkingCompleted: new Set(), streamActivity: newStreamActivity() });
     this.#lastMessageRef = messageRef;
     const draft = this.#draft(snapshot, "message.started", { role: messageRole, contentDigest: source ? digest(source) : null,
       textChars: source ? source.length : null, imageCount: imageCount(message) }, { sourceObservedAt: message?.timestamp, messageRef });
@@ -167,6 +192,7 @@ export class PiSessionStreamAdapter {
   }
   messageUpdated(event: { assistantMessageEvent?: any }, snapshot: BridgeSnapshot): RuntimeEventDraft[] {
     const update = event.assistantMessageEvent, active = this.#activeByRole.get("assistant"); if (!active || !update) return [];
+    observeStreamActivity(active.streamActivity, update.type, this.#now());
     if (update.type === "text_delta" && typeof update.delta === "string") {
       if (active.emittedEvents >= MAX_MESSAGE_STREAM_EVENTS) { active.truncated = true; return []; }
       const remaining = MAX_STREAM_BUFFER - active.rawBuffer.length;
@@ -205,20 +231,24 @@ export class PiSessionStreamAdapter {
     if (messageRole === "assistant" && (reason === "error" || reason === "aborted")) {
       const error = safe(message?.errorMessage, 500);
       const failed = this.#draft(snapshot, "message.failed", { role: "assistant", reason, errorCode: reason === "error" ? "assistant-message-error" : "assistant-message-aborted",
-        message: error.text || null, contentDigest: finalText.text ? digest(finalText.text) : null },
+        message: error.text || null, contentDigest: finalText.text ? digest(finalText.text) : null,
+        streamActivity: { ...active.streamActivity } },
       { sourceObservedAt: message?.timestamp, messageRef: active.ref, redacted: finalText.redacted || error.redacted, truncated: finalText.truncated || error.truncated });
       if (failed) drafts.push(failed); return drafts;
     }
     const completed = this.#draft(snapshot, "message.completed", { role: messageRole, contentDigest: finalText.text ? digest(finalText.text) : null,
       contentRef: null, textPreview: messageRole === "tool-result" ? null : finalText.text.slice(0, 4_000), textChars: messageRole === "tool-result" ? null : finalText.text.length,
-      blockCount: Math.min(10_000, Array.isArray(message?.content) ? message.content.length : finalText.text ? 1 : 0), stopReason: reason, usage: usage(message) },
+      blockCount: Math.min(10_000, Array.isArray(message?.content) ? message.content.length : finalText.text ? 1 : 0), stopReason: reason, usage: usage(message),
+      ...(messageRole === "assistant" ? { streamActivity: { ...active.streamActivity } } : {}) },
     { sourceObservedAt: message?.timestamp, messageRef: active.ref, redacted: finalText.redacted, truncated: finalText.truncated || active.truncated });
     if (completed) drafts.push(completed); return drafts;
   }
   turnEnded(event: { message?: unknown; toolResults?: unknown[] }, snapshot: BridgeSnapshot): RuntimeEventDraft[] {
     const reason = stopReason(event.message), count = Array.isArray(event.toolResults) ? Math.min(10_000, event.toolResults.length) : 0;
+    const drafts = this.#settleActiveTools(snapshot, "turn-ended-before-tool-result");
     const draft = this.#draft(snapshot, "turn.ended", { phase: "ended", finalMessageRef: this.#lastMessageRef, toolResultCount: count, stopReason: reason });
-    return draft ? [draft] : [];
+    if (draft) drafts.push(draft);
+    return drafts;
   }
   toolStarted(event: { toolCallId?: unknown; toolName?: unknown; args?: unknown }, snapshot: BridgeSnapshot): RuntimeEventDraft[] {
     if (typeof event.toolCallId !== "string" || !event.toolCallId) return [];
@@ -226,7 +256,8 @@ export class PiSessionStreamAdapter {
       ? this.#drainLines(snapshot, this.#activeByRole.get("assistant") as ActiveMessage, false) : [];
     const name = safeToolName(event.toolName);
     const ref = opaque("tool", [snapshot.identity?.sessionRef, event.toolCallId]), activityRef = opaque("activity", [snapshot.identity?.sessionRef, event.toolCallId]);
-    this.#toolRefs.set(event.toolCallId, ref); this.#toolInputs.set(event.toolCallId, toolClassificationInput(event.args));
+    this.#toolRefs.set(event.toolCallId, ref); this.#toolNames.set(event.toolCallId, name);
+    this.#toolInputs.set(event.toolCallId, toolClassificationInput(event.args));
     this.#lastToolProgress.set(event.toolCallId, 0);
     const draft = this.#draft(snapshot, "activity.started", activityPayload("started", activityRef, name), { toolCallId: ref });
     if (draft) drafts.push(draft);
@@ -247,12 +278,28 @@ export class PiSessionStreamAdapter {
     const ref = this.#toolRefs.get(event.toolCallId); if (!ref) return [];
     const name = safeToolName(event.toolName);
     const reasonCode = classifyToolFailure(name, event.isError === true, event.result, this.#toolInputs.get(event.toolCallId));
-    const state = (event.isError === true || reasonCode !== null) && !handledToolFailure(reasonCode) ? "failed" : "finished";
+    const state = (event.isError === true || reasonCode !== null) && !handledToolFailure(reasonCode, name) ? "failed" : "finished";
     const activityRef = opaque("activity", [snapshot.identity?.sessionRef, event.toolCallId]);
-    this.#toolRefs.delete(event.toolCallId); this.#toolInputs.delete(event.toolCallId); this.#lastToolProgress.delete(event.toolCallId);
+    this.#toolRefs.delete(event.toolCallId); this.#toolNames.delete(event.toolCallId);
+    this.#toolInputs.delete(event.toolCallId); this.#lastToolProgress.delete(event.toolCallId);
     const draft = this.#draft(snapshot, `activity.${state}`, activityPayload(state, activityRef, name, reasonCode), { toolCallId: ref });
     return draft ? [draft] : [];
   }
+  #settleActiveTools(snapshot: BridgeSnapshot, reasonCode: string): RuntimeEventDraft[] {
+    const drafts: RuntimeEventDraft[] = [];
+    for (const [rawToolCallId, ref] of this.#toolRefs) {
+      const toolName = this.#toolNames.get(rawToolCallId) ?? "tool";
+      const activityRef = opaque("activity", [snapshot.identity?.sessionRef, rawToolCallId]);
+      const draft = this.#draft(snapshot, "activity.aborted", activityPayload("aborted", activityRef, toolName, reasonCode),
+        { toolCallId: ref, evidence: "derived" });
+      if (draft) drafts.push(draft);
+    }
+    this.#toolRefs.clear(); this.#toolNames.clear(); this.#toolInputs.clear(); this.#lastToolProgress.clear();
+    return drafts;
+  }
+  operationInterrupted(snapshot: BridgeSnapshot, reasonCode = "session-replaced-before-tool-result"): RuntimeEventDraft[] {
+    return this.#settleActiveTools(snapshot, reasonCode);
+  }
   agentSettled(snapshot: BridgeSnapshot, hasPendingMessages: boolean | null): RuntimeEventDraft[] {
     // A queued follow-up belongs to the same logical operation. Do not emit a
     // terminal edge or clear stream identity between recovery turns.
@@ -264,9 +311,11 @@ export class PiSessionStreamAdapter {
     // Fail closed here so a missed/late completion hook cannot paint an open
     // task as completed in the WebUI.
     const governedTaskOpen = Boolean(snapshot.identity?.taskRunId) && snapshot.taskState !== "terminal";
+    const drafts = this.#settleActiveTools(snapshot, "operation-settled-before-tool-result");
     const draft = this.#draft(snapshot, "agent-operation.settled", {
       settlement: governedTaskOpen ? "unknown" : "completed", lastStopReason: null, hasPendingMessages: value
     });
-    this.reset(); return draft ? [draft] : [];
+    if (draft) drafts.push(draft);
+    this.reset(); return drafts;
   }
 }

package/packages/piagent-webui/extension/source-mutation-controller.ts

@@ -35,11 +35,19 @@ function timestamp(value: unknown): value is string {
   if (typeof value !== "string" || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value)) return false;
   const parsed = Date.parse(value); return Number.isFinite(parsed) && new Date(parsed).toISOString() === value;
 }
+function nullableRevision(value: unknown): value is string | null { return value === null || typeof value === "string" && REVISION.test(value); }
 function wireIdentity(value: BridgeIdentity): BridgeIdentity { return { projectRef: value.projectRef, runtimeInstanceId: value.runtimeInstanceId,
   sessionRef: value.sessionRef, taskId: value.taskId, taskRunId: value.taskRunId, agentOperationId: null, toolCallId: null }; }
 function wireRevisions(value: Record<string, any>): BridgeRevisions { return { runtimeRevision: value.runtimeRevision, taskRevision: value.taskRevision,
   controlRevision: value.controlRevision, workspaceRevision: value.workspaceRevision, indexRevision: value.indexRevision,
   approvalRevision: value.approvalRevision, sessionOptionRevision: value.sessionOptionRevision, queueRevision: value.queueRevision }; }
+function replayIdentityDisposition(record: Pick<SourceMutationEvidenceRecord, "projectRef" | "runtimeInstanceId" | "sessionRef" | "taskId" | "taskRunId">,
+  identity: BridgeIdentity): "task-identity-mismatch" | "runtime-or-session-replaced" | null {
+  if (record.taskId !== identity.taskId || record.taskRunId !== identity.taskRunId) return "task-identity-mismatch";
+  if (record.projectRef !== identity.projectRef || record.runtimeInstanceId !== identity.runtimeInstanceId || record.sessionRef !== identity.sessionRef)
+    return "runtime-or-session-replaced";
+  return null;
+}
 
 function receiptFromRecord(record: SourceMutationEvidenceRecord, deduplicated: boolean): SourceMutationReceipt {
   if (record.action === "source.revert") throw new Error("source-mutation-evidence-action-mismatch");
@@ -109,8 +117,9 @@ export class SourceMutationController {
     if (prior.length) {
       if (prior.some((record) => record.commandId !== command.commandId || record.idempotencyKeyDigest !== keyDigest || record.actionDigest !== command.actionDigest
         || record.action !== command.action)) return this.#reject(command, "idempotency-payload-mismatch", "idempotency-payload-mismatch", false);
-      if (prior.some((record) => record.runtimeInstanceId !== identity.runtimeInstanceId || record.sessionRef !== identity.sessionRef))
-        return this.#reject(command, "identity-mismatch", "runtime-or-session-replaced", false);
+      const dispositions = prior.map((record) => replayIdentityDisposition(record, identity)).filter(Boolean);
+      if (dispositions.length) return this.#reject(command, "identity-mismatch",
+        dispositions.includes("task-identity-mismatch") ? "task-identity-mismatch" : "runtime-or-session-replaced", false);
       return receiptFromRecord(prior.at(-1)!, true);
     }
     const now = this.#now().getTime();
@@ -122,6 +131,20 @@ export class SourceMutationController {
     let resolved: { projection: SourceMutationProjection; authority: SourceMutationAuthority | null };
     try { resolved = await this.#resolve(command.action, command.payload.fileRef); }
     catch { return this.#reject(command, "capability-unavailable", "mutation-preview-unavailable", true); }
+    const rebound = this.#bridge.snapshot();
+    if (rebound.state !== "ready" || !rebound.identity || !rebound.revisions)
+      return this.#reject(command, "resync-required", "mutation-binding-unavailable-after-preview", true);
+    const reboundIdentity = wireIdentity(rebound.identity), reboundRevisions = wireRevisions(rebound.revisions);
+    if (!same(reboundIdentity, identity)) {
+      const taskChanged = reboundIdentity.taskId !== identity.taskId || reboundIdentity.taskRunId !== identity.taskRunId;
+      return this.#reject(command, "identity-mismatch", taskChanged ? "task-identity-mismatch" : "runtime-or-session-replaced", false);
+    }
+    if (rebound.taskState === "terminal") return this.#reject(command, "terminal-task", "task-terminal-after-preview", false);
+    if (rebound.liveness !== "idle") return this.#reject(command, "capability-unavailable", "agent-not-idle-after-preview", true);
+    if (command.expectedRevisions.runtimeRevision !== reboundRevisions.runtimeRevision
+      || command.expectedRevisions.taskRevision !== reboundRevisions.taskRevision
+      || command.expectedRevisions.controlRevision !== reboundRevisions.controlRevision)
+      return this.#reject(command, "stale-revision", "stale-task-control-revision-after-preview", true);
     if (!resolved.authority || resolved.projection.state !== "ready" || !resolved.projection.target)
       return this.#reject(command, "capability-unavailable", resolved.projection.reasonCode ?? "mutation-preview-unavailable", true);
     const target = resolved.projection.target;
@@ -185,8 +208,11 @@ export class SourceMutationController {
       || command.identity.agentOperationId !== null || command.identity.toolCallId !== null) return "invalid-command-identity";
     const preimageKeys = [...REVISION_KEYS, "workspacePreimage", "indexPreimage", "patchPreimage"];
     if (!exactKeys(command.expectedRevisions, preimageKeys) || !REVISION.test(command.expectedRevisions.runtimeRevision)
-      || !REVISION.test(command.expectedRevisions.taskRevision ?? "") || !REVISION.test(command.expectedRevisions.workspaceRevision ?? "")
+      || !REVISION.test(command.expectedRevisions.taskRevision ?? "") || !REVISION.test(command.expectedRevisions.controlRevision ?? "")
+      || !REVISION.test(command.expectedRevisions.workspaceRevision ?? "")
       || !REVISION.test(command.expectedRevisions.indexRevision ?? "") || !WORKSPACE.test(command.expectedRevisions.workspacePreimage)
+      || ![command.expectedRevisions.approvalRevision, command.expectedRevisions.sessionOptionRevision,
+        command.expectedRevisions.queueRevision].every(nullableRevision)
       || !DIGEST.test(command.expectedRevisions.indexPreimage) || !DIGEST.test(command.expectedRevisions.patchPreimage)) return "invalid-mutation-authority";
     if (!exactKeys(command.payload, ["fileRef", "hunkRefs", "contentDigest"]) || !REF.test(command.payload.fileRef)
       || !Array.isArray(command.payload.hunkRefs) || command.payload.hunkRefs.length > 128

package/packages/piagent-webui/extension/source-open-controller.ts

@@ -33,6 +33,13 @@ function revisions(value: Record<string, any>, record?: SourceHandoffRecord): Br
   taskRevision: record?.taskRevision ?? value.taskRevision, controlRevision: value.controlRevision,
   workspaceRevision: record?.workspaceRevision ?? value.workspaceRevision, indexRevision: value.indexRevision,
   approvalRevision: value.approvalRevision, sessionOptionRevision: value.sessionOptionRevision, queueRevision: value.queueRevision }; }
+function replayIdentityDisposition(record: Pick<SourceHandoffRecord, "projectRef" | "runtimeInstanceId" | "sessionRef" | "taskId" | "taskRunId">,
+  current: BridgeIdentity): "task-identity-mismatch" | "runtime-or-session-replaced" | null {
+  if (record.taskId !== current.taskId || record.taskRunId !== current.taskRunId) return "task-identity-mismatch";
+  if (record.projectRef !== current.projectRef || record.runtimeInstanceId !== current.runtimeInstanceId || record.sessionRef !== current.sessionRef)
+    return "runtime-or-session-replaced";
+  return null;
+}
 
 export class SourceOpenController {
   readonly #bridge: SameSessionPiBridge; readonly #root: string; readonly #resolve: (fileRef: string) => Promise<SourceOpenAuthority | null>;
@@ -55,8 +62,9 @@ export class SourceOpenController {
     if (prior.length) {
       if (prior.some((record) => record.commandId !== command.commandId || record.idempotencyKeyDigest !== keyDigest || record.actionDigest !== command.actionDigest))
         return this.#reject(command, "idempotency-payload-mismatch", "idempotency-payload-mismatch", false);
-      if (prior.some((record) => record.runtimeInstanceId !== currentIdentity.runtimeInstanceId || record.sessionRef !== currentIdentity.sessionRef))
-        return this.#reject(command, "identity-mismatch", "runtime-or-session-replaced", false);
+      const dispositions = prior.map((record) => replayIdentityDisposition(record, currentIdentity)).filter(Boolean);
+      if (dispositions.length) return this.#reject(command, "identity-mismatch",
+        dispositions.includes("task-identity-mismatch") ? "task-identity-mismatch" : "runtime-or-session-replaced", false);
       const last = prior.at(-1)!; if (last.phase !== "requested") return this.#receipt(last, currentRevisions, true);
       const uncertain = this.#append(command, currentIdentity, keyDigest, last, "uncertain", "effect-unknown", "source-open-outcome-unknown");
       return this.#receipt(uncertain, currentRevisions, true);
@@ -64,9 +72,22 @@ export class SourceOpenController {
     const now = this.#now().getTime(); if (Date.parse(command.requestedAt) > now + 30_000) return this.#reject(command, "invalid-command", "requested-at-in-future", false);
     if (now > Date.parse(command.expiresAt)) return this.#reject(command, "expired", "command-expired", false);
     if (!same(command.identity, currentIdentity)) return this.#reject(command, "identity-mismatch", "identity-mismatch", false);
-    if (command.expectedRevisions.runtimeRevision !== currentRevisions.runtimeRevision || command.expectedRevisions.taskRevision !== currentRevisions.taskRevision)
-      return this.#reject(command, "stale-revision", "stale-source-open-revision", true);
+    if (command.expectedRevisions.runtimeRevision !== currentRevisions.runtimeRevision || command.expectedRevisions.taskRevision !== currentRevisions.taskRevision
+      || command.expectedRevisions.controlRevision !== currentRevisions.controlRevision)
+      return this.#reject(command, "stale-revision", "stale-task-control-revision", true);
     let authority: SourceOpenAuthority | null; try { authority = await this.#resolve(command.payload.fileRef); } catch { authority = null; }
+    const rebound = this.#bridge.snapshot();
+    if (rebound.state !== "ready" || !rebound.identity || !rebound.revisions)
+      return this.#reject(command, "resync-required", "source-open-binding-unavailable-after-target-resolution", true);
+    const reboundIdentity = identity(rebound.identity), reboundRevisions = revisions(rebound.revisions);
+    if (!same(reboundIdentity, currentIdentity)) {
+      const taskChanged = reboundIdentity.taskId !== currentIdentity.taskId || reboundIdentity.taskRunId !== currentIdentity.taskRunId;
+      return this.#reject(command, "identity-mismatch", taskChanged ? "task-identity-mismatch" : "runtime-or-session-replaced", false);
+    }
+    if (command.expectedRevisions.runtimeRevision !== reboundRevisions.runtimeRevision
+      || command.expectedRevisions.taskRevision !== reboundRevisions.taskRevision
+      || command.expectedRevisions.controlRevision !== reboundRevisions.controlRevision)
+      return this.#reject(command, "stale-revision", "stale-task-control-revision-after-target-resolution", true);
     if (!authority) return this.#reject(command, "capability-unavailable", "source-open-target-unavailable", true);
     if (authority.target.taskRevision !== command.expectedRevisions.taskRevision || authority.target.workspaceRevision !== command.expectedRevisions.workspaceRevision)
       return this.#reject(command, "stale-revision", "source-open-target-stale", true);
@@ -110,9 +131,10 @@ export class SourceOpenController {
       || command.identity.agentOperationId !== null || command.identity.toolCallId !== null) return "invalid-command-identity";
     if (!exact(command.expectedRevisions, [...REVISION_KEYS, "workspacePreimage", "indexPreimage", "patchPreimage"])
       || !REVISION.test(command.expectedRevisions.runtimeRevision) || !REVISION.test(command.expectedRevisions.taskRevision ?? "")
-      || !REVISION.test(command.expectedRevisions.workspaceRevision ?? "") || command.expectedRevisions.workspacePreimage !== null
-      || ![command.expectedRevisions.controlRevision, command.expectedRevisions.indexRevision, command.expectedRevisions.approvalRevision,
-        command.expectedRevisions.sessionOptionRevision, command.expectedRevisions.queueRevision].every(nullableRevision)
+      || !REVISION.test(command.expectedRevisions.controlRevision ?? "") || !REVISION.test(command.expectedRevisions.workspaceRevision ?? "")
+      || command.expectedRevisions.workspacePreimage !== null
+      || ![command.expectedRevisions.indexRevision, command.expectedRevisions.approvalRevision, command.expectedRevisions.sessionOptionRevision,
+        command.expectedRevisions.queueRevision].every(nullableRevision)
       || command.expectedRevisions.indexPreimage !== null || command.expectedRevisions.patchPreimage !== null) return "invalid-source-open-authority";
     if (!exact(command.payload, ["fileRef", "line", "column"]) || !REF.test(command.payload.fileRef)
       || command.payload.line !== null && (!Number.isInteger(command.payload.line) || command.payload.line < 1 || command.payload.line > 100_000_000)

package/packages/piagent-webui/extension/source-revert-controller.ts

@@ -38,6 +38,13 @@ function wireIdentity(value: BridgeIdentity): BridgeIdentity { return { projectR
 function wireRevisions(value: Record<string, any>): BridgeRevisions { return { runtimeRevision: value.runtimeRevision, taskRevision: value.taskRevision,
   controlRevision: value.controlRevision, workspaceRevision: value.workspaceRevision, indexRevision: value.indexRevision,
   approvalRevision: value.approvalRevision, sessionOptionRevision: value.sessionOptionRevision, queueRevision: value.queueRevision }; }
+function replayIdentityDisposition(record: Pick<SourceMutationEvidenceRecord, "projectRef" | "runtimeInstanceId" | "sessionRef" | "taskId" | "taskRunId">,
+  identity: BridgeIdentity): "task-identity-mismatch" | "runtime-or-session-replaced" | null {
+  if (record.taskId !== identity.taskId || record.taskRunId !== identity.taskRunId) return "task-identity-mismatch";
+  if (record.projectRef !== identity.projectRef || record.runtimeInstanceId !== identity.runtimeInstanceId || record.sessionRef !== identity.sessionRef)
+    return "runtime-or-session-replaced";
+  return null;
+}
 function receipt(record: SourceMutationEvidenceRecord, deduplicated: boolean): SourceRevertReceipt {
   const identity = { projectRef: record.projectRef, runtimeInstanceId: record.runtimeInstanceId, sessionRef: record.sessionRef,
     taskId: record.taskId, taskRunId: record.taskRunId, agentOperationId: null, toolCallId: null } as BridgeIdentity;
@@ -90,8 +97,9 @@ export class SourceRevertController {
     if (prior.length) {
       if (prior.some((record) => record.commandId !== command.commandId || record.idempotencyKeyDigest !== keyDigest || record.actionDigest !== command.actionDigest
         || record.action !== command.action)) return this.#reject(command, "idempotency-payload-mismatch", "idempotency-payload-mismatch", false);
-      if (prior.some((record) => record.runtimeInstanceId !== identity.runtimeInstanceId || record.sessionRef !== identity.sessionRef))
-        return this.#reject(command, "identity-mismatch", "runtime-or-session-replaced", false);
+      const dispositions = prior.map((record) => replayIdentityDisposition(record, identity)).filter(Boolean);
+      if (dispositions.length) return this.#reject(command, "identity-mismatch",
+        dispositions.includes("task-identity-mismatch") ? "task-identity-mismatch" : "runtime-or-session-replaced", false);
       return receipt(prior.at(-1)!, true);
     }
     const now = this.#now().getTime();
@@ -103,10 +111,25 @@ export class SourceRevertController {
     let resolved: { projection: SourceRevertProjection; authority: SourceRevertAuthority | null };
     try { resolved = await this.#resolve(command.payload.fileRef, command.payload.hunkRefs); }
     catch { return this.#reject(command, "capability-unavailable", "revert-preview-unavailable", true); }
+    const rebound = this.#bridge.snapshot();
+    if (rebound.state !== "ready" || !rebound.identity || !rebound.revisions)
+      return this.#reject(command, "resync-required", "revert-binding-unavailable-after-preview", true);
+    const reboundIdentity = wireIdentity(rebound.identity), reboundRevisions = wireRevisions(rebound.revisions);
+    if (!same(reboundIdentity, identity)) {
+      const taskChanged = reboundIdentity.taskId !== identity.taskId || reboundIdentity.taskRunId !== identity.taskRunId;
+      return this.#reject(command, "identity-mismatch", taskChanged ? "task-identity-mismatch" : "runtime-or-session-replaced", false);
+    }
+    if (rebound.taskState === "terminal") return this.#reject(command, "terminal-task", "task-terminal-after-preview", false);
+    if (rebound.liveness !== "idle") return this.#reject(command, "capability-unavailable", "agent-not-idle-after-preview", true);
+    if (command.expectedRevisions.runtimeRevision !== reboundRevisions.runtimeRevision
+      || command.expectedRevisions.taskRevision !== reboundRevisions.taskRevision
+      || command.expectedRevisions.controlRevision !== reboundRevisions.controlRevision)
+      return this.#reject(command, "stale-revision", "stale-task-control-revision-after-preview", true);
     if (!resolved.authority || resolved.projection.state !== "ready" || !resolved.projection.target)
       return this.#reject(command, "capability-unavailable", resolved.projection.reasonCode ?? "revert-preview-unavailable", true);
     const target = resolved.projection.target;
-    if (!this.#matches(command, target) || now > Date.parse(target.expiresAt)) return this.#reject(command, "stale-revision", "revert-preview-stale", true);
+    if (!this.#matches(command, target) || this.#now().getTime() > Date.parse(target.expiresAt))
+      return this.#reject(command, "stale-revision", "revert-preview-stale", true);
     const before = { ...bridgeRevisions, workspaceRevision: target.workspaceRevision, indexRevision: target.indexRevision };
     let requested: SourceMutationEvidenceRecord;
     try { requested = appendSourceMutationEvidence({ projectRoot: this.#projectRoot, projectRef: identity.projectRef, runtimeInstanceId: identity.runtimeInstanceId,

package/packages/piagent-webui/gateway/gateway-events.ts

@@ -14,10 +14,14 @@ export type GatewayProtocolEvent = {
   payload: Record<string, unknown>;
 };
 
+export type GatewayTaskStatus = "pending" | "completed" | "refused" | "failed" | "unknown";
+
 export type GatewayTerminalSettlement = {
   sessionRef: string;
   operationRef: string;
+  messageRequestId?: string;
   settlement: "blocked" | "aborted" | "error" | "unknown";
+  taskStatus: GatewayTaskStatus;
   reasonCode: string;
   settledAt: string;
   sequence: number;
@@ -30,7 +34,12 @@ const SETTLEMENT_RETENTION_COUNT = 100;
 const SETTLEMENT_RETENTION_MS = 60 * 60_000;
 const MAX_SETTLEMENT_DECISION_COUNT = 10_000;
 type GatewaySettlementDecision = { settledAt: string; settlement: "completed" | GatewayTerminalSettlement["settlement"];
-  reasonCode: string | null };
+  taskStatus: GatewayTaskStatus; reasonCode: string | null };
+
+function settlementTaskStatus(value: unknown): GatewayTaskStatus {
+  return ["pending", "completed", "refused", "failed", "unknown"].includes(String(value))
+    ? value as GatewayTaskStatus : "unknown";
+}
 
 function settlementReason(settlement: GatewayTerminalSettlement["settlement"], value: unknown): string {
   if (typeof value === "string" && REASON_CODE_PATTERN.test(value) && !redactSensitiveText(value).redacted) return value;
@@ -84,7 +93,8 @@ export class GatewayEventStore {
     if (indexed) return indexed;
     const retained = this.#settlements.find((item) => item.sessionRef === sessionRef && item.operationRef === operationRef);
     if (!retained) return undefined;
-    const restored = { settledAt: retained.settledAt, settlement: retained.settlement, reasonCode: retained.reasonCode };
+    const restored = { settledAt: retained.settledAt, settlement: retained.settlement,
+      taskStatus: retained.taskStatus, reasonCode: retained.reasonCode };
     this.#settlementDecisions.set(key, restored);
     return restored;
   }
@@ -100,11 +110,16 @@ export class GatewayEventStore {
     if (this.#settlementDecision(sessionRef, operationRef)) return;
     this.#settlementDecisions.set(key, { settledAt: event.generatedAt,
       settlement: settlement as GatewaySettlementDecision["settlement"],
+      taskStatus: settlementTaskStatus(event.payload.taskStatus),
       reasonCode: settlement === "completed" ? null : String(event.payload.reasonCode) });
-    const retained = { sessionRef, operationRef, settledAt: event.generatedAt, sequence: event.sequence };
+    const messageRequestId = typeof event.payload.messageRequestId === "string" && OPAQUE_REF_PATTERN.test(event.payload.messageRequestId)
+      ? event.payload.messageRequestId : undefined;
+    const retained = { sessionRef, operationRef, ...(messageRequestId ? { messageRequestId } : {}),
+      settledAt: event.generatedAt, sequence: event.sequence };
     if (settlement !== "completed") {
       const outcome = settlement as GatewayTerminalSettlement["settlement"];
-      this.#settlements.push({ ...retained, settlement: outcome, reasonCode: settlementReason(outcome, event.payload.reasonCode) });
+      this.#settlements.push({ ...retained, settlement: outcome, taskStatus: settlementTaskStatus(event.payload.taskStatus),
+        reasonCode: settlementReason(outcome, event.payload.reasonCode) });
     }
     this.#pruneSettlements(now);
   }
@@ -112,6 +127,7 @@ export class GatewayEventStore {
   publish(kind: GatewayEventKind, payload: Record<string, unknown>, now = new Date()): GatewayProtocolEvent {
     if (!Number.isFinite(now.getTime())) throw new Error("gateway-event-time-invalid");
     if (kind === "operation.settled") {
+      payload = { ...payload, taskStatus: settlementTaskStatus(payload.taskStatus) };
       if (payload.settlement === "completed") payload = { ...payload, reasonCode: null };
       else {
         const settlement = ["blocked", "aborted", "error", "unknown"].includes(String(payload.settlement))
@@ -123,7 +139,8 @@ export class GatewayEventStore {
       if (typeof sessionRef === "string" && OPAQUE_REF_PATTERN.test(sessionRef)
         && typeof operationRef === "string" && OPAQUE_REF_PATTERN.test(operationRef)) {
         const canonical = this.#settlementDecision(sessionRef, operationRef);
-        if (canonical) payload = { ...payload, settlement: canonical.settlement, reasonCode: canonical.reasonCode };
+        if (canonical) payload = { ...payload, settlement: canonical.settlement,
+          taskStatus: canonical.taskStatus, reasonCode: canonical.reasonCode };
       }
     }
     this.#sequence += 1;