From ad68b6195f54b3861615e35a76850e86f195a6a6 Mon Sep 17 00:00:00 2001
From: David Hill <iamdavidhill@gmail.com>
Date: Sun, 22 Mar 2026 17:50:13 +0000
Subject: [PATCH] app: prevent duplicate context tooltips by restricting
 tooltip to session header button only

---
 packages/app/e2e/prompt/context.spec.ts       | 20 +++++++++++++++++++
 .../src/components/session-context-usage.tsx  | 14 ++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/app/e2e/prompt/context.spec.ts b/packages/app/e2e/prompt/context.spec.ts
index 366191fd70..7cb270f7be 100644
--- a/packages/app/e2e/prompt/context.spec.ts
+++ b/packages/app/e2e/prompt/context.spec.ts
@@ -93,3 +93,23 @@ test("context panel can open file picker from context actions", async ({ page, s
     await expect(dialog).toHaveCount(0)
   })
 })
+
+test("context tooltip only appears from the session header trigger", async ({ page, sdk, gotoSession }) => {
+  await withSession(sdk, `e2e context tooltip ${Date.now()}`, async (session) => {
+    await seedContextSession({ sessionID: session.id, sdk })
+    await gotoSession(session.id)
+
+    const trigger = contextButton(page)
+    await expect(trigger).toBeVisible()
+    await trigger.click()
+
+    const tab = page.getByRole("tab", { name: "Context" })
+    await expect(tab).toBeVisible()
+
+    await tab.locator('[data-component="progress-circle"]').hover()
+    await expect(page.locator('[data-component="tooltip"]')).toHaveCount(0)
+
+    await trigger.hover()
+    await expect(page.locator('[data-component="tooltip"]')).toBeVisible()
+  })
+})
diff --git a/packages/app/src/components/session-context-usage.tsx b/packages/app/src/components/session-context-usage.tsx
index 7379833f8b..7604682826 100644
--- a/packages/app/src/components/session-context-usage.tsx
+++ b/packages/app/src/components/session-context-usage.tsx
@@ -101,10 +101,10 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
 
   return (
     <Show when={params.id}>
-      <Tooltip value={tooltipValue()} placement={props.placement ?? "top"}>
-        <Switch>
-          <Match when={variant() === "indicator"}>{circle()}</Match>
-          <Match when={true}>
+      <Switch>
+        <Match when={variant() === "indicator"}>{circle()}</Match>
+        <Match when={true}>
+          <Tooltip value={tooltipValue()} placement={props.placement ?? "top"}>
             <Button
               type="button"
               variant="ghost"
@@ -114,9 +114,9 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
             >
               {circle()}
             </Button>
-          </Match>
-        </Switch>
-      </Tooltip>
+          </Tooltip>
+        </Match>
+      </Switch>
     </Show>
   )
 }