diff --git a/v2/src/App.svelte b/v2/src/App.svelte
index 7e0c724..f79b9b1 100644
--- a/v2/src/App.svelte
+++ b/v2/src/App.svelte
@@ -2,7 +2,7 @@
   import { onMount, onDestroy } from 'svelte';
   import SessionList from './lib/components/Sidebar/SessionList.svelte';
   import TilingGrid from './lib/components/Layout/TilingGrid.svelte';
-  import { addPane, focusPaneByIndex, getPanes } from './lib/stores/layout';
+  import { addPane, focusPaneByIndex, getPanes } from './lib/stores/layout.svelte';
   import { startAgentDispatcher, stopAgentDispatcher } from './lib/agent-dispatcher';
 
   function newTerminal() {
diff --git a/v2/src/lib/agent-dispatcher.ts b/v2/src/lib/agent-dispatcher.ts
index e694cb7..40313fd 100644
--- a/v2/src/lib/agent-dispatcher.ts
+++ b/v2/src/lib/agent-dispatcher.ts
@@ -10,7 +10,7 @@ import {
   setAgentModel,
   appendAgentMessages,
   updateAgentCost,
-} from './stores/agents';
+} from './stores/agents.svelte';
 
 let unlistenFn: (() => void) | null = null;
 
diff --git a/v2/src/lib/components/Agent/AgentPane.svelte b/v2/src/lib/components/Agent/AgentPane.svelte
index 1a6383c..b24e7ca 100644
--- a/v2/src/lib/components/Agent/AgentPane.svelte
+++ b/v2/src/lib/components/Agent/AgentPane.svelte
@@ -6,7 +6,7 @@
     createAgentSession,
     removeAgentSession,
     type AgentSession,
-  } from '../../stores/agents';
+  } from '../../stores/agents.svelte';
   import type {
     AgentMessage,
     TextContent,
@@ -49,7 +49,7 @@
     const ready = await isAgentReady();
     if (!ready) {
       createAgentSession(sessionId, text);
-      const { updateAgentStatus } = await import('../../stores/agents');
+      const { updateAgentStatus } = await import('../../stores/agents.svelte');
       updateAgentStatus(sessionId, 'error', 'Sidecar not ready — agent features unavailable');
       return;
     }
diff --git a/v2/src/lib/components/Layout/TilingGrid.svelte b/v2/src/lib/components/Layout/TilingGrid.svelte
index a5c9c8d..4b787df 100644
--- a/v2/src/lib/components/Layout/TilingGrid.svelte
+++ b/v2/src/lib/components/Layout/TilingGrid.svelte
@@ -8,7 +8,7 @@
     getPaneGridArea,
     focusPane,
     removePane,
-  } from '../../stores/layout';
+  } from '../../stores/layout.svelte';
 
   let gridTemplate = $derived(getGridTemplate());
   let panes = $derived(getPanes());
diff --git a/v2/src/lib/components/Sidebar/SessionList.svelte b/v2/src/lib/components/Sidebar/SessionList.svelte
index db2dc0b..7245e72 100644
--- a/v2/src/lib/components/Sidebar/SessionList.svelte
+++ b/v2/src/lib/components/Sidebar/SessionList.svelte
@@ -7,7 +7,7 @@
     getActivePreset,
     setPreset,
     type LayoutPreset,
-  } from '../../stores/layout';
+  } from '../../stores/layout.svelte';
 
   let panes = $derived(getPanes());
   let preset = $derived(getActivePreset());
diff --git a/v2/src/lib/stores/agents.ts b/v2/src/lib/stores/agents.svelte.ts
similarity index 100%
rename from v2/src/lib/stores/agents.ts
rename to v2/src/lib/stores/agents.svelte.ts
diff --git a/v2/src/lib/stores/layout.ts b/v2/src/lib/stores/layout.svelte.ts
similarity index 100%
rename from v2/src/lib/stores/layout.ts
rename to v2/src/lib/stores/layout.svelte.ts
diff --git a/v2/src/lib/stores/sessions.ts b/v2/src/lib/stores/sessions.svelte.ts
similarity index 100%
rename from v2/src/lib/stores/sessions.ts
rename to v2/src/lib/stores/sessions.svelte.ts