diff --git a/.changeset/agent-manager-modal-mode-shortcut.md b/.changeset/agent-manager-modal-mode-shortcut.md
new file mode 100644
index 00000000000..4efdaa9bc43
--- /dev/null
+++ b/.changeset/agent-manager-modal-mode-shortcut.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix Agent Manager mode shortcuts in the New Worktree dialog so the selected mode and its matching model stay in sync.
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-mode-router.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-mode-router.test.ts
new file mode 100644
index 00000000000..50f1560b34b
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-mode-router.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from "bun:test"
+import { createModeRouter } from "../../webview-ui/agent-manager/mode-router"
+
+describe("Agent Manager mode router", () => {
+  it("dispatches to the active modal handler and reports consumption", () => {
+    const router = createModeRouter()
+    const directions: number[] = []
+
+    router.register((direction) => directions.push(direction))
+
+    expect(router.dispatch(1)).toBe(true)
+    expect(router.dispatch(-1)).toBe(true)
+    expect(directions).toEqual([1, -1])
+  })
+
+  it("restores normal routing after the modal unregisters", () => {
+    const router = createModeRouter()
+    const dispose = router.register(() => undefined)
+
+    dispose()
+
+    expect(router.dispatch(1)).toBe(false)
+  })
+
+  it("does not let an old modal cleanup remove a replacement handler", () => {
+    const router = createModeRouter()
+    const first = router.register(() => undefined)
+    const directions: number[] = []
+
+    router.register((direction) => directions.push(direction))
+    first()
+
+    expect(router.dispatch(1)).toBe(true)
+    expect(directions).toEqual([1])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/session-model-store.test.ts b/packages/kilo-vscode/tests/unit/session-model-store.test.ts
index 01f862b9bd3..0c99900dcb1 100644
--- a/packages/kilo-vscode/tests/unit/session-model-store.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-model-store.test.ts
@@ -3,6 +3,7 @@ import {
   type ModelStore,
   type ResolveEnv,
   applyModel,
+  getAgentModel,
   getSessionModel,
   getSelected,
 } from "../../webview-ui/src/context/session-model-store"
@@ -149,6 +150,22 @@ describe("per-session model selection", () => {
 })
 
 describe("per-mode model memory", () => {
+  it("uses remembered model selections for modes without configured models", () => {
+    const store = { ...emptyStore(), modelSelections: { ask: gpt } }
+
+    expect(getAgentModel(store, env(), "ask")).toEqual(gpt)
+  })
+
+  it("ignores stale remembered selections when a configured mode model is user-set", () => {
+    const configured: ResolveEnv = {
+      ...env(),
+      getModeModel: (name) => (name === "code" ? claude : null),
+    }
+    const store = { ...emptyStore(), modelSelections: { code: gpt } }
+
+    expect(getAgentModel(store, configured, "code", true)).toEqual(claude)
+  })
+
   it("applyModel in a session writes only to sessionOverrides", () => {
     const store = emptyStore()
     const result = applyModel(store, "code", claude, "session-a")
diff --git a/packages/kilo-vscode/tests/unit/session-variant-store.test.ts b/packages/kilo-vscode/tests/unit/session-variant-store.test.ts
index c6c27294b16..a2b678009c3 100644
--- a/packages/kilo-vscode/tests/unit/session-variant-store.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-variant-store.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "bun:test"
 import {
   cycleVariant,
+  getAgentVariant,
   getVariant,
   sessionVariantKeys,
   sessionVariants,
@@ -43,6 +44,13 @@ describe("per-session variant selection", () => {
     expect(getVariant(store, model, variants, "ask")).toBe("high")
   })
 
+  it("resolves the effective variant for a mode and model", () => {
+    const store: Record<string, string> = {}
+    store[variantKey(model, "ask")] = "high"
+
+    expect(getAgentVariant(store, model, { variants: { low: {}, high: {} } }, "ask")).toBe("high")
+  })
+
   it("carries the pre-submit agent variant into a newly created session", () => {
     const store: Record<string, string> = {}
 
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
index 979679f24ba..5b5849734a5 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
@@ -76,6 +76,7 @@ import { ProviderShell } from "../src/context/provider-shell"
 import { ChatView } from "../src/components/chat"
 import HistoryView from "../src/components/history/HistoryView"
 import { NewWorktreeDialog } from "./NewWorktreeDialog"
+import { createModeRouter } from "./mode-router"
 import { ProjectList } from "./ProjectList"
 import { SidebarBody } from "./SidebarBody"
 import { TabBar } from "./TabBar"
@@ -227,6 +228,7 @@ const AgentManagerContent: Component = () => {
   const session = useSession()
   const vscode = useVSCode()
   const dialog = useDialog()
+  const mode = createModeRouter()
   let sidebarSearchMenu: SidebarSearchMenuRef | undefined
 
   const [kb, setKb] = createSignal<Record<string, string>>(defaultBindings)
@@ -1111,9 +1113,11 @@ const AgentManagerContent: Component = () => {
       else if (msg.action === "focusSearch")
         focusChatSearch({ history: setHistory, review: setReviewActive, terminal: () => terms.setActiveId(undefined) })
       else if (msg.action === "newTerminal") termHandlers.requestNew()
-      else if (msg.action === "cycleAgentMode" && document.hasFocus()) cycleAgent(1)
-      else if (msg.action === "cyclePreviousAgentMode" && document.hasFocus()) cycleAgent(-1)
-      else {
+      else if (msg.action === "cycleAgentMode" && document.hasFocus()) {
+        if (!mode.dispatch(1)) cycleAgent(1)
+      } else if (msg.action === "cyclePreviousAgentMode" && document.hasFocus()) {
+        if (!mode.dispatch(-1)) cycleAgent(-1)
+      } else {
         // Handle jumpTo1 through jumpTo9
         const match = /^jumpTo([1-9])$/.exec(msg.action ?? "")
         if (match) projectNav.jump(parseInt(match[1]!) - 1)
@@ -1790,7 +1794,9 @@ const AgentManagerContent: Component = () => {
   const showNewWorktreeDialog = () => {
     if (!loaded()) return
     expandSidebar()
-    dialog.show(() => <NewWorktreeDialog onClose={() => dialog.close()} defaultBaseBranch={repoDefaultBranch()} />)
+    dialog.show(() => (
+      <NewWorktreeDialog mode={mode} onClose={() => dialog.close()} defaultBaseBranch={repoDefaultBranch()} />
+    ))
   }
 
   const confirmDeleteWorktree = (worktreeId: string) => {
@@ -2256,6 +2262,7 @@ const AgentManagerContent: Component = () => {
             selectedProject={activeProjectId()}
             selection={selection() ?? undefined}
             currentSessionID={session.currentSessionID}
+            mode={mode}
             bindings={kb()}
             t={t}
             onSearchRef={(ref) => (sidebarSearchMenu = ref)}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx b/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
index a91193c725a..65217564e36 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
@@ -44,6 +44,8 @@ import { insertSpacedText } from "../src/components/chat/prompt-input-utils"
 import { WandSparkles } from "@kilocode/kilo-ui/lucide"
 import { BranchSelect, BranchSelectPopover } from "../src/components/shared/BranchSelect"
 import { tracker } from "./telemetry"
+import { cycleAgent } from "../src/context/session-agent"
+import type { ModeRouter } from "./mode-router"
 
 type VersionCount = 1 | 2 | 3 | 4
 const VERSION_OPTIONS: VersionCount[] = [1, 2, 3, 4]
@@ -74,9 +76,12 @@ function sanitizeBranchName(name: string): string {
     .join("/")
 }
 
-export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBranch?: string; projectId?: string }> = (
-  props,
-) => {
+export const NewWorktreeDialog: Component<{
+  onClose: () => void
+  defaultBaseBranch?: string
+  projectId?: string
+  mode: ModeRouter
+}> = (props) => {
   const { t } = useLanguage()
   const vscode = useVSCode()
   const server = useServer()
@@ -101,10 +106,12 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
   const cached = vscode.getState<Record<string, unknown>>()
   const [prompt, setPrompt] = createSignal((cached?.advancedDialogPrompt as string) ?? "")
   const [versions, setVersions] = createSignal<VersionCount>(1)
-  const [model, setModel] = createSignal<{ providerID: string; modelID: string } | null>(session.configModel())
+  const initialAgent = session.selectedAgent()
+  const initialModel = session.modelForAgent(initialAgent)
+  const [model, setModel] = createSignal<{ providerID: string; modelID: string } | null>(initialModel)
   const [compareMode, setCompareMode] = createSignal(false)
   const [modelAllocations, setModelAllocations] = createSignal<ModelAllocations>(new Map())
-  const [agent, setAgent] = createSignal(session.selectedAgent())
+  const [agent, setAgent] = createSignal(initialAgent)
   const [starting, setStarting] = createSignal(false)
   const [enhancing, setEnhancing] = createSignal(false)
   const [showAdvanced, setShowAdvanced] = createSignal(false)
@@ -113,7 +120,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
   const [baseBranchOpen, setBaseBranchOpen] = createSignal(false)
   const [compareOpen, setCompareOpen] = createSignal(false)
   const [highlightedIndex, setHighlightedIndex] = createSignal(0)
-  const [variant, setVariant] = createSignal<string | undefined>(session.currentVariant())
+  const [variant, setVariant] = createSignal<string | undefined>(session.variantForAgent(initialAgent, initialModel))
   const [sandbox, setSandbox] = createSignal<boolean | undefined>()
   const [sandboxDefault, setSandboxDefault] = createSignal<boolean | undefined>()
   const [sandboxOverride, setSandboxOverride] = createSignal<boolean | undefined>()
@@ -133,6 +140,34 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
     setEnhancing(false)
   }
 
+  const selectAgent = (name: string) => {
+    setAgent(name)
+    const sel = session.modelForAgent(name)
+    setModel(sel)
+    setVariant(session.variantForAgent(name, sel))
+  }
+
+  const resetModel = () => {
+    const sel = session.configModelForAgent(agent())
+    setModel(sel)
+    setVariant(session.variantForAgent(agent(), sel))
+  }
+
+  const cycle = (direction: 1 | -1) => {
+    cycleAgent({
+      agents: session.agents(),
+      direction,
+      selected: () => agent(),
+      select: selectAgent,
+    })
+  }
+
+  createEffect(() => {
+    if (tab() !== "new") return
+    const dispose = props.mode.register(cycle)
+    onCleanup(dispose)
+  })
+
   // Variant list for the currently selected model
   const variants = createMemo(() => {
     const sel = model()
@@ -153,7 +188,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
   // True when the user has changed the model from the session/config default
   const overridden = createMemo(() => {
     const sel = model()
-    const cfg = session.configModel()
+    const cfg = session.configModelForAgent(agent())
     if (!sel || !cfg) return false
     return sel.providerID !== cfg.providerID || sel.modelID !== cfg.modelID
   })
@@ -583,7 +618,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
                     <ModeSwitcherBase
                       agents={session.agents()}
                       value={agent()}
-                      onSelect={setAgent}
+                      onSelect={selectAgent}
                       portal={false}
                       deferDismiss
                     />
@@ -611,7 +646,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
                         <Button
                           variant="ghost"
                           size="small"
-                          onClick={() => setModel(session.configModel())}
+                          onClick={resetModel}
                           aria-label={t("prompt.action.resetModel")}
                         >
                           <svg width="12" height="12" viewBox="0 0 16 16" fill="currentColor">
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx b/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx
index fa03d3e0c47..9ea5304843d 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx
@@ -19,6 +19,7 @@ import type { SidebarSearchItem } from "./sidebar-search"
 import { LOCAL } from "./navigate"
 import { NewWorktreeDialog } from "./NewWorktreeDialog"
 import { ProjectBranchDialog } from "./ProjectBranchDialog"
+import type { ModeRouter } from "./mode-router"
 
 interface Props {
   projects: AgentProjectSnapshot[]
@@ -30,6 +31,7 @@ interface Props {
   selectedProject?: string
   selection?: string
   currentSessionID?: () => string | undefined
+  mode: ModeRouter
   busy?: (id: string) => boolean
   bindings: Record<string, string>
   t: LanguageContextValue["t"]
@@ -131,6 +133,7 @@ export const ProjectList: Component<Props> = (props) => {
     dialog.show(() => (
       <NewWorktreeDialog
         projectId={projectId}
+        mode={props.mode}
         defaultBaseBranch={state?.defaultBaseBranch ?? props.local[projectId]?.branch}
         onClose={() => dialog.close()}
       />
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/mode-router.ts b/packages/kilo-vscode/webview-ui/agent-manager/mode-router.ts
new file mode 100644
index 00000000000..5edbd6db08e
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/mode-router.ts
@@ -0,0 +1,26 @@
+export type ModeDirection = 1 | -1
+export type ModeHandler = (direction: ModeDirection) => void
+
+export interface ModeRouter {
+  register: (handler: ModeHandler) => () => void
+  dispatch: (direction: ModeDirection) => boolean
+}
+
+export function createModeRouter(): ModeRouter {
+  const state: { handler?: ModeHandler } = {}
+
+  return {
+    register(handler) {
+      state.handler = handler
+      return () => {
+        if (state.handler === handler) state.handler = undefined
+      }
+    },
+    dispatch(direction) {
+      const handler = state.handler
+      if (!handler) return false
+      handler(direction)
+      return true
+    },
+  }
+}
diff --git a/packages/kilo-vscode/webview-ui/src/context/session-model-store.ts b/packages/kilo-vscode/webview-ui/src/context/session-model-store.ts
index 424d5bf51d8..704e03fc648 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-model-store.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-model-store.ts
@@ -78,6 +78,17 @@ export function getSelected(
   return resolveModel(env, agentName, store.modelSelections[agentName], store.recentModels)
 }
 
+/** Returns the effective model for a mode outside a session scope. */
+export function getAgentModel(
+  store: ModelStore,
+  env: ResolveEnv,
+  agentName: string,
+  userSet = false,
+): ModelSelection | null {
+  const override = env.getModeModel(agentName) && userSet ? null : store.modelSelections[agentName]
+  return resolveModel(env, agentName, override, store.recentModels)
+}
+
 export interface ApplyResult {
   modelSelections: Record<string, ModelSelection | null>
   sessionOverrides: Record<string, ModelSelection>
diff --git a/packages/kilo-vscode/webview-ui/src/context/session-variant-store.ts b/packages/kilo-vscode/webview-ui/src/context/session-variant-store.ts
index a997f251d7d..bbbb5ca5a8a 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-variant-store.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-variant-store.ts
@@ -24,6 +24,16 @@ export function getVariant(
   return stored && variants.includes(stored) ? stored : variants[0]
 }
 
+export function getAgentVariant(
+  store: Record<string, string>,
+  sel: ModelSelection,
+  model: { variants?: Record<string, unknown> } | undefined,
+  agent: string,
+) {
+  if (!model?.variants) return undefined
+  return getVariant(store, sel, Object.keys(model.variants), agent)
+}
+
 /**
  * Next variant in the list, wrapping back to the first after the last.
  * An unknown or missing current value starts at the first variant.
diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx
index c7bad43c0a8..54917021876 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx
@@ -67,12 +67,13 @@ import {
 } from "./session-utils"
 import { Identifier } from "../utils/id"
 import { resolveModelSelection } from "./model-selection"
+import { getAgentModel } from "./session-model-store"
 import { resolveMessagePrefs } from "./session-preferences"
 import { errorIDs } from "./session-errors"
 import { PartStash } from "./part-stash"
 import { mergeParts, sameParts } from "./session-parts"
 import { state as todoState } from "./todo-revert"
-import { getVariant, sessionVariantKeys, transferVariants, variantKey } from "./session-variant-store"
+import { getAgentVariant, getVariant, sessionVariantKeys, transferVariants, variantKey } from "./session-variant-store"
 import { KILO_AUTO, KILO_PROVIDER_ID, parseModelString } from "../../../src/shared/provider-model"
 import { reviewMetadata, type ReviewMessageData } from "../../../src/shared/review-comments"
 import { visibleMessages as filterVisibleMessages } from "./session-queue"
@@ -201,6 +202,8 @@ interface SessionContextValue {
   // Model selection (global, extension-lifetime)
   selected: (sessionID?: string) => ModelSelection | null
   configModel: (sessionID?: string) => ModelSelection | null
+  modelForAgent: (agent: string) => ModelSelection | null
+  configModelForAgent: (agent: string) => ModelSelection | null
   selectModel: (providerID: string, modelID: string, sessionID?: string) => void
   hasModelOverride: (sessionID?: string) => boolean
   clearModelOverride: (sessionID?: string) => void
@@ -237,6 +240,7 @@ interface SessionContextValue {
   // Thinking variant for the selected model
   variantList: (sessionID?: string) => string[]
   currentVariant: (sessionID?: string) => string | undefined
+  variantForAgent: (agent: string, model: ModelSelection | null) => string | undefined
   selectVariant: (value: string, sessionID?: string) => void
 
   // Model favorites
@@ -735,6 +739,30 @@ export const SessionProvider: ParentComponent = (props) => {
     return resolveModel(agentName)
   }
 
+  function modelForAgent(agentName: string): ModelSelection | null {
+    return getAgentModel(
+      {
+        modelSelections: store.modelSelections,
+        sessionOverrides: store.sessionOverrides,
+        agentSelections: store.agentSelections,
+        recentModels: store.recentModels,
+      },
+      {
+        providers: provider.providers(),
+        connected: provider.connected(),
+        getModeModel,
+        getGlobalModel,
+        fallback: KILO_AUTO,
+      },
+      agentName,
+      userSetAgents()[agentName] === true,
+    )
+  }
+
+  function configModelForAgent(agentName: string): ModelSelection | null {
+    return resolveModel(agentName)
+  }
+
   /** True when the active model differs from what the config dictates. */
   function hasModelOverride(sessionID?: string) {
     const sel = selected(sessionID)
@@ -878,6 +906,12 @@ export const SessionProvider: ParentComponent = (props) => {
     return Object.keys(model.variants)
   }
 
+  function variantForAgent(agentName: string, sel: ModelSelection | null) {
+    if (!sel) return undefined
+    const model = provider.findModel(sel)
+    return getAgentVariant(store.variantSelections, sel, model, agentName)
+  }
+
   const currentVariant = (sessionID?: string) => {
     const sid = sessionID ?? currentSessionID()
     const sel = selected(sid)
@@ -2947,6 +2981,8 @@ export const SessionProvider: ParentComponent = (props) => {
     scopedSuggestions,
     selected,
     configModel,
+    modelForAgent,
+    configModelForAgent,
     selectModel,
     hasModelOverride,
     clearModelOverride,
@@ -2993,6 +3029,7 @@ export const SessionProvider: ParentComponent = (props) => {
     toggleFavorite,
     variantList,
     currentVariant,
+    variantForAgent,
     selectVariant,
     revert,
     revertedCount,
diff --git a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
index 9b6789d00c8..b422e6740c1 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
@@ -221,6 +221,8 @@ export function mockSessionValue(overrides?: {
     scopedQuestions: (sid?: string) => (sid ? qs.filter((q) => q.sessionID === sid) : qs),
     scopedSuggestions: (sid?: string) => (sid ? suggestions.filter((item) => item.sessionID === sid) : suggestions),
     selected: () => ({ providerID: "kilo", modelID: "anthropic/claude-sonnet-4-6" }),
+    modelForAgent: () => ({ providerID: "kilo", modelID: "anthropic/claude-sonnet-4-6" }),
+    configModelForAgent: () => ({ providerID: "kilo", modelID: "anthropic/claude-sonnet-4-6" }),
     selectModel: noop,
     hasModelOverride: () => false,
     clearModelOverride: noop,
@@ -249,6 +251,7 @@ export function mockSessionValue(overrides?: {
     toggleFavorite: noop,
     variantList: () => [],
     currentVariant: () => undefined,
+    variantForAgent: () => undefined,
     selectVariant: noop,
     sendMessage: noop,
     sendCommand: noop,
diff --git a/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx
index 9c465120c0c..9db2a45fa80 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx
@@ -29,6 +29,7 @@ import { ThinkingSelectorBase } from "../components/shared/ThinkingSelector"
 import { createSignal, onCleanup, onMount, type JSX } from "solid-js"
 import type { WorktreeFileDiff, WorktreeState, WorktreeGitStats, PRStatus } from "../types/messages"
 import type { ReviewComment } from "../../diff-viewer/review-comments"
+import { createModeRouter } from "../../agent-manager/mode-router"
 import "../../agent-manager/agent-manager.css"
 import "../../agent-manager/agent-manager-review.css"
 
@@ -1292,6 +1293,7 @@ export const MultiProjectSidebar: Story = {
       <StoryProviders noPadding>
         <div style={{ display: "flex", "flex-direction": "column", "max-height": "720px", overflow: "auto" }}>
           <ProjectList
+            mode={createModeRouter()}
             projects={[projectA, projectB]}
             states={{
               [projectA.id]: projectState(