Fix terminal row focus navigation

Author: johannesjo

src/store/focus.test.ts

@@ -301,6 +301,55 @@ describe('focus navigation neighbor map', () => {
     expect(mockStore.activeAgentId).toBe('agent-2b');
   });
 
+  it('stays on the AI terminal row when crossing into a task with shell terminals', () => {
+    setTask('task-1', { agentIds: ['agent-1a', 'agent-1b'] });
+    setTask('task-2', {
+      agentIds: ['agent-2a', 'agent-2b'],
+      selectedAgentId: 'agent-2b',
+      shellAgentIds: ['shell-2'],
+    });
+    mockStore.taskOrder = ['task-1', 'task-2'];
+    mockStore.focusedPanel['task-1'] = 'ai-terminal:agent-1b';
+
+    navigateColumn('right');
+
+    expect(mockStore.activeTaskId).toBe('task-2');
+    expect(mockStore.focusedPanel['task-2']).toBe('ai-terminal:agent-2b');
+    expect(mockStore.activeAgentId).toBe('agent-2b');
+  });
+
+  it('stays on the AI terminal row when crossing left into a task with shell terminals', () => {
+    setTask('task-1', {
+      agentIds: ['agent-1a', 'agent-1b'],
+      selectedAgentId: 'agent-1b',
+      shellAgentIds: ['shell-1'],
+    });
+    setTask('task-2', { agentIds: ['agent-2a', 'agent-2b'] });
+    mockStore.taskOrder = ['task-1', 'task-2'];
+    mockStore.activeTaskId = 'task-2';
+    mockStore.activeAgentId = 'agent-2a';
+    mockStore.focusedPanel['task-2'] = 'ai-terminal:agent-2a';
+
+    navigateColumn('left');
+
+    expect(mockStore.activeTaskId).toBe('task-1');
+    expect(mockStore.focusedPanel['task-1']).toBe('ai-terminal:agent-1b');
+    expect(mockStore.activeAgentId).toBe('agent-1b');
+  });
+
+  it('crosses from a shell terminal to the target shell toolbar when no shell is open', () => {
+    setTask('task-1', { shellAgentIds: ['shell-1'] });
+    setTask('task-2', { agentIds: ['agent-2a', 'agent-2b'] });
+    mockStore.taskOrder = ['task-1', 'task-2'];
+    mockStore.focusedPanel['task-1'] = 'shell:0';
+
+    navigateColumn('right');
+
+    expect(mockStore.activeTaskId).toBe('task-2');
+    expect(mockStore.focusedPanel['task-2']).toBe('shell-toolbar:0');
+    expect(mockStore.activeAgentId).toBe('agent-2a');
+  });
+
   it('moves down from a secondary split-mode AI terminal to the prompt', () => {
     setTask('task-1', { agentIds: ['agent-1', 'agent-2'] });
     mockStore.taskSplitMode['task-1'] = true;

src/store/focus.ts

@@ -39,6 +39,8 @@ export function triggerAction(key: string): void {
 //    repeated down the left columns so left/right crossings stay consistent.
 
 const AI_TERMINAL_PANEL = 'ai-terminal';
+const SHELL_PANEL_PREFIX = 'shell:';
+const SHELL_TOOLBAR_PANEL_PREFIX = 'shell-toolbar:';
 
 function aiTerminalPanelId(agentId: string): string {
   return `${AI_TERMINAL_PANEL}:${agentId}`;
@@ -58,6 +60,48 @@ function aiTerminalPanels(task: { agentIds: string[] }): string[] {
   return task.agentIds.length > 0 ? task.agentIds.map(aiTerminalPanelId) : [AI_TERMINAL_PANEL];
 }
 
+function shellToolbarPanels(task: { projectId: string }): string[] {
+  const bookmarkCount =
+    store.projects.find((p) => p.id === task.projectId)?.terminalBookmarks?.length ?? 0;
+  return Array.from({ length: 1 + bookmarkCount }, (_, i) => `${SHELL_TOOLBAR_PANEL_PREFIX}${i}`);
+}
+
+function isShellPanel(panel: string): boolean {
+  return panel.startsWith(SHELL_PANEL_PREFIX);
+}
+
+function isShellToolbarPanel(panel: string): boolean {
+  return panel.startsWith(SHELL_TOOLBAR_PANEL_PREFIX);
+}
+
+function edgeIndex(count: number, entryEdge: 'left' | 'right'): number {
+  return entryEdge === 'right' ? 0 : count - 1;
+}
+
+function pickTargetTerminalFamilyPanel(
+  current: string,
+  targetTask: { shellAgentIds: string[]; projectId: string },
+  entryEdge: 'left' | 'right',
+): string | null {
+  if (isAiTerminalPanel(current)) return AI_TERMINAL_PANEL;
+
+  if (isShellPanel(current)) {
+    if (targetTask.shellAgentIds.length > 0) {
+      return `${SHELL_PANEL_PREFIX}${edgeIndex(targetTask.shellAgentIds.length, entryEdge)}`;
+    }
+
+    const toolbarPanels = shellToolbarPanels(targetTask);
+    return toolbarPanels[edgeIndex(toolbarPanels.length, entryEdge)] ?? null;
+  }
+
+  if (isShellToolbarPanel(current)) {
+    const toolbarPanels = shellToolbarPanels(targetTask);
+    return toolbarPanels[edgeIndex(toolbarPanels.length, entryEdge)] ?? null;
+  }
+
+  return null;
+}
+
 function normalizeTaskPanel(taskId: string, panel: string): string {
   if (panel !== AI_TERMINAL_PANEL) return panel;
   const task = store.tasks[taskId];
@@ -78,9 +122,7 @@ function isLeftColumnPanel(panel: string): boolean {
 function buildGrid(panelId: string): string[][] {
   const task = store.tasks[panelId];
   if (task) {
-    const bookmarkCount =
-      store.projects.find((p) => p.id === task.projectId)?.terminalBookmarks?.length ?? 0;
-    const toolbarCols = Array.from({ length: 1 + bookmarkCount }, (_, i) => `shell-toolbar:${i}`);
+    const toolbarCols = shellToolbarPanels(task);
     const aiCols = aiTerminalPanels(task);
 
     if (store.taskSplitMode[panelId]) {
@@ -433,6 +475,16 @@ export function navigateColumn(direction: 'left' | 'right'): void {
     } else if (!store.tasks[targetId]) {
       focusTaskPanel(targetId, defaultPanelFor(targetId));
     } else {
+      const semanticTarget = pickTargetTerminalFamilyPanel(
+        current,
+        store.tasks[targetId],
+        entryEdge,
+      );
+      if (semanticTarget) {
+        focusTaskPanel(targetId, semanticTarget);
+        return;
+      }
+
       const targetGrid = buildGrid(targetId);
       const targetPos = findInGrid(targetGrid, current);
       const targetRow = targetPos ? targetPos.row : pos.row;