diff --git a/src/components/swarm/swarm-mission-picker.tsx b/src/components/swarm/swarm-mission-picker.tsx
index a1da0df..3d375b7 100644
--- a/src/components/swarm/swarm-mission-picker.tsx
+++ b/src/components/swarm/swarm-mission-picker.tsx
@@ -11,7 +11,7 @@ const useMissionList = () => ({
 });
 
 export function SwarmMissionPicker() {
-    const { setUrlState, swarmId } = useUrlState();
+    const { setView, setSwarmId, swarmId } = useUrlState();
     const { missions } = useMissionList();
 
     return (
@@ -20,7 +20,10 @@ export function SwarmMissionPicker() {
             {missions.map(m => (
                 <button
                     key={m.id}
-                    onClick={() => setUrlState({ view: 'swarm', swarmId: m.id })}
+                    onClick={() => {
+                        setView('swarm');
+                        setSwarmId(m.id);
+                    }}
                     className={`flex flex-col items-start p-3 min-h-[44px] rounded-md hover:bg-accent transition-colors w-full focus:outline-none focus:ring-2 focus:ring-ring ${swarmId === m.id ? 'bg-accent border' : ''}`}
                 >
                     <span className="font-medium text-sm">{m.title}</span>
diff --git a/tests/api/swarm/archetypes.test.ts b/tests/api/swarm/archetypes.test.ts
index b4d6ba6..9ab8e85 100644
--- a/tests/api/swarm/archetypes.test.ts
+++ b/tests/api/swarm/archetypes.test.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import { expect, test, describe, mock } from 'bun:test';
 import { GET } from '../../../src/app/api/swarm/archetypes/route';
 
diff --git a/tests/components/swarm/swarm-mission-picker.test.tsx b/tests/components/swarm/swarm-mission-picker.test.tsx
index cae41ea..2a26e48 100644
--- a/tests/components/swarm/swarm-mission-picker.test.tsx
+++ b/tests/components/swarm/swarm-mission-picker.test.tsx
@@ -1,3 +1,4 @@
+// @ts-ignore
 import { expect, test, describe, mock } from 'bun:test';
 
 // Mock the hook that the component tries to import
@@ -7,6 +8,7 @@ mock.module('@/hooks/use-url-state', () => ({
 
 describe('SwarmMissionPicker Component', () => {
     test('exports SwarmMissionPicker component that is a function', async () => {
+        // @ts-ignore
         const mod = await import('../../../src/components/swarm/swarm-mission-picker');
         expect(mod.SwarmMissionPicker).toBeDefined();
         expect(typeof mod.SwarmMissionPicker).toBe('function');
diff --git a/tests/components/swarm/swarm-workspace.test.tsx b/tests/components/swarm/swarm-workspace.test.tsx
index 1eac3d0..19b343f 100644
--- a/tests/components/swarm/swarm-workspace.test.tsx
+++ b/tests/components/swarm/swarm-workspace.test.tsx
@@ -1,8 +1,9 @@
+// @ts-ignore
 import { expect, test, describe } from 'bun:test';
 
 describe('SwarmWorkspace Component', () => {
     test('exports SwarmWorkspace component that is a function', async () => {
-        // This will fail because the file doesn't exist yet
+        // @ts-ignore
         const mod = await import('../../../src/components/swarm/swarm-workspace');
         expect(mod.SwarmWorkspace).toBeDefined();
         expect(typeof mod.SwarmWorkspace).toBe('function');
diff --git a/tests/components/unified-shell.test.tsx b/tests/components/unified-shell.test.tsx
index 5b99be3..0bbe050 100644
--- a/tests/components/unified-shell.test.tsx
+++ b/tests/components/unified-shell.test.tsx
@@ -1,6 +1,6 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
-// We'll use bun test to add a specific rendering test
+// @ts-ignore
 import { expect, test as bunTest } from 'bun:test';
 
 describe('UnifiedShell Component Contract', () => {
@@ -27,7 +27,7 @@ describe('UnifiedShell Component Contract', () => {
 
 bunTest('UnifiedShell handles swarm view conditionally', async () => {
   const mod = await import('../../src/components/shared/unified-shell');
-  const UnifiedShell = mod.UnifiedShell;
+  const _UnifiedShell = mod.UnifiedShell;
 
   // Create a minimal mock state to just render the function
   // We mock out the hooks if we can, but since this is a Server Component or uses context, it might be tricky.
diff --git a/tests/server/beads-fs.test.ts b/tests/server/beads-fs.test.ts
index cd4c3d8..81a3de7 100644
--- a/tests/server/beads-fs.test.ts
+++ b/tests/server/beads-fs.test.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import { expect, test, describe } from 'bun:test';
 import { getArchetypes } from '../../src/lib/server/beads-fs';