From aa840f0f5c6c966fcb338ea173a6fa87e6fbf4ca Mon Sep 17 00:00:00 2001
From: Peter Steinberger <peter@steipete.me>
Date: Sun, 12 Jul 2026 13:46:35 +0100
Subject: [PATCH] fix(ui): serialize agent file tab selection (#105366)

---
 ui/src/pages/agents/panels-status-files.ts |  3 ++
 ui/src/pages/agents/view.test.ts           | 44 ++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/ui/src/pages/agents/panels-status-files.ts b/ui/src/pages/agents/panels-status-files.ts
index 930cd29e84f4..60428645ce63 100644
--- a/ui/src/pages/agents/panels-status-files.ts
+++ b/ui/src/pages/agents/panels-status-files.ts
@@ -505,11 +505,14 @@ export function renderAgentFiles(params: {
                 ${files.map((file) => {
                   const isActive = active === file.name;
                   const label = file.name.replace(/\.md$/i, "");
+                  // File reads are serialized; changing the active tab mid-read would
+                  // expose an editor whose content request was never accepted.
                   return html`
                     <button
                       class="agent-tab ${isActive ? "active" : ""} ${file.missing
                         ? "agent-tab--missing"
                         : ""}"
+                      ?disabled=${params.agentFilesLoading}
                       @click=${() => params.onSelectFile(file.name)}
                     >
                       ${label}${file.missing
diff --git a/ui/src/pages/agents/view.test.ts b/ui/src/pages/agents/view.test.ts
index 184676d1e118..002840d16568 100644
--- a/ui/src/pages/agents/view.test.ts
+++ b/ui/src/pages/agents/view.test.ts
@@ -437,6 +437,50 @@ describe("renderAgents", () => {
 });
 
 describe("renderAgentFiles", () => {
+  it("does not accept another file selection while a file request is loading", () => {
+    const container = document.createElement("div");
+    const onSelectFile = vi.fn();
+
+    render(
+      renderAgentFiles({
+        agentId: "alpha",
+        agentFilesList: {
+          agentId: "alpha",
+          workspace: "/tmp/workspace",
+          files: [
+            {
+              name: "AGENTS.md",
+              path: "/tmp/workspace/AGENTS.md",
+              missing: false,
+            },
+            {
+              name: "HEARTBEAT.md",
+              path: "/tmp/workspace/HEARTBEAT.md",
+              missing: false,
+            },
+          ],
+        },
+        agentFilesLoading: true,
+        agentFilesError: null,
+        agentFileActive: "AGENTS.md",
+        agentFileContents: { "AGENTS.md": "# Instructions" },
+        agentFileDrafts: { "AGENTS.md": "# Instructions" },
+        agentFileSaving: false,
+        onLoadFiles: () => undefined,
+        onSelectFile,
+        onFileDraftChange: () => undefined,
+        onFileReset: () => undefined,
+        onFileSave: () => undefined,
+      }),
+      container,
+    );
+
+    const heartbeatTab = expectAgentTab(container, "HEARTBEAT");
+    expect(heartbeatTab.disabled).toBe(true);
+    heartbeatTab.click();
+    expect(onSelectFile).not.toHaveBeenCalled();
+  });
+
   it("renders the upgraded markdown preview structure with file metadata", () => {
     const container = document.createElement("div");