From 2fbc5f4b591a1ecb715a982d2f42aae8d7d81f01 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 31 Oct 2026 10:14:00 +0000
Subject: [PATCH] fix(server): capture reload reply before publishing updates

---
 .../src/server/daemon-e2e/concurrent-agent-refresh.e2e.test.ts  | 1 +
 packages/server/src/server/session.ts                           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/server/daemon-e2e/concurrent-agent-refresh.e2e.test.ts b/packages/server/src/server/daemon-e2e/concurrent-agent-refresh.e2e.test.ts
index 3958add65b..0f09c730aa 100644
--- a/packages/server/src/server/daemon-e2e/concurrent-agent-refresh.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/concurrent-agent-refresh.e2e.test.ts
@@ -66,6 +66,7 @@ async function setup(provider: AgentClient, agentId?: string) {
   const clients = [0, 1].map(() => new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` }));
   resources.push({ daemon, clients, cwd });
   await Promise.all(clients.map((client) => client.connect()));
+  await Promise.all(clients.map((client) => client.fetchAgents({ subscribe: {} })));
   const agent = await daemon.daemon.agentManager.createAgent({ provider: "claude", cwd }, agentId, {
     workspaceId: undefined,
   });
diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts
index 02b94a3643..5bfe83cb09 100644
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -4779,8 +4779,8 @@ export class Session {
           });
       }
       const snapshot = await refresh;
-      await this.agentUpdates.forwardLiveAgent(snapshot);
       const timelineSize = this.agentManager.getTimeline(agentId).length;
+      await this.agentUpdates.forwardLiveAgent(snapshot);
       if (requestId) {
         this.emit({
           type: "status",