fix(chat): read distinct stored instructions on receipt replay

Signed-off-by: huangruiteng <huangrt01@163.com>

Author: huangruiteng

apps/presentation/dashboard/src/data/conversation-returns.test.mjs

@@ -67,4 +67,16 @@ assert.equal(hydratedRoles.length, 2);
 assert.equal(hydratedRoles[0].sourceMessageId, "user-message");
 assert.equal(hydratedRoles[1].sourceMessageId, "agent-message");
 assert.equal(hydratedRoles[1].text, "Live answer");
+// The initial optimistic request is the first user message of its Turn.
+// Later instructions must retain independent stored identities and remain visible.
+const withInstructions = [storedRoles[0],
+  { session_id: "current", message_id: "instruction-1", turn_id: "same-turn", role: "user", text: "Chinese first" },
+  { session_id: "current", message_id: "instruction-2", turn_id: "same-turn", role: "user", text: "Do not publish" },
+  storedRoles[1]];
+const recoveredInstructions = reconcileConversationHistory(bothRoles, withInstructions, createHistory);
+assert.equal(recoveredInstructions.length, 4);
+assert.equal(recoveredInstructions.find(row => row.text === "My request").sourceMessageId, "user-message");
+assert.equal(recoveredInstructions.find(row => row.text === "Chinese first").sourceMessageId, "instruction-1");
+assert.equal(recoveredInstructions.find(row => row.text === "Do not publish").sourceMessageId, "instruction-2");
+assert.equal(reconcileConversationHistory(recoveredInstructions, withInstructions, createHistory), recoveredInstructions);
 console.log("conversation-returns: passed (session isolation, late return, deduplication, transport uncertainty, stream preservation and watch retirement)");

apps/presentation/dashboard/src/data/conversation-returns.ts

@@ -31,8 +31,14 @@ export function reconcileConversationReturns<T extends ConversationMessage>(
   createReply: (message: ChatVisibleMessage) => T,
 ): T[] {
   const byId = new Map(messages.map((row) => [row.message_id, row]));
-  const byTurn = new Map(messages.filter((row) => row.origin !== "manager_followup")
-    .map((row) => [`${row.turn_id}:${row.role === "user" ? "user" : "assistant"}`, row]));
+  const byTurn = new Map<string, ChatVisibleMessage>();
+  for (const row of messages) {
+    if (row.origin === "manager_followup") continue;
+    const key = `${row.turn_id}:${row.role === "user" ? "user" : "assistant"}`;
+    // The Turn starts with its user request. Later user instructions have their
+    // own message IDs; they must not hydrate that original optimistic request.
+    if (row.role !== "user" || !byTurn.has(key)) byTurn.set(key, row);
+  }
   const seen = new Set(previous.filter((row) => row.sourceSessionId === sessionId).map((row) => row.sourceMessageId));
   let changed = false;
   const updated = previous.map((row) => {

apps/presentation/dashboard/src/views/dashboard-page.tsx

@@ -2956,7 +2956,7 @@ function PersonalGoalHome({
             if (receipt.created === false) {
               // A replay reads an existing delivery; its message belongs to the
               // stored transcript, not a second optimistic user bubble.
-              if (targetContextId === contextId) conversationHistory.retry();
+              if (targetContextId === contextId) await conversationHistory.refresh();
               return;
             }
             const id = managerMessageId.current++;

docs/architecture/rfcs/app-conversation-and-async-inbox-v0.md

@@ -137,8 +137,10 @@ receipt → observed work or actionable failure → readable answer in the same
   composer persists the original Session/Turn/text/ingress before dispatch and
   reuses it only for the matching Session and text; restoring the cache never
   sends automatically. Only a confirmed non-delivery permits a new ingress.
-  Replaying a delivered receipt uses the stored transcript rather than
-  inserting another local copy of the instruction.
+  Replaying a delivered receipt reads the current stored transcript rather than
+  reusing an earlier snapshot or inserting another local copy of the instruction.
+  History keeps the initial user request and later instructions as distinct messages
+  even while the initial request is still being reconciled with its stored identity.
   Unavailable browser storage keeps current-page retry behavior but cannot
   promise reload recovery. This tab-local cache is not delivery authority.
   Acceptance means the executor received the instructions, not that it adopted

examples/personal-workspace-browser/composer-session-admission.mjs

@@ -56,6 +56,8 @@ export const composerSessionAdmissionScenario = {
           const body = route.request().postDataJSON();
           posts.push(body.message);
           const queuedTurnId = `${turnId}-queued-${posts.length}`;
+          page.__loopxRuntime.messages.get(sessionId).push({ message_id: `${queuedTurnId}-user`, turn_id: queuedTurnId,
+            role: "user", text: body.message, created_at: "2026-08-13T01:00:01Z" });
           // A queued follow-up waits behind the running Turn; its stream is held too.
           routes.push(`**/api/chat/sessions/${sessionId}/turns/${queuedTurnId}/events`);
           await page.route(routes.at(-1), (held) => { heldEvents.push(held); });
@@ -84,10 +86,14 @@ export const composerSessionAdmissionScenario = {
         const body = route.request().postDataJSON();
         const target = new URL(route.request().url()).pathname.split("/")[6];
         adjustments.push({ ...body, turnId: target });
-        if ([1, 6].includes(adjustments.length)) return route.fulfill({ status: 409, json: { ok: false, error: "接收状态未确认" } });
+        if (adjustments.length === 9) {
+          page.__loopxRuntime.messages.get(sessionId).push({ message_id: "stored-current-page", turn_id: target,
+            role: "user", text: body.message, created_at: "2026-08-13T01:00:02Z" });
+        }
+        if ([1, 6, 9].includes(adjustments.length)) return route.fulfill({ status: 409, json: { ok: false, error: "接收状态未确认" } });
         if (adjustments.length === 4) return route.fulfill({ status: 409, json: { ok: false, error: "本次未送达", delivery_state: "not_delivered" } });
         const receipt = { ok: true, session_id: sessionId, turn_id: adjustments.length === 2 ? "wrong-turn" : target,
-          client_ingress_id: body.client_ingress_id, status: "delivered", created: adjustments.length !== 7 };
+          client_ingress_id: body.client_ingress_id, status: "delivered", created: ![7, 10].includes(adjustments.length) };
         if (adjustments.length === 3) { delayedReceipt = () => route.fulfill({ json: receipt }); return; }
         await route.fulfill({ json: receipt });
       });
@@ -165,6 +171,20 @@ export const composerSessionAdmissionScenario = {
         || adjustments[7].turnId === managed.turnId || await composerInput.inputValue()) {
         throw new Error("Instructions during the original send started new work or failed to clear the submitted draft");
       }
+      // Without reloading, a delivered replay must fetch the new stored message,
+      // not reuse the history snapshot taken before the instruction was sent.
+      const currentPageInstruction = "问卷里补上使用频率。";
+      await composerInput.fill(currentPageInstruction);
+      await sendButton.click();
+      await page.getByRole("status").filter({ hasText: "接收状态未确认" }).waitFor();
+      await sendButton.click();
+      await page.getByRole("status").filter({ hasText: "执行器已接收本轮追加指令" }).waitFor();
+      const currentPageStored = page.locator(".personal-message").getByText(currentPageInstruction, { exact: true });
+      await currentPageStored.waitFor({ timeout: 5000 });
+      if (await currentPageStored.count() !== 1 || adjustments.length !== 10
+        || adjustments[8].client_ingress_id !== adjustments[9].client_ingress_id || managed.posts.length !== 1) {
+        throw new Error("Delivered replay did not read back one stored instruction on the current page");
+      }
       await managed.release();
       notes.push("managed Codex: ordinary composer steers its exact Turn while the original send waits, retaining drafts and retry identity, including after completion and reload; restored requests never dispatch automatically");
 
@@ -174,7 +194,7 @@ export const composerSessionAdmissionScenario = {
       if (!await sendButton.isDisabled()) throw new Error("Unsupported executor was offered native steering");
       await sendButton.click({ force: true });
       await page.waitForTimeout(100);
-      if (unsupported.posts.length || adjustments.length !== 8) throw new Error("Unsupported executor received an effect");
+      if (unsupported.posts.length || adjustments.length !== 10) throw new Error("Unsupported executor received an effect");
       await composerInput.fill("");
       await unsupported.release();
       notes.push("unsupported managed adapter: draft retained and no Turn or steering effect");