refactor: remove includeProjects navigation option

Projects are now always included in keyboard navigation (cmd+j/k, cmd+1-9).
This simplifies the navigation model and removes a rarely-used configuration
option.

Author: shkm

src-tauri/src/config.rs

@@ -188,20 +188,10 @@ impl Default for MergeConfig {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default)]
 pub struct NavigationConfig {
-    /// Include open projects in keyboard navigation (cmd+j/k)
-    #[serde(rename = "includeProjects")]
-    pub include_projects: bool,
-}
-
-impl Default for NavigationConfig {
-    fn default() -> Self {
-        Self {
-            include_projects: true,
-        }
-    }
+    // Reserved for future navigation settings
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

src-tauri/src/config.schema.json

@@ -179,14 +179,8 @@
     },
     "navigation": {
       "type": "object",
-      "description": "Configuration for keyboard navigation",
-      "properties": {
-        "includeProjects": {
-          "type": "boolean",
-          "description": "Include open projects in keyboard navigation (cmd+j/k, cmd+1-9). When false, only cycles through open worktrees.",
-          "default": true
-        }
-      },
+      "description": "Reserved for future navigation settings",
+      "properties": {},
       "additionalProperties": false
     },
     "indicators": {

src-tauri/src/default_config.jsonc

@@ -44,10 +44,6 @@
     }
   },
 
-  "navigation": {
-    // Include open projects in keyboard navigation (cmd+j/k, cmd+1-9)
-    "includeProjects": true
-  },
 
   "indicators": {
     // Time in ms after last activity before progress indicator turns off

src/App.tsx

@@ -314,15 +314,15 @@ function App() {
 
   // Open entities in sidebar order - scratch terminals first, then projects/worktrees
   // Used for unified keyboard navigation (1-9, j/k)
-  // When includeProjects is true, projects are interleaved with their worktrees in sidebar order
+  // Projects are interleaved with their worktrees in sidebar order
   const openEntitiesInOrder = useMemo(() => {
     const scratchIds = scratchTerminals.map(s => ({ type: 'scratch' as const, id: s.id }));
 
     // Build project/worktree list in sidebar visual order
     const projectAndWorktreeIds: Array<{ type: 'project' | 'worktree'; id: string }> = [];
     for (const project of projects) {
-      // Include project if includeProjects is enabled and project terminal is open
-      if (config.navigation.includeProjects && openProjectIds.has(project.id)) {
+      // Include project if project terminal is open
+      if (openProjectIds.has(project.id)) {
         projectAndWorktreeIds.push({ type: 'project' as const, id: project.id });
       }
       // Include open worktrees from this project
@@ -334,7 +334,7 @@ function App() {
     }
 
     return [...scratchIds, ...projectAndWorktreeIds];
-  }, [scratchTerminals, projects, openProjectIds, openWorktreeIds, config.navigation.includeProjects]);
+  }, [scratchTerminals, projects, openProjectIds, openWorktreeIds]);
 
   // Worktrees with running tasks and their counts (for sidebar indicator)
   const runningTaskCounts = useMemo(() => {

src/components/Drawer/DrawerTerminal.test.tsx

@@ -15,7 +15,7 @@ describe('DrawerTerminal', () => {
     entityId: 'worktree-1',
     isActive: true,
     shouldAutoFocus: false,
-    terminalConfig: defaultTestConfig.terminal,
+    terminalConfig: defaultTestConfig.drawer,
   };
 
   beforeEach(() => {
@@ -38,7 +38,7 @@ describe('DrawerTerminal', () => {
 
     it('applies padding from config', () => {
       const customConfig = {
-        ...defaultTestConfig.terminal,
+        ...defaultTestConfig.drawer,
         padding: 12,
       };
 
@@ -197,7 +197,7 @@ describe('DrawerTerminal', () => {
   describe('terminal config', () => {
     it('applies font family from config', async () => {
       const customConfig = {
-        ...defaultTestConfig.terminal,
+        ...defaultTestConfig.drawer,
         fontFamily: 'JetBrains Mono',
       };
 
@@ -212,7 +212,7 @@ describe('DrawerTerminal', () => {
 
     it('applies font size from config', async () => {
       const customConfig = {
-        ...defaultTestConfig.terminal,
+        ...defaultTestConfig.drawer,
         fontSize: 14,
       };
 

src/components/MainPane/MainTerminal.test.tsx

@@ -14,7 +14,7 @@ describe('MainTerminal', () => {
     type: 'main' as const,
     isActive: true,
     shouldAutoFocus: false,
-    terminalConfig: defaultTestConfig.terminal,
+    terminalConfig: defaultTestConfig.drawer,
   };
 
   beforeEach(() => {
@@ -47,7 +47,7 @@ describe('MainTerminal', () => {
 
     it('applies padding from config', () => {
       const customConfig = {
-        ...defaultTestConfig.terminal,
+        ...defaultTestConfig.drawer,
         padding: 16,
       };
 
@@ -154,7 +154,7 @@ describe('MainTerminal', () => {
   describe('terminal config', () => {
     it('applies font settings from config', async () => {
       const customConfig = {
-        ...defaultTestConfig.terminal,
+        ...defaultTestConfig.drawer,
         fontSize: 16,
         fontFamily: 'Fira Code',
       };
@@ -175,7 +175,7 @@ describe('MainTerminal', () => {
         const { unmount } = render(
           <MainTerminal
             {...defaultProps}
-            terminalConfig={{ ...defaultTestConfig.terminal, padding }}
+            terminalConfig={{ ...defaultTestConfig.drawer, padding }}
           />
         );
 

src/hooks/useConfig.ts

@@ -27,7 +27,7 @@ export interface MergeConfig {
 }
 
 export interface NavigationConfig {
-  includeProjects: boolean;
+  // Reserved for future navigation settings
 }
 
 export type TaskKind = 'command' | 'daemon';
@@ -111,9 +111,7 @@ const defaultConfig: Config = {
     terminal: 'Ghostty',
     editor: 'Zed',
   },
-  navigation: {
-    includeProjects: true,
-  },
+  navigation: {},
   indicators: {
     activityTimeout: 250,
     showIdleCheck: true,

src/test/setup.ts

@@ -31,7 +31,7 @@ export function emitEvent(eventName: string, payload: unknown) {
 export const defaultTestConfig = {
   main: { command: null, fontFamily: 'Menlo', fontSize: 13, fontLigatures: false, padding: 8 },
   drawer: { fontFamily: 'Menlo', fontSize: 13, fontLigatures: false, padding: 8 },
-  navigation: { includeProjects: true },
+  navigation: {},
   indicators: { activityTimeout: 5000, showIdleCheck: true },
   apps: { terminal: 'Terminal', editor: 'VS Code' },
   tasks: [],