From d1163cb5ec3b9481eb5e40507010d9be5afc4d85 Mon Sep 17 00:00:00 2001
From: Aiden Cline <aidenpcline@gmail.com>
Date: Fri, 3 Jul 2026 14:08:16 -0500
Subject: [PATCH] fix(tui): retain global forms across locations

---
 packages/tui/src/context/data.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index d292926aa7..b0a3ec122c 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -726,17 +726,19 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           async refresh(sessionID: string) {
             if (sessionID === "global") {
               const result = await sdk.api.form.listRequests({ location: locationQuery(defaultLocation()) })
+              const location = { directory: result.location.directory, workspaceID: result.location.workspaceID }
               setStore(
                 "session",
                 "form",
                 sessionID,
                 mutable(
-                  result.data
-                    .filter((form) => form.sessionID === "global")
-                    .map((form) => ({
-                      ...form,
-                      location: { directory: result.location.directory, workspaceID: result.location.workspaceID },
-                    })),
+                  [
+                    ...(store.session.form[sessionID] ?? []).filter(
+                      (form) =>
+                        form.location?.directory !== location.directory || form.location.workspaceID !== location.workspaceID,
+                    ),
+                    ...result.data.filter((form) => form.sessionID === "global").map((form) => ({ ...form, location })),
+                  ],
                 ),
               )
               return