From e64716b3edf7ac31ed767557397425735a848b6a Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 1 Aug 2026 12:34:06 +0200
Subject: [PATCH] fix(server): validate rewind before interrupting

---
 .../src/server/agent/agent-manager.test.ts    | 27 +++++++++++++++++--
 .../server/src/server/agent/agent-manager.ts  | 25 ++++++++---------
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/packages/server/src/server/agent/agent-manager.test.ts b/packages/server/src/server/agent/agent-manager.test.ts
index b03b9fd6b9..e6addccd3b 100644
--- a/packages/server/src/server/agent/agent-manager.test.ts
+++ b/packages/server/src/server/agent/agent-manager.test.ts
@@ -8152,6 +8152,7 @@ test("canonical submitted prompt keeps wire identity while rewind resolves provi
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-submitted-prompt-"));
   const storagePath = join(workdir, "agents");
   const storage = new AgentStorage(storagePath, logger);
+  const allowProviderEcho = deferred<void>();
 
   class SubmittedUserMessageSession extends TestAgentSession {
     override readonly capabilities = {
@@ -8159,6 +8160,7 @@ test("canonical submitted prompt keeps wire identity while rewind resolves provi
       supportsRewindFiles: true,
     };
     readonly rewindMessageIds: string[] = [];
+    interruptCount = 0;
 
     override async startTurn(
       prompt: AgentPromptInput,
@@ -8166,7 +8168,7 @@ test("canonical submitted prompt keeps wire identity while rewind resolves provi
     ): Promise<{ turnId: string }> {
       const turnId = "turn-submitted-user-message";
       const text = typeof prompt === "string" ? prompt : "";
-      setTimeout(() => {
+      setTimeout(async () => {
         this.pushEvent({ type: "turn_started", provider: this.provider, turnId });
         this.pushEvent({
           type: "timeline",
@@ -8174,6 +8176,7 @@ test("canonical submitted prompt keeps wire identity while rewind resolves provi
           turnId,
           item: { type: "assistant_message", text: "output before provider echo" },
         });
+        await allowProviderEcho.promise;
         this.pushEvent({
           type: "timeline",
           provider: this.provider,
@@ -8190,6 +8193,15 @@ test("canonical submitted prompt keeps wire identity while rewind resolves provi
       return { turnId };
     }
 
+    override async interrupt(): Promise<void> {
+      this.interruptCount += 1;
+      this.pushEvent({
+        type: "turn_canceled",
+        provider: this.provider,
+        turnId: "turn-submitted-user-message",
+      });
+    }
+
     override async revertFiles({ messageId }: { messageId: string }): Promise<void> {
       this.rewindMessageIds.push(messageId);
     }
@@ -8238,7 +8250,18 @@ test("canonical submitted prompt keeps wire identity while rewind resolves provi
       workspaceId: undefined,
     });
 
-    await manager.runAgent(snapshot.id, "hello from composer", { clientMessageId: "msg-client-1" });
+    const run = manager.runAgent(snapshot.id, "hello from composer", {
+      clientMessageId: "msg-client-1",
+    });
+    await manager.waitForAgentRunStart(snapshot.id);
+
+    await expect(manager.rewind(snapshot.id, "msg-client-1", "files")).rejects.toThrow(
+      "Cannot rewind before the provider acknowledges the submitted prompt",
+    );
+    expect(client.session?.interruptCount).toBe(0);
+
+    allowProviderEcho.resolve();
+    expect(await run).toMatchObject({ canceled: false });
 
     expect(streamEvents()).toEqual([
       { type: "turn_started" },
diff --git a/packages/server/src/server/agent/agent-manager.ts b/packages/server/src/server/agent/agent-manager.ts
index a8dce41f1c..7adb9257c8 100644
--- a/packages/server/src/server/agent/agent-manager.ts
+++ b/packages/server/src/server/agent/agent-manager.ts
@@ -2484,24 +2484,25 @@ export class AgentManager {
 
   async rewind(agentId: string, messageId: string, mode: RewindMode): Promise<void> {
     const agent = this.requireSessionAgent(agentId);
+    const submittedRow = this.timelineStore
+      .getRows(agentId)
+      .find(
+        (row) =>
+          row.item.type === "user_message" &&
+          row.item.messageId === messageId &&
+          row.item.clientMessageId === messageId,
+      );
+    if (submittedRow && !submittedRow.providerMessageId) {
+      throw new Error("Cannot rewind before the provider acknowledges the submitted prompt");
+    }
+    const providerMessageId = submittedRow?.providerMessageId ?? messageId;
+
     if (this.hasInFlightRun(agentId)) {
       await this.cancelAgentRunBefore(agentId, "rewind");
     }
 
     const lock = this.runs.createPendingRun(agentId);
     try {
-      const submittedRow = this.timelineStore
-        .getRows(agentId)
-        .find(
-          (row) =>
-            row.item.type === "user_message" &&
-            row.item.messageId === messageId &&
-            row.item.clientMessageId === messageId,
-        );
-      if (submittedRow && !submittedRow.providerMessageId) {
-        throw new Error("Cannot rewind before the provider acknowledges the submitted prompt");
-      }
-      const providerMessageId = submittedRow?.providerMessageId ?? messageId;
       this.logger.info(
         { agentId, provider: agent.provider, messageId, mode },
         "agent.rewind.start",