From 1701d0026e5429b932e1b4f644c6c8ebe1aa5ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0les=C3=A1r?= <michal.slesar@tordohm.net>
Date: Sat, 14 Mar 2026 11:20:17 +0100
Subject: [PATCH 1/2] fix(app): agent switch should not reset thinking level

---
 packages/app/src/context/local.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/context/local.tsx b/packages/app/src/context/local.tsx
index bed7ecd15c23..76d337c82b42 100644
--- a/packages/app/src/context/local.tsx
+++ b/packages/app/src/context/local.tsx
@@ -192,10 +192,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
             model: item.model,
             variant: item.variant ?? null,
           })
+          const prev = scope()
           const next = {
             agent: item.name,
-            model: item.model,
-            variant: item.variant,
+            model: item.model ?? prev?.model,
+            variant: item.variant ?? prev?.variant,
           } satisfies State
           const session = id()
           if (session) {

From 0dccac5350d0b891e6c58c952a53fb3e48676af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0les=C3=A1r?= <michal.slesar@tordohm.net>
Date: Sat, 14 Mar 2026 12:08:38 +0100
Subject: [PATCH 2/2] test(app): add e2e test for variant preservation across
 agent switches

---
 .../session/session-model-persistence.spec.ts | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/app/e2e/session/session-model-persistence.spec.ts b/packages/app/e2e/session/session-model-persistence.spec.ts
index 4b09a5287340..933d5e6f96d9 100644
--- a/packages/app/e2e/session/session-model-persistence.spec.ts
+++ b/packages/app/e2e/session/session-model-persistence.spec.ts
@@ -349,3 +349,25 @@ test("session model restore across workspaces", async ({ page, withProject }) =>
     await waitFooter(page, firstState)
   })
 })
+
+test("variant preserved when switching agent modes", async ({ page, withProject }) => {
+  await page.setViewportSize({ width: 1440, height: 900 })
+
+  await withProject(async ({ directory, gotoSession }) => {
+    await gotoSession()
+
+    await ensureVariant(page, directory)
+    const updated = await chooseDifferentVariant(page)
+
+    const available = await agents(page)
+    const other = available.find((name) => name !== updated.agent)
+    test.skip(!other, "only one agent available")
+    if (!other) return
+
+    await choose(page, promptAgentSelector, other)
+    await waitFooter(page, { agent: other, variant: updated.variant })
+
+    await choose(page, promptAgentSelector, updated.agent)
+    await waitFooter(page, { agent: updated.agent, variant: updated.variant })
+  })
+})