fix(server): preserve each refresh caller workspace recovery

Hold reload and history hydration together across client connections, and scope
pending work to the agent manager that owns it. Exercise the real daemon with a
slow-history provider, separate managers, shared failures and subsequent retries.

Co-authored-by: tieo <65707274+tieo@users.noreply.github.com>

packages/server/package.json

@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/terminal-worker-lifecycle.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts src/server/plugins/usage-sources.e2e.test.ts src/server/plugins/lifecycle.e2e.test.ts src/server/connected-hosts/hosts.e2e.test.ts src/server/owned-subscriptions.e2e.test.ts && vitest run --maxWorkers=1 src/server/agent/providers/omp/history.e2e.test.ts src/server/daemon-e2e/git-operations.e2e.test.ts src/server/session.create-agent-worktree-autoarchive.e2e.test.ts src/server/agent/providers/opencode-bridge.local.e2e.test.ts src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"merges into|creates a worktree and auto-archives both|versioned runtime|oversized attachments|connected hosts|password-protected daemon refuses|replays selected OMP history\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/terminal-worker-lifecycle.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts src/server/plugins/usage-sources.e2e.test.ts src/server/plugins/lifecycle.e2e.test.ts src/server/connected-hosts/hosts.e2e.test.ts src/server/owned-subscriptions.e2e.test.ts src/server/daemon-e2e/concurrent-agent-refresh.e2e.test.ts && vitest run --maxWorkers=1 src/server/agent/providers/omp/history.e2e.test.ts src/server/daemon-e2e/git-operations.e2e.test.ts src/server/session.create-agent-worktree-autoarchive.e2e.test.ts src/server/agent/providers/opencode-bridge.local.e2e.test.ts src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"merges into|creates a worktree and auto-archives both|versioned runtime|oversized attachments|connected hosts|password-protected daemon refuses|replays selected OMP history\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",

packages/server/src/server/daemon-e2e/concurrent-agent-refresh.e2e.test.ts

@@ -0,0 +1,207 @@
+import { execFileSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import path from "node:path";
+import { afterEach, expect, test } from "vitest";
+import type { AgentClient, AgentSession } from "../agent/agent-sdk-types.js";
+import { createTestAgentClient } from "../test-utils/fake-agent-client.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+function deferred() {
+  let resolve!: () => void;
+  const promise = new Promise<void>((done) => {
+    resolve = done;
+  });
+  return { promise, resolve };
+}
+
+const artifactRoot = path.resolve(".artifacts");
+mkdirSync(artifactRoot, { recursive: true });
+const resources: { daemon: TestPaseoDaemon; clients: DaemonClient[]; cwd: string }[] = [];
+const releases: (() => void)[] = [];
+afterEach(async () => {
+  releases.splice(0).forEach((release) => release());
+  for (const { daemon, clients, cwd } of resources.splice(0)) {
+    await Promise.all(clients.map((client) => client.close()));
+    await daemon.close();
+    rmSync(cwd, { recursive: true, force: true });
+  }
+});
+
+function heldHistoryProvider() {
+  const historyStarted = deferred();
+  const releaseHistory = deferred();
+  releases.push(releaseHistory.resolve);
+  const base = createTestAgentClient("claude");
+  let resumes = 0;
+  const provider: AgentClient = {
+    provider: base.provider,
+    capabilities: base.capabilities,
+    createSession: (...args) => base.createSession(...args),
+    fetchCatalog: (...args) => base.fetchCatalog(...args),
+    isAvailable: (...args) => base.isAvailable(...args),
+    async resumeSession(...args) {
+      resumes += 1;
+      const session = await base.resumeSession(...args);
+      // Delay provider history through its public interface, keeping the manager real.
+      return new Proxy(session, {
+        get(target, key: keyof AgentSession) {
+          if (key === "streamHistory")
+            return async function* () {
+              historyStarted.resolve();
+              await releaseHistory.promise;
+              yield* target.streamHistory();
+            };
+          const value = Reflect.get(target, key);
+          return typeof value === "function" ? value.bind(target) : value;
+        },
+      });
+    },
+  };
+  return { provider, historyStarted, releaseHistory, resumes: () => resumes };
+}
+
+async function setup(provider: AgentClient, agentId?: string, appVersions = ["0.14.0", "0.14.0"]) {
+  const cwd = mkdtempSync(path.join(artifactRoot, "concurrent-refresh-"));
+  const daemon = await createTestPaseoDaemon({ agentClients: { claude: provider } });
+  const clients = appVersions.map(
+    (appVersion) => new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion }),
+  );
+  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,
+  });
+  return { clients, agent, cwd };
+}
+
+test("refreshes from separate connections share the reload until history is ready", async () => {
+  const provider = heldHistoryProvider();
+  const { clients, agent } = await setup(provider.provider);
+  const first = clients[0].refreshAgent(agent.id);
+  await provider.historyStarted.promise;
+  const second = clients[1].refreshAgent(agent.id);
+  // The following RPC traverses the same connection after the second refresh request.
+  await clients[1].fetchAgents();
+  provider.releaseHistory.resolve();
+  const results = await Promise.all([first, second]);
+  expect(results.map((result) => result.agentId)).toEqual([agent.id, agent.id]);
+  expect(provider.resumes()).toBe(1);
+  await clients[0].refreshAgent(agent.id);
+  expect(provider.resumes()).toBe(2);
+});
+
+test("refreshing the same id in separate daemons does not share a provider reload", async () => {
+  const provider = heldHistoryProvider();
+  const firstDaemon = await setup(provider.provider);
+  const secondDaemon = await setup(createTestAgentClient("claude"), firstDaemon.agent.id);
+  const first = firstDaemon.clients[0].refreshAgent(firstDaemon.agent.id);
+  await provider.historyStarted.promise;
+  const second = secondDaemon.clients[0].refreshAgent(secondDaemon.agent.id);
+  await secondDaemon.clients[0].fetchAgents();
+  // The other daemon must finish without releasing the first one's provider history.
+  let deadline: ReturnType<typeof setTimeout> | undefined;
+  let independent: boolean;
+  try {
+    independent = await Promise.race([
+      second.then(() => true),
+      new Promise<boolean>((resolve) => {
+        deadline = setTimeout(() => resolve(false), 5000);
+      }),
+    ]);
+  } finally {
+    clearTimeout(deadline);
+  }
+  provider.releaseHistory.resolve();
+  await Promise.all([first, second]);
+  expect(independent).toBe(true);
+});
+
+test("concurrent refreshes share a failure and a later retry starts a new reload", async () => {
+  const resumeStarted = deferred();
+  const releaseResume = deferred();
+  releases.push(releaseResume.resolve);
+  let resumes = 0;
+  const provider = createTestAgentClient("claude", {
+    beforeResumeSession: async () => {
+      resumes += 1;
+      if (resumes === 1) {
+        resumeStarted.resolve();
+        await releaseResume.promise;
+        throw new Error("provider resume failed");
+      }
+    },
+  });
+  const { clients, agent } = await setup(provider);
+  const first = clients[0].refreshAgent(agent.id);
+  // Attach handlers before releasing the rejected provider operation.
+  const outcome = Promise.allSettled([first]);
+  await resumeStarted.promise;
+  const second = clients[1].refreshAgent(agent.id);
+  const retryOutcome = Promise.allSettled([second]);
+  await clients[1].fetchAgents();
+  releaseResume.resolve();
+  const results = [...(await outcome), ...(await retryOutcome)];
+  expect(results.map((result) => result.status)).toEqual(["rejected", "rejected"]);
+  for (const result of results) {
+    if (result.status === "rejected")
+      expect(String(result.reason)).toContain("provider resume failed");
+  }
+  expect(resumes).toBe(1);
+  await expect(clients[0].refreshAgent(agent.id)).resolves.toMatchObject({ agentId: agent.id });
+  expect(resumes).toBe(2);
+});
+
+test("a legacy caller restores its workspace when joining a modern refresh", async () => {
+  const provider = heldHistoryProvider();
+  const {
+    clients: [modern, legacy],
+    cwd,
+  } = await setup(provider.provider, undefined, ["0.1.105", "0.1.104"]);
+  // An independent repository prevents archive from owning the enclosing test checkout.
+  execFileSync("git", ["init", "-b", "main", cwd], { stdio: "pipe" });
+  execFileSync(
+    "git",
+    [
+      "-c",
+      "user.name=Paseo Test",
+      "-c",
+      "user.email=test@example.com",
+      "-c",
+      "commit.gpgsign=false",
+      "commit",
+      "--allow-empty",
+      "-m",
+      "fixture",
+    ],
+    { cwd, stdio: "pipe" },
+  );
+  const created = await modern.createWorkspace({ source: { kind: "directory", path: cwd } });
+  expect(created.error).toBeNull();
+  const workspace = created.workspace!;
+  const agent = await modern.createAgent({ provider: "claude", cwd, workspaceId: workspace.id });
+  await modern.archiveWorkspace(workspace.id);
+  expect((await modern.fetchWorkspaces()).entries.some((entry) => entry.id === workspace.id)).toBe(
+    false,
+  );
+  const first = modern.refreshAgent(agent.id);
+  await provider.historyStarted.promise;
+  expect((await modern.fetchWorkspaces()).entries.some((entry) => entry.id === workspace.id)).toBe(
+    false,
+  );
+  const joining = legacy.refreshAgent(agent.id);
+  const outcomes = Promise.allSettled([first, joining]);
+  try {
+    await expect
+      .poll(
+        async () =>
+          (await legacy.fetchWorkspaces()).entries.some((entry) => entry.id === workspace.id),
+        { timeout: 5000 },
+      )
+      .toBe(true);
+  } finally {
+    provider.releaseHistory.resolve();
+  }
+  expect((await outcomes).map((result) => result.status)).toEqual(["fulfilled", "fulfilled"]);
+});

packages/server/src/server/session.ts

@@ -682,6 +682,9 @@ interface ClientActivity {
   appVisibilityChangedAt: Date;
 }
 
+// Connections on one daemon share refreshes; independent managers own independent agents.
+const pendingAgentRefreshes = new WeakMap<AgentManager, Map<string, Promise<ManagedAgent>>>();
+
 export class Session {
   private readonly connectedHostSession: ConnectedHostSession | null;
   private routed = false;
@@ -4759,39 +4762,26 @@ export class Session {
 
     try {
       await this.restoreOwningWorkspaceForLegacyAgentRefresh(agentId);
-      await unarchiveAgentState(this.agentStorage, this.agentManager, agentId);
-      let snapshot: ManagedAgent;
-      const existing = this.agentManager.getAgent(agentId);
-      if (existing) {
-        await this.interruptAgentIfRunning(agentId);
-        snapshot = await this.agentManager.reloadAgentSession(agentId, undefined, {
-          rehydrateFromDisk: true,
-        });
-      } else {
-        const record = await this.agentStorage.get(agentId);
-        if (!record) {
-          throw new Error(`Agent not found: ${agentId}`);
-        }
-        const registeredProviderIds = this.providerSnapshotManager.listRegisteredProviderIds();
-        if (!isStoredAgentProviderAvailable(record, registeredProviderIds)) {
-          throw new Error(`Agent ${agentId} references unavailable provider '${record.provider}'`);
-        }
-        if (!toAgentPersistenceHandle(registeredProviderIds, record.persistence)) {
-          throw new Error(`Agent ${agentId} cannot be refreshed because it lacks persistence`);
-        }
-        // Share the loader's per-agent in-flight operation with timeline fetches.
-        // Unarchiving publishes the record before provider resume finishes, so
-        // the agent pane can otherwise race this request and resume it twice.
-        snapshot = await ensureAgentLoaded(agentId, {
-          agentManager: this.agentManager,
-          agentStorage: this.agentStorage,
-          broadcastTimeline: true,
-          logger: this.sessionLogger,
-        });
+      // Runtime replacement is serialized, but the reply also needs provider history.
+      // Another replacement during hydration can remove the agent before that reply.
+      // Share the whole reload and hydration across connections, including failures.
+      const refreshes =
+        pendingAgentRefreshes.get(this.agentManager) ?? new Map<string, Promise<ManagedAgent>>();
+      pendingAgentRefreshes.set(this.agentManager, refreshes);
+      let refresh = refreshes.get(agentId);
+      if (!refresh) {
+        const started = this.refreshAgentFromPersistence(agentId);
+        refresh = started;
+        refreshes.set(agentId, started);
+        void started
+          .catch(() => undefined)
+          .finally(() => {
+            if (refreshes.get(agentId) === started) refreshes.delete(agentId);
+          });
       }
-      await this.agentManager.hydrateTimelineFromProvider(agentId, { broadcast: true });
-      await this.agentUpdates.forwardLiveAgent(snapshot);
+      const snapshot = await refresh;
       const timelineSize = this.agentManager.getTimeline(agentId).length;
+      await this.agentUpdates.forwardLiveAgent(snapshot);
       if (requestId) {
         this.emit({
           type: "status",
@@ -4829,6 +4819,41 @@ export class Session {
     }
   }
 
+  private async refreshAgentFromPersistence(agentId: string): Promise<ManagedAgent> {
+    await unarchiveAgentState(this.agentStorage, this.agentManager, agentId);
+    let snapshot: ManagedAgent;
+    const existing = this.agentManager.getAgent(agentId);
+    if (existing) {
+      await this.interruptAgentIfRunning(agentId);
+      snapshot = await this.agentManager.reloadAgentSession(agentId, undefined, {
+        rehydrateFromDisk: true,
+      });
+    } else {
+      const record = await this.agentStorage.get(agentId);
+      if (!record) {
+        throw new Error(`Agent not found: ${agentId}`);
+      }
+      const registeredProviderIds = this.providerSnapshotManager.listRegisteredProviderIds();
+      if (!isStoredAgentProviderAvailable(record, registeredProviderIds)) {
+        throw new Error(`Agent ${agentId} references unavailable provider '${record.provider}'`);
+      }
+      if (!toAgentPersistenceHandle(registeredProviderIds, record.persistence)) {
+        throw new Error(`Agent ${agentId} cannot be refreshed because it lacks persistence`);
+      }
+      // Share the loader's per-agent in-flight operation with timeline fetches.
+      // Unarchiving publishes the record before provider resume finishes, so
+      // the agent pane can otherwise race this request and resume it twice.
+      snapshot = await ensureAgentLoaded(agentId, {
+        agentManager: this.agentManager,
+        agentStorage: this.agentStorage,
+        broadcastTimeline: true,
+        logger: this.sessionLogger,
+      });
+    }
+    await this.agentManager.hydrateTimelineFromProvider(agentId, { broadcast: true });
+    return snapshot;
+  }
+
   private async handleCancelAgentRequest(agentId: string, requestId?: string): Promise<void> {
     this.sessionLogger.info({ agentId }, `Cancel request received for agent ${agentId}`);
 

patches/react-native-unistyles+3.2.4.patch

@@ -705,59 +705,3 @@ index a9c1804..f5a3c20 100644
  
          return Insets(
              this._insets.top / density,
-diff --git a/node_modules/react-native-unistyles/cxx/shadowTree/ShadowTreeManager.cpp b/node_modules/react-native-unistyles/cxx/shadowTree/ShadowTreeManager.cpp
-index 01026dc..3786ec4 100644
---- a/node_modules/react-native-unistyles/cxx/shadowTree/ShadowTreeManager.cpp
-+++ b/node_modules/react-native-unistyles/cxx/shadowTree/ShadowTreeManager.cpp
-@@ -17,13 +17,16 @@ void shadow::ShadowTreeManager::updateShadowTree(jsi::Runtime& rt) {
-         }
- 
- #if REACT_NATIVE_VERSION_MINOR >= 81
--        std::unordered_map<Tag, folly::dynamic> tagToProps;
-+        // Paseo backport of https://github.com/jpudysz/react-native-unistyles/pull/1357.
-+        // UIManager::updateShadowTree commits a root cloned before the commit, so when a
-+        // window-size commit (rotation, keyboard) lands in between, the retried Unistyles
-+        // commit puts the previous layout constraints back and the app stays laid out for
-+        // the old size. Commit here instead and clone from the root the commit hands us.
-+        std::unordered_set<SurfaceId> affectedSurfaces;
- 
-         for (const auto& [family, props] : updates) {
-             auto safeProps = props.isObject() ? props : folly::dynamic::object();
- 
--            tagToProps.insert({family->getTag(), safeProps});
--
-             auto* mutableFamily = const_cast<ShadowNodeFamily*>(family);
- 
-             if (mutableFamily->nativeProps_DEPRECATED && mutableFamily->nativeProps_DEPRECATED->isObject()) {
-@@ -31,9 +34,30 @@ void shadow::ShadowTreeManager::updateShadowTree(jsi::Runtime& rt) {
-             } else {
-                 mutableFamily->nativeProps_DEPRECATED = std::make_unique<folly::dynamic>(safeProps);
-             }
-+
-+            affectedSurfaces.insert(family->getSurfaceId());
-         }
- 
--        UIManagerBinding::getBinding(rt)->getUIManager().updateShadowTree(std::move(tagToProps));
-+        const auto& shadowTreeRegistry = UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry();
-+
-+        shadowTreeRegistry.enumerate([&updates, &affectedSurfaces](const ShadowTree& shadowTree, bool&){
-+            if (!affectedSurfaces.contains(shadowTree.getSurfaceId())) {
-+                return;
-+            }
-+
-+            auto transaction = [&updates](const RootShadowNode& oldRootShadowNode) -> RootShadowNode::Unshared {
-+                auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(oldRootShadowNode, updates);
-+
-+                return std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
-+                    oldRootShadowNode,
-+                    updates,
-+                    affectedNodes
-+                ));
-+            };
-+
-+            // mountSynchronously: this is an update from C++, not React
-+            shadowTree.commit(transaction, {false, true});
-+        });
- #else
-         const auto& shadowTreeRegistry = UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry();
- 

scripts/postinstall-patches.mjs

@@ -28,9 +28,6 @@ const patchedPackages = [
   // withUnistyles: also keep the uniProps filter until upstream consumes its control prop.
   // Android configuration: backport 3.5.3; remove the two NativePlatform hunks at >= 3.5.3.
   // https://github.com/jpudysz/react-native-unistyles/compare/v3.5.2...v3.5.3
-  // Layout constraints: backport of https://github.com/jpudysz/react-native-unistyles/pull/1357
-  // (commit from the root the commit hands us, so a concurrent window-size commit is kept).
-  // Remove the ShadowTreeManager hunk when the installed release includes that PR.
   {
     nodeModulesPath: "node_modules/react-native-unistyles",
     patchPrefix: "react-native-unistyles+",