From d43f603a354960816978359a650ef2ae0ef8fbd8 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 10:51:39 -0300
Subject: [PATCH 01/43] MAESTRO: feat: add description field to AITab interface

Added optional `description?: string` to AITab for user-defined tab
context annotations. This is the data model foundation for the tab
description feature.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/types/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/types/index.ts b/src/renderer/types/index.ts
index 74fdb2b14..494b836b9 100644
--- a/src/renderer/types/index.ts
+++ b/src/renderer/types/index.ts
@@ -425,6 +425,8 @@ export interface AITab {
 	autoSendOnActivate?: boolean; // When true, automatically send inputValue when tab becomes active
 	wizardState?: SessionWizardState; // Per-tab inline wizard state for /wizard command
 	isGeneratingName?: boolean; // True while automatic tab naming is in progress
+	/** Optional user-defined description for tab context */
+	description?: string;
 }
 
 // A single "thinking item" — one busy tab within a session.

From 2be1f5113e919ebac21eac75a2593c9d8026d2ae Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 10:53:48 -0300
Subject: [PATCH 02/43] MAESTRO: feat: add unifiedInbox and tabDescription to
 EncoreFeatureFlags

Extends the Encore Feature system with two new feature flags for upcoming
Unified Inbox and Tab Description features. tabDescription defaults to
true (enabled by default), unifiedInbox defaults to false.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/stores/settingsStore.ts | 2 ++
 src/renderer/types/index.ts          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/renderer/stores/settingsStore.ts b/src/renderer/stores/settingsStore.ts
index c10e6071e..d2e9c21a1 100644
--- a/src/renderer/stores/settingsStore.ts
+++ b/src/renderer/stores/settingsStore.ts
@@ -109,6 +109,8 @@ export const DEFAULT_ONBOARDING_STATS: OnboardingStats = {
 
 export const DEFAULT_ENCORE_FEATURES: EncoreFeatureFlags = {
 	directorNotes: false,
+	unifiedInbox: false,
+	tabDescription: true,
 };
 
 export const DEFAULT_DIRECTOR_NOTES_SETTINGS: DirectorNotesSettings = {
diff --git a/src/renderer/types/index.ts b/src/renderer/types/index.ts
index 74fdb2b14..0039a74d2 100644
--- a/src/renderer/types/index.ts
+++ b/src/renderer/types/index.ts
@@ -905,6 +905,8 @@ export interface LeaderboardSubmitResponse {
 // Each key is a feature ID, value indicates whether it's enabled
 export interface EncoreFeatureFlags {
 	directorNotes: boolean;
+	unifiedInbox: boolean;
+	tabDescription: boolean;
 }
 
 // Director's Notes settings for synopsis generation

From 88231509b353eb41257e3c7cf4735297d0cb0784 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 10:56:58 -0300
Subject: [PATCH 03/43] MAESTRO: test: expand fuzzy search test coverage with
 14 new cases

Add missing tests for scoring hierarchy (exact > substring > scattered),
case-insensitive scored matching, special characters in query (regex
metacharacters, unicode, emoji), and deterministic scoring verification.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/__tests__/renderer/utils/search.test.ts | 91 +++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/src/__tests__/renderer/utils/search.test.ts b/src/__tests__/renderer/utils/search.test.ts
index 58d4b2d7b..f1aa862f3 100644
--- a/src/__tests__/renderer/utils/search.test.ts
+++ b/src/__tests__/renderer/utils/search.test.ts
@@ -431,6 +431,97 @@ describe('search utils', () => {
 			});
 		});
 
+		describe('scoring - exact vs fuzzy vs substring ranking', () => {
+			it('exact match scores higher than scattered fuzzy match', () => {
+				const exact = fuzzyMatchWithScore('abc', 'abc');
+				const scattered = fuzzyMatchWithScore('aXbXc', 'abc');
+
+				expect(exact.matches).toBe(true);
+				expect(scattered.matches).toBe(true);
+				expect(exact.score).toBeGreaterThan(scattered.score);
+			});
+
+			it('substring match scores higher than scattered fuzzy match', () => {
+				const substring = fuzzyMatchWithScore('xxabcxx', 'abc');
+				const scattered = fuzzyMatchWithScore('aXXbXXc', 'abc');
+
+				expect(substring.matches).toBe(true);
+				expect(scattered.matches).toBe(true);
+				expect(substring.score).toBeGreaterThan(scattered.score);
+			});
+
+			it('exact match scores higher than substring match', () => {
+				const exact = fuzzyMatchWithScore('hello', 'hello');
+				const substring = fuzzyMatchWithScore('say hello there', 'hello');
+
+				expect(exact.matches).toBe(true);
+				expect(substring.matches).toBe(true);
+				expect(exact.score).toBeGreaterThan(substring.score);
+			});
+		});
+
+		describe('case-insensitive matching in scored search', () => {
+			it('matches regardless of case', () => {
+				const upper = fuzzyMatchWithScore('HELLO WORLD', 'hello');
+				const lower = fuzzyMatchWithScore('hello world', 'HELLO');
+				const mixed = fuzzyMatchWithScore('HeLLo WoRLd', 'hElLo');
+
+				expect(upper.matches).toBe(true);
+				expect(lower.matches).toBe(true);
+				expect(mixed.matches).toBe(true);
+			});
+
+			it('case-matching query scores higher than mismatched case', () => {
+				const caseMatch = fuzzyMatchWithScore('Hello', 'Hello');
+				const caseMismatch = fuzzyMatchWithScore('Hello', 'hello');
+
+				expect(caseMatch.matches).toBe(true);
+				expect(caseMismatch.matches).toBe(true);
+				expect(caseMatch.score).toBeGreaterThan(caseMismatch.score);
+			});
+		});
+
+		describe('special characters in query', () => {
+			it('does not crash with regex special characters in query', () => {
+				expect(() => fuzzyMatchWithScore('some text', '.*+?^${}()|[]\\')).not.toThrow();
+				expect(() => fuzzyMatch('some text', '.*+?^${}()|[]\\')).not.toThrow();
+			});
+
+			it('does not crash with brackets and parens in query', () => {
+				const result = fuzzyMatchWithScore('function()', '()');
+				expect(result).toHaveProperty('matches');
+				expect(result).toHaveProperty('score');
+			});
+
+			it('does not crash with unicode in query', () => {
+				const result = fuzzyMatchWithScore('caf\u00e9 latte', 'caf\u00e9');
+				expect(result.matches).toBe(true);
+				expect(result.score).toBeGreaterThan(0);
+			});
+
+			it('does not crash with emoji in query', () => {
+				expect(() => fuzzyMatchWithScore('hello world', '\ud83d\ude00')).not.toThrow();
+				expect(() => fuzzyMatch('hello world', '\ud83d\ude00')).not.toThrow();
+			});
+		});
+
+		describe('deterministic scoring', () => {
+			it('produces identical scores for identical inputs across multiple calls', () => {
+				const results = Array.from({ length: 10 }, () =>
+					fuzzyMatchWithScore('src/renderer/utils/search.ts', 'search')
+				);
+
+				const firstScore = results[0].score;
+				expect(results.every((r) => r.score === firstScore)).toBe(true);
+			});
+
+			it('produces identical match results for identical inputs', () => {
+				const results = Array.from({ length: 10 }, () => fuzzyMatch('handleUserInput', 'hui'));
+
+				expect(results.every((r) => r === true)).toBe(true);
+			});
+		});
+
 		describe('integration scenarios', () => {
 			it('handles real file search scenario', () => {
 				const files = [

From a770cdb623141e75e20734354aa42532f32316e6 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 10:56:59 -0300
Subject: [PATCH 04/43] MAESTRO: feat: implement handleUpdateTabDescription
 handler in useTabHandlers

Adds a new handler for updating AI tab descriptions with trim and
empty-string-to-undefined normalization. Follows existing immutable
state update pattern via useSessionStore. Includes 4 tests covering
set, trim, empty, and whitespace-only cases.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../renderer/hooks/useTabHandlers.test.ts     | 44 +++++++++++++++++++
 src/renderer/hooks/tabs/useTabHandlers.ts     | 18 ++++++++
 2 files changed, 62 insertions(+)

diff --git a/src/__tests__/renderer/hooks/useTabHandlers.test.ts b/src/__tests__/renderer/hooks/useTabHandlers.test.ts
index 703155a81..b836dd1ac 100644
--- a/src/__tests__/renderer/hooks/useTabHandlers.test.ts
+++ b/src/__tests__/renderer/hooks/useTabHandlers.test.ts
@@ -762,6 +762,50 @@ describe('useTabHandlers', () => {
 			expect(getSession().aiTabs[0].showThinking).toBe('off');
 		});
 
+		it('handleUpdateTabDescription sets description on tab', () => {
+			const tab = createMockAITab({ id: 'tab-1' });
+			const { result } = renderWithSession([tab]);
+			act(() => {
+				result.current.handleUpdateTabDescription('tab-1', 'My description');
+			});
+
+			const session = getSession();
+			expect(session.aiTabs[0].description).toBe('My description');
+		});
+
+		it('handleUpdateTabDescription trims whitespace', () => {
+			const tab = createMockAITab({ id: 'tab-1' });
+			const { result } = renderWithSession([tab]);
+			act(() => {
+				result.current.handleUpdateTabDescription('tab-1', '  spaces around  ');
+			});
+
+			const session = getSession();
+			expect(session.aiTabs[0].description).toBe('spaces around');
+		});
+
+		it('handleUpdateTabDescription sets undefined for empty string', () => {
+			const tab = createMockAITab({ id: 'tab-1', description: 'existing' } as any);
+			const { result } = renderWithSession([tab]);
+			act(() => {
+				result.current.handleUpdateTabDescription('tab-1', '');
+			});
+
+			const session = getSession();
+			expect(session.aiTabs[0].description).toBeUndefined();
+		});
+
+		it('handleUpdateTabDescription sets undefined for whitespace-only string', () => {
+			const tab = createMockAITab({ id: 'tab-1', description: 'existing' } as any);
+			const { result } = renderWithSession([tab]);
+			act(() => {
+				result.current.handleUpdateTabDescription('tab-1', '   ');
+			});
+
+			const session = getSession();
+			expect(session.aiTabs[0].description).toBeUndefined();
+		});
+
 		it('handleUpdateTabByClaudeSessionId updates tab by agent session id', () => {
 			const tab = createMockAITab({
 				id: 'tab-1',
diff --git a/src/renderer/hooks/tabs/useTabHandlers.ts b/src/renderer/hooks/tabs/useTabHandlers.ts
index dfb59d4f7..5d6edcd4f 100644
--- a/src/renderer/hooks/tabs/useTabHandlers.ts
+++ b/src/renderer/hooks/tabs/useTabHandlers.ts
@@ -75,6 +75,7 @@ export interface TabHandlersReturn {
 		agentSessionId: string,
 		updates: { name?: string | null; starred?: boolean }
 	) => void;
+	handleUpdateTabDescription: (tabId: string, description: string) => void;
 	handleTabStar: (tabId: string, starred: boolean) => void;
 	handleTabMarkUnread: (tabId: string) => void;
 	handleToggleTabReadOnlyMode: () => void;
@@ -966,6 +967,22 @@ export function useTabHandlers(): TabHandlersReturn {
 	// Tab Properties
 	// ========================================================================
 
+	const handleUpdateTabDescription = useCallback((tabId: string, description: string) => {
+		const trimmed = description.trim();
+		const { setSessions, activeSessionId } = useSessionStore.getState();
+		setSessions((prev: Session[]) =>
+			prev.map((s) => {
+				if (s.id !== activeSessionId) return s;
+				return {
+					...s,
+					aiTabs: s.aiTabs.map((tab) =>
+						tab.id === tabId ? { ...tab, description: trimmed || undefined } : tab
+					),
+				};
+			})
+		);
+	}, []);
+
 	const handleRequestTabRename = useCallback((tabId: string) => {
 		const { sessions, activeSessionId, setSessions } = useSessionStore.getState();
 		const session = sessions.find((s) => s.id === activeSessionId);
@@ -1393,6 +1410,7 @@ export function useTabHandlers(): TabHandlersReturn {
 		handleCloseTabsRight,
 		handleCloseCurrentTab,
 		handleRequestTabRename,
+		handleUpdateTabDescription,
 		handleUpdateTabByClaudeSessionId,
 		handleTabStar,
 		handleTabMarkUnread,

From 22293f5c73e89cb3c7e072650aff3aa094dd45d6 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 10:59:14 -0300
Subject: [PATCH 05/43] MAESTRO: perf: add fast-paths for fuzzy search engine

Add early returns in fuzzyMatch and fuzzyMatchWithScore for:
- Empty text (can't match anything)
- Query longer than text (impossible to match all chars)

Empty query already had early return. All 5 consumers already
skip fuzzy matching on empty input. No consumer changes needed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/utils/search.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/renderer/utils/search.ts b/src/renderer/utils/search.ts
index ba96a113b..b1a60e8b4 100644
--- a/src/renderer/utils/search.ts
+++ b/src/renderer/utils/search.ts
@@ -14,6 +14,7 @@ export interface FuzzyMatchResult {
  */
 export const fuzzyMatch = (text: string, query: string): boolean => {
 	if (!query) return true;
+	if (!text || query.length > text.length) return false;
 	const lowerText = text.toLowerCase();
 	const lowerQuery = query.toLowerCase();
 	let queryIndex = 0;
@@ -45,6 +46,10 @@ export const fuzzyMatchWithScore = (text: string, query: string): FuzzyMatchResu
 		return { matches: true, score: 0 };
 	}
 
+	if (!text || query.length > text.length) {
+		return { matches: false, score: 0 };
+	}
+
 	const lowerText = text.toLowerCase();
 	const lowerQuery = query.toLowerCase();
 

From 7dba842d7638388295becc5301021642ed68e173 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 10:59:23 -0300
Subject: [PATCH 06/43] MAESTRO: feat: add Unified Inbox and Tab Descriptions
 cards to Settings Encore tab

- Import Inbox and FileText icons from lucide-react
- Change Encore tab icon from FlaskConical to Sparkles per spec
- Add Unified Inbox feature card with toggle, Beta badge, left-border accent
- Add Tab Descriptions feature card with toggle, left-border accent
- Both cards follow existing toggle pattern (spread-copy + flip flag)
- All 113 SettingsModal tests pass, lint clean

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/SettingsModal.tsx | 134 +++++++++++++++++++++-
 1 file changed, 133 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/SettingsModal.tsx b/src/renderer/components/SettingsModal.tsx
index e67f7b9ea..359b6e8c0 100644
--- a/src/renderer/components/SettingsModal.tsx
+++ b/src/renderer/components/SettingsModal.tsx
@@ -37,6 +37,8 @@ import {
 	Clapperboard,
 	HelpCircle,
 	AppWindow,
+	Inbox,
+	FileText,
 } from 'lucide-react';
 import { useSettings } from '../hooks';
 import type {
@@ -1234,7 +1236,7 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
 						tabIndex={-1}
 						title="Encore Features"
 					>
-						<FlaskConical className="w-4 h-4" />
+						<Sparkles className="w-4 h-4" />
 						{activeTab === 'encore' && <span>Encore Features</span>}
 					</button>
 					<div className="flex-1 flex justify-end items-center pr-4">
@@ -3638,6 +3640,136 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
 										);
 									})()}
 							</div>
+
+							{/* Unified Inbox Feature Card */}
+							<div
+								className="rounded-lg p-4"
+								style={{
+									borderLeft: `3px solid ${encoreFeatures.unifiedInbox ? theme.colors.accent : theme.colors.border}`,
+									backgroundColor: encoreFeatures.unifiedInbox
+										? `${theme.colors.accent}08`
+										: 'transparent',
+								}}
+							>
+								<button
+									className="w-full flex items-center justify-between text-left"
+									onClick={() =>
+										setEncoreFeatures({
+											...encoreFeatures,
+											unifiedInbox: !encoreFeatures.unifiedInbox,
+										})
+									}
+									role="switch"
+									aria-checked={encoreFeatures.unifiedInbox}
+								>
+									<div className="flex items-center gap-3">
+										<Inbox
+											className="w-5 h-5"
+											style={{
+												color: encoreFeatures.unifiedInbox
+													? theme.colors.accent
+													: theme.colors.textDim,
+											}}
+										/>
+										<div>
+											<div
+												className="text-sm font-bold flex items-center gap-2"
+												style={{ color: theme.colors.textMain }}
+											>
+												Unified Inbox
+												<span
+													className="px-1.5 py-0.5 rounded text-[9px] font-bold uppercase"
+													style={{
+														backgroundColor: theme.colors.warning + '30',
+														color: theme.colors.warning,
+													}}
+												>
+													Beta
+												</span>
+											</div>
+											<div className="text-xs mt-0.5" style={{ color: theme.colors.textDim }}>
+												Aggregated view of pending actions across all agents
+											</div>
+										</div>
+									</div>
+									<div
+										className={`relative w-10 h-5 rounded-full transition-colors ${encoreFeatures.unifiedInbox ? '' : 'opacity-50'}`}
+										style={{
+											backgroundColor: encoreFeatures.unifiedInbox
+												? theme.colors.accent
+												: theme.colors.border,
+										}}
+									>
+										<div
+											className="absolute top-0.5 w-4 h-4 rounded-full bg-white transition-transform"
+											style={{
+												transform: encoreFeatures.unifiedInbox
+													? 'translateX(22px)'
+													: 'translateX(2px)',
+											}}
+										/>
+									</div>
+								</button>
+							</div>
+
+							{/* Tab Descriptions Feature Card */}
+							<div
+								className="rounded-lg p-4"
+								style={{
+									borderLeft: `3px solid ${encoreFeatures.tabDescription ? theme.colors.accent : theme.colors.border}`,
+									backgroundColor: encoreFeatures.tabDescription
+										? `${theme.colors.accent}08`
+										: 'transparent',
+								}}
+							>
+								<button
+									className="w-full flex items-center justify-between text-left"
+									onClick={() =>
+										setEncoreFeatures({
+											...encoreFeatures,
+											tabDescription: !encoreFeatures.tabDescription,
+										})
+									}
+									role="switch"
+									aria-checked={encoreFeatures.tabDescription}
+								>
+									<div className="flex items-center gap-3">
+										<FileText
+											className="w-5 h-5"
+											style={{
+												color: encoreFeatures.tabDescription
+													? theme.colors.accent
+													: theme.colors.textDim,
+											}}
+										/>
+										<div>
+											<div className="text-sm font-bold" style={{ color: theme.colors.textMain }}>
+												Tab Descriptions
+											</div>
+											<div className="text-xs mt-0.5" style={{ color: theme.colors.textDim }}>
+												Show AI-generated descriptions below tab names for quick context
+											</div>
+										</div>
+									</div>
+									<div
+										className={`relative w-10 h-5 rounded-full transition-colors ${encoreFeatures.tabDescription ? '' : 'opacity-50'}`}
+										style={{
+											backgroundColor: encoreFeatures.tabDescription
+												? theme.colors.accent
+												: theme.colors.border,
+										}}
+									>
+										<div
+											className="absolute top-0.5 w-4 h-4 rounded-full bg-white transition-transform"
+											style={{
+												transform: encoreFeatures.tabDescription
+													? 'translateX(22px)'
+													: 'translateX(2px)',
+											}}
+										/>
+									</div>
+								</button>
+							</div>
 						</div>
 					)}
 				</div>

From 889040adbc5842fdbf645a6d73e872f47dae63c4 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:02:37 -0300
Subject: [PATCH 07/43] MAESTRO: feat: wire handleUpdateTabDescription through
 props chain to TabBar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thread the tab description handler from useTabHandlers through
useMainPanelProps → App.tsx → MainPanel → TabBar. Gate with
encoreFeatures.tabDescription flag (default: false).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/App.tsx                          | 4 ++++
 src/renderer/components/MainPanel.tsx         | 3 +++
 src/renderer/components/TabBar.tsx            | 2 ++
 src/renderer/hooks/props/useMainPanelProps.ts | 3 +++
 src/renderer/stores/settingsStore.ts          | 1 +
 src/renderer/types/index.ts                   | 1 +
 6 files changed, 14 insertions(+)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 4f31351c3..0a8f917f1 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -847,6 +847,7 @@ function MaestroConsoleInner() {
 		handleCloseCurrentTab,
 		handleRequestTabRename,
 		handleUpdateTabByClaudeSessionId,
+		handleUpdateTabDescription,
 		handleTabStar,
 		handleTabMarkUnread,
 		handleToggleTabReadOnlyMode,
@@ -3212,6 +3213,9 @@ function MaestroConsoleInner() {
 		handleTabReorder,
 		handleUnifiedTabReorder,
 		handleUpdateTabByClaudeSessionId,
+		handleUpdateTabDescription: encoreFeatures.tabDescription
+			? handleUpdateTabDescription
+			: undefined,
 		handleTabStar,
 		handleTabMarkUnread,
 		handleToggleTabReadOnlyMode,
diff --git a/src/renderer/components/MainPanel.tsx b/src/renderer/components/MainPanel.tsx
index 86fe27ff2..9384d5af2 100644
--- a/src/renderer/components/MainPanel.tsx
+++ b/src/renderer/components/MainPanel.tsx
@@ -167,6 +167,7 @@ interface MainPanelProps {
 	onRequestTabRename?: (tabId: string) => void;
 	onTabReorder?: (fromIndex: number, toIndex: number) => void;
 	onUnifiedTabReorder?: (fromIndex: number, toIndex: number) => void;
+	onUpdateTabDescription?: (tabId: string, description: string) => void;
 	onTabStar?: (tabId: string, starred: boolean) => void;
 	onTabMarkUnread?: (tabId: string) => void;
 	onUpdateTabByClaudeSessionId?: (
@@ -455,6 +456,7 @@ export const MainPanel = React.memo(
 			onRequestTabRename,
 			onTabReorder,
 			onUnifiedTabReorder,
+			onUpdateTabDescription,
 			onTabStar,
 			onTabMarkUnread,
 			onToggleUnreadFilter,
@@ -1470,6 +1472,7 @@ export const MainPanel = React.memo(
 									onRequestRename={onRequestTabRename}
 									onTabReorder={onTabReorder}
 									onUnifiedTabReorder={onUnifiedTabReorder}
+									onUpdateTabDescription={onUpdateTabDescription}
 									onTabStar={onTabStar}
 									onTabMarkUnread={onTabMarkUnread}
 									onMergeWith={onMergeWith}
diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index 6cd3090e9..e69d1be31 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -38,6 +38,7 @@ interface TabBarProps {
 	onTabReorder?: (fromIndex: number, toIndex: number) => void;
 	/** Handler to reorder tabs in unified tab order (AI + file tabs) */
 	onUnifiedTabReorder?: (fromIndex: number, toIndex: number) => void;
+	onUpdateTabDescription?: (tabId: string, description: string) => void;
 	onTabStar?: (tabId: string, starred: boolean) => void;
 	onTabMarkUnread?: (tabId: string) => void;
 	/** Handler to open merge session modal with this tab as source */
@@ -1512,6 +1513,7 @@ function TabBarInner({
 	onNewTab,
 	onRequestRename,
 	onTabReorder,
+	onUpdateTabDescription,
 	onTabStar,
 	onTabMarkUnread,
 	onMergeWith,
diff --git a/src/renderer/hooks/props/useMainPanelProps.ts b/src/renderer/hooks/props/useMainPanelProps.ts
index dd4bd232b..3b34fd798 100644
--- a/src/renderer/hooks/props/useMainPanelProps.ts
+++ b/src/renderer/hooks/props/useMainPanelProps.ts
@@ -170,6 +170,7 @@ export interface UseMainPanelPropsDeps {
 		agentSessionId: string,
 		updates: { name?: string | null; starred?: boolean }
 	) => void;
+	handleUpdateTabDescription?: (tabId: string, description: string) => void;
 	handleTabStar: (tabId: string, starred: boolean) => void;
 	handleTabMarkUnread: (tabId: string) => void;
 	handleToggleTabReadOnlyMode: () => void;
@@ -351,6 +352,7 @@ export function useMainPanelProps(deps: UseMainPanelPropsDeps) {
 			onTabReorder: deps.handleTabReorder,
 			onUnifiedTabReorder: deps.handleUnifiedTabReorder,
 			onUpdateTabByClaudeSessionId: deps.handleUpdateTabByClaudeSessionId,
+			onUpdateTabDescription: deps.handleUpdateTabDescription,
 			onTabStar: deps.handleTabStar,
 			onTabMarkUnread: deps.handleTabMarkUnread,
 			onToggleTabReadOnlyMode: deps.handleToggleTabReadOnlyMode,
@@ -553,6 +555,7 @@ export function useMainPanelProps(deps: UseMainPanelPropsDeps) {
 			deps.handleTabReorder,
 			deps.handleUnifiedTabReorder,
 			deps.handleUpdateTabByClaudeSessionId,
+			deps.handleUpdateTabDescription,
 			deps.handleTabStar,
 			deps.handleTabMarkUnread,
 			deps.handleToggleTabReadOnlyMode,
diff --git a/src/renderer/stores/settingsStore.ts b/src/renderer/stores/settingsStore.ts
index c10e6071e..d7c52f586 100644
--- a/src/renderer/stores/settingsStore.ts
+++ b/src/renderer/stores/settingsStore.ts
@@ -109,6 +109,7 @@ export const DEFAULT_ONBOARDING_STATS: OnboardingStats = {
 
 export const DEFAULT_ENCORE_FEATURES: EncoreFeatureFlags = {
 	directorNotes: false,
+	tabDescription: false,
 };
 
 export const DEFAULT_DIRECTOR_NOTES_SETTINGS: DirectorNotesSettings = {
diff --git a/src/renderer/types/index.ts b/src/renderer/types/index.ts
index 494b836b9..8a2a58b09 100644
--- a/src/renderer/types/index.ts
+++ b/src/renderer/types/index.ts
@@ -907,6 +907,7 @@ export interface LeaderboardSubmitResponse {
 // Each key is a feature ID, value indicates whether it's enabled
 export interface EncoreFeatureFlags {
 	directorNotes: boolean;
+	tabDescription: boolean;
 }
 
 // Director's Notes settings for synopsis generation

From 5d60333d2aede190c268b4f63c4efdcbb4ef76f7 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:09:23 -0300
Subject: [PATCH 08/43] MAESTRO: feat: gate keyboard shortcuts for agentInbox
 and directorNotes encore features

Add agentInbox shortcut (Alt+I) with encoreFeatures.unifiedInbox guard.
Director's Notes shortcut already had its guard. Register agentInbox modal
in the modal store and wire through App.tsx keyboard handler context.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/App.tsx                                 |  4 ++++
 src/renderer/constants/shortcuts.ts                  |  1 +
 .../hooks/keyboard/useMainKeyboardHandler.ts         |  4 ++++
 src/renderer/stores/modalStore.ts                    | 12 +++++++++++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 4f31351c3..ff486d0db 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -344,6 +344,9 @@ function MaestroConsoleInner() {
 		// Director's Notes Modal
 		directorNotesOpen,
 		setDirectorNotesOpen,
+		// Agent Inbox Modal (Unified Inbox)
+		agentInboxOpen,
+		setAgentInboxOpen,
 	} = useModalActions();
 
 	// --- MOBILE LANDSCAPE MODE (reading-only view) ---
@@ -3009,6 +3012,7 @@ function MaestroConsoleInner() {
 		setMarketplaceModalOpen,
 		setSymphonyModalOpen,
 		setDirectorNotesOpen,
+		setAgentInboxOpen,
 		encoreFeatures,
 		setShowNewGroupChatModal,
 		deleteGroupChatWithConfirmation,
diff --git a/src/renderer/constants/shortcuts.ts b/src/renderer/constants/shortcuts.ts
index 37f530386..cdee93147 100644
--- a/src/renderer/constants/shortcuts.ts
+++ b/src/renderer/constants/shortcuts.ts
@@ -78,6 +78,7 @@ export const DEFAULT_SHORTCUTS: Record<string, Shortcut> = {
 		label: "Director's Notes",
 		keys: ['Meta', 'Shift', 'o'],
 	},
+	agentInbox: { id: 'agentInbox', label: 'Unified Inbox', keys: ['Alt', 'i'] },
 };
 
 // Non-editable shortcuts (displayed in help but not configurable)
diff --git a/src/renderer/hooks/keyboard/useMainKeyboardHandler.ts b/src/renderer/hooks/keyboard/useMainKeyboardHandler.ts
index 93675698d..4873d7d35 100644
--- a/src/renderer/hooks/keyboard/useMainKeyboardHandler.ts
+++ b/src/renderer/hooks/keyboard/useMainKeyboardHandler.ts
@@ -420,6 +420,10 @@ export function useMainKeyboardHandler(): UseMainKeyboardHandlerReturn {
 				e.preventDefault();
 				ctx.setDirectorNotesOpen?.(true);
 				trackShortcut('directorNotes');
+			} else if (ctx.isShortcut(e, 'agentInbox') && ctx.encoreFeatures?.unifiedInbox) {
+				e.preventDefault();
+				ctx.setAgentInboxOpen?.(true);
+				trackShortcut('agentInbox');
 			} else if (ctx.isShortcut(e, 'jumpToBottom')) {
 				e.preventDefault();
 				// Jump to the bottom of the current main panel output (AI logs or terminal output)
diff --git a/src/renderer/stores/modalStore.ts b/src/renderer/stores/modalStore.ts
index b385ea745..55301501c 100644
--- a/src/renderer/stores/modalStore.ts
+++ b/src/renderer/stores/modalStore.ts
@@ -218,7 +218,9 @@ export type ModalId =
 	// Platform Warnings
 	| 'windowsWarning'
 	// Director's Notes
-	| 'directorNotes';
+	| 'directorNotes'
+	// Agent Inbox (Unified Inbox)
+	| 'agentInbox';
 
 /**
  * Type mapping from ModalId to its data type.
@@ -757,6 +759,10 @@ export function getModalActions() {
 		setDirectorNotesOpen: (open: boolean) =>
 			open ? openModal('directorNotes') : closeModal('directorNotes'),
 
+		// Agent Inbox Modal (Unified Inbox)
+		setAgentInboxOpen: (open: boolean) =>
+			open ? openModal('agentInbox') : closeModal('agentInbox'),
+
 		// Lightbox refs replacement - use updateModalData instead
 		setLightboxIsGroupChat: (isGroupChat: boolean) => updateModalData('lightbox', { isGroupChat }),
 		setLightboxAllowDelete: (allowDelete: boolean) => updateModalData('lightbox', { allowDelete }),
@@ -846,6 +852,7 @@ export function useModalActions() {
 	const symphonyModalOpen = useModalStore(selectModalOpen('symphony'));
 	const windowsWarningModalOpen = useModalStore(selectModalOpen('windowsWarning'));
 	const directorNotesOpen = useModalStore(selectModalOpen('directorNotes'));
+	const agentInboxOpen = useModalStore(selectModalOpen('agentInbox'));
 
 	// Get stable actions
 	const actions = getModalActions();
@@ -1014,6 +1021,9 @@ export function useModalActions() {
 		// Director's Notes Modal
 		directorNotesOpen,
 
+		// Agent Inbox Modal (Unified Inbox)
+		agentInboxOpen,
+
 		// Lightbox ref replacements (now stored as data)
 		lightboxIsGroupChat: lightboxData?.isGroupChat ?? false,
 		lightboxAllowDelete: lightboxData?.allowDelete ?? false,

From 72c1ec719b23725e00c1dd6629259a1444b6736e Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:10:14 -0300
Subject: [PATCH 09/43] MAESTRO: feat: add description display/edit UI to tab
 hover overlay

Adds a description section to the AI tab hover overlay menu with two modes:
- Display mode: FileText icon + description text (2-line clamp) or italic placeholder
- Edit mode: auto-focus textarea with Enter to save, Shift+Enter for newline, Escape to cancel

Feature-gated behind onUpdateTabDescription prop. Only calls handler when value actually changed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/TabBar.tsx | 112 +++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index e69d1be31..c258d29e5 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -20,6 +20,7 @@ import {
 	Loader2,
 	ExternalLink,
 	FolderOpen,
+	FileText,
 } from 'lucide-react';
 import type { AITab, Theme, FilePreviewTab, UnifiedTab } from '../types';
 import { hasDraft } from '../utils/tabHelpers';
@@ -119,6 +120,8 @@ interface TabProps {
 	onExportHtml?: (tabId: string) => void;
 	/** Stable callback - receives tabId */
 	onPublishGist?: (tabId: string) => void;
+	/** Stable callback - receives tabId and new description */
+	onUpdateTabDescription?: (tabId: string, description: string) => void;
 	/** Stable callback - receives tabId */
 	onMoveToFirst?: (tabId: string) => void;
 	/** Stable callback - receives tabId */
@@ -215,6 +218,7 @@ const Tab = memo(function Tab({
 	onCopyContext,
 	onExportHtml,
 	onPublishGist,
+	onUpdateTabDescription,
 	onMoveToFirst,
 	onMoveToLast,
 	isFirstTab,
@@ -232,6 +236,8 @@ const Tab = memo(function Tab({
 	const [isHovered, setIsHovered] = useState(false);
 	const [overlayOpen, setOverlayOpen] = useState(false);
 	const [showCopied, setShowCopied] = useState(false);
+	const [isEditingDescription, setIsEditingDescription] = useState(false);
+	const [descriptionDraft, setDescriptionDraft] = useState(tab.description ?? '');
 	const [overlayPosition, setOverlayPosition] = useState<{
 		top: number;
 		left: number;
@@ -454,6 +460,50 @@ const Tab = memo(function Tab({
 		[onCloseTabsRight, tabId]
 	);
 
+	// Description editing handlers
+	const descriptionButtonRef = useRef<HTMLButtonElement>(null);
+
+	const handleDescriptionSave = useCallback(
+		(value: string) => {
+			const trimmed = value.trim();
+			if (trimmed !== (tab.description ?? '')) {
+				onUpdateTabDescription?.(tabId, trimmed);
+			}
+			setIsEditingDescription(false);
+			setDescriptionDraft(trimmed || (tab.description ?? ''));
+		},
+		[onUpdateTabDescription, tabId, tab.description]
+	);
+
+	const handleDescriptionCancel = useCallback(() => {
+		setDescriptionDraft(tab.description ?? '');
+		setIsEditingDescription(false);
+	}, [tab.description]);
+
+	const handleDescriptionKeyDown = useCallback(
+		(e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+			if (e.key === 'Enter' && !e.shiftKey) {
+				e.preventDefault();
+				handleDescriptionSave(descriptionDraft);
+			} else if (e.key === 'Escape') {
+				e.preventDefault();
+				handleDescriptionCancel();
+			}
+		},
+		[descriptionDraft, handleDescriptionSave, handleDescriptionCancel]
+	);
+
+	const handleDescriptionBlur = useCallback(() => {
+		handleDescriptionSave(descriptionDraft);
+	}, [descriptionDraft, handleDescriptionSave]);
+
+	// Sync draft with tab.description when it changes externally
+	useEffect(() => {
+		if (!isEditingDescription) {
+			setDescriptionDraft(tab.description ?? '');
+		}
+	}, [tab.description, isEditingDescription]);
+
 	// Handlers for drag events using stable tabId
 	const handleTabSelect = useCallback(() => {
 		onSelect(tabId);
@@ -682,6 +732,66 @@ const Tab = memo(function Tab({
 								</div>
 							)}
 
+							{/* Description section - only render when feature is enabled */}
+							{onUpdateTabDescription && (
+								<div className="px-3 py-2 border-b" style={{ borderColor: theme.colors.border }}>
+									{isEditingDescription ? (
+										<textarea
+											ref={(el) => el?.focus()}
+											value={descriptionDraft}
+											onChange={(e) => setDescriptionDraft(e.target.value)}
+											onKeyDown={handleDescriptionKeyDown}
+											onBlur={handleDescriptionBlur}
+											placeholder="Add a description..."
+											rows={2}
+											aria-label="Tab description"
+											className="w-full text-xs resize-none outline-none rounded px-2 py-1.5"
+											style={{
+												backgroundColor: theme.colors.bgMain,
+												color: theme.colors.textMain,
+												border: `1px solid ${theme.colors.border}`,
+												maxHeight: '100px',
+												overflowY: 'auto',
+											}}
+										/>
+									) : (
+										<button
+											ref={descriptionButtonRef}
+											onClick={() => setIsEditingDescription(true)}
+											className="w-full flex items-start gap-2 rounded text-xs text-left cursor-pointer hover:bg-white/5 transition-colors px-1 py-0.5"
+											aria-label={tab.description ? 'Edit tab description' : 'Add tab description'}
+										>
+											<FileText
+												className="w-3.5 h-3.5 shrink-0 mt-0.5"
+												style={{ color: theme.colors.textDim }}
+											/>
+											{tab.description ? (
+												<span
+													style={{
+														color: theme.colors.textMain,
+														display: '-webkit-box',
+														WebkitLineClamp: 2,
+														WebkitBoxOrient: 'vertical',
+														overflow: 'hidden',
+													}}
+												>
+													{tab.description}
+												</span>
+											) : (
+												<span
+													style={{
+														color: theme.colors.textDim,
+														fontStyle: 'italic',
+													}}
+												>
+													Add description...
+												</span>
+											)}
+										</button>
+									)}
+								</div>
+							)}
+
 							{/* Actions */}
 							<div className="p-1">
 								{tab.agentSessionId && (
@@ -1977,6 +2087,7 @@ function TabBarInner({
 												? handleTabPublishGist
 												: undefined
 										}
+										onUpdateTabDescription={onUpdateTabDescription}
 										onMoveToFirst={
 											!isFirstTab && onUnifiedTabReorder ? handleMoveToFirst : undefined
 										}
@@ -2094,6 +2205,7 @@ function TabBarInner({
 											? handleTabPublishGist
 											: undefined
 									}
+									onUpdateTabDescription={onUpdateTabDescription}
 									onMoveToFirst={!isFirstTab && onTabReorder ? handleMoveToFirst : undefined}
 									onMoveToLast={!isLastTab && onTabReorder ? handleMoveToLast : undefined}
 									isFirstTab={isFirstTab}

From 0d5dd580d96dfaa18210b245c40e798d0a8bb61d Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:12:25 -0300
Subject: [PATCH 10/43] MAESTRO: feat: save description draft when tab overlay
 closes during edit

Add cleanup logic so that if the overlay closes while the user is editing
a tab description, the current draft is saved rather than discarded. Uses
a useRef to track the latest draft value, avoiding stale closure issues.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/TabBar.tsx | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index c258d29e5..0d6ebb184 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -238,6 +238,7 @@ const Tab = memo(function Tab({
 	const [showCopied, setShowCopied] = useState(false);
 	const [isEditingDescription, setIsEditingDescription] = useState(false);
 	const [descriptionDraft, setDescriptionDraft] = useState(tab.description ?? '');
+	const descriptionDraftRef = useRef(descriptionDraft);
 	const [overlayPosition, setOverlayPosition] = useState<{
 		top: number;
 		left: number;
@@ -504,6 +505,23 @@ const Tab = memo(function Tab({
 		}
 	}, [tab.description, isEditingDescription]);
 
+	// Keep ref in sync with latest draft value to avoid stale closures in cleanup
+	useEffect(() => {
+		descriptionDraftRef.current = descriptionDraft;
+	}, [descriptionDraft]);
+
+	// Save description draft when overlay closes while editing
+	useEffect(() => {
+		if (!overlayOpen && isEditingDescription) {
+			const draft = descriptionDraftRef.current.trim();
+			if (draft !== (tab.description ?? '')) {
+				onUpdateTabDescription?.(tabId, draft);
+			}
+			setIsEditingDescription(false);
+			setDescriptionDraft(draft || (tab.description ?? ''));
+		}
+	}, [overlayOpen, isEditingDescription, tab.description, onUpdateTabDescription, tabId]);
+
 	// Handlers for drag events using stable tabId
 	const handleTabSelect = useCallback(() => {
 		onSelect(tabId);

From 5a5d60a7349656e969fd0744cf3a968cc97a6a33 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:15:15 -0300
Subject: [PATCH 11/43] MAESTRO: feat: return focus to description button after
 save/cancel in tab overlay

Adds requestAnimationFrame-based focus management so that when
the user saves or cancels description editing, focus returns to
the description display button for keyboard accessibility.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/TabBar.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index 0d6ebb184..1d5448082 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -472,6 +472,9 @@ const Tab = memo(function Tab({
 			}
 			setIsEditingDescription(false);
 			setDescriptionDraft(trimmed || (tab.description ?? ''));
+			requestAnimationFrame(() => {
+				descriptionButtonRef.current?.focus();
+			});
 		},
 		[onUpdateTabDescription, tabId, tab.description]
 	);
@@ -479,6 +482,9 @@ const Tab = memo(function Tab({
 	const handleDescriptionCancel = useCallback(() => {
 		setDescriptionDraft(tab.description ?? '');
 		setIsEditingDescription(false);
+		requestAnimationFrame(() => {
+			descriptionButtonRef.current?.focus();
+		});
 	}, [tab.description]);
 
 	const handleDescriptionKeyDown = useCallback(

From 2381c054fdf91fd12c41d588dedacde5341b079b Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:16:05 -0300
Subject: [PATCH 12/43] MAESTRO: port Unified Inbox with all CRITICAL fixes
 from review branches

Port 6 inbox files from feat/unified-inbox-encore (which already incorporates
all 8 rounds of CodeRabbit/Greptile review fixes) and integrate into the
existing codebase with full App.tsx handler wiring.

CRITICAL fixes included:
- Race condition: effect-driven pendingInboxQuickReply replaces setTimeout
- Memory leak: resizeCleanupRef + useEffect unmount guard for drag listeners
- Group collision: sessionId as group key, sessionName as display-only label
- Ref binding: inboxProcessInputRef.current = processInput after useInputHandlers
- Duplicate log: quick reply delegates to processInput (no manual log push)
- AI mode: force inputMode='ai' before sending inbox replies
- Modal data: openModal preserves data, updateModalData handles undefined base

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/App.tsx                          |  168 +++
 .../components/AgentInbox/FocusModeView.tsx   | 1218 ++++++++++++++++
 .../components/AgentInbox/InboxListView.tsx   | 1296 +++++++++++++++++
 src/renderer/components/AgentInbox/index.tsx  |  366 +++++
 src/renderer/constants/modalPriorities.ts     |    3 +
 src/renderer/constants/shortcuts.ts           |    1 +
 .../hooks/keyboard/useMainKeyboardHandler.ts  |    8 +
 src/renderer/hooks/useAgentInbox.ts           |  234 +++
 src/renderer/stores/modalStore.ts             |   35 +-
 src/renderer/stores/settingsStore.ts          |    1 +
 src/renderer/types/agent-inbox.ts             |   47 +
 src/renderer/types/index.ts                   |    1 +
 src/renderer/utils/tabDisplayName.ts          |   40 +
 13 files changed, 3412 insertions(+), 6 deletions(-)
 create mode 100644 src/renderer/components/AgentInbox/FocusModeView.tsx
 create mode 100644 src/renderer/components/AgentInbox/InboxListView.tsx
 create mode 100644 src/renderer/components/AgentInbox/index.tsx
 create mode 100644 src/renderer/hooks/useAgentInbox.ts
 create mode 100644 src/renderer/types/agent-inbox.ts
 create mode 100644 src/renderer/utils/tabDisplayName.ts

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 4f31351c3..128277d9a 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -41,6 +41,7 @@ const DocumentGraphView = lazy(() =>
 const DirectorNotesModal = lazy(() =>
 	import('./components/DirectorNotes').then((m) => ({ default: m.DirectorNotesModal }))
 );
+const AgentInbox = lazy(() => import('./components/AgentInbox'));
 
 // Re-import the type for SymphonyContributionData (types don't need lazy loading)
 import type { SymphonyContributionData } from './components/SymphonyModal';
@@ -344,6 +345,9 @@ function MaestroConsoleInner() {
 		// Director's Notes Modal
 		directorNotesOpen,
 		setDirectorNotesOpen,
+		// Agent Inbox Modal
+		agentInboxOpen,
+		setAgentInboxOpen,
 	} = useModalActions();
 
 	// --- MOBILE LANDSCAPE MODE (reading-only view) ---
@@ -1372,6 +1376,149 @@ function MaestroConsoleInner() {
 		}
 	}, [activeSession?.id, handleResumeSession]);
 
+	// --- AGENT INBOX SESSION NAVIGATION ---
+	// Close inbox modal and switch to the target agent session
+	const handleAgentInboxNavigateToSession = useCallback(
+		(sessionId: string, tabId?: string) => {
+			setAgentInboxOpen(false);
+			setActiveSessionId(sessionId);
+			if (tabId) {
+				setSessions((prev) =>
+					prev.map((s) =>
+						s.id === sessionId
+							? { ...s, activeTabId: tabId, activeFileTabId: null, inputMode: 'ai' as const }
+							: s
+					)
+				);
+			}
+		},
+		[setAgentInboxOpen, setActiveSessionId, setSessions]
+	);
+
+	// Ref for processInput — populated after useInputHandlers (declared later in component).
+	// Handlers below close over this ref so they always call the latest version.
+	const inboxProcessInputRef = useRef<(text?: string) => void>(() => {});
+	const [pendingInboxQuickReply, setPendingInboxQuickReply] = useState<{
+		targetSessionId: string;
+		previousActiveSessionId: string | null;
+		text: string;
+	} | null>(null);
+
+	// Flush pending quick-reply once target session is active (deterministic, no RAF timing chain).
+	useEffect(() => {
+		if (!pendingInboxQuickReply) return;
+		if (activeSession?.id !== pendingInboxQuickReply.targetSessionId) return;
+
+		inboxProcessInputRef.current(pendingInboxQuickReply.text);
+		const previousActiveSessionId = pendingInboxQuickReply.previousActiveSessionId;
+		setPendingInboxQuickReply(null);
+
+		if (
+			previousActiveSessionId &&
+			previousActiveSessionId !== pendingInboxQuickReply.targetSessionId
+		) {
+			queueMicrotask(() => {
+				setActiveSessionId(previousActiveSessionId);
+			});
+		}
+	}, [pendingInboxQuickReply, activeSession?.id, setActiveSessionId]);
+
+	// Agent Inbox: Quick Reply — sends text to target session/tab via processInput
+	const handleAgentInboxQuickReply = useCallback(
+		(sessionId: string, tabId: string, text: string) => {
+			// Save current active session so we can restore it after sending.
+			const previousActiveSessionId = activeSessionIdRef.current;
+
+			// Activate the target tab and mark as read (processInput adds the user log entry)
+			setSessions((prev) =>
+				prev.map((s) => {
+					if (s.id !== sessionId) return s;
+					return {
+						...s,
+						activeTabId: tabId,
+						activeFileTabId: null,
+						inputMode: 'ai' as const,
+						aiTabs: s.aiTabs.map((t) => (t.id === tabId ? { ...t, hasUnread: false } : t)),
+					};
+				})
+			);
+
+			// Switch to target session and let the effect above send once state is committed.
+			setPendingInboxQuickReply({
+				targetSessionId: sessionId,
+				previousActiveSessionId,
+				text,
+			});
+			setActiveSessionId(sessionId);
+		},
+		[setSessions, setActiveSessionId, activeSessionIdRef]
+	);
+
+	// Agent Inbox: Open & Reply — navigates to session with pre-filled input
+	const handleAgentInboxOpenAndReply = useCallback(
+		(sessionId: string, tabId: string, text: string) => {
+			setActiveSessionId(sessionId);
+			setSessions((prev) =>
+				prev.map((s) => {
+					if (s.id !== sessionId) return s;
+					return {
+						...s,
+						activeTabId: tabId,
+						activeFileTabId: null,
+						inputMode: 'ai' as const,
+						aiTabs: s.aiTabs.map((t) =>
+							t.id === tabId ? { ...t, inputValue: text, hasUnread: false } : t
+						),
+					};
+				})
+			);
+			setAgentInboxOpen(false);
+		},
+		[setActiveSessionId, setSessions, setAgentInboxOpen]
+	);
+
+	// Agent Inbox: Mark as Read — dismiss unread badge without replying
+	const handleAgentInboxMarkAsRead = useCallback(
+		(sessionId: string, tabId: string) => {
+			setSessions((prev) =>
+				prev.map((s) => {
+					if (s.id !== sessionId) return s;
+					return {
+						...s,
+						aiTabs: s.aiTabs.map((t) => (t.id === tabId ? { ...t, hasUnread: false } : t)),
+					};
+				})
+			);
+		},
+		[setSessions]
+	);
+
+	// Agent Inbox: Toggle thinking mode on a specific tab
+	const handleAgentInboxToggleThinking = useCallback(
+		(sessionId: string, tabId: string, mode: ThinkingMode) => {
+			setSessions((prev) =>
+				prev.map((s) => {
+					if (s.id !== sessionId) return s;
+					return {
+						...s,
+						aiTabs: s.aiTabs.map((t) => {
+							if (t.id !== tabId) return t;
+							if (mode === 'off') {
+								return {
+									...t,
+									showThinking: 'off',
+									logs: t.logs.filter((l) => l.source !== 'thinking' && l.source !== 'tool'),
+								};
+							}
+							return { ...t, showThinking: mode };
+						}),
+					};
+				})
+			);
+		},
+		[setSessions]
+	);
+
 	// --- BATCH HANDLERS (Auto Run processing, quit confirmation, error handling) ---
 	const {
 		startBatchRun,
@@ -1590,6 +1737,9 @@ function MaestroConsoleInner() {
 		activeSessionIdRef,
 	});
 
+	// Bind the ref so Inbox Quick Reply handlers always call the latest processInput.
+	inboxProcessInputRef.current = processInput;
+
 	// This is used by context transfer to automatically send the transferred context to the agent
 	useEffect(() => {
 		if (!activeSession) return;
@@ -3009,6 +3159,7 @@ function MaestroConsoleInner() {
 		setMarketplaceModalOpen,
 		setSymphonyModalOpen,
 		setDirectorNotesOpen,
+		setAgentInboxOpen: encoreFeatures.unifiedInbox ? setAgentInboxOpen : undefined,
 		encoreFeatures,
 		setShowNewGroupChatModal,
 		deleteGroupChatWithConfirmation,
@@ -4103,6 +4254,23 @@ function MaestroConsoleInner() {
 					</Suspense>
 				)}
 
+				{/* --- AGENT INBOX MODAL (lazy-loaded, Encore Feature) --- */}
+				{encoreFeatures.unifiedInbox && agentInboxOpen && (
+					<Suspense fallback={null}>
+						<AgentInbox
+							sessions={sessions}
+							groups={groups}
+							theme={theme}
+							onClose={() => setAgentInboxOpen(false)}
+							onNavigateToSession={handleAgentInboxNavigateToSession}
+							onQuickReply={handleAgentInboxQuickReply}
+							onOpenAndReply={handleAgentInboxOpenAndReply}
+							onMarkAsRead={handleAgentInboxMarkAsRead}
+							onToggleThinking={handleAgentInboxToggleThinking}
+						/>
+					</Suspense>
+				)}
+
 				{/* --- GIST PUBLISH MODAL --- */}
 				{/* Supports both file preview tabs and tab context gist publishing */}
 				{gistPublishModalOpen && (activeFileTab || tabGistContent) && (
diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
new file mode 100644
index 000000000..ea0116c2b
--- /dev/null
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -0,0 +1,1218 @@
+import { useMemo, useRef, useEffect, useState, useCallback } from 'react';
+import {
+	ArrowLeft,
+	X,
+	Bot,
+	User,
+	ArrowUp,
+	ExternalLink,
+	ChevronLeft,
+	ChevronRight,
+	ChevronDown,
+	Eye,
+	Brain,
+	Pin,
+	FileText,
+} from 'lucide-react';
+import type { Theme, Session, LogEntry, ThinkingMode } from '../../types';
+import type { InboxItem, InboxFilterMode, InboxSortMode } from '../../types/agent-inbox';
+import { STATUS_LABELS, STATUS_COLORS } from '../../types/agent-inbox';
+import { resolveContextUsageColor } from './InboxListView';
+import { formatRelativeTime } from '../../utils/formatters';
+import { MarkdownRenderer } from '../MarkdownRenderer';
+import { generateTerminalProseStyles } from '../../utils/markdownConfig';
+
+/* POLISH-04 Token Audit (@architect)
+ * Line 166: bgSidebar in user bubble color-mix — CORRECT (chrome blend for user messages)
+ * Line 210: bgActivity for AI bubble — CORRECT (content)
+ * Line 429: bgSidebar for sidebar group header — CORRECT (chrome)
+ * Line 722: bgSidebar for focus header — CORRECT (chrome)
+ * Line 818: bgActivity for subheader info bar — CORRECT (content)
+ * Line 904: bgSidebar for sidebar bg — CORRECT (chrome)
+ * Line 1025: bgActivity → bgMain (textarea is nested input, needs contrast)
+ * All other usages: CORRECT
+ */
+
+/* POLISH-03 Design Spec (@ux-design-expert)
+ * BUBBLES:
+ * - All corners: rounded-xl (uniform, no sharp edges)
+ * - Padding: p-4 (remove pb-10 hack)
+ * - Timestamp: inline flex row below content, text-[10px] textDim opacity 0.6, justify-end mt-2
+ * - Left border: user = 3px solid success, AI = 3px solid accent
+ * - Max width: 85% (unchanged)
+ *
+ * SIDEBAR ITEMS:
+ * - Height: 48px (was 36px)
+ * - Layout: status dot + vertical(name, preview) + indicators
+ * - Preview: text-[10px] truncate, textDim opacity 0.5, max 60 chars, strip markdown
+ * - Indicators: alignSelf flex-start, marginTop 2
+ */
+
+// @architect: lastMessage available via InboxItem type (agent-inbox.ts:13) — sidebar scroll OK at 48px (overflow-y-auto, no max-height constraint)
+
+const MAX_LOG_ENTRIES = 50;
+
+function FocusLogEntry({
+	log,
+	theme,
+	showRawMarkdown,
+	onToggleRaw,
+}: {
+	log: LogEntry;
+	theme: Theme;
+	showRawMarkdown: boolean;
+	onToggleRaw: () => void;
+}) {
+	const isUser = log.source === 'user';
+	const isAI = log.source === 'ai' || log.source === 'stdout';
+	const isThinking = log.source === 'thinking';
+	const isTool = log.source === 'tool';
+
+	// Thinking entry — left border accent + badge
+	if (isThinking) {
+		return (
+			<div
+				className="px-4 py-2 text-sm font-mono border-l-2"
+				style={{
+					color: theme.colors.textMain,
+					borderColor: theme.colors.accent,
+				}}
+			>
+				<div className="flex items-center gap-2 mb-1">
+					<span
+						className="text-[10px] px-1.5 py-0.5 rounded"
+						style={{
+							backgroundColor: `${theme.colors.accent}30`,
+							color: theme.colors.accent,
+						}}
+					>
+						thinking
+					</span>
+					<span className="text-xs" style={{ color: theme.colors.textDim, opacity: 0.7 }}>
+						{formatRelativeTime(log.timestamp)}
+					</span>
+				</div>
+				<div
+					style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', fontSize: 13, lineHeight: 1.5 }}
+				>
+					{log.text}
+				</div>
+			</div>
+		);
+	}
+
+	// Tool entry — compact badge with status
+	if (isTool) {
+		const toolInput = (log.metadata as any)?.toolState?.input as
+			| Record<string, unknown>
+			| undefined;
+		const safeStr = (v: unknown): string | null => (typeof v === 'string' ? v : null);
+		const toolDetail = toolInput
+			? safeStr(toolInput.command) ||
+				safeStr(toolInput.pattern) ||
+				safeStr(toolInput.file_path) ||
+				safeStr(toolInput.query) ||
+				safeStr(toolInput.description) ||
+				safeStr(toolInput.prompt) ||
+				safeStr(toolInput.task_id) ||
+				null
+			: null;
+		const toolStatus = (log.metadata as any)?.toolState?.status as string | undefined;
+
+		return (
+			<div
+				className="px-4 py-1.5 text-xs font-mono border-l-2"
+				style={{
+					color: theme.colors.textMain,
+					borderColor: theme.colors.accent,
+				}}
+			>
+				<div className="flex items-start gap-2">
+					<span
+						className="px-1.5 py-0.5 rounded shrink-0"
+						style={{
+							backgroundColor: `${theme.colors.accent}30`,
+							color: theme.colors.accent,
+						}}
+					>
+						{log.text}
+					</span>
+					{toolStatus === 'running' && (
+						<span className="animate-pulse shrink-0 pt-0.5" style={{ color: theme.colors.warning }}>
+							●
+						</span>
+					)}
+					{toolStatus === 'completed' && (
+						<span className="shrink-0 pt-0.5" style={{ color: theme.colors.success }}>
+							✓
+						</span>
+					)}
+					{toolDetail && (
+						<span
+							className="opacity-70 break-words whitespace-pre-wrap"
+							style={{ color: theme.colors.textMain }}
+						>
+							{toolDetail}
+						</span>
+					)}
+				</div>
+			</div>
+		);
+	}
+
+	// User entry — right-aligned with User icon
+	if (isUser) {
+		return (
+			<div className="flex gap-2" style={{ flexDirection: 'row-reverse' }}>
+				<div
+					className="flex-shrink-0 w-6 h-6 rounded-full flex items-center justify-center"
+					style={{ backgroundColor: `${theme.colors.success}20` }}
+				>
+					<User className="w-3.5 h-3.5" style={{ color: theme.colors.success }} />
+				</div>
+				<div
+					className="flex-1 min-w-0 p-4 rounded-xl border overflow-hidden text-sm"
+					style={{
+						backgroundColor: `color-mix(in srgb, ${theme.colors.accent} 20%, ${theme.colors.bgSidebar})`,
+						borderColor: `${theme.colors.accent}40`,
+						color: theme.colors.textMain,
+						maxWidth: '85%',
+						borderLeft: `3px solid ${theme.colors.success}`,
+					}}
+				>
+					<div
+						style={{
+							whiteSpace: 'pre-wrap',
+							wordBreak: 'break-word',
+							fontSize: 13,
+							lineHeight: 1.5,
+						}}
+					>
+						{log.text}
+					</div>
+					<div className="flex justify-end mt-2">
+						<span className="text-[10px]" style={{ color: theme.colors.textDim, opacity: 0.6 }}>
+							{formatRelativeTime(log.timestamp)}
+						</span>
+					</div>
+				</div>
+			</div>
+		);
+	}
+
+	// AI / stdout entry — left-aligned with Bot icon + markdown
+	if (isAI) {
+		const handleCopy = (text: string) => {
+			navigator.clipboard.writeText(text).catch(() => {});
+		};
+
+		return (
+			<div className="flex gap-2 group">
+				<div
+					className="flex-shrink-0 w-6 h-6 rounded-full flex items-center justify-center"
+					style={{ backgroundColor: `${theme.colors.accent}20` }}
+				>
+					<Bot className="w-3.5 h-3.5" style={{ color: theme.colors.accent }} />
+				</div>
+				<div
+					className="flex-1 min-w-0 p-4 rounded-xl border overflow-hidden text-sm"
+					style={{
+						backgroundColor: theme.colors.bgActivity,
+						borderColor: theme.colors.border,
+						color: theme.colors.textMain,
+						borderLeft: `3px solid ${theme.colors.accent}`,
+					}}
+				>
+					{/* Raw/rendered toggle */}
+					<div className="flex justify-end">
+						<button
+							onClick={onToggleRaw}
+							className="p-1 rounded opacity-0 group-hover:opacity-50 hover:!opacity-100 transition-opacity"
+							style={{ color: showRawMarkdown ? theme.colors.accent : theme.colors.textDim }}
+							title={showRawMarkdown ? 'Show formatted' : 'Show plain text'}
+						>
+							{showRawMarkdown ? (
+								<Eye className="w-3.5 h-3.5" />
+							) : (
+								<FileText className="w-3.5 h-3.5" />
+							)}
+						</button>
+					</div>
+
+					{showRawMarkdown ? (
+						<div
+							style={{
+								whiteSpace: 'pre-wrap',
+								wordBreak: 'break-word',
+								fontSize: 13,
+								lineHeight: 1.5,
+							}}
+						>
+							{log.text}
+						</div>
+					) : (
+						<MarkdownRenderer content={log.text} theme={theme} onCopy={handleCopy} />
+					)}
+
+					<div className="flex justify-end mt-2">
+						<span className="text-[10px]" style={{ color: theme.colors.textDim, opacity: 0.6 }}>
+							{formatRelativeTime(log.timestamp)}
+						</span>
+					</div>
+				</div>
+			</div>
+		);
+	}
+
+	// Fallback — should not reach here given the filter
+	return null;
+}
+
+interface FocusModeViewProps {
+	theme: Theme;
+	item: InboxItem;
+	items: InboxItem[]; // Full filtered+sorted list for prev/next
+	sessions: Session[]; // For accessing AITab.logs
+	currentIndex: number; // Position of item in items[]
+	enterToSendAI?: boolean; // false = Cmd+Enter sends, true = Enter sends
+	filterMode?: InboxFilterMode;
+	setFilterMode?: (mode: InboxFilterMode) => void;
+	sortMode?: InboxSortMode;
+	onClose: () => void; // Close the entire modal
+	onExitFocus: () => void; // Return to list view
+	onNavigateItem: (index: number) => void; // Jump to item at index
+	onNavigateToSession?: (sessionId: string, tabId?: string) => void;
+	onQuickReply?: (sessionId: string, tabId: string, text: string) => void;
+	onOpenAndReply?: (sessionId: string, tabId: string, text: string) => void;
+	onMarkAsRead?: (sessionId: string, tabId: string) => void;
+	onToggleThinking?: (sessionId: string, tabId: string, mode: ThinkingMode) => void;
+}
+
+// Maps STATUS_COLORS key to actual hex from theme
+function resolveStatusColor(state: InboxItem['state'], theme: Theme): string {
+	const colorKey = STATUS_COLORS[state];
+	const colorMap: Record<string, string> = {
+		success: theme.colors.success,
+		warning: theme.colors.warning,
+		error: theme.colors.error,
+		info: theme.colors.accent,
+		textMuted: theme.colors.textDim,
+	};
+	return colorMap[colorKey] ?? theme.colors.textDim;
+}
+
+// ============================================================================
+// Compact filter control for sidebar
+// ============================================================================
+const FILTER_OPTIONS: { value: InboxFilterMode; label: string }[] = [
+	{ value: 'all', label: 'All' },
+	{ value: 'unread', label: 'Unread' },
+	{ value: 'starred', label: 'Starred' },
+];
+
+function SidebarFilter({
+	value,
+	onChange,
+	theme,
+}: {
+	value: InboxFilterMode;
+	onChange: (v: InboxFilterMode) => void;
+	theme: Theme;
+}) {
+	return (
+		<div className="flex items-center gap-1.5">
+			{FILTER_OPTIONS.map((opt) => {
+				const isActive = value === opt.value;
+				return (
+					<button
+						key={opt.value}
+						onClick={() => onChange(opt.value)}
+						className="text-[11px] px-2.5 py-1 rounded-full cursor-pointer transition-all"
+						style={{
+							backgroundColor: isActive ? `${theme.colors.accent}25` : 'transparent',
+							color: isActive ? theme.colors.accentText : theme.colors.textDim,
+							border: isActive ? `1px solid ${theme.colors.accent}50` : '1px solid transparent',
+							outline: 'none',
+							opacity: isActive ? 1 : 0.6,
+						}}
+					>
+						{opt.label}
+					</button>
+				);
+			})}
+		</div>
+	);
+}
+
+// ============================================================================
+// FocusSidebar — condensed navigable list of inbox items with agent grouping
+// ============================================================================
+function FocusSidebar({
+	items,
+	currentIndex,
+	theme,
+	sortMode,
+	filterMode,
+	setFilterMode,
+	onNavigateItem,
+}: {
+	items: InboxItem[];
+	currentIndex: number;
+	theme: Theme;
+	sortMode?: InboxSortMode;
+	filterMode?: InboxFilterMode;
+	setFilterMode?: (mode: InboxFilterMode) => void;
+	onNavigateItem: (index: number) => void;
+}) {
+	const currentRowRef = useRef<HTMLDivElement>(null);
+	const [collapsedGroups, setCollapsedGroups] = useState<Set<string>>(new Set());
+
+	// Auto-scroll to keep the current item visible
+	useEffect(() => {
+		currentRowRef.current?.scrollIntoView({ block: 'nearest' });
+	}, [currentIndex]);
+
+	// Build grouped rows — always group by agent/group to avoid duplicate headers
+	const rows = useMemo(() => {
+		const effectiveSort = sortMode ?? 'newest';
+		const useGroupName = effectiveSort === 'grouped';
+
+		// Collect items per unique group key, preserving original index
+		const groupMap = new Map<
+			string,
+			{ groupName: string; items: { item: InboxItem; index: number }[] }
+		>();
+		const groupOrder: string[] = [];
+		items.forEach((itm, idx) => {
+			const groupKey = useGroupName ? (itm.groupName ?? 'Ungrouped') : itm.sessionId;
+			const groupName = useGroupName ? (itm.groupName ?? 'Ungrouped') : itm.sessionName;
+			if (!groupMap.has(groupKey)) {
+				groupMap.set(groupKey, { groupName, items: [] });
+				groupOrder.push(groupKey);
+			}
+			groupMap.get(groupKey)!.items.push({ item: itm, index: idx });
+		});
+
+		const result: (
+			| { type: 'header'; groupKey: string; groupName: string; count: number }
+			| { type: 'item'; item: InboxItem; index: number }
+		)[] = [];
+		for (const groupKey of groupOrder) {
+			const group = groupMap.get(groupKey)!;
+			result.push({
+				type: 'header',
+				groupKey,
+				groupName: group.groupName,
+				count: group.items.length,
+			});
+			for (const entry of group.items) {
+				result.push({ type: 'item', item: entry.item, index: entry.index });
+			}
+		}
+		return result;
+	}, [items, sortMode]);
+
+	return (
+		<div className="flex flex-col">
+			{/* Filter control header */}
+			{filterMode !== undefined && setFilterMode && (
+				<div
+					className="flex items-center justify-center px-2 py-2 border-b"
+					style={{ borderColor: theme.colors.border }}
+				>
+					<SidebarFilter value={filterMode} onChange={setFilterMode} theme={theme} />
+				</div>
+			)}
+			{/* Item list */}
+			<div className="flex-1 overflow-y-auto py-1">
+				{(() => {
+					let activeGroup: string | null = null;
+					return rows.map((row, rowIdx) => {
+						if (row.type === 'header') {
+							activeGroup = row.groupKey;
+							return (
+								<div
+									key={`header-${row.groupKey}-${rowIdx}`}
+									tabIndex={0}
+									role="option"
+									aria-selected={false}
+									onClick={() => {
+										setCollapsedGroups((prev) => {
+											const next = new Set(prev);
+											if (next.has(row.groupKey)) next.delete(row.groupKey);
+											else next.add(row.groupKey);
+											return next;
+										});
+									}}
+									onKeyDown={(e) => {
+										if (e.key === 'Enter' || e.key === ' ') {
+											e.preventDefault();
+											setCollapsedGroups((prev) => {
+												const next = new Set(prev);
+												if (next.has(row.groupKey)) next.delete(row.groupKey);
+												else next.add(row.groupKey);
+												return next;
+											});
+										}
+									}}
+									className="flex items-center gap-1.5 px-3 py-1.5 text-[10px] uppercase tracking-wider cursor-pointer"
+									style={{
+										color: theme.colors.textDim,
+										fontWeight: 600,
+										backgroundColor: theme.colors.bgSidebar,
+									}}
+								>
+									{collapsedGroups.has(row.groupKey) ? (
+										<ChevronRight className="w-3 h-3" />
+									) : (
+										<ChevronDown className="w-3 h-3" />
+									)}
+									{row.groupName}
+									<span style={{ color: theme.colors.textDim, opacity: 0.5, marginLeft: 'auto' }}>
+										{row.type === 'header' ? row.count : 0}
+									</span>
+								</div>
+							);
+						}
+
+						// Skip items in collapsed groups
+						if (activeGroup && collapsedGroups.has(activeGroup)) return null;
+
+						const itm = row.item;
+						const idx = row.index;
+						const isCurrent = idx === currentIndex;
+						const statusColor = resolveStatusColor(itm.state, theme);
+
+						const previewText = itm.lastMessage
+							? itm.lastMessage.replace(/[#*`>]/g, '').slice(0, 60)
+							: '';
+
+						return (
+							<div
+								key={`${itm.sessionId}-${itm.tabId}`}
+								ref={isCurrent ? currentRowRef : undefined}
+								tabIndex={0}
+								role="option"
+								aria-selected={isCurrent}
+								onClick={() => onNavigateItem(idx)}
+								onKeyDown={(e) => {
+									if (e.key === 'Enter' || e.key === ' ') {
+										e.preventDefault();
+										onNavigateItem(idx);
+									}
+								}}
+								className="flex items-center gap-2 px-3 cursor-pointer transition-colors"
+								style={{
+									height: 48,
+									backgroundColor: isCurrent ? `${theme.colors.accent}15` : 'transparent',
+									borderLeft: isCurrent
+										? `2px solid ${theme.colors.accent}`
+										: '2px solid transparent',
+								}}
+								onMouseEnter={(e) => {
+									if (!isCurrent)
+										e.currentTarget.style.backgroundColor = `${theme.colors.accent}08`;
+								}}
+								onMouseLeave={(e) => {
+									if (!isCurrent) e.currentTarget.style.backgroundColor = 'transparent';
+								}}
+								onFocus={(e) => {
+									if (!isCurrent)
+										e.currentTarget.style.backgroundColor = `${theme.colors.accent}08`;
+								}}
+								onBlur={(e) => {
+									if (!isCurrent) e.currentTarget.style.backgroundColor = 'transparent';
+								}}
+							>
+								{/* Status dot */}
+								<span
+									className="flex-shrink-0"
+									style={{
+										width: 6,
+										height: 6,
+										borderRadius: '50%',
+										backgroundColor: statusColor,
+									}}
+								/>
+								{/* Name + preview vertical stack */}
+								<div className="flex-1 flex flex-col gap-0.5 min-w-0">
+									<span
+										className="text-xs truncate"
+										style={{
+											color: isCurrent ? theme.colors.textMain : theme.colors.textDim,
+											fontWeight: isCurrent ? 600 : 400,
+										}}
+									>
+										{itm.tabName || 'Tab'}
+									</span>
+									{previewText && (
+										<span
+											className="text-[10px] truncate"
+											style={{ color: theme.colors.textDim, opacity: 0.5 }}
+										>
+											{previewText}
+										</span>
+									)}
+								</div>
+								{/* Indicators: unread */}
+								{itm.hasUnread && (
+									<span
+										className="flex-shrink-0"
+										style={{
+											width: 6,
+											height: 6,
+											borderRadius: '50%',
+											backgroundColor: theme.colors.accent,
+											alignSelf: 'flex-start',
+											marginTop: 2,
+										}}
+									/>
+								)}
+							</div>
+						);
+					});
+				})()}
+			</div>
+		</div>
+	);
+}
+
+export default function FocusModeView({
+	theme,
+	item,
+	items,
+	sessions,
+	currentIndex,
+	enterToSendAI,
+	filterMode,
+	setFilterMode,
+	sortMode,
+	onClose,
+	onExitFocus,
+	onNavigateItem,
+	onQuickReply,
+	onOpenAndReply,
+	onMarkAsRead: _onMarkAsRead,
+	onToggleThinking,
+}: FocusModeViewProps) {
+	const statusColor = resolveStatusColor(item.state, theme);
+	const hasValidContext = item.contextUsage !== undefined && !isNaN(item.contextUsage);
+
+	// ---- Resizable sidebar ----
+	const [sidebarWidth, setSidebarWidth] = useState(220);
+	const isResizingRef = useRef(false);
+	const resizeCleanupRef = useRef<(() => void) | null>(null);
+
+	// Unmount safety: clean up resize listeners if component unmounts mid-drag
+	useEffect(() => {
+		return () => {
+			resizeCleanupRef.current?.();
+			resizeCleanupRef.current = null;
+		};
+	}, []);
+
+	const handleResizeStart = useCallback(
+		(e: React.MouseEvent) => {
+			e.preventDefault();
+			isResizingRef.current = true;
+			const startX = e.clientX;
+			const startWidth = sidebarWidth;
+
+			const onMouseMove = (ev: MouseEvent) => {
+				if (!isResizingRef.current) return;
+				const newWidth = Math.max(160, Math.min(400, startWidth + (ev.clientX - startX)));
+				setSidebarWidth(newWidth);
+			};
+
+			const cleanup = () => {
+				isResizingRef.current = false;
+				document.removeEventListener('mousemove', onMouseMove);
+				document.removeEventListener('mouseup', onMouseUp);
+				document.body.style.cursor = '';
+				document.body.style.userSelect = '';
+				resizeCleanupRef.current = null;
+			};
+
+			const onMouseUp = () => {
+				cleanup();
+			};
+
+			resizeCleanupRef.current = cleanup;
+			document.addEventListener('mousemove', onMouseMove);
+			document.addEventListener('mouseup', onMouseUp);
+			document.body.style.cursor = 'col-resize';
+			document.body.style.userSelect = 'none';
+		},
+		[sidebarWidth]
+	);
+	const contextColor = hasValidContext
+		? resolveContextUsageColor(item.contextUsage!, theme)
+		: undefined;
+
+	// Truncate helper
+	const truncate = (str: string, max: number) =>
+		str.length > max ? str.slice(0, max) + '...' : str;
+
+	// Session existence check (session may be deleted while focus mode is open)
+	const sessionExists = sessions.some((s) => s.id === item.sessionId);
+
+	// ---- Thinking toggle state (3-state: off → on → sticky → off) ----
+	// Read showThinking from the actual tab property (synced with main app)
+	const showThinking: ThinkingMode = useMemo(() => {
+		const session = sessions.find((s) => s.id === item.sessionId);
+		if (!session) return 'off';
+		const tab = session.aiTabs.find((t) => t.id === item.tabId);
+		return tab?.showThinking ?? 'off';
+	}, [sessions, item.sessionId, item.tabId]);
+
+	const cycleThinking = useCallback(() => {
+		const nextMode: ThinkingMode =
+			showThinking === 'off' ? 'on' : showThinking === 'on' ? 'sticky' : 'off';
+		if (onToggleThinking) {
+			onToggleThinking(item.sessionId, item.tabId, nextMode);
+		}
+	}, [showThinking, item.sessionId, item.tabId, onToggleThinking]);
+
+	// ---- Raw markdown toggle (per-session, not per-log) ----
+	const [showRawMarkdown, setShowRawMarkdown] = useState(false);
+
+	// Compute conversation tail — last N renderable log entries
+	const logs = useMemo(() => {
+		const session = sessions.find((s) => s.id === item.sessionId);
+		if (!session) return [];
+		const tab = session.aiTabs.find((t) => t.id === item.tabId);
+		if (!tab) return [];
+		// Include all renderable log types
+		const relevant = tab.logs.filter(
+			(log) =>
+				log.source === 'ai' ||
+				log.source === 'stdout' ||
+				log.source === 'user' ||
+				log.source === 'thinking' ||
+				log.source === 'tool'
+		);
+		// Take last N entries
+		return relevant.slice(-MAX_LOG_ENTRIES);
+	}, [sessions, item.sessionId, item.tabId]);
+
+	// Filter out thinking/tool when toggle is off
+	const visibleLogs = useMemo(() => {
+		if (showThinking !== 'off') return logs;
+		return logs.filter((log) => log.source !== 'thinking' && log.source !== 'tool');
+	}, [logs, showThinking]);
+
+	// Memoized prose styles — same as TerminalOutput, scoped to .focus-mode-prose
+	const proseStyles = useMemo(
+		() => generateTerminalProseStyles(theme, '.focus-mode-prose'),
+		[theme]
+	);
+
+	// Auto-scroll to bottom ONLY if user is near bottom (within 150px) or item changed
+	const scrollRef = useRef<HTMLDivElement>(null);
+	const prevScrollItemRef = useRef<string>('');
+
+	useEffect(() => {
+		if (!scrollRef.current) return;
+		const el = scrollRef.current;
+		const itemKey = `${item.sessionId}:${item.tabId}`;
+		const isNewItem = prevScrollItemRef.current !== itemKey;
+		if (isNewItem) {
+			prevScrollItemRef.current = itemKey;
+			el.scrollTop = el.scrollHeight;
+			return;
+		}
+		// Only auto-scroll if user is near bottom
+		const distanceFromBottom = el.scrollHeight - el.scrollTop - el.clientHeight;
+		if (distanceFromBottom < 150) {
+			el.scrollTop = el.scrollHeight;
+		}
+	}, [visibleLogs, item.sessionId, item.tabId]);
+
+	// ---- Reply state ----
+	const [replyText, setReplyText] = useState('');
+	const replyInputRef = useRef<HTMLTextAreaElement>(null);
+
+	// Auto-focus reply input when entering focus mode or switching items
+	useEffect(() => {
+		const rafId = requestAnimationFrame(() => {
+			replyInputRef.current?.focus();
+		});
+		// Fallback for heavy render frames where the first focus attempt loses timing.
+		const timeoutId = window.setTimeout(() => {
+			replyInputRef.current?.focus();
+		}, 60);
+		return () => {
+			cancelAnimationFrame(rafId);
+			window.clearTimeout(timeoutId);
+		};
+	}, [item.sessionId, item.tabId]);
+
+	// Reset reply text when item changes (prev/next navigation)
+	useEffect(() => {
+		setReplyText('');
+	}, [item.sessionId, item.tabId]);
+
+	const handleQuickReply = useCallback(() => {
+		const text = replyText.trim();
+		if (!text) return;
+		if (onQuickReply) {
+			onQuickReply(item.sessionId, item.tabId, text);
+		}
+		setReplyText('');
+	}, [replyText, item, onQuickReply]);
+
+	const handleOpenAndReply = useCallback(() => {
+		const text = replyText.trim();
+		if (!text) return;
+		if (onOpenAndReply) {
+			onOpenAndReply(item.sessionId, item.tabId, text);
+		}
+	}, [replyText, item, onOpenAndReply]);
+
+	// ---- Smooth transition on item change ----
+	const [isTransitioning, setIsTransitioning] = useState(false);
+	const prevItemRef = useRef<string>(`${item.sessionId}-${item.tabId}`);
+
+	useEffect(() => {
+		const currentKey = `${item.sessionId}-${item.tabId}`;
+		if (prevItemRef.current !== currentKey) {
+			setIsTransitioning(true);
+			const timer = setTimeout(() => setIsTransitioning(false), 150);
+			prevItemRef.current = currentKey;
+			return () => clearTimeout(timer);
+		}
+	}, [item.sessionId, item.tabId]);
+
+	// Mark as read only on explicit interaction (reply), not on view.
+	// This preserves the Unread filter — items stay unread until the user acts.
+
+	return (
+		<div className="flex flex-col flex-1" style={{ minHeight: 0 }}>
+			{/* Header bar */}
+			<div
+				className="flex items-center px-4 py-3 border-b"
+				style={{
+					backgroundColor: theme.colors.bgSidebar,
+					borderColor: theme.colors.border,
+				}}
+			>
+				{/* Left: Back button */}
+				<button
+					aria-label="Return to inbox list"
+					onClick={onExitFocus}
+					className="flex items-center gap-1.5 text-sm font-medium"
+					style={{
+						background: 'transparent',
+						border: 'none',
+						cursor: 'pointer',
+						color: theme.colors.textDim,
+						padding: 0,
+					}}
+					onMouseEnter={(e) => (e.currentTarget.style.color = theme.colors.textMain)}
+					onMouseLeave={(e) => (e.currentTarget.style.color = theme.colors.textDim)}
+				>
+					<ArrowLeft style={{ width: 16, height: 16 }} />
+					<span>Inbox</span>
+				</button>
+
+				{/* Center: GROUP | Agent name · tab */}
+				<div
+					className="flex-1 flex items-center justify-center gap-1"
+					style={{ overflow: 'hidden' }}
+				>
+					{item.groupName && (
+						<>
+							<span
+								className="text-xs"
+								style={{
+									color: theme.colors.textDim,
+									whiteSpace: 'nowrap',
+									textTransform: 'uppercase',
+									letterSpacing: '0.5px',
+								}}
+							>
+								{item.groupName}
+							</span>
+							<span className="text-xs" style={{ color: theme.colors.textDim, padding: '0 4px' }}>
+								|
+							</span>
+						</>
+					)}
+					<span
+						className="text-lg font-semibold"
+						style={{
+							color: theme.colors.textMain,
+							whiteSpace: 'nowrap',
+							overflow: 'hidden',
+							textOverflow: 'ellipsis',
+						}}
+					>
+						{truncate(item.sessionName, 30)}
+					</span>
+					{item.tabName && (
+						<>
+							<span className="text-xs" style={{ color: theme.colors.textDim }}>
+								·
+							</span>
+							<span
+								className="text-xs"
+								style={{
+									color: theme.colors.textDim,
+									whiteSpace: 'nowrap',
+									overflow: 'hidden',
+									textOverflow: 'ellipsis',
+								}}
+							>
+								{item.tabName}
+							</span>
+						</>
+					)}
+					{/* TODO: cost badge — needs InboxItem.cost field */}
+				</div>
+
+				{/* Right: Close button */}
+				<button
+					onClick={onClose}
+					className="p-1.5 rounded"
+					style={{ color: theme.colors.textDim }}
+					onMouseEnter={(e) => (e.currentTarget.style.backgroundColor = `${theme.colors.accent}20`)}
+					onMouseLeave={(e) => (e.currentTarget.style.backgroundColor = 'transparent')}
+					title="Close (Esc)"
+				>
+					<X className="w-4 h-4" />
+				</button>
+			</div>
+
+			{/* Subheader info bar — 32px */}
+			<div
+				className="flex items-center justify-end px-4 py-2 gap-3 text-xs border-b"
+				style={{
+					borderColor: theme.colors.border,
+					backgroundColor: theme.colors.bgActivity,
+					color: theme.colors.textDim,
+				}}
+			>
+				{item.gitBranch && (
+					<span
+						className="px-1.5 py-0.5 rounded"
+						style={{
+							fontFamily: "'SF Mono', 'Menlo', monospace",
+							backgroundColor: `${theme.colors.border}40`,
+							color: theme.colors.textDim,
+						}}
+					>
+						{truncate(item.gitBranch, 25)}
+					</span>
+				)}
+				{hasValidContext && (
+					<span style={{ color: contextColor }}>Context: {item.contextUsage}%</span>
+				)}
+				<span
+					style={{
+						padding: '1px 8px',
+						borderRadius: 10,
+						backgroundColor: `${statusColor}20`,
+						color: statusColor,
+						whiteSpace: 'nowrap',
+					}}
+				>
+					{STATUS_LABELS[item.state]}
+				</span>
+				{/* Thinking toggle — 3-state: off → on → sticky → off */}
+				<button
+					onClick={cycleThinking}
+					className={`flex items-center gap-1.5 text-[10px] px-2 py-1 rounded-full cursor-pointer transition-all ${
+						showThinking !== 'off' ? '' : 'opacity-40 hover:opacity-70'
+					}`}
+					style={{
+						backgroundColor:
+							showThinking === 'sticky'
+								? `${theme.colors.warning}30`
+								: showThinking === 'on'
+									? `${theme.colors.accentText}25`
+									: 'transparent',
+						color:
+							showThinking === 'sticky'
+								? theme.colors.warning
+								: showThinking === 'on'
+									? theme.colors.accentText
+									: theme.colors.textDim,
+						border:
+							showThinking === 'sticky'
+								? `1px solid ${theme.colors.warning}50`
+								: showThinking === 'on'
+									? `1px solid ${theme.colors.accentText}50`
+									: '1px solid transparent',
+					}}
+					title={
+						showThinking === 'off'
+							? 'Show Thinking - Click to stream AI reasoning'
+							: showThinking === 'on'
+								? 'Thinking (temporary) - Click for sticky mode'
+								: 'Thinking (sticky) - Click to turn off'
+					}
+				>
+					<Brain className="w-3 h-3" />
+					<span>Thinking</span>
+					{showThinking === 'sticky' && <Pin className="w-2.5 h-2.5" />}
+				</button>
+			</div>
+
+			{/* Prose styles for markdown rendering — injected once at container level */}
+			<style>{proseStyles}</style>
+
+			{/* Two-column layout: sidebar + main content */}
+			<div className="flex flex-1" style={{ minHeight: 0 }}>
+				{/* Sidebar mini-list */}
+				<div
+					className="flex-shrink-0 overflow-y-auto"
+					style={{
+						width: sidebarWidth,
+						borderColor: theme.colors.border,
+						backgroundColor: theme.colors.bgSidebar,
+					}}
+					data-testid="focus-sidebar"
+				>
+					<FocusSidebar
+						items={items}
+						currentIndex={currentIndex}
+						theme={theme}
+						sortMode={sortMode}
+						filterMode={filterMode}
+						setFilterMode={setFilterMode}
+						onNavigateItem={onNavigateItem}
+					/>
+				</div>
+
+				{/* Resize handle */}
+				<div
+					onMouseDown={handleResizeStart}
+					style={{
+						width: 4,
+						cursor: 'col-resize',
+						backgroundColor: 'transparent',
+						borderRight: `1px solid ${theme.colors.border}`,
+						flexShrink: 0,
+					}}
+					onMouseEnter={(e) => {
+						e.currentTarget.style.backgroundColor = `${theme.colors.accent}30`;
+					}}
+					onMouseLeave={(e) => {
+						if (!isResizingRef.current) {
+							e.currentTarget.style.backgroundColor = 'transparent';
+						}
+					}}
+				/>
+
+				{/* Main content: conversation body + reply input */}
+				<div className="flex-1 flex flex-col" style={{ minWidth: 0, minHeight: 0 }}>
+					{/* Body — conversation tail */}
+					{!sessionExists ? (
+						<div
+							className="flex-1 flex items-center justify-center"
+							style={{ color: theme.colors.textDim }}
+						>
+							<span className="text-sm">Agent no longer available</span>
+						</div>
+					) : (
+						<div
+							ref={scrollRef}
+							role="log"
+							aria-label="Agent conversation"
+							className="focus-mode-prose flex-1 overflow-y-auto p-4"
+							style={{
+								minHeight: 0,
+								opacity: isTransitioning ? 0.3 : 1,
+								transition: 'opacity 150ms ease',
+							}}
+						>
+							{visibleLogs.length === 0 ? (
+								<div
+									className="flex items-center justify-center h-full"
+									style={{ color: theme.colors.textDim }}
+								>
+									<span className="text-sm">No conversation yet</span>
+								</div>
+							) : (
+								<div className="flex flex-col gap-3">
+									{visibleLogs.map((log) => (
+										<FocusLogEntry
+											key={log.id}
+											log={log}
+											theme={theme}
+											showRawMarkdown={showRawMarkdown}
+											onToggleRaw={() => setShowRawMarkdown((v) => !v)}
+										/>
+									))}
+								</div>
+							)}
+						</div>
+					)}
+
+					{/* Reply input bar */}
+					<div
+						className="flex items-center gap-2 px-4 py-3 border-t"
+						style={{ borderColor: theme.colors.border }}
+					>
+						<textarea
+							ref={replyInputRef}
+							value={replyText}
+							onChange={(e) => setReplyText(e.target.value)}
+							onKeyDown={(e) => {
+								if (e.key === 'Enter') {
+									if (enterToSendAI) {
+										// Enter sends, Shift+Enter = Open & Reply
+										if (!e.shiftKey && !e.metaKey) {
+											e.preventDefault();
+											handleQuickReply();
+										} else if (e.shiftKey && !e.metaKey) {
+											e.preventDefault();
+											handleOpenAndReply();
+										}
+									} else {
+										// Cmd+Enter sends, Shift+Enter = Open & Reply
+										if (e.metaKey && !e.shiftKey) {
+											e.preventDefault();
+											handleQuickReply();
+										} else if (e.shiftKey && !e.metaKey) {
+											e.preventDefault();
+											handleOpenAndReply();
+										}
+									}
+									e.stopPropagation();
+									return;
+								}
+								// CRITICAL: Prevent focus-mode keyboard shortcuts from firing while typing
+								e.stopPropagation();
+							}}
+							placeholder="Reply to agent..."
+							rows={1}
+							aria-label="Reply to agent"
+							className="flex-1 resize-none rounded-lg px-3 py-2 text-sm outline-none"
+							style={{
+								backgroundColor: theme.colors.bgMain, // token: bgSidebar=chrome | bgActivity=content | bgMain=nested
+								color: theme.colors.textMain,
+								border: `1px solid ${theme.colors.border}`,
+								minHeight: 36,
+								maxHeight: 80,
+							}}
+							onInput={(e) => {
+								// Auto-resize textarea
+								const target = e.target as HTMLTextAreaElement;
+								target.style.height = 'auto';
+								target.style.height = Math.min(target.scrollHeight, 80) + 'px';
+							}}
+						/>
+						{/* Quick Reply button (primary) */}
+						<button
+							onClick={handleQuickReply}
+							disabled={!replyText.trim()}
+							className="p-2 rounded-lg transition-colors flex-shrink-0"
+							style={{
+								backgroundColor: replyText.trim()
+									? theme.colors.accent
+									: `${theme.colors.accent}30`,
+								color: replyText.trim() ? theme.colors.accentForeground : theme.colors.textDim,
+								cursor: replyText.trim() ? 'pointer' : 'default',
+							}}
+							title={enterToSendAI ? 'Quick reply (Enter)' : 'Quick reply (⌘Enter)'}
+						>
+							<ArrowUp className="w-4 h-4" />
+						</button>
+						{/* Open & Reply button (secondary) */}
+						<button
+							onClick={handleOpenAndReply}
+							disabled={!replyText.trim()}
+							className="p-1.5 rounded-lg transition-colors flex-shrink-0 text-xs"
+							style={{
+								border: `1px solid ${theme.colors.border}`,
+								color: replyText.trim() ? theme.colors.textMain : theme.colors.textDim,
+								backgroundColor: 'transparent',
+								cursor: replyText.trim() ? 'pointer' : 'default',
+								opacity: replyText.trim() ? 1 : 0.5,
+							}}
+							title="Open session & reply (Shift+Enter)"
+						>
+							<ExternalLink className="w-3.5 h-3.5" />
+						</button>
+					</div>
+				</div>
+			</div>
+
+			{/* Footer — 44px */}
+			<div
+				className="flex items-center justify-between px-4 border-t"
+				style={{
+					height: 44,
+					borderColor: theme.colors.border,
+				}}
+			>
+				{/* Prev button */}
+				<button
+					onClick={() => onNavigateItem((currentIndex - 1 + items.length) % items.length)}
+					disabled={items.length <= 1}
+					aria-disabled={items.length <= 1 ? 'true' : undefined}
+					className="flex items-center gap-1 text-xs px-3 py-1.5 rounded transition-colors"
+					style={{
+						border: `1px solid ${theme.colors.border}`,
+						color: items.length > 1 ? theme.colors.textMain : theme.colors.textDim,
+						backgroundColor: 'transparent',
+						cursor: items.length > 1 ? 'pointer' : 'default',
+						opacity: items.length <= 1 ? 0.4 : 1,
+					}}
+					onMouseEnter={(e) => {
+						if (items.length > 1)
+							e.currentTarget.style.backgroundColor = `${theme.colors.accent}10`;
+					}}
+					onMouseLeave={(e) => {
+						e.currentTarget.style.backgroundColor = 'transparent';
+					}}
+					title="Previous item (⌘←)"
+				>
+					<ChevronLeft className="w-3 h-3" />
+					Prev
+				</button>
+
+				{/* Center: counter + keyboard hints */}
+				<div className="flex flex-col items-center gap-0.5">
+					<span
+						aria-live="polite"
+						className="text-sm font-medium"
+						style={{ color: theme.colors.textMain }}
+					>
+						{currentIndex + 1} / {items.length}
+					</span>
+					<span className="text-xs" style={{ color: theme.colors.textDim, opacity: 0.6 }}>
+						⌘←→ Navigate · Esc Back
+					</span>
+				</div>
+
+				{/* Next button */}
+				<button
+					onClick={() => onNavigateItem((currentIndex + 1) % items.length)}
+					disabled={items.length <= 1}
+					aria-disabled={items.length <= 1 ? 'true' : undefined}
+					className="flex items-center gap-1 text-xs px-3 py-1.5 rounded transition-colors"
+					style={{
+						border: `1px solid ${theme.colors.border}`,
+						color: items.length > 1 ? theme.colors.textMain : theme.colors.textDim,
+						backgroundColor: 'transparent',
+						cursor: items.length > 1 ? 'pointer' : 'default',
+						opacity: items.length <= 1 ? 0.4 : 1,
+					}}
+					onMouseEnter={(e) => {
+						if (items.length > 1)
+							e.currentTarget.style.backgroundColor = `${theme.colors.accent}10`;
+					}}
+					onMouseLeave={(e) => {
+						e.currentTarget.style.backgroundColor = 'transparent';
+					}}
+					title="Next item (⌘→)"
+				>
+					Next
+					<ChevronRight className="w-3 h-3" />
+				</button>
+			</div>
+		</div>
+	);
+}
diff --git a/src/renderer/components/AgentInbox/InboxListView.tsx b/src/renderer/components/AgentInbox/InboxListView.tsx
new file mode 100644
index 000000000..e5b59691a
--- /dev/null
+++ b/src/renderer/components/AgentInbox/InboxListView.tsx
@@ -0,0 +1,1296 @@
+import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { X, CheckCircle, ChevronDown, ChevronRight, Maximize2, Minimize2, Bot } from 'lucide-react';
+import type { Theme, SessionState } from '../../types';
+import type { InboxItem, InboxFilterMode, InboxSortMode } from '../../types/agent-inbox';
+import { STATUS_LABELS, STATUS_COLORS } from '../../types/agent-inbox';
+import { formatRelativeTime } from '../../utils/formatters';
+import { formatShortcutKeys } from '../../utils/shortcutFormatter';
+import { getModalActions } from '../../stores/modalStore';
+
+interface InboxListViewProps {
+	theme: Theme;
+	items: InboxItem[];
+	selectedIndex: number;
+	setSelectedIndex: React.Dispatch<React.SetStateAction<number>>;
+	filterMode: InboxFilterMode;
+	setFilterMode: (mode: InboxFilterMode) => void;
+	sortMode: InboxSortMode;
+	setSortMode: (mode: InboxSortMode) => void;
+	onClose: () => void;
+	onNavigateToSession?: (sessionId: string, tabId?: string) => void;
+	onEnterFocus: (item: InboxItem) => void;
+	containerRef: React.RefObject<HTMLDivElement | null>;
+	keyDownRef?: React.MutableRefObject<((e: React.KeyboardEvent) => void) | null>;
+	isExpanded: boolean;
+	onToggleExpanded: (expanded: boolean | ((prev: boolean) => boolean)) => void;
+}
+
+const ITEM_HEIGHT = 132;
+const GROUP_HEADER_HEIGHT = 36;
+const MODAL_HEADER_HEIGHT = 80;
+const MODAL_FOOTER_HEIGHT = 36;
+const STATS_BAR_HEIGHT = 32;
+
+// ============================================================================
+// Empty state messages per filter mode
+// ============================================================================
+const EMPTY_STATE_MESSAGES: Record<InboxFilterMode, { text: string; showIcon: boolean }> = {
+	all: { text: 'No active agents to show.', showIcon: true },
+	unread: { text: 'No unread agents.', showIcon: false },
+	read: { text: 'No read agents with activity.', showIcon: false },
+	starred: { text: 'No starred agents.', showIcon: false },
+};
+
+// ============================================================================
+// Grouped list model: interleaves group headers with items when sort = 'grouped'
+// ============================================================================
+type ListRow =
+	| { type: 'header'; groupKey: string; groupName: string }
+	| { type: 'item'; item: InboxItem; index: number };
+
+function buildRows(items: InboxItem[], sortMode: InboxSortMode): ListRow[] {
+	if (sortMode !== 'grouped' && sortMode !== 'byAgent') {
+		return items.map((item, index) => ({ type: 'item' as const, item, index }));
+	}
+	const rows: ListRow[] = [];
+	let lastGroupKey: string | null = null;
+	let itemIndex = 0;
+	for (const item of items) {
+		// For 'grouped': group by Left Bar group name
+		// For 'byAgent': group by sessionId (unique) and display sessionName
+		const groupKey = sortMode === 'byAgent' ? item.sessionId : (item.groupName ?? 'Ungrouped');
+		const groupName = sortMode === 'byAgent' ? item.sessionName : (item.groupName ?? 'Ungrouped');
+		if (groupKey !== lastGroupKey) {
+			rows.push({ type: 'header', groupKey, groupName });
+			lastGroupKey = groupKey;
+		}
+		rows.push({ type: 'item', item, index: itemIndex });
+		itemIndex++;
+	}
+	return rows;
+}
+
+// ============================================================================
+// STATUS color resolver — maps STATUS_COLORS key to actual hex
+// ============================================================================
+function resolveStatusColor(state: SessionState, theme: Theme): string {
+	const colorKey = STATUS_COLORS[state];
+	const colorMap: Record<string, string> = {
+		success: theme.colors.success,
+		warning: theme.colors.warning,
+		error: theme.colors.error,
+		info: theme.colors.accent,
+		textMuted: theme.colors.textDim,
+	};
+	return colorMap[colorKey] ?? theme.colors.textDim;
+}
+
+// ============================================================================
+// Context usage color resolver — green/orange/red thresholds
+// ============================================================================
+export function resolveContextUsageColor(percentage: number, theme: Theme): string {
+	if (percentage >= 80) return theme.colors.error;
+	if (percentage >= 60) return theme.colors.warning;
+	return theme.colors.success;
+}
+
+// ============================================================================
+// InboxItemCard — rendered inside each row
+// ============================================================================
+function InboxItemCardContent({
+	item,
+	theme,
+	isSelected,
+	onClick,
+	onDoubleClick,
+}: {
+	item: InboxItem;
+	theme: Theme;
+	isSelected: boolean;
+	onClick: () => void;
+	onDoubleClick?: () => void;
+}) {
+	const statusColor = resolveStatusColor(item.state, theme);
+	const hasValidContext = item.contextUsage !== undefined && !isNaN(item.contextUsage);
+	const contextColor = hasValidContext
+		? resolveContextUsageColor(item.contextUsage!, theme)
+		: undefined;
+
+	return (
+		<div
+			role="option"
+			aria-selected={isSelected}
+			id={`inbox-item-${item.sessionId}-${item.tabId}`}
+			tabIndex={isSelected ? 0 : -1}
+			onClick={onClick}
+			onDoubleClick={onDoubleClick}
+			style={{
+				height: ITEM_HEIGHT - 12,
+				borderRadius: 8,
+				cursor: 'pointer',
+				backgroundColor: isSelected ? `${theme.colors.accent}15` : 'transparent',
+				display: 'flex',
+				flexDirection: 'column',
+				justifyContent: 'space-between',
+				overflow: 'hidden',
+				position: 'relative',
+			}}
+			onFocus={(e) => {
+				e.currentTarget.style.outline = `2px solid ${theme.colors.accent}`;
+				e.currentTarget.style.outlineOffset = '-2px';
+			}}
+			onBlur={(e) => {
+				e.currentTarget.style.outline = 'none';
+			}}
+		>
+			{/* Card content — horizontal flex with agent icon + details */}
+			<div
+				style={{
+					padding: '12px 16px',
+					display: 'flex',
+					alignItems: 'center',
+					gap: 10,
+					flex: 1,
+				}}
+			>
+				{/* Agent icon */}
+				<div
+					style={{
+						width: 28,
+						height: 28,
+						borderRadius: 6,
+						display: 'flex',
+						alignItems: 'center',
+						justifyContent: 'center',
+						backgroundColor: `${theme.colors.accent}15`,
+						flexShrink: 0,
+					}}
+				>
+					<Bot style={{ width: 14, height: 14, color: theme.colors.accent }} />
+				</div>
+				{/* Card details */}
+				<div
+					style={{
+						display: 'flex',
+						flexDirection: 'column',
+						justifyContent: 'center',
+						gap: 6,
+						flex: 1,
+						minWidth: 0,
+					}}
+				>
+					{/* Row 1: GROUP | session | tab    timestamp */}
+					<div style={{ display: 'flex', alignItems: 'center', gap: 0 }}>
+						{item.groupName && (
+							<>
+								<span
+									style={{
+										fontSize: 12,
+										color: theme.colors.textDim,
+										whiteSpace: 'nowrap',
+										textTransform: 'uppercase',
+										letterSpacing: '0.5px',
+									}}
+								>
+									{item.groupName}
+								</span>
+								<span style={{ fontSize: 12, color: theme.colors.textDim, padding: '0 6px' }}>
+									|
+								</span>
+							</>
+						)}
+						<span
+							style={{
+								fontSize: 14,
+								fontWeight: 600,
+								color: theme.colors.textMain,
+								overflow: 'hidden',
+								textOverflow: 'ellipsis',
+								whiteSpace: 'nowrap',
+								flex: 1,
+							}}
+						>
+							{item.sessionName}
+							{item.tabName && (
+								<>
+									<span
+										style={{
+											fontSize: 12,
+											color: theme.colors.textDim,
+											padding: '0 6px',
+											fontWeight: 400,
+										}}
+									>
+										|
+									</span>
+									<span style={{ fontWeight: 400, color: theme.colors.textDim }}>
+										{item.tabName}
+									</span>
+								</>
+							)}
+						</span>
+						<span
+							style={{
+								fontSize: 12,
+								color: theme.colors.textDim,
+								whiteSpace: 'nowrap',
+								flexShrink: 0,
+							}}
+						>
+							{formatRelativeTime(item.timestamp)}
+						</span>
+					</div>
+
+					{/* Row 2: last message (2-line clamp) */}
+					<div
+						style={{
+							fontSize: 12,
+							color: theme.colors.textDim,
+							overflow: 'hidden',
+							display: '-webkit-box',
+							WebkitLineClamp: 2,
+							WebkitBoxOrient: 'vertical' as const,
+							lineHeight: '1.4',
+						}}
+					>
+						{item.lastMessage}
+					</div>
+
+					{/* Row 3: badges */}
+					<div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+						{item.gitBranch && (
+							<span
+								data-testid="git-branch-badge"
+								style={{
+									fontSize: 11,
+									fontFamily: "'SF Mono', 'Menlo', monospace",
+									padding: '1px 6px',
+									borderRadius: 4,
+									backgroundColor: `${theme.colors.accent}15`,
+									color: theme.colors.accent,
+									whiteSpace: 'nowrap',
+									overflow: 'hidden',
+									textOverflow: 'ellipsis',
+									maxWidth: 200,
+								}}
+							>
+								⎇{' '}
+								{item.gitBranch.length > 25 ? item.gitBranch.slice(0, 25) + '...' : item.gitBranch}
+							</span>
+						)}
+						<span
+							data-testid="context-usage-text"
+							style={{
+								fontSize: 11,
+								color: hasValidContext ? contextColor : theme.colors.textDim,
+							}}
+						>
+							{hasValidContext ? `Context: ${item.contextUsage}%` : 'Context: \u2014'}
+						</span>
+						<span
+							style={{
+								fontSize: 11,
+								padding: '1px 8px',
+								borderRadius: 10,
+								backgroundColor: `${statusColor}20`,
+								color: statusColor,
+								whiteSpace: 'nowrap',
+							}}
+						>
+							{STATUS_LABELS[item.state]}
+						</span>
+					</div>
+				</div>
+			</div>
+
+			{/* Context usage bar — 4px at bottom of card */}
+			{hasValidContext && (
+				<div
+					data-testid="context-usage-bar"
+					title={`Context window: ${item.contextUsage}% used`}
+					style={{
+						height: 4,
+						width: '100%',
+						backgroundColor: `${theme.colors.border}40`,
+						flexShrink: 0,
+					}}
+				>
+					<div
+						style={{
+							height: '100%',
+							width: `${Math.min(Math.max(item.contextUsage!, 0), 100)}%`,
+							backgroundColor: contextColor,
+							borderRadius: item.contextUsage! >= 100 ? 0 : '0 2px 2px 0',
+							transition: 'width 0.3s ease',
+						}}
+					/>
+				</div>
+			)}
+		</div>
+	);
+}
+
+// ============================================================================
+// SegmentedControl
+// ============================================================================
+interface SegmentedControlProps<T extends string> {
+	options: { value: T; label: string }[];
+	value: T;
+	onChange: (value: T) => void;
+	theme: Theme;
+	ariaLabel?: string;
+}
+
+function SegmentedControl<T extends string>({
+	options,
+	value,
+	onChange,
+	theme,
+	ariaLabel,
+}: SegmentedControlProps<T>) {
+	return (
+		<div
+			aria-label={ariaLabel}
+			style={{
+				display: 'inline-flex',
+				gap: 2,
+				borderRadius: 8,
+			}}
+		>
+			{options.map((opt) => {
+				const isActive = value === opt.value;
+				return (
+					<button
+						key={opt.value}
+						aria-pressed={isActive}
+						onClick={() => onChange(opt.value)}
+						style={{
+							padding: '4px 12px',
+							fontSize: 12,
+							border: 'none',
+							borderRadius: 8,
+							cursor: 'pointer',
+							transition: 'background 150ms ease',
+							backgroundColor: isActive ? `${theme.colors.accent}20` : 'transparent',
+							color: isActive ? theme.colors.accent : theme.colors.textDim,
+							outline: 'none',
+						}}
+						onMouseEnter={(e) => {
+							if (!isActive) {
+								e.currentTarget.style.backgroundColor = `${theme.colors.accent}10`;
+							}
+						}}
+						onMouseLeave={(e) => {
+							if (!isActive) {
+								e.currentTarget.style.backgroundColor = 'transparent';
+							}
+						}}
+						onFocus={(e) => {
+							e.currentTarget.style.outline = `2px solid ${theme.colors.accent}`;
+							e.currentTarget.style.outlineOffset = '-2px';
+						}}
+						onBlur={(e) => {
+							e.currentTarget.style.outline = 'none';
+						}}
+					>
+						{opt.label}
+					</button>
+				);
+			})}
+		</div>
+	);
+}
+
+// ============================================================================
+// InboxStatsStrip — compact 32px metric bar between header and list
+// ============================================================================
+function InboxStatsStrip({ items, theme }: { items: InboxItem[]; theme: Theme }) {
+	const stats = useMemo(() => {
+		const uniqueAgents = new Set(items.map((i) => i.sessionId)).size;
+		const unread = items.filter((i) => i.hasUnread).length;
+		const needsInput = items.filter((i) => i.state === 'waiting_input').length;
+		const highContext = items.filter(
+			(i) => i.contextUsage !== undefined && i.contextUsage >= 80
+		).length;
+		return { uniqueAgents, unread, needsInput, highContext };
+	}, [items]);
+
+	const metrics = [
+		{ label: 'Agents', value: stats.uniqueAgents },
+		{ label: 'Unread', value: stats.unread },
+		{ label: 'Needs Input', value: stats.needsInput },
+		{ label: 'Context \u226580%', value: stats.highContext },
+	];
+
+	return (
+		<div
+			className="flex items-center gap-4 px-6 py-1 border-b text-xs"
+			style={{
+				height: STATS_BAR_HEIGHT,
+				backgroundColor: theme.colors.bgActivity,
+				borderColor: theme.colors.border,
+			}}
+		>
+			{metrics.map((m) => (
+				<span key={m.label} className="flex items-center gap-1">
+					<span
+						style={{
+							color: theme.colors.textDim,
+							textTransform: 'uppercase',
+							letterSpacing: '0.5px',
+						}}
+					>
+						{m.label}
+					</span>
+					<span style={{ color: theme.colors.textMain, fontWeight: 600, marginLeft: 4 }}>
+						{m.value}
+					</span>
+				</span>
+			))}
+		</div>
+	);
+}
+
+// ============================================================================
+// Human-readable agent display names for group headers
+// ============================================================================
+const TOOL_TYPE_LABELS: Record<string, string> = {
+	'claude-code': 'Claude Code',
+	codex: 'Codex',
+	opencode: 'OpenCode',
+	'factory-droid': 'Factory Droid',
+	terminal: 'Terminal',
+};
+
+// ============================================================================
+// InboxListView Component
+// ============================================================================
+const SORT_OPTIONS: { value: InboxSortMode; label: string }[] = [
+	{ value: 'newest', label: 'Newest' },
+	{ value: 'oldest', label: 'Oldest' },
+	{ value: 'grouped', label: 'Grouped' },
+	{ value: 'byAgent', label: 'By Agent' },
+];
+
+const FILTER_OPTIONS: { value: InboxFilterMode; label: string }[] = [
+	{ value: 'all', label: 'All' },
+	{ value: 'unread', label: 'Unread' },
+	{ value: 'read', label: 'Read' },
+	{ value: 'starred', label: 'Starred' },
+];
+
+// Track the identity of the selected row so we can re-find it after rows change
+type RowIdentity =
+	| { type: 'header'; groupKey: string }
+	| { type: 'item'; sessionId: string; tabId: string };
+
+export default function InboxListView({
+	theme,
+	items,
+	selectedIndex,
+	setSelectedIndex,
+	filterMode,
+	setFilterMode,
+	sortMode,
+	setSortMode,
+	onClose,
+	onNavigateToSession,
+	onEnterFocus,
+	containerRef,
+	keyDownRef,
+	isExpanded,
+	onToggleExpanded,
+}: InboxListViewProps) {
+	const [collapsedGroups, setCollapsedGroups] = useState<Set<string>>(new Set());
+
+	// Initial mount flag — enables staggered entrance animation only on first render
+	const [isInitialMount, setIsInitialMount] = useState(true);
+	useEffect(() => {
+		const timer = setTimeout(() => setIsInitialMount(false), 600);
+		return () => clearTimeout(timer);
+	}, []);
+
+	// Write state changes back to modalStore for persistence
+	useEffect(() => {
+		const { updateAgentInboxData } = getModalActions();
+		updateAgentInboxData({ filterMode, sortMode, isExpanded });
+	}, [filterMode, sortMode, isExpanded]);
+
+	const toggleGroup = useCallback((groupKey: string) => {
+		setCollapsedGroups((prev) => {
+			const next = new Set(prev);
+			if (next.has(groupKey)) {
+				next.delete(groupKey);
+			} else {
+				next.add(groupKey);
+			}
+			return next;
+		});
+	}, []);
+
+	// Auto-collapse zero-unread agents ONLY on initial transition into byAgent mode.
+	// After that, manual toggles are preserved — items changes do NOT reset collapse state.
+	const prevSortModeRef = useRef(sortMode);
+	useEffect(() => {
+		const prev = prevSortModeRef.current;
+		prevSortModeRef.current = sortMode;
+
+		if (sortMode === 'byAgent' && prev !== 'byAgent') {
+			const agentUnreads = new Map<string, number>();
+			for (const item of items) {
+				const count = agentUnreads.get(item.sessionId) ?? 0;
+				agentUnreads.set(item.sessionId, count + (item.hasUnread ? 1 : 0));
+			}
+			const toCollapse = new Set<string>();
+			for (const [agent, count] of agentUnreads) {
+				if (count === 0) toCollapse.add(agent);
+			}
+			setCollapsedGroups(toCollapse);
+		} else if (sortMode !== 'byAgent' && prev === 'byAgent') {
+			setCollapsedGroups(new Set());
+		}
+	}, [sortMode, items]);
+
+	const allRows = useMemo(() => buildRows(items, sortMode), [items, sortMode]);
+	const rows = useMemo(() => {
+		if ((sortMode !== 'grouped' && sortMode !== 'byAgent') || collapsedGroups.size === 0)
+			return allRows;
+		return allRows.filter((row) => {
+			if (row.type === 'header') return true;
+			const collapseKey =
+				sortMode === 'byAgent' ? row.item.sessionId : (row.item.groupName ?? 'Ungrouped');
+			return !collapsedGroups.has(collapseKey);
+		});
+	}, [allRows, collapsedGroups, sortMode]);
+
+	// Map from row index to visible-item-number (1-based, only for item rows)
+	// Also build reverse map: visibleItemNumber -> row index (for Cmd+N)
+	const { visibleItemNumbers, visibleItemByNumber } = useMemo(() => {
+		const numbers = new Map<number, number>(); // rowIndex -> 1-based visible number
+		const byNumber = new Map<number, number>(); // 1-based visible number -> rowIndex
+		let counter = 0;
+		for (let i = 0; i < rows.length; i++) {
+			if (rows[i].type === 'item') {
+				counter++;
+				numbers.set(i, counter);
+				byNumber.set(counter, i);
+			}
+		}
+		return { visibleItemNumbers: numbers, visibleItemByNumber: byNumber };
+	}, [rows]);
+
+	// ============================================================================
+	// Row-based navigation — navigates over rows (headers + items), no useListNavigation
+	// ============================================================================
+	// Initialize to first item row (skip leading headers)
+	const firstItemRow = useMemo(() => {
+		for (let i = 0; i < rows.length; i++) {
+			if (rows[i].type === 'item') return i;
+		}
+		return 0;
+	}, [rows]);
+	const [selectedRowIndex, setSelectedRowIndex] = useState(firstItemRow);
+	const selectedRowIdentityRef = useRef<RowIdentity | null>(null);
+
+	// Keep the identity ref in sync with selectedRowIndex
+	useEffect(() => {
+		const row = rows[selectedRowIndex];
+		if (!row) {
+			selectedRowIdentityRef.current = null;
+			return;
+		}
+		if (row.type === 'header') {
+			selectedRowIdentityRef.current = { type: 'header', groupKey: row.groupKey };
+		} else {
+			selectedRowIdentityRef.current = {
+				type: 'item',
+				sessionId: row.item.sessionId,
+				tabId: row.item.tabId,
+			};
+		}
+	}, [selectedRowIndex, rows]);
+
+	// Ref to the scrollable list container
+	const scrollContainerRef = useRef<HTMLDivElement>(null);
+	const headerRef = useRef<HTMLDivElement>(null);
+
+	// Stabilize selectedRowIndex after rows change (collapse/expand/filter)
+	useEffect(() => {
+		if (rows.length === 0) {
+			setSelectedRowIndex(0);
+			return;
+		}
+
+		const identity = selectedRowIdentityRef.current;
+		if (!identity) return;
+
+		// Check if the current index still points at the same identity
+		const currentRow = rows[selectedRowIndex];
+		if (currentRow) {
+			if (
+				identity.type === 'header' &&
+				currentRow.type === 'header' &&
+				currentRow.groupKey === identity.groupKey
+			) {
+				return; // Still correct
+			}
+			if (
+				identity.type === 'item' &&
+				currentRow.type === 'item' &&
+				currentRow.item.sessionId === identity.sessionId &&
+				currentRow.item.tabId === identity.tabId
+			) {
+				return; // Still correct
+			}
+		}
+
+		// Identity drifted — search for the old identity in the new rows
+		for (let i = 0; i < rows.length; i++) {
+			const r = rows[i];
+			if (identity.type === 'header' && r.type === 'header' && r.groupKey === identity.groupKey) {
+				setSelectedRowIndex(i);
+				return;
+			}
+			if (
+				identity.type === 'item' &&
+				r.type === 'item' &&
+				r.item.sessionId === identity.sessionId &&
+				r.item.tabId === identity.tabId
+			) {
+				setSelectedRowIndex(i);
+				return;
+			}
+		}
+
+		// Old identity no longer in rows (collapsed away) — find nearest item or clamp
+		const clamped = Math.min(selectedRowIndex, rows.length - 1);
+		// Search downward from clamped position for an item row
+		for (let i = clamped; i < rows.length; i++) {
+			if (rows[i].type === 'item') {
+				setSelectedRowIndex(i);
+				return;
+			}
+		}
+		// Search upward
+		for (let i = clamped - 1; i >= 0; i--) {
+			if (rows[i].type === 'item') {
+				setSelectedRowIndex(i);
+				return;
+			}
+		}
+		// Only headers remain — select the first header
+		setSelectedRowIndex(0);
+	}, [rows, selectedRowIndex]);
+
+	// When sort mode or filter mode changes, reset selection to first item row
+	const prevSortForResetRef = useRef(sortMode);
+	const prevFilterForResetRef = useRef(filterMode);
+	useEffect(() => {
+		if (sortMode !== prevSortForResetRef.current || filterMode !== prevFilterForResetRef.current) {
+			prevSortForResetRef.current = sortMode;
+			prevFilterForResetRef.current = filterMode;
+			for (let i = 0; i < rows.length; i++) {
+				if (rows[i].type === 'item') {
+					setSelectedRowIndex(i);
+					return;
+				}
+			}
+			setSelectedRowIndex(0);
+		}
+	}, [sortMode, filterMode, rows]);
+
+	// Sync selectedRowIndex -> parent selectedIndex (used by Focus Mode entry)
+	useEffect(() => {
+		const row = rows[selectedRowIndex];
+		if (!row) return;
+
+		if (row.type === 'item') {
+			setSelectedIndex(row.index);
+			return;
+		}
+
+		// Header selected — find nearest item below, then above
+		for (let i = selectedRowIndex + 1; i < rows.length; i++) {
+			const r = rows[i];
+			if (r.type === 'header') break; // hit next group, stop
+			if (r.type === 'item') {
+				setSelectedIndex(r.index);
+				return;
+			}
+		}
+		// No item below in same group — search upward
+		for (let i = selectedRowIndex - 1; i >= 0; i--) {
+			const r = rows[i];
+			if (r.type === 'item') {
+				setSelectedIndex(r.index);
+				return;
+			}
+		}
+	}, [selectedRowIndex, rows, setSelectedIndex]);
+
+	// Guard: ensure parent selectedIndex points to a visible item after collapse
+	useEffect(() => {
+		if (rows.length === 0) return;
+		const visibleItemIndexes = new Set(
+			rows.filter((row) => row.type === 'item').map((row) => row.index)
+		);
+		if (!visibleItemIndexes.has(selectedIndex)) {
+			const firstItemRow = rows.find((row) => row.type === 'item');
+			if (firstItemRow && firstItemRow.type === 'item') {
+				setSelectedIndex(firstItemRow.index);
+			}
+		}
+	}, [rows, selectedIndex, setSelectedIndex]);
+
+	// Row height getter for variable-size rows
+	const getRowHeight = useCallback(
+		(index: number): number => {
+			const row = rows[index];
+			if (!row) return ITEM_HEIGHT;
+			return row.type === 'header' ? GROUP_HEADER_HEIGHT : ITEM_HEIGHT;
+		},
+		[rows]
+	);
+
+	// Calculate list height
+	const listHeight = useMemo(() => {
+		if (typeof window === 'undefined') return 400;
+		if (isExpanded) {
+			return Math.min(
+				window.innerHeight * 0.85 -
+					MODAL_HEADER_HEIGHT -
+					MODAL_FOOTER_HEIGHT -
+					STATS_BAR_HEIGHT -
+					80,
+				1000
+			);
+		}
+		return Math.min(
+			window.innerHeight * 0.8 - MODAL_HEADER_HEIGHT - MODAL_FOOTER_HEIGHT - STATS_BAR_HEIGHT - 80,
+			700
+		);
+	}, [isExpanded]);
+
+	// Virtualizer
+	const virtualizer = useVirtualizer({
+		count: rows.length,
+		getScrollElement: () => scrollContainerRef.current,
+		estimateSize: getRowHeight,
+		overscan: 5,
+	});
+
+	// Scroll to selected row
+	useEffect(() => {
+		if (rows.length > 0 && selectedRowIndex < rows.length) {
+			virtualizer.scrollToIndex(selectedRowIndex, { align: 'auto' });
+		}
+	}, [selectedRowIndex, rows.length, virtualizer]);
+
+	const handleNavigate = useCallback(
+		(item: InboxItem) => {
+			if (onNavigateToSession) {
+				onNavigateToSession(item.sessionId, item.tabId);
+			}
+			onClose();
+		},
+		[onNavigateToSession, onClose]
+	);
+
+	// Get the selected item's element ID for aria-activedescendant
+	const selectedItemId = useMemo(() => {
+		const row = rows[selectedRowIndex];
+		if (!row || row.type !== 'item') return undefined;
+		return `inbox-item-${row.item.sessionId}-${row.item.tabId}`;
+	}, [rows, selectedRowIndex]);
+
+	// Collect focusable header elements for Tab cycling
+	const getHeaderFocusables = useCallback((): HTMLElement[] => {
+		if (!headerRef.current) return [];
+		return Array.from(headerRef.current.querySelectorAll<HTMLElement>('button, [tabindex="0"]'));
+	}, []);
+
+	// Row-based keyboard handler — arrows navigate rows (headers + items)
+	const handleKeyDown = useCallback(
+		(e: React.KeyboardEvent) => {
+			// Tab cycling for header controls
+			if (e.key === 'Tab') {
+				const focusables = getHeaderFocusables();
+				if (focusables.length === 0) return;
+				const active = document.activeElement;
+				const focusIdx = focusables.indexOf(active as HTMLElement);
+
+				if (e.shiftKey) {
+					if (focusIdx <= 0) {
+						e.preventDefault();
+						containerRef.current?.focus();
+					} else {
+						e.preventDefault();
+						focusables[focusIdx - 1].focus();
+					}
+				} else {
+					if (focusIdx === -1) {
+						e.preventDefault();
+						focusables[0].focus();
+					} else if (focusIdx >= focusables.length - 1) {
+						e.preventDefault();
+						containerRef.current?.focus();
+					} else {
+						e.preventDefault();
+						focusables[focusIdx + 1].focus();
+					}
+				}
+				return;
+			}
+
+			// Arrow navigation over rows (headers + items)
+			if (e.key === 'ArrowDown') {
+				e.preventDefault();
+				if (rows.length === 0) return;
+				setSelectedRowIndex((prev) => Math.min(prev + 1, rows.length - 1));
+				return;
+			}
+			if (e.key === 'ArrowUp') {
+				e.preventDefault();
+				if (rows.length === 0) return;
+				setSelectedRowIndex((prev) => Math.max(prev - 1, 0));
+				return;
+			}
+
+			// T / Enter on a header → toggle group
+			// Enter on an item → navigate to session
+			if (e.key === 'Enter') {
+				e.preventDefault();
+				const row = rows[selectedRowIndex];
+				if (!row) return;
+				if (row.type === 'header') {
+					toggleGroup(row.groupKey);
+				} else {
+					handleNavigate(row.item);
+				}
+				return;
+			}
+
+			// T to toggle group (works on headers AND items)
+			if ((e.key === 't' || e.key === 'T') && !e.metaKey && !e.ctrlKey && !e.altKey) {
+				if (sortMode === 'grouped' || sortMode === 'byAgent') {
+					e.preventDefault();
+					const row = rows[selectedRowIndex];
+					if (!row) return;
+					if (row.type === 'header') {
+						toggleGroup(row.groupKey);
+					} else {
+						const groupKey =
+							sortMode === 'byAgent' ? row.item.sessionId : (row.item.groupName ?? 'Ungrouped');
+						toggleGroup(groupKey);
+					}
+				}
+				return;
+			}
+
+			// Cmd/Ctrl+1-9, 0 hotkeys for quick select (visible-item based)
+			if (
+				(e.metaKey || e.ctrlKey) &&
+				['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'].includes(e.key)
+			) {
+				e.preventDefault();
+				const number = e.key === '0' ? 10 : parseInt(e.key);
+				const targetRowIndex = visibleItemByNumber.get(number);
+				if (targetRowIndex !== undefined) {
+					const targetRow = rows[targetRowIndex];
+					if (targetRow && targetRow.type === 'item') {
+						handleNavigate(targetRow.item);
+					}
+				}
+				return;
+			}
+		},
+		[
+			getHeaderFocusables,
+			containerRef,
+			rows,
+			selectedRowIndex,
+			sortMode,
+			visibleItemByNumber,
+			toggleGroup,
+			handleNavigate,
+		]
+	);
+
+	// Expose keyboard handler to shell via ref
+	useEffect(() => {
+		if (keyDownRef) keyDownRef.current = handleKeyDown;
+		return () => {
+			if (keyDownRef) keyDownRef.current = null;
+		};
+	}, [keyDownRef, handleKeyDown]);
+
+	const actionCount = items.length;
+
+	// Filter-aware count label
+	const countLabel =
+		filterMode === 'unread'
+			? `${actionCount} unread`
+			: filterMode === 'starred'
+				? `${actionCount} starred`
+				: filterMode === 'read'
+					? `${actionCount} read`
+					: `${actionCount} need action`;
+
+	return (
+		<>
+			{/* Header — 80px, two rows */}
+			<div
+				ref={headerRef}
+				className="px-4 py-3 border-b"
+				style={{
+					height: MODAL_HEADER_HEIGHT,
+					backgroundColor: theme.colors.bgSidebar,
+					borderColor: theme.colors.border,
+					display: 'flex',
+					flexDirection: 'column',
+					justifyContent: 'center',
+					gap: 8,
+				}}
+			>
+				{/* Header row 1: title + badge + close */}
+				<div className="flex items-center justify-between">
+					<div className="flex items-center gap-2">
+						<Bot className="w-5 h-5" style={{ color: theme.colors.accent }} />
+						<h2 className="text-lg font-semibold" style={{ color: theme.colors.textMain }}>
+							Unified Inbox
+						</h2>
+						<span
+							aria-live="polite"
+							className="text-xs px-2 py-0.5 rounded-full"
+							style={{
+								backgroundColor: `${theme.colors.accent}20`,
+								color: theme.colors.accent,
+							}}
+						>
+							{countLabel}
+						</span>
+					</div>
+					<div className="flex items-center gap-2">
+						<button
+							onClick={() => {
+								if (items.length > 0 && items[selectedIndex]) {
+									onEnterFocus(items[selectedIndex]);
+								}
+							}}
+							disabled={items.length === 0}
+							className="text-xs px-2.5 py-1 rounded transition-colors"
+							style={{
+								backgroundColor: items.length > 0 ? `${theme.colors.accent}15` : 'transparent',
+								color: items.length > 0 ? theme.colors.accent : theme.colors.textDim,
+								cursor: items.length > 0 ? 'pointer' : 'default',
+								opacity: items.length === 0 ? 0.5 : 1,
+							}}
+							onMouseEnter={(e) => {
+								if (items.length > 0) {
+									e.currentTarget.style.backgroundColor = `${theme.colors.accent}25`;
+								}
+							}}
+							onMouseLeave={(e) => {
+								if (items.length > 0) {
+									e.currentTarget.style.backgroundColor = `${theme.colors.accent}15`;
+								}
+							}}
+							title="Enter Focus Mode (F)"
+						>
+							Focus ▶
+						</button>
+						<button
+							onClick={() => onToggleExpanded((prev) => !prev)}
+							className="p-1.5 rounded"
+							style={{ color: theme.colors.textDim }}
+							onMouseEnter={(e) =>
+								(e.currentTarget.style.backgroundColor = `${theme.colors.accent}20`)
+							}
+							onMouseLeave={(e) => (e.currentTarget.style.backgroundColor = 'transparent')}
+							title={isExpanded ? 'Collapse' : 'Expand'}
+							aria-label={isExpanded ? 'Collapse modal' : 'Expand modal'}
+						>
+							{isExpanded ? <Minimize2 className="w-4 h-4" /> : <Maximize2 className="w-4 h-4" />}
+						</button>
+						<button
+							onClick={onClose}
+							className="p-1.5 rounded"
+							style={{ color: theme.colors.textDim }}
+							onMouseEnter={(e) =>
+								(e.currentTarget.style.backgroundColor = `${theme.colors.accent}20`)
+							}
+							onMouseLeave={(e) => (e.currentTarget.style.backgroundColor = 'transparent')}
+							onFocus={(e) => {
+								e.currentTarget.style.outline = `2px solid ${theme.colors.accent}`;
+							}}
+							onBlur={(e) => {
+								e.currentTarget.style.outline = 'none';
+							}}
+							title="Close (Esc)"
+						>
+							<X className="w-4 h-4" />
+						</button>
+					</div>
+				</div>
+				{/* Header row 2: sort + filter controls */}
+				<div className="flex items-center justify-between">
+					<SegmentedControl
+						options={SORT_OPTIONS}
+						value={sortMode}
+						onChange={setSortMode}
+						theme={theme}
+						ariaLabel="Sort agents"
+					/>
+					<SegmentedControl
+						options={FILTER_OPTIONS}
+						value={filterMode}
+						onChange={setFilterMode}
+						theme={theme}
+						ariaLabel="Filter agents"
+					/>
+				</div>
+			</div>
+
+			{/* Stats strip — 32px aggregate metrics */}
+			<InboxStatsStrip items={items} theme={theme} />
+
+			{/* Body — virtualized list */}
+			<div
+				role="listbox"
+				tabIndex={0}
+				onKeyDown={handleKeyDown}
+				aria-activedescendant={selectedItemId}
+				aria-label="Inbox items"
+				className="outline-none"
+				style={{ flex: 1, overflow: 'hidden' }}
+				onFocus={(e) => {
+					e.currentTarget.style.outline = `2px solid ${theme.colors.accent}`;
+					e.currentTarget.style.outlineOffset = '-2px';
+				}}
+				onBlur={(e) => {
+					e.currentTarget.style.outline = 'none';
+				}}
+			>
+				{rows.length === 0 ? (
+					<div
+						data-testid="inbox-empty-state"
+						className="flex flex-col items-center justify-center gap-3"
+						style={{ height: listHeight, color: theme.colors.textDim }}
+					>
+						{EMPTY_STATE_MESSAGES[filterMode].showIcon && (
+							<CheckCircle
+								data-testid="inbox-empty-icon"
+								style={{
+									width: 32,
+									height: 32,
+									color: theme.colors.textDim,
+									opacity: 0.5,
+								}}
+							/>
+						)}
+						<span
+							style={{
+								fontSize: 14,
+								color: theme.colors.textDim,
+								maxWidth: 280,
+								textAlign: 'center',
+							}}
+						>
+							{EMPTY_STATE_MESSAGES[filterMode].text}
+						</span>
+					</div>
+				) : (
+					<div
+						ref={scrollContainerRef}
+						style={{
+							height: listHeight,
+							overflow: 'auto',
+						}}
+					>
+						<div
+							style={{
+								height: `${virtualizer.getTotalSize()}px`,
+								width: '100%',
+								position: 'relative',
+							}}
+						>
+							{virtualizer.getVirtualItems().map((virtualRow) => {
+								const row = rows[virtualRow.index];
+								if (!row) return null;
+								const isRowSelected = virtualRow.index === selectedRowIndex;
+
+								if (row.type === 'header') {
+									const isCollapsed = collapsedGroups.has(row.groupKey);
+
+									// For byAgent mode: derive agent type label and unread count from subsequent rows
+									let agentToolType: string | undefined;
+									let unreadCount = 0;
+									if (sortMode === 'byAgent') {
+										for (let i = virtualRow.index + 1; i < rows.length; i++) {
+											const r = rows[i];
+											if (r.type === 'header') break;
+											if (r.type === 'item') {
+												if (!agentToolType) agentToolType = r.item.toolType;
+												if (r.item.hasUnread) unreadCount++;
+											}
+										}
+									}
+
+									return (
+										<button
+											type="button"
+											key={`header-${row.groupKey}`}
+											className="outline-none"
+											style={{
+												position: 'absolute',
+												top: 0,
+												left: 0,
+												width: '100%',
+												height: `${virtualRow.size}px`,
+												transform: `translateY(${virtualRow.start}px)`,
+												display: 'flex',
+												alignItems: 'center',
+												paddingLeft: 16,
+												paddingRight: 16,
+												fontSize: 13,
+												fontWeight: 600,
+												color: isRowSelected ? theme.colors.accent : theme.colors.textDim,
+												letterSpacing: '0.5px',
+												textTransform: 'uppercase',
+												borderBottom: `2px solid ${theme.colors.border}40`,
+												borderLeft: isRowSelected
+													? `3px solid ${theme.colors.accent}`
+													: '3px solid transparent',
+												backgroundColor: isRowSelected ? `${theme.colors.accent}10` : 'transparent',
+												cursor: 'pointer',
+												borderTop: 'none',
+												borderRight: 'none',
+												textAlign: 'left',
+											}}
+											onClick={() => toggleGroup(row.groupKey)}
+											onKeyDown={(e) => {
+												if (e.key === 'Enter' || e.key === ' ') {
+													e.preventDefault();
+													toggleGroup(row.groupKey);
+												}
+											}}
+										>
+											{isCollapsed ? (
+												<ChevronRight
+													style={{ width: 14, height: 14, marginRight: 4, flexShrink: 0 }}
+												/>
+											) : (
+												<ChevronDown
+													style={{ width: 14, height: 14, marginRight: 4, flexShrink: 0 }}
+												/>
+											)}
+											{row.groupName}
+											{sortMode === 'byAgent' && agentToolType && (
+												<span
+													style={{
+														fontSize: 11,
+														color: theme.colors.textDim,
+														fontWeight: 400,
+														marginLeft: 4,
+													}}
+												>
+													({TOOL_TYPE_LABELS[agentToolType] ?? agentToolType})
+												</span>
+											)}
+											{sortMode === 'byAgent' && unreadCount > 0 && (
+												<span
+													style={{
+														fontSize: 11,
+														marginLeft: 'auto',
+														padding: '1px 6px',
+														borderRadius: 10,
+														backgroundColor: theme.colors.warning + '20',
+														color: theme.colors.warning,
+													}}
+												>
+													{unreadCount} unread
+												</span>
+											)}
+										</button>
+									);
+								}
+
+								const isLastRow = virtualRow.index === rows.length - 1;
+								const visibleNum = visibleItemNumbers.get(virtualRow.index);
+								const showNumber = visibleNum !== undefined && visibleNum >= 1 && visibleNum <= 10;
+								const numberBadge = visibleNum === 10 ? 0 : visibleNum;
+
+								// Stagger animation: only on initial mount, capped at 300ms (10 items)
+								const animationDelay = isInitialMount
+									? `${Math.min(virtualRow.index * 30, 300)}ms`
+									: undefined;
+
+								return (
+									<div
+										key={`item-${row.item.sessionId}-${row.item.tabId}`}
+										className={isInitialMount ? 'inbox-card-enter' : undefined}
+										style={{
+											position: 'absolute',
+											top: 0,
+											left: 0,
+											width: '100%',
+											height: `${virtualRow.size}px`,
+											transform: `translateY(${virtualRow.start}px)`,
+											paddingLeft: 16,
+											paddingRight: 16,
+											paddingTop: 6,
+											paddingBottom: 6,
+											borderBottom: isLastRow ? undefined : `1px solid ${theme.colors.border}40`,
+											animationDelay,
+										}}
+									>
+										<div style={{ display: 'flex', alignItems: 'center', gap: 8, height: '100%' }}>
+											{showNumber ? (
+												<div
+													className="flex-shrink-0 w-5 h-5 rounded flex items-center justify-center text-xs font-bold"
+													style={{
+														backgroundColor: theme.colors.bgMain,
+														color: theme.colors.textDim,
+														border: `1px solid ${theme.colors.border}`,
+													}}
+													data-testid="number-badge"
+												>
+													{numberBadge}
+												</div>
+											) : (
+												<div className="flex-shrink-0 w-5 h-5" />
+											)}
+											<div style={{ flex: 1, minWidth: 0 }}>
+												<InboxItemCardContent
+													item={row.item}
+													theme={theme}
+													isSelected={isRowSelected}
+													onClick={() => handleNavigate(row.item)}
+													onDoubleClick={() => onEnterFocus(row.item)}
+												/>
+											</div>
+										</div>
+									</div>
+								);
+							})}
+						</div>
+					</div>
+				)}
+			</div>
+
+			{/* Footer — 36px */}
+			<div
+				className="flex items-center justify-between px-4 py-2 border-t text-xs"
+				style={{
+					height: MODAL_FOOTER_HEIGHT,
+					borderColor: theme.colors.border,
+					color: theme.colors.textDim,
+				}}
+			>
+				<span>{countLabel}</span>
+				<span>{`↑↓ navigate • ${sortMode === 'grouped' || sortMode === 'byAgent' ? 'T collapse • ' : ''}F focus • Enter open • ${formatShortcutKeys(['Meta'])}1-9 quick select • Esc close`}</span>
+			</div>
+		</>
+	);
+}
diff --git a/src/renderer/components/AgentInbox/index.tsx b/src/renderer/components/AgentInbox/index.tsx
new file mode 100644
index 000000000..4a014e720
--- /dev/null
+++ b/src/renderer/components/AgentInbox/index.tsx
@@ -0,0 +1,366 @@
+/* POLISH-04 Token Audit (@architect)
+ * Line 267: bgActivity for dialog container — CORRECT (content)
+ * All other usages: CORRECT
+ */
+
+import { useState, useEffect, useRef, useCallback } from 'react';
+import InboxListView from './InboxListView';
+import FocusModeView from './FocusModeView';
+import type { Theme, Session, Group, ThinkingMode } from '../../types';
+import type {
+	InboxItem,
+	InboxViewMode,
+	InboxFilterMode,
+	InboxSortMode,
+} from '../../types/agent-inbox';
+import { useModalLayer } from '../../hooks/ui/useModalLayer';
+import { MODAL_PRIORITIES } from '../../constants/modalPriorities';
+import { useModalStore, selectModalData } from '../../stores/modalStore';
+import { useAgentInbox } from '../../hooks/useAgentInbox';
+
+// Re-export so existing test imports don't break
+export { resolveContextUsageColor } from './InboxListView';
+
+interface AgentInboxProps {
+	theme: Theme;
+	sessions: Session[];
+	groups: Group[];
+	enterToSendAI?: boolean;
+	onClose: () => void;
+	onNavigateToSession?: (sessionId: string, tabId?: string) => void;
+	onQuickReply?: (sessionId: string, tabId: string, text: string) => void;
+	onOpenAndReply?: (sessionId: string, tabId: string, text: string) => void;
+	onMarkAsRead?: (sessionId: string, tabId: string) => void;
+	onToggleThinking?: (sessionId: string, tabId: string, mode: ThinkingMode) => void;
+}
+
+export default function AgentInbox({
+	theme,
+	sessions,
+	groups,
+	enterToSendAI,
+	onClose,
+	onNavigateToSession,
+	onQuickReply,
+	onOpenAndReply,
+	onMarkAsRead,
+	onToggleThinking,
+}: AgentInboxProps) {
+	// ---- Focus restoration ----
+	// Capture trigger element synchronously during initial render (before child effects)
+	const triggerRef = useRef<HTMLElement | null>(
+		document.activeElement instanceof HTMLElement ? document.activeElement : null
+	);
+
+	const handleClose = useCallback(() => {
+		const trigger = triggerRef.current;
+		onClose();
+		// Schedule focus restoration after React unmounts the modal.
+		// No cleanup needed — the RAF fires once post-unmount and is harmless if trigger is gone.
+		requestAnimationFrame(() => {
+			trigger?.focus();
+		});
+	}, [onClose]);
+
+	// ---- View mode state ----
+	const [viewMode, setViewMode] = useState<InboxViewMode>('list');
+	const [focusIndex, setFocusIndex] = useState(0);
+	const [selectedIndex, setSelectedIndex] = useState(0);
+
+	// ---- Filter/sort state (lifted from InboxListView for shared access) ----
+	const inboxData = useModalStore(selectModalData('agentInbox'));
+	const [filterMode, setFilterMode] = useState<InboxFilterMode>(
+		(inboxData?.filterMode as InboxFilterMode) ?? 'unread'
+	);
+	const [sortMode, setSortMode] = useState<InboxSortMode>(
+		(inboxData?.sortMode as InboxSortMode) ?? 'newest'
+	);
+
+	// ---- Compute live items (used in list mode) ----
+	const liveItems = useAgentInbox(sessions, groups, filterMode, sortMode);
+
+	// ---- Frozen snapshot for Focus Mode ----
+	// Simple ref-based approach: freeze item order on entry, resolve against live data
+	// for real-time updates (logs, status), but keep the ORDER stable.
+	const frozenOrderRef = useRef<{ sessionId: string; tabId: string }[]>([]);
+
+	// Resolve frozen order against live items (live data, frozen order)
+	const resolveFrozenItems = useCallback(
+		(frozen: { sessionId: string; tabId: string }[]): InboxItem[] => {
+			const liveMap = new Map<string, InboxItem>();
+			for (const item of liveItems) {
+				liveMap.set(`${item.sessionId}:${item.tabId}`, item);
+			}
+			const resolved: InboxItem[] = [];
+			for (const key of frozen) {
+				const live = liveMap.get(`${key.sessionId}:${key.tabId}`);
+				if (live) resolved.push(live);
+			}
+			return resolved.length > 0 ? resolved : liveItems;
+		},
+		[liveItems]
+	);
+
+	// Items: in focus mode use frozen-order resolved against live data, else live
+	const items =
+		viewMode === 'focus' && frozenOrderRef.current.length > 0
+			? resolveFrozenItems(frozenOrderRef.current)
+			: liveItems;
+
+	const handleSetFilterMode = useCallback(
+		(mode: InboxFilterMode) => {
+			setFilterMode(mode);
+			if (viewMode === 'focus') {
+				// Re-snapshot: resolve new filter results immediately
+				// We need a render with the new filterMode first, so defer the snapshot
+				frozenOrderRef.current = [];
+				setFocusIndex(0);
+			}
+		},
+		[viewMode]
+	);
+
+	const handleExitFocus = useCallback(() => {
+		setViewMode('list');
+		frozenOrderRef.current = [];
+	}, []);
+
+	// Re-snapshot after filter change empties the ref (needs liveItems from new filter)
+	useEffect(() => {
+		if (viewMode === 'focus' && frozenOrderRef.current.length === 0 && liveItems.length > 0) {
+			frozenOrderRef.current = liveItems.map((i) => ({
+				sessionId: i.sessionId,
+				tabId: i.tabId,
+			}));
+		}
+	}, [viewMode, liveItems]);
+
+	// ---- Edge case: items shrink while in focus mode ----
+	useEffect(() => {
+		if (viewMode === 'focus' && items.length > 0 && focusIndex >= items.length) {
+			setFocusIndex(items.length - 1);
+		}
+	}, [items.length, focusIndex, viewMode]);
+
+	const handleEnterFocus = useCallback(
+		(item: InboxItem) => {
+			const idx = liveItems.findIndex(
+				(i) => i.sessionId === item.sessionId && i.tabId === item.tabId
+			);
+			setFocusIndex(idx >= 0 ? idx : 0);
+			// Freeze current order as simple identity pairs
+			frozenOrderRef.current = liveItems.map((i) => ({
+				sessionId: i.sessionId,
+				tabId: i.tabId,
+			}));
+			setViewMode('focus');
+		},
+		[liveItems]
+	);
+
+	// ---- Navigate item wrapper ----
+	const handleNavigateItem = useCallback((idx: number) => {
+		setFocusIndex(idx);
+	}, []);
+
+	// ---- Layer stack: viewMode-aware Escape ----
+	const handleLayerEscape = useCallback(() => {
+		if (viewMode === 'focus') {
+			handleExitFocus();
+		} else {
+			handleClose();
+		}
+	}, [viewMode, handleExitFocus, handleClose]);
+
+	useModalLayer(MODAL_PRIORITIES.AGENT_INBOX, 'Unified Inbox', handleLayerEscape);
+
+	// ---- Container ref for keyboard focus ----
+	const containerRef = useRef<HTMLDivElement>(null);
+
+	// Auto-focus container on mount for immediate keyboard navigation
+	useEffect(() => {
+		const raf = requestAnimationFrame(() => {
+			containerRef.current?.focus();
+		});
+		return () => cancelAnimationFrame(raf);
+	}, []);
+
+	// ---- Expanded state (lifted to shell for dialog width control) ----
+	const [isExpanded, setIsExpanded] = useState(inboxData?.isExpanded ?? false);
+
+	// ---- Compute dialog dimensions (focus mode or expanded → wide) ----
+	const isWide = isExpanded || viewMode === 'focus';
+	const expandedWidth = Math.min(
+		typeof window !== 'undefined' ? window.innerWidth * 0.92 : 1400,
+		1400
+	);
+	const dialogWidth = viewMode === 'focus' ? expandedWidth : isWide ? expandedWidth : 780;
+	const dialogHeight = viewMode === 'focus' ? '85vh' : undefined;
+	const dialogMaxHeight = viewMode === 'focus' ? undefined : isWide ? '90vh' : '80vh';
+
+	// ---- Keyboard handler ref from InboxListView ----
+	const listKeyDownRef = useRef<((e: React.KeyboardEvent) => void) | null>(null);
+
+	// ---- CAPTURE phase: Cmd+[/] must fire BEFORE textarea consumes the event ----
+	const handleCaptureKeyDown = useCallback(
+		(e: React.KeyboardEvent) => {
+			if (viewMode !== 'focus') return;
+			if ((e.metaKey || e.ctrlKey) && (e.key === '[' || e.key === ']')) {
+				e.preventDefault();
+				e.stopPropagation();
+				if (items.length > 1) {
+					setFocusIndex((prev) =>
+						e.key === '[' ? Math.max(prev - 1, 0) : Math.min(prev + 1, items.length - 1)
+					);
+				}
+			}
+		},
+		[viewMode, items]
+	);
+
+	// ---- BUBBLE phase: all other keyboard shortcuts ----
+	const handleShellKeyDown = useCallback(
+		(e: React.KeyboardEvent) => {
+			if (viewMode === 'focus') {
+				switch (e.key) {
+					case 'Escape':
+						e.preventDefault();
+						e.stopPropagation();
+						handleExitFocus();
+						return;
+					case 'Backspace':
+					case 'b':
+					case 'B':
+						// Guard: only exit if NOT typing in the reply textarea
+						if (document.activeElement?.tagName !== 'TEXTAREA') {
+							e.preventDefault();
+							handleExitFocus();
+						}
+						return;
+				}
+				return;
+			}
+
+			// List mode: F to enter focus
+			if ((e.key === 'f' || e.key === 'F') && !e.metaKey && !e.ctrlKey && !e.altKey) {
+				e.preventDefault();
+				if (items.length > 0 && items[selectedIndex]) {
+					handleEnterFocus(items[selectedIndex]);
+				}
+				return;
+			}
+
+			// Delegate only when the shell container itself is focused.
+			// Avoid re-processing events already handled inside InboxListView.
+			if (
+				viewMode === 'list' &&
+				listKeyDownRef.current &&
+				!e.defaultPrevented &&
+				e.target === e.currentTarget
+			) {
+				e.stopPropagation();
+				listKeyDownRef.current(e);
+			}
+		},
+		[viewMode, items, selectedIndex, handleEnterFocus, handleExitFocus]
+	);
+
+	return (
+		<div
+			className="fixed inset-0 modal-overlay flex items-center justify-center z-[9999] animate-in fade-in duration-100"
+			onClick={handleClose}
+		>
+			<div
+				ref={containerRef}
+				tabIndex={-1}
+				role="dialog"
+				aria-modal="true"
+				aria-label="Unified Inbox"
+				className="rounded-xl shadow-2xl border overflow-hidden flex flex-col outline-none"
+				style={{
+					backgroundColor: theme.colors.bgActivity,
+					borderColor: theme.colors.border,
+					width: dialogWidth,
+					maxWidth: '95vw',
+					height: dialogHeight,
+					maxHeight: dialogMaxHeight,
+					transition: 'width 200ms ease, height 200ms ease, max-height 200ms ease',
+				}}
+				onClick={(e) => e.stopPropagation()}
+				onKeyDownCapture={handleCaptureKeyDown}
+				onKeyDown={handleShellKeyDown}
+				onFocus={() => {}}
+				onBlur={() => {}}
+			>
+				<div className="flex-1 flex flex-col overflow-hidden" style={{ minHeight: 0 }}>
+					{viewMode === 'list' ? (
+						<InboxListView
+							theme={theme}
+							items={items}
+							selectedIndex={selectedIndex}
+							setSelectedIndex={setSelectedIndex}
+							filterMode={filterMode}
+							setFilterMode={handleSetFilterMode}
+							sortMode={sortMode}
+							setSortMode={setSortMode}
+							onClose={handleClose}
+							onNavigateToSession={onNavigateToSession}
+							onEnterFocus={handleEnterFocus}
+							containerRef={containerRef}
+							keyDownRef={listKeyDownRef}
+							isExpanded={isExpanded}
+							onToggleExpanded={setIsExpanded}
+						/>
+					) : items[focusIndex] ? (
+						<FocusModeView
+							theme={theme}
+							item={items[focusIndex]}
+							items={items}
+							sessions={sessions}
+							currentIndex={focusIndex}
+							enterToSendAI={enterToSendAI}
+							filterMode={filterMode}
+							setFilterMode={handleSetFilterMode}
+							sortMode={sortMode}
+							onClose={handleClose}
+							onExitFocus={handleExitFocus}
+							onNavigateItem={handleNavigateItem}
+							onNavigateToSession={onNavigateToSession}
+							onQuickReply={onQuickReply}
+							onOpenAndReply={onOpenAndReply}
+							onMarkAsRead={onMarkAsRead}
+							onToggleThinking={onToggleThinking}
+						/>
+					) : (
+						<div
+							style={{ color: theme.colors.textDim, padding: 40, textAlign: 'center' }}
+							className="flex flex-col items-center gap-3"
+						>
+							<span className="text-sm">
+								{filterMode === 'unread'
+									? 'No unread items'
+									: filterMode === 'starred'
+										? 'No starred items'
+										: 'No items to focus on'}
+							</span>
+							{filterMode !== 'all' && (
+								<button
+									onClick={() => handleSetFilterMode('all')}
+									className="text-xs px-3 py-1.5 rounded-full"
+									style={{
+										backgroundColor: `${theme.colors.accent}20`,
+										color: theme.colors.accent,
+										border: 'none',
+										cursor: 'pointer',
+									}}
+								>
+									Show all items
+								</button>
+							)}
+						</div>
+					)}
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/src/renderer/constants/modalPriorities.ts b/src/renderer/constants/modalPriorities.ts
index a8222eb46..e5fd60556 100644
--- a/src/renderer/constants/modalPriorities.ts
+++ b/src/renderer/constants/modalPriorities.ts
@@ -191,6 +191,9 @@ export const MODAL_PRIORITIES = {
 	/** Update check modal */
 	UPDATE_CHECK: 610,
 
+	/** Unified Inbox modal — agent inbox with focus mode */
+	AGENT_INBOX: 555,
+
 	/** Process monitor modal */
 	PROCESS_MONITOR: 550,
 
diff --git a/src/renderer/constants/shortcuts.ts b/src/renderer/constants/shortcuts.ts
index 37f530386..cdee93147 100644
--- a/src/renderer/constants/shortcuts.ts
+++ b/src/renderer/constants/shortcuts.ts
@@ -78,6 +78,7 @@ export const DEFAULT_SHORTCUTS: Record<string, Shortcut> = {
 		label: "Director's Notes",
 		keys: ['Meta', 'Shift', 'o'],
 	},
+	agentInbox: { id: 'agentInbox', label: 'Unified Inbox', keys: ['Alt', 'i'] },
 };
 
 // Non-editable shortcuts (displayed in help but not configurable)
diff --git a/src/renderer/hooks/keyboard/useMainKeyboardHandler.ts b/src/renderer/hooks/keyboard/useMainKeyboardHandler.ts
index 93675698d..30501b1ac 100644
--- a/src/renderer/hooks/keyboard/useMainKeyboardHandler.ts
+++ b/src/renderer/hooks/keyboard/useMainKeyboardHandler.ts
@@ -420,6 +420,14 @@ export function useMainKeyboardHandler(): UseMainKeyboardHandlerReturn {
 				e.preventDefault();
 				ctx.setDirectorNotesOpen?.(true);
 				trackShortcut('directorNotes');
+			} else if (
+				ctx.isShortcut(e, 'agentInbox') &&
+				ctx.encoreFeatures?.unifiedInbox &&
+				ctx.setAgentInboxOpen
+			) {
+				e.preventDefault();
+				ctx.setAgentInboxOpen(true);
+				trackShortcut('agentInbox');
 			} else if (ctx.isShortcut(e, 'jumpToBottom')) {
 				e.preventDefault();
 				// Jump to the bottom of the current main panel output (AI logs or terminal output)
diff --git a/src/renderer/hooks/useAgentInbox.ts b/src/renderer/hooks/useAgentInbox.ts
new file mode 100644
index 000000000..afa177177
--- /dev/null
+++ b/src/renderer/hooks/useAgentInbox.ts
@@ -0,0 +1,234 @@
+import { useMemo } from 'react';
+import type { Session, Group } from '../types';
+import type { InboxItem, InboxFilterMode, InboxSortMode } from '../types/agent-inbox';
+import { getTabDisplayName } from '../utils/tabDisplayName';
+
+const MAX_MESSAGE_LENGTH = 90;
+const DEFAULT_MESSAGE = 'No activity yet';
+const ELLIPSIS = '...';
+
+/**
+ * Determines whether a session/tab combination should be included
+ * based on the current filter mode.
+ */
+function matchesFilter(
+	sessionState: Session['state'],
+	hasUnread: boolean,
+	filterMode: InboxFilterMode,
+	isStarred: boolean
+): boolean {
+	switch (filterMode) {
+		case 'all':
+			return true;
+		case 'unread':
+			return hasUnread === true;
+		case 'read':
+			return hasUnread === false;
+		case 'starred':
+			return isStarred === true;
+		default:
+			return false;
+	}
+}
+
+/**
+ * Truncates text to MAX_MESSAGE_LENGTH with ellipsis.
+ */
+export function truncate(text: string): string {
+	if (text.length <= MAX_MESSAGE_LENGTH) return text;
+	const maxWithoutEllipsis = Math.max(0, MAX_MESSAGE_LENGTH - ELLIPSIS.length);
+	return text.slice(0, maxWithoutEllipsis) + ELLIPSIS;
+}
+
+/**
+ * Extracts the first sentence from text (up to the first period, exclamation, or newline).
+ */
+function firstSentence(text: string): string {
+	const match = text.match(/^[^.!?\n]+[.!?]?/);
+	return match ? match[0].trim() : text.trim();
+}
+
+/**
+ * Generates a 1-line smart summary from a tab's logs and session state.
+ *
+ * Rules:
+ * - waiting_input: "Waiting: " + last AI message snippet
+ * - Last AI message ends with "?": show the question directly
+ * - Last AI message is a statement: "Done: " + first sentence
+ * - Empty logs: "No activity yet"
+ */
+export function generateSmartSummary(
+	logs: Session['aiLogs'] | undefined,
+	sessionState: Session['state']
+): string {
+	const safeLogs = logs ?? [];
+	if (safeLogs.length === 0) return DEFAULT_MESSAGE;
+
+	// Look at the last 3 entries to find the most recent AI message
+	const recentLogs = safeLogs.slice(-3);
+	let lastAiText: string | undefined;
+	for (let i = recentLogs.length - 1; i >= 0; i--) {
+		const entry = recentLogs[i];
+		if (!entry?.text) continue;
+		if (entry.source === 'ai') {
+			lastAiText = entry.text.trim();
+			break;
+		}
+	}
+
+	// If session is waiting for input, prefix with "Waiting: "
+	if (sessionState === 'waiting_input') {
+		if (lastAiText) return truncate('Waiting: ' + lastAiText);
+		return truncate('Waiting: awaiting your response');
+	}
+
+	// If we found an AI message
+	if (lastAiText) {
+		// If it ends with a question mark, show the question directly
+		if (lastAiText.endsWith('?')) return truncate(lastAiText);
+		// Statement — prefix with "Done: " + first sentence
+		return truncate('Done: ' + firstSentence(lastAiText));
+	}
+
+	// Fallback: use last log entry text regardless of source
+	const lastLog = safeLogs[safeLogs.length - 1];
+	if (lastLog?.text) return truncate(lastLog.text);
+
+	return DEFAULT_MESSAGE;
+}
+
+/**
+ * Derives a valid timestamp from available data.
+ * Falls back through: last log entry → tab createdAt → Date.now()
+ */
+function deriveTimestamp(logs: Session['aiLogs'] | undefined, tabCreatedAt: number): number {
+	// Try last log entry timestamp
+	if (logs && logs.length > 0) {
+		const lastTs = logs[logs.length - 1]?.timestamp;
+		if (lastTs && Number.isFinite(lastTs) && lastTs > 0) return lastTs;
+	}
+	// Try tab createdAt
+	if (Number.isFinite(tabCreatedAt) && tabCreatedAt > 0) return tabCreatedAt;
+	// Fallback
+	return Date.now();
+}
+
+/**
+ * Sorts InboxItems based on the selected sort mode.
+ */
+function sortItems(items: InboxItem[], sortMode: InboxSortMode): InboxItem[] {
+	const sorted = [...items];
+	switch (sortMode) {
+		case 'newest':
+			sorted.sort((a, b) => b.timestamp - a.timestamp);
+			break;
+		case 'oldest':
+			sorted.sort((a, b) => a.timestamp - b.timestamp);
+			break;
+		case 'grouped':
+			sorted.sort((a, b) => {
+				// Ungrouped (no groupName) goes last
+				const aGroup = a.groupName ?? '\uffff';
+				const bGroup = b.groupName ?? '\uffff';
+				const groupCompare = aGroup.localeCompare(bGroup);
+				if (groupCompare !== 0) return groupCompare;
+				// Within same group, sort by timestamp descending
+				return b.timestamp - a.timestamp;
+			});
+			break;
+		case 'byAgent': {
+			// Step 1: Group items by sessionId (unique) — sessionName is display-only
+			const agentGroups = new Map<string, { label: string; items: InboxItem[] }>();
+			for (const item of sorted) {
+				const key = item.sessionId;
+				if (!agentGroups.has(key)) agentGroups.set(key, { label: item.sessionName, items: [] });
+				agentGroups.get(key)!.items.push(item);
+			}
+
+			// Step 2: Pre-compute metadata per group
+			const groupMeta: { key: string; label: string; unreadCount: number; items: InboxItem[] }[] =
+				[];
+			for (const [key, group] of agentGroups) {
+				const unreadCount = group.items.filter((i) => i.hasUnread).length;
+				// Sort items within group: newest first
+				group.items.sort((a, b) => b.timestamp - a.timestamp);
+				groupMeta.push({ key, label: group.label, unreadCount, items: group.items });
+			}
+
+			// Step 3: Sort groups — unreads first (by count desc), then zero-unreads (alphabetical by label)
+			groupMeta.sort((a, b) => {
+				if (a.unreadCount > 0 && b.unreadCount === 0) return -1;
+				if (a.unreadCount === 0 && b.unreadCount > 0) return 1;
+				if (a.unreadCount > 0 && b.unreadCount > 0) return b.unreadCount - a.unreadCount;
+				return a.label.localeCompare(b.label);
+			});
+
+			// Step 4: Flatten back
+			sorted.length = 0;
+			for (const group of groupMeta) {
+				sorted.push(...group.items);
+			}
+			break;
+		}
+	}
+	return sorted;
+}
+
+/**
+ * Data aggregation hook for Agent Inbox.
+ *
+ * Iterates all sessions and their AI tabs, filters based on session state
+ * and tab unread status, then sorts the resulting InboxItems.
+ *
+ * Uses useMemo with exact dependency values (not refs) to prevent stale data.
+ */
+export function useAgentInbox(
+	sessions: Session[],
+	groups: Group[],
+	filterMode: InboxFilterMode,
+	sortMode: InboxSortMode
+): InboxItem[] {
+	return useMemo(() => {
+		// Build group lookup map for O(1) access
+		const groupMap = new Map<string, Group>();
+		for (const group of groups) {
+			groupMap.set(group.id, group);
+		}
+
+		const items: InboxItem[] = [];
+
+		for (const session of sessions) {
+			// Skip sessions with falsy id
+			if (!session.id) continue;
+
+			const tabs = session.aiTabs ?? [];
+
+			for (const tab of tabs) {
+				const hasUnread = tab.hasUnread === true;
+
+				if (!matchesFilter(session.state, hasUnread, filterMode, tab.starred === true)) continue;
+
+				const parentGroup = session.groupId ? groupMap.get(session.groupId) : undefined;
+
+				items.push({
+					sessionId: session.id,
+					tabId: tab.id,
+					groupId: session.groupId ?? undefined,
+					groupName: parentGroup?.name ?? undefined,
+					sessionName: session.name,
+					tabName: getTabDisplayName(tab),
+					toolType: session.toolType,
+					gitBranch: session.worktreeBranch ?? undefined,
+					contextUsage: session.contextUsage ?? undefined,
+					lastMessage: generateSmartSummary(tab.logs, session.state),
+					timestamp: deriveTimestamp(tab.logs, tab.createdAt),
+					state: session.state,
+					hasUnread,
+					starred: tab.starred === true,
+				});
+			}
+		}
+
+		return sortItems(items, sortMode);
+	}, [sessions, groups, filterMode, sortMode]);
+}
diff --git a/src/renderer/stores/modalStore.ts b/src/renderer/stores/modalStore.ts
index b385ea745..738e75ad3 100644
--- a/src/renderer/stores/modalStore.ts
+++ b/src/renderer/stores/modalStore.ts
@@ -138,6 +138,15 @@ export interface KeyboardMasteryData {
 	level: number;
 }
 
+// Note: filterMode/sortMode typed as string (not InboxFilterMode/InboxSortMode)
+// to avoid circular dependency with types/agent-inbox.ts
+/** Agent Inbox modal data (persisted filter/sort/expand state) */
+export interface AgentInboxModalData {
+	filterMode?: string;
+	sortMode?: string;
+	isExpanded?: boolean;
+}
+
 // ============================================================================
 // Modal ID Registry
 // ============================================================================
@@ -218,7 +227,9 @@ export type ModalId =
 	// Platform Warnings
 	| 'windowsWarning'
 	// Director's Notes
-	| 'directorNotes';
+	| 'directorNotes'
+	// Agent Inbox
+	| 'agentInbox';
 
 /**
  * Type mapping from ModalId to its data type.
@@ -249,6 +260,7 @@ export interface ModalDataMap {
 	firstRunCelebration: FirstRunCelebrationData;
 	keyboardMastery: KeyboardMasteryData;
 	lightbox: LightboxData;
+	agentInbox: AgentInboxModalData;
 }
 
 // Helper type to get data type for a modal ID
@@ -318,10 +330,11 @@ export const useModalStore = create<ModalStore>()((set, get) => ({
 	openModal: (id, data) => {
 		set((state) => {
 			const current = state.modals.get(id);
+			const nextData = data !== undefined ? data : current?.data;
 			// Skip if already open with same data reference
-			if (current?.open && current.data === data) return state;
+			if (current?.open && current.data === nextData) return state;
 			const newModals = new Map(state.modals);
-			newModals.set(id, { open: true, data });
+			newModals.set(id, { open: true, data: nextData });
 			return { modals: newModals };
 		});
 	},
@@ -353,11 +366,12 @@ export const useModalStore = create<ModalStore>()((set, get) => ({
 	updateModalData: (id, data) => {
 		set((state) => {
 			const current = state.modals.get(id);
-			if (!current || !current.data) return state;
 			const newModals = new Map(state.modals);
-			const mergedData = Object.assign({}, current.data, data);
+
+			const baseData = current?.data ?? {};
+			const mergedData = Object.assign({}, baseData, data);
 			newModals.set(id, {
-				...current,
+				open: current?.open ?? false,
 				data: mergedData,
 			});
 			return { modals: newModals };
@@ -757,6 +771,11 @@ export function getModalActions() {
 		setDirectorNotesOpen: (open: boolean) =>
 			open ? openModal('directorNotes') : closeModal('directorNotes'),
 
+		// Agent Inbox Modal
+		setAgentInboxOpen: (open: boolean) =>
+			open ? openModal('agentInbox') : closeModal('agentInbox'),
+		updateAgentInboxData: (data: Record<string, unknown>) => updateModalData('agentInbox', data),
+
 		// Lightbox refs replacement - use updateModalData instead
 		setLightboxIsGroupChat: (isGroupChat: boolean) => updateModalData('lightbox', { isGroupChat }),
 		setLightboxAllowDelete: (allowDelete: boolean) => updateModalData('lightbox', { allowDelete }),
@@ -846,6 +865,7 @@ export function useModalActions() {
 	const symphonyModalOpen = useModalStore(selectModalOpen('symphony'));
 	const windowsWarningModalOpen = useModalStore(selectModalOpen('windowsWarning'));
 	const directorNotesOpen = useModalStore(selectModalOpen('directorNotes'));
+	const agentInboxOpen = useModalStore(selectModalOpen('agentInbox'));
 
 	// Get stable actions
 	const actions = getModalActions();
@@ -1014,6 +1034,9 @@ export function useModalActions() {
 		// Director's Notes Modal
 		directorNotesOpen,
 
+		// Agent Inbox Modal
+		agentInboxOpen,
+
 		// Lightbox ref replacements (now stored as data)
 		lightboxIsGroupChat: lightboxData?.isGroupChat ?? false,
 		lightboxAllowDelete: lightboxData?.allowDelete ?? false,
diff --git a/src/renderer/stores/settingsStore.ts b/src/renderer/stores/settingsStore.ts
index c10e6071e..5e58cc4ba 100644
--- a/src/renderer/stores/settingsStore.ts
+++ b/src/renderer/stores/settingsStore.ts
@@ -109,6 +109,7 @@ export const DEFAULT_ONBOARDING_STATS: OnboardingStats = {
 
 export const DEFAULT_ENCORE_FEATURES: EncoreFeatureFlags = {
 	directorNotes: false,
+	unifiedInbox: false,
 };
 
 export const DEFAULT_DIRECTOR_NOTES_SETTINGS: DirectorNotesSettings = {
diff --git a/src/renderer/types/agent-inbox.ts b/src/renderer/types/agent-inbox.ts
new file mode 100644
index 000000000..c677396c2
--- /dev/null
+++ b/src/renderer/types/agent-inbox.ts
@@ -0,0 +1,47 @@
+import type { SessionState } from './index';
+
+export interface InboxItem {
+	sessionId: string;
+	tabId: string;
+	groupId?: string;
+	groupName?: string;
+	sessionName: string;
+	tabName?: string;
+	toolType: string;
+	gitBranch?: string;
+	contextUsage?: number; // 0-100, undefined = unknown
+	lastMessage: string; // truncated to 90 chars
+	timestamp: number; // Unix ms, must be validated > 0
+	state: SessionState;
+	hasUnread: boolean;
+	starred?: boolean;
+}
+
+/** UI labels: "Newest", "Oldest", "Grouped", "By Agent" */
+export type InboxSortMode = 'newest' | 'oldest' | 'grouped' | 'byAgent';
+
+/** UI labels: "All", "Unread", "Read", "Starred" */
+export type InboxFilterMode = 'all' | 'unread' | 'read' | 'starred';
+
+/** Human-readable status badges */
+export const STATUS_LABELS: Record<SessionState, string> = {
+	idle: 'Ready',
+	waiting_input: 'Needs Input',
+	busy: 'Processing',
+	connecting: 'Connecting',
+	error: 'Error',
+};
+
+// Note: Values are not keyof ThemeColors — 'info' and 'textMuted' are resolved
+// through a local colorMap in resolveStatusColor(), not direct ThemeColors keys.
+/** Status badge color keys (map to theme.colors.* via resolveStatusColor()) */
+export const STATUS_COLORS: Record<SessionState, string> = {
+	idle: 'success',
+	waiting_input: 'warning',
+	busy: 'info',
+	connecting: 'textMuted',
+	error: 'error',
+};
+
+/** View mode inside the AgentInbox modal */
+export type InboxViewMode = 'list' | 'focus';
diff --git a/src/renderer/types/index.ts b/src/renderer/types/index.ts
index 74fdb2b14..163c64761 100644
--- a/src/renderer/types/index.ts
+++ b/src/renderer/types/index.ts
@@ -905,6 +905,7 @@ export interface LeaderboardSubmitResponse {
 // Each key is a feature ID, value indicates whether it's enabled
 export interface EncoreFeatureFlags {
 	directorNotes: boolean;
+	unifiedInbox: boolean;
 }
 
 // Director's Notes settings for synopsis generation
diff --git a/src/renderer/utils/tabDisplayName.ts b/src/renderer/utils/tabDisplayName.ts
new file mode 100644
index 000000000..e93447193
--- /dev/null
+++ b/src/renderer/utils/tabDisplayName.ts
@@ -0,0 +1,40 @@
+import type { AITab } from '../types';
+
+/**
+ * Get the display name for a tab.
+ * Priority: name > truncated session ID > "New Session"
+ *
+ * Handles different agent session ID formats:
+ * - Claude UUID: "abc123-def456-ghi789" → "ABC123" (first octet)
+ * - OpenCode: "SES_4BCDFE8C5FFE4KC1UV9NSMYEDB" → "SES_4BCD" (prefix + 4 chars)
+ * - Codex: "thread_abc123..." → "THR_ABC1" (prefix + 4 chars)
+ */
+export function getTabDisplayName(tab: Pick<AITab, 'name' | 'agentSessionId'>): string {
+	if (tab.name) {
+		return tab.name;
+	}
+	if (tab.agentSessionId) {
+		const id = tab.agentSessionId;
+
+		// OpenCode format: ses_XXXX... or SES_XXXX...
+		if (id.toLowerCase().startsWith('ses_')) {
+			// Return "SES_" + first 4 chars of the ID portion
+			return `SES_${id.slice(4, 8).toUpperCase()}`;
+		}
+
+		// Codex format: thread_XXXX...
+		if (id.toLowerCase().startsWith('thread_')) {
+			// Return "THR_" + first 4 chars of the ID portion
+			return `THR_${id.slice(7, 11).toUpperCase()}`;
+		}
+
+		// Claude UUID format: has dashes, return first octet
+		if (id.includes('-')) {
+			return id.split('-')[0].toUpperCase();
+		}
+
+		// Generic fallback: first 8 chars uppercase
+		return id.slice(0, 8).toUpperCase();
+	}
+	return 'New Session';
+}

From 3f2c297fb867ca54fe4b8af149526790c3ab2ce3 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:17:20 -0300
Subject: [PATCH 13/43] MAESTRO: feat: gate AgentInbox modal rendering and
 handler props behind unifiedInbox encore feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add onOpenAgentInbox gated prop (App.tsx → AppModals → QuickActionsModal)
- Add AgentInbox rendering placeholder in App.tsx (commented, component TBD)
- Add Unified Inbox entry to QuickActionsModal command palette
- DirectorNotesModal gating was already in place from prior work

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/App.tsx                          | 12 ++++++++++++
 src/renderer/components/AppModals.tsx         | 11 +++++++++++
 src/renderer/components/QuickActionsModal.tsx | 18 ++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index ff486d0db..bd790b367 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -3712,6 +3712,7 @@ function MaestroConsoleInner() {
 					onOpenDirectorNotes={
 						encoreFeatures.directorNotes ? () => setDirectorNotesOpen(true) : undefined
 					}
+					onOpenAgentInbox={encoreFeatures.unifiedInbox ? () => setAgentInboxOpen(true) : undefined}
 					autoScrollAiMode={autoScrollAiMode}
 					setAutoScrollAiMode={setAutoScrollAiMode}
 					tabSwitcherOpen={tabSwitcherOpen}
@@ -4107,6 +4108,17 @@ function MaestroConsoleInner() {
 					</Suspense>
 				)}
 
+				{/* --- AGENT INBOX MODAL (Encore Feature — component TBD) --- */}
+				{/* Gate: renders only when unifiedInbox encore feature is enabled */}
+				{/* {encoreFeatures.unifiedInbox && agentInboxOpen && (
+					<Suspense fallback={null}>
+						<AgentInboxModal
+							theme={theme}
+							onClose={() => setAgentInboxOpen(false)}
+						/>
+					</Suspense>
+				)} */}
+
 				{/* --- GIST PUBLISH MODAL --- */}
 				{/* Supports both file preview tabs and tab context gist publishing */}
 				{gistPublishModalOpen && (activeFileTab || tabGistContent) && (
diff --git a/src/renderer/components/AppModals.tsx b/src/renderer/components/AppModals.tsx
index fb8de50c2..39f8ca335 100644
--- a/src/renderer/components/AppModals.tsx
+++ b/src/renderer/components/AppModals.tsx
@@ -859,6 +859,9 @@ export interface AppUtilityModalsProps {
 	// Director's Notes
 	onOpenDirectorNotes?: () => void;
 
+	// Agent Inbox (Unified Inbox)
+	onOpenAgentInbox?: () => void;
+
 	// Auto-scroll
 	autoScrollAiMode?: boolean;
 	setAutoScrollAiMode?: (value: boolean) => void;
@@ -1060,6 +1063,8 @@ export const AppUtilityModals = memo(function AppUtilityModals({
 	onOpenSymphony,
 	// Director's Notes
 	onOpenDirectorNotes,
+	// Agent Inbox (Unified Inbox)
+	onOpenAgentInbox,
 	// Auto-scroll
 	autoScrollAiMode,
 	setAutoScrollAiMode,
@@ -1218,6 +1223,7 @@ export const AppUtilityModals = memo(function AppUtilityModals({
 					onOpenLastDocumentGraph={onOpenLastDocumentGraph}
 					onOpenSymphony={onOpenSymphony}
 					onOpenDirectorNotes={onOpenDirectorNotes}
+					onOpenAgentInbox={onOpenAgentInbox}
 					autoScrollAiMode={autoScrollAiMode}
 					setAutoScrollAiMode={setAutoScrollAiMode}
 				/>
@@ -2013,6 +2019,8 @@ export interface AppModalsProps {
 	onOpenSymphony?: () => void;
 	// Director's Notes
 	onOpenDirectorNotes?: () => void;
+	// Agent Inbox (Unified Inbox)
+	onOpenAgentInbox?: () => void;
 	// Auto-scroll
 	autoScrollAiMode?: boolean;
 	setAutoScrollAiMode?: (value: boolean) => void;
@@ -2337,6 +2345,8 @@ export const AppModals = memo(function AppModals(props: AppModalsProps) {
 		onOpenSymphony,
 		// Director's Notes
 		onOpenDirectorNotes,
+		// Agent Inbox (Unified Inbox)
+		onOpenAgentInbox,
 		// Auto-scroll
 		autoScrollAiMode,
 		setAutoScrollAiMode,
@@ -2651,6 +2661,7 @@ export const AppModals = memo(function AppModals(props: AppModalsProps) {
 				onOpenMarketplace={onOpenMarketplace}
 				onOpenSymphony={onOpenSymphony}
 				onOpenDirectorNotes={onOpenDirectorNotes}
+				onOpenAgentInbox={onOpenAgentInbox}
 				autoScrollAiMode={autoScrollAiMode}
 				setAutoScrollAiMode={setAutoScrollAiMode}
 				tabSwitcherOpen={tabSwitcherOpen}
diff --git a/src/renderer/components/QuickActionsModal.tsx b/src/renderer/components/QuickActionsModal.tsx
index 144c8e229..4d2137128 100644
--- a/src/renderer/components/QuickActionsModal.tsx
+++ b/src/renderer/components/QuickActionsModal.tsx
@@ -117,6 +117,8 @@ interface QuickActionsModalProps {
 	onOpenSymphony?: () => void;
 	// Director's Notes
 	onOpenDirectorNotes?: () => void;
+	// Agent Inbox (Unified Inbox)
+	onOpenAgentInbox?: () => void;
 	// Auto-scroll
 	autoScrollAiMode?: boolean;
 	setAutoScrollAiMode?: (value: boolean) => void;
@@ -204,6 +206,7 @@ export const QuickActionsModal = memo(function QuickActionsModal(props: QuickAct
 		onOpenLastDocumentGraph,
 		onOpenSymphony,
 		onOpenDirectorNotes,
+		onOpenAgentInbox,
 		autoScrollAiMode,
 		setAutoScrollAiMode,
 	} = props;
@@ -1034,6 +1037,21 @@ export const QuickActionsModal = memo(function QuickActionsModal(props: QuickAct
 					},
 				]
 			: []),
+		// Agent Inbox (Unified Inbox) - cross-agent message hub
+		...(onOpenAgentInbox
+			? [
+					{
+						id: 'agentInbox',
+						label: 'Unified Inbox',
+						shortcut: shortcuts.agentInbox,
+						subtext: 'Open the unified inbox for cross-agent messages',
+						action: () => {
+							onOpenAgentInbox();
+							setQuickActionOpen(false);
+						},
+					},
+				]
+			: []),
 		// Auto-scroll toggle
 		...(setAutoScrollAiMode
 			? [

From 21bcf98ac6790bb40376f6b278cc939954a8d2ce Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:19:00 -0300
Subject: [PATCH 14/43] MAESTRO: test: add tab description handler and UI tests

Adds 2 missing useTabHandlers tests (non-active session isolation,
other tabs isolation) and 7 TabBar description UI tests covering
rendering, edit mode, Enter/Escape behavior, and feature gating.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../renderer/components/TabBar.test.tsx       | 264 ++++++++++++++++++
 .../renderer/hooks/useTabHandlers.test.ts     |  38 +++
 2 files changed, 302 insertions(+)

diff --git a/src/__tests__/renderer/components/TabBar.test.tsx b/src/__tests__/renderer/components/TabBar.test.tsx
index aea4c81c7..88eb29815 100644
--- a/src/__tests__/renderer/components/TabBar.test.tsx
+++ b/src/__tests__/renderer/components/TabBar.test.tsx
@@ -5645,3 +5645,267 @@ describe('Performance: Many file tabs (10+)', () => {
 		expect(inactiveFileTab).toHaveStyle({ marginBottom: '0' });
 	});
 });
+
+describe('TabBar description section', () => {
+	const mockOnTabSelect = vi.fn();
+	const mockOnTabClose = vi.fn();
+	const mockOnNewTab = vi.fn();
+	const mockOnUpdateTabDescription = vi.fn();
+	const mockOnTabStar = vi.fn();
+	const mockOnRequestRename = vi.fn();
+
+	const mockThemeDesc: Theme = {
+		id: 'test-theme',
+		name: 'Test Theme',
+		mode: 'dark',
+		colors: {
+			bgMain: '#1a1a1a',
+			bgSidebar: '#2a2a2a',
+			bgActivity: '#3a3a3a',
+			textMain: '#ffffff',
+			textDim: '#888888',
+			accent: '#007acc',
+			border: '#444444',
+			error: '#ff4444',
+			success: '#44ff44',
+			warning: '#ffaa00',
+			vibe: '#ff00ff',
+			agentStatus: '#00ff00',
+		},
+	};
+
+	beforeEach(() => {
+		vi.useFakeTimers();
+		vi.clearAllMocks();
+		Element.prototype.scrollTo = vi.fn();
+		Element.prototype.scrollIntoView = vi.fn();
+		Object.assign(navigator, {
+			clipboard: {
+				writeText: vi.fn().mockResolvedValue(undefined),
+			},
+		});
+	});
+
+	afterEach(() => {
+		vi.useRealTimers();
+	});
+
+	function openOverlay(tabName: string) {
+		const tab = screen.getByText(tabName).closest('[data-tab-id]')!;
+		fireEvent.mouseEnter(tab);
+		act(() => {
+			vi.advanceTimersByTime(450);
+		});
+	}
+
+	it('renders description section when onUpdateTabDescription is provided', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+			}),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onTabStar={mockOnTabStar}
+				onRequestRename={mockOnRequestRename}
+				onUpdateTabDescription={mockOnUpdateTabDescription}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		expect(screen.getByText('Add description...')).toBeInTheDocument();
+	});
+
+	it('does NOT render description section when onUpdateTabDescription is undefined', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+			}),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onTabStar={mockOnTabStar}
+				onRequestRename={mockOnRequestRename}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		expect(screen.queryByText('Add description...')).not.toBeInTheDocument();
+	});
+
+	it('shows "Add description..." placeholder when tab has no description', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+			}),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onUpdateTabDescription={mockOnUpdateTabDescription}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		expect(screen.getByText('Add description...')).toBeInTheDocument();
+		expect(screen.getByLabelText('Add tab description')).toBeInTheDocument();
+	});
+
+	it('shows existing description text when tab has one', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+				description: 'My existing description',
+			} as any),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onUpdateTabDescription={mockOnUpdateTabDescription}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		expect(screen.getByText('My existing description')).toBeInTheDocument();
+		expect(screen.getByLabelText('Edit tab description')).toBeInTheDocument();
+	});
+
+	it('clicking description area enters edit mode (textarea appears)', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+			}),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onUpdateTabDescription={mockOnUpdateTabDescription}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		const descButton = screen.getByLabelText('Add tab description');
+		fireEvent.click(descButton);
+
+		expect(screen.getByLabelText('Tab description')).toBeInTheDocument();
+		expect(screen.getByPlaceholderText('Add a description...')).toBeInTheDocument();
+	});
+
+	it('pressing Enter in textarea calls onUpdateTabDescription with trimmed value', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+			}),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onUpdateTabDescription={mockOnUpdateTabDescription}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		const descButton = screen.getByLabelText('Add tab description');
+		fireEvent.click(descButton);
+
+		const textarea = screen.getByLabelText('Tab description');
+		fireEvent.change(textarea, { target: { value: '  New description  ' } });
+		fireEvent.keyDown(textarea, { key: 'Enter' });
+
+		expect(mockOnUpdateTabDescription).toHaveBeenCalledWith('tab-1', 'New description');
+	});
+
+	it('pressing Escape in textarea exits edit mode without calling handler', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+				description: 'Original description',
+			} as any),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onUpdateTabDescription={mockOnUpdateTabDescription}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		const descButton = screen.getByLabelText('Edit tab description');
+		fireEvent.click(descButton);
+
+		const textarea = screen.getByLabelText('Tab description');
+		fireEvent.change(textarea, { target: { value: 'Changed text' } });
+		fireEvent.keyDown(textarea, { key: 'Escape' });
+
+		// Should not call the handler
+		expect(mockOnUpdateTabDescription).not.toHaveBeenCalled();
+		// Should exit edit mode — textarea gone, button visible
+		expect(screen.queryByLabelText('Tab description')).not.toBeInTheDocument();
+		expect(screen.getByText('Original description')).toBeInTheDocument();
+	});
+});
diff --git a/src/__tests__/renderer/hooks/useTabHandlers.test.ts b/src/__tests__/renderer/hooks/useTabHandlers.test.ts
index b836dd1ac..b0bebbec8 100644
--- a/src/__tests__/renderer/hooks/useTabHandlers.test.ts
+++ b/src/__tests__/renderer/hooks/useTabHandlers.test.ts
@@ -806,6 +806,44 @@ describe('useTabHandlers', () => {
 			expect(session.aiTabs[0].description).toBeUndefined();
 		});
 
+		it('handleUpdateTabDescription does not modify tabs in non-active sessions', () => {
+			const tab = createMockAITab({ id: 'tab-1' });
+			setupSessionWithTabs([tab]);
+
+			// Add a second non-active session with its own tab
+			const otherSession = createMockSession({
+				id: 'other-session',
+				aiTabs: [createMockAITab({ id: 'other-tab' })],
+				activeTabId: 'other-tab',
+				unifiedTabOrder: [{ type: 'ai', id: 'other-tab' }],
+			});
+			useSessionStore.setState((prev: any) => ({
+				sessions: [...prev.sessions, otherSession],
+			}));
+
+			const { result } = renderHook(() => useTabHandlers());
+			act(() => {
+				result.current.handleUpdateTabDescription('other-tab', 'should not apply');
+			});
+
+			const state = useSessionStore.getState();
+			const other = state.sessions.find((s) => s.id === 'other-session')!;
+			expect(other.aiTabs[0].description).toBeUndefined();
+		});
+
+		it('handleUpdateTabDescription does not modify other tabs in the same session', () => {
+			const tab1 = createMockAITab({ id: 'tab-1' });
+			const tab2 = createMockAITab({ id: 'tab-2', description: 'original' } as any);
+			const { result } = renderWithSession([tab1, tab2]);
+			act(() => {
+				result.current.handleUpdateTabDescription('tab-1', 'New description');
+			});
+
+			const session = getSession();
+			expect(session.aiTabs[0].description).toBe('New description');
+			expect(session.aiTabs[1].description).toBe('original');
+		});
+
 		it('handleUpdateTabByClaudeSessionId updates tab by agent session id', () => {
 			const tab = createMockAITab({
 				id: 'tab-1',

From 060ba44a3ed85d5859d1d001c2dec7d25c1d8a77 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:21:37 -0300
Subject: [PATCH 15/43] MAESTRO: fix: set tabDescription encore default to
 false for convention consistency

The tabDescription encore feature was defaulting to true, inconsistent
with the encore pattern (all features disabled by default). No handler
or UI exists yet for tab descriptions, so this is purely a default fix.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/stores/settingsStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/stores/settingsStore.ts b/src/renderer/stores/settingsStore.ts
index d2e9c21a1..945052a66 100644
--- a/src/renderer/stores/settingsStore.ts
+++ b/src/renderer/stores/settingsStore.ts
@@ -110,7 +110,7 @@ export const DEFAULT_ONBOARDING_STATS: OnboardingStats = {
 export const DEFAULT_ENCORE_FEATURES: EncoreFeatureFlags = {
 	directorNotes: false,
 	unifiedInbox: false,
-	tabDescription: true,
+	tabDescription: false,
 };
 
 export const DEFAULT_DIRECTOR_NOTES_SETTINGS: DirectorNotesSettings = {

From 24e5528d6f340a4a7a01ac006eebc7d751210f87 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:21:54 -0300
Subject: [PATCH 16/43] MAESTRO: replace setTimeout focus hack with double rAF
 in FocusModeView

The reply input auto-focus in FocusModeView used a setTimeout(60ms) fallback
alongside requestAnimationFrame. Replaced with double requestAnimationFrame
which reliably fires after browser paint without arbitrary timing delays.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../components/AgentInbox/FocusModeView.tsx    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index ea0116c2b..e15640a39 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -732,18 +732,18 @@ export default function FocusModeView({
 	const [replyText, setReplyText] = useState('');
 	const replyInputRef = useRef<HTMLTextAreaElement>(null);
 
-	// Auto-focus reply input when entering focus mode or switching items
+	// Auto-focus reply input when entering focus mode or switching items.
+	// Double rAF ensures focus fires after the browser paints the new item.
 	useEffect(() => {
-		const rafId = requestAnimationFrame(() => {
-			replyInputRef.current?.focus();
+		let innerRafId: number | undefined;
+		const outerRafId = requestAnimationFrame(() => {
+			innerRafId = requestAnimationFrame(() => {
+				replyInputRef.current?.focus();
+			});
 		});
-		// Fallback for heavy render frames where the first focus attempt loses timing.
-		const timeoutId = window.setTimeout(() => {
-			replyInputRef.current?.focus();
-		}, 60);
 		return () => {
-			cancelAnimationFrame(rafId);
-			window.clearTimeout(timeoutId);
+			cancelAnimationFrame(outerRafId);
+			if (innerRafId !== undefined) cancelAnimationFrame(innerRafId);
 		};
 	}, [item.sessionId, item.tabId]);
 

From 3dae036bf63c6a7bb56b1d09f77f3f59c672c0e5 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:26:29 -0300
Subject: [PATCH 17/43] MAESTRO: add Unified Inbox toggle with ARIA in
 SettingsModal Encore section

Adds role="switch" and aria-checked for accessibility compliance.
Follows existing Director's Notes toggle pattern.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/SettingsModal.tsx | 70 +++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/src/renderer/components/SettingsModal.tsx b/src/renderer/components/SettingsModal.tsx
index e67f7b9ea..6afd2ceba 100644
--- a/src/renderer/components/SettingsModal.tsx
+++ b/src/renderer/components/SettingsModal.tsx
@@ -37,6 +37,7 @@ import {
 	Clapperboard,
 	HelpCircle,
 	AppWindow,
+	Inbox,
 } from 'lucide-react';
 import { useSettings } from '../hooks';
 import type {
@@ -3638,6 +3639,75 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
 										);
 									})()}
 							</div>
+
+							{/* Unified Inbox Feature Section */}
+							<div
+								className="rounded-lg border"
+								style={{
+									borderColor: encoreFeatures.unifiedInbox
+										? theme.colors.accent
+										: theme.colors.border,
+									backgroundColor: encoreFeatures.unifiedInbox
+										? `${theme.colors.accent}08`
+										: 'transparent',
+								}}
+							>
+								<div className="w-full flex items-center justify-between p-4">
+									<div className="flex items-center gap-3">
+										<Inbox
+											className="w-5 h-5"
+											style={{
+												color: encoreFeatures.unifiedInbox
+													? theme.colors.accent
+													: theme.colors.textDim,
+											}}
+										/>
+										<div>
+											<div
+												className="text-sm font-bold flex items-center gap-2"
+												style={{ color: theme.colors.textMain }}
+											>
+												Unified Inbox
+												<span
+													className="px-1.5 py-0.5 rounded text-[9px] font-bold uppercase"
+													style={{
+														backgroundColor: theme.colors.warning + '30',
+														color: theme.colors.warning,
+													}}
+												>
+													Beta
+												</span>
+											</div>
+											<div className="text-xs mt-0.5" style={{ color: theme.colors.textDim }}>
+												Cross-agent inbox to triage and reply to all active conversations (Alt+I)
+											</div>
+										</div>
+									</div>
+									<button
+										role="switch"
+										aria-checked={encoreFeatures.unifiedInbox}
+										onClick={(e) => {
+											e.stopPropagation();
+											setEncoreFeatures({
+												...encoreFeatures,
+												unifiedInbox: !encoreFeatures.unifiedInbox,
+											});
+										}}
+										className="relative w-10 h-5 rounded-full transition-colors flex-shrink-0"
+										style={{
+											backgroundColor: encoreFeatures.unifiedInbox
+												? theme.colors.accent
+												: theme.colors.bgActivity,
+										}}
+									>
+										<span
+											className={`absolute left-0 top-0.5 w-4 h-4 rounded-full bg-white transition-transform ${
+												encoreFeatures.unifiedInbox ? 'translate-x-5' : 'translate-x-0.5'
+											}`}
+										/>
+									</button>
+								</div>
+							</div>
 						</div>
 					)}
 				</div>

From 0f4331476c93b1c8cf98cb7ac0847164d10cd069 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:38:29 -0300
Subject: [PATCH 18/43] MAESTRO: wire Unified Inbox into command palette
 (Cmd+K) with encore gating
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add onOpenAgentInbox prop through App.tsx → AppModals → QuickActionsModal
chain, gated behind encoreFeatures.unifiedInbox. The action calls the same
setAgentInboxOpen(true) used by the Alt+I keyboard shortcut, ensuring all
entry points share the same open/close state from modalStore.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/App.tsx                          |  1 +
 src/renderer/components/AppModals.tsx         | 11 +++++++++++
 src/renderer/components/QuickActionsModal.tsx | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 128277d9a..a2b8b19d4 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -3859,6 +3859,7 @@ function MaestroConsoleInner() {
 					onOpenDirectorNotes={
 						encoreFeatures.directorNotes ? () => setDirectorNotesOpen(true) : undefined
 					}
+					onOpenAgentInbox={encoreFeatures.unifiedInbox ? () => setAgentInboxOpen(true) : undefined}
 					autoScrollAiMode={autoScrollAiMode}
 					setAutoScrollAiMode={setAutoScrollAiMode}
 					tabSwitcherOpen={tabSwitcherOpen}
diff --git a/src/renderer/components/AppModals.tsx b/src/renderer/components/AppModals.tsx
index fb8de50c2..4866faa7e 100644
--- a/src/renderer/components/AppModals.tsx
+++ b/src/renderer/components/AppModals.tsx
@@ -859,6 +859,9 @@ export interface AppUtilityModalsProps {
 	// Director's Notes
 	onOpenDirectorNotes?: () => void;
 
+	// Unified Inbox
+	onOpenAgentInbox?: () => void;
+
 	// Auto-scroll
 	autoScrollAiMode?: boolean;
 	setAutoScrollAiMode?: (value: boolean) => void;
@@ -1060,6 +1063,8 @@ export const AppUtilityModals = memo(function AppUtilityModals({
 	onOpenSymphony,
 	// Director's Notes
 	onOpenDirectorNotes,
+	// Unified Inbox
+	onOpenAgentInbox,
 	// Auto-scroll
 	autoScrollAiMode,
 	setAutoScrollAiMode,
@@ -1218,6 +1223,7 @@ export const AppUtilityModals = memo(function AppUtilityModals({
 					onOpenLastDocumentGraph={onOpenLastDocumentGraph}
 					onOpenSymphony={onOpenSymphony}
 					onOpenDirectorNotes={onOpenDirectorNotes}
+					onOpenAgentInbox={onOpenAgentInbox}
 					autoScrollAiMode={autoScrollAiMode}
 					setAutoScrollAiMode={setAutoScrollAiMode}
 				/>
@@ -2013,6 +2019,8 @@ export interface AppModalsProps {
 	onOpenSymphony?: () => void;
 	// Director's Notes
 	onOpenDirectorNotes?: () => void;
+	// Unified Inbox
+	onOpenAgentInbox?: () => void;
 	// Auto-scroll
 	autoScrollAiMode?: boolean;
 	setAutoScrollAiMode?: (value: boolean) => void;
@@ -2337,6 +2345,8 @@ export const AppModals = memo(function AppModals(props: AppModalsProps) {
 		onOpenSymphony,
 		// Director's Notes
 		onOpenDirectorNotes,
+		// Unified Inbox
+		onOpenAgentInbox,
 		// Auto-scroll
 		autoScrollAiMode,
 		setAutoScrollAiMode,
@@ -2651,6 +2661,7 @@ export const AppModals = memo(function AppModals(props: AppModalsProps) {
 				onOpenMarketplace={onOpenMarketplace}
 				onOpenSymphony={onOpenSymphony}
 				onOpenDirectorNotes={onOpenDirectorNotes}
+				onOpenAgentInbox={onOpenAgentInbox}
 				autoScrollAiMode={autoScrollAiMode}
 				setAutoScrollAiMode={setAutoScrollAiMode}
 				tabSwitcherOpen={tabSwitcherOpen}
diff --git a/src/renderer/components/QuickActionsModal.tsx b/src/renderer/components/QuickActionsModal.tsx
index 144c8e229..504552600 100644
--- a/src/renderer/components/QuickActionsModal.tsx
+++ b/src/renderer/components/QuickActionsModal.tsx
@@ -117,6 +117,8 @@ interface QuickActionsModalProps {
 	onOpenSymphony?: () => void;
 	// Director's Notes
 	onOpenDirectorNotes?: () => void;
+	// Unified Inbox
+	onOpenAgentInbox?: () => void;
 	// Auto-scroll
 	autoScrollAiMode?: boolean;
 	setAutoScrollAiMode?: (value: boolean) => void;
@@ -204,6 +206,7 @@ export const QuickActionsModal = memo(function QuickActionsModal(props: QuickAct
 		onOpenLastDocumentGraph,
 		onOpenSymphony,
 		onOpenDirectorNotes,
+		onOpenAgentInbox,
 		autoScrollAiMode,
 		setAutoScrollAiMode,
 	} = props;
@@ -1034,6 +1037,21 @@ export const QuickActionsModal = memo(function QuickActionsModal(props: QuickAct
 					},
 				]
 			: []),
+		// Unified Inbox - centralized agent conversations
+		...(onOpenAgentInbox
+			? [
+					{
+						id: 'agentInbox',
+						label: 'Unified Inbox',
+						shortcut: shortcuts.agentInbox,
+						subtext: 'Centralized view of all agent conversations with Focus Mode',
+						action: () => {
+							onOpenAgentInbox();
+							setQuickActionOpen(false);
+						},
+					},
+				]
+			: []),
 		// Auto-scroll toggle
 		...(setAutoScrollAiMode
 			? [

From efb0f9f80fdebf3cc7bcc355fac5491a6bb0713d Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:44:27 -0300
Subject: [PATCH 19/43] MAESTRO: add useAgentInbox hook tests (filter, sort,
 truncation, timestamp)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

26 tests covering:
- Filter logic: all/unread/read/starred modes
- Sort logic: newest/oldest/grouped/byAgent modes
- Summary truncation at MAX_MESSAGE_LENGTH (90 chars)
- Timestamp fallback chain: log → createdAt → Date.now()
- Exported utilities: truncate() and generateSmartSummary()

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../renderer/hooks/useAgentInbox.test.ts      | 384 ++++++++++++++++++
 1 file changed, 384 insertions(+)
 create mode 100644 src/__tests__/renderer/hooks/useAgentInbox.test.ts

diff --git a/src/__tests__/renderer/hooks/useAgentInbox.test.ts b/src/__tests__/renderer/hooks/useAgentInbox.test.ts
new file mode 100644
index 000000000..c0dbf2ffe
--- /dev/null
+++ b/src/__tests__/renderer/hooks/useAgentInbox.test.ts
@@ -0,0 +1,384 @@
+import { describe, it, expect } from 'vitest';
+import { renderHook } from '@testing-library/react';
+import {
+	useAgentInbox,
+	truncate,
+	generateSmartSummary,
+} from '../../../renderer/hooks/useAgentInbox';
+import type { Session, Group } from '../../../renderer/types';
+import type { InboxFilterMode, InboxSortMode } from '../../../renderer/types/agent-inbox';
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+/** Minimal AITab factory. Fields not relevant to inbox are given sensible defaults. */
+const makeTab = (overrides: Record<string, unknown> = {}) => ({
+	id: `tab-${Math.random().toString(36).slice(2, 8)}`,
+	agentSessionId: null,
+	name: null,
+	starred: false,
+	logs: [],
+	inputValue: '',
+	stagedImages: [],
+	createdAt: 1000,
+	state: 'idle' as const,
+	hasUnread: false,
+	...overrides,
+});
+
+/** Minimal Session factory. Only fields consumed by useAgentInbox need real values. */
+const makeSession = (overrides: Partial<Session> = {}): Session =>
+	({
+		id: `s-${Math.random().toString(36).slice(2, 8)}`,
+		name: 'Agent A',
+		toolType: 'claude-code',
+		state: 'idle',
+		cwd: '/test',
+		fullPath: '/test',
+		projectRoot: '/test',
+		port: 0,
+		aiPid: 0,
+		terminalPid: 0,
+		inputMode: 'ai',
+		aiTabs: [makeTab()],
+		activeTabId: 'default-tab',
+		closedTabHistory: [],
+		aiLogs: [],
+		shellLogs: [],
+		workLog: [],
+		executionQueue: [],
+		contextUsage: 0,
+		isGitRepo: false,
+		changedFiles: [],
+		fileTree: [],
+		fileExplorerExpanded: [],
+		fileExplorerScrollPos: 0,
+		isLive: false,
+		...overrides,
+	}) as unknown as Session;
+
+const makeGroup = (overrides: Partial<Group> = {}): Group => ({
+	id: `g-${Math.random().toString(36).slice(2, 8)}`,
+	name: 'Group',
+	emoji: '',
+	collapsed: false,
+	...overrides,
+});
+
+// ---------------------------------------------------------------------------
+// truncate()
+// ---------------------------------------------------------------------------
+
+describe('truncate', () => {
+	it('returns short text unchanged', () => {
+		expect(truncate('hello')).toBe('hello');
+	});
+
+	it('returns text exactly at MAX_MESSAGE_LENGTH unchanged', () => {
+		const text = 'a'.repeat(90);
+		expect(truncate(text)).toBe(text);
+	});
+
+	it('truncates text longer than 90 chars with ellipsis', () => {
+		const text = 'a'.repeat(100);
+		const result = truncate(text);
+		expect(result.length).toBe(90);
+		expect(result.endsWith('...')).toBe(true);
+		// 90 - 3 (ellipsis) = 87 'a' chars
+		expect(result).toBe('a'.repeat(87) + '...');
+	});
+});
+
+// ---------------------------------------------------------------------------
+// generateSmartSummary()
+// ---------------------------------------------------------------------------
+
+describe('generateSmartSummary', () => {
+	it('returns default message for empty logs', () => {
+		expect(generateSmartSummary([], 'idle')).toBe('No activity yet');
+	});
+
+	it('returns default message for undefined logs', () => {
+		expect(generateSmartSummary(undefined, 'idle')).toBe('No activity yet');
+	});
+
+	it('prefixes with "Waiting:" when session is waiting_input', () => {
+		const logs = [
+			{ id: '1', timestamp: 1000, source: 'ai' as const, text: 'What should I do next?' },
+		];
+		const result = generateSmartSummary(logs, 'waiting_input');
+		expect(result.startsWith('Waiting: ')).toBe(true);
+		expect(result).toContain('What should I do next?');
+	});
+
+	it('shows question directly when AI message ends with "?"', () => {
+		const logs = [{ id: '1', timestamp: 1000, source: 'ai' as const, text: 'Shall I proceed?' }];
+		const result = generateSmartSummary(logs, 'idle');
+		expect(result).toBe('Shall I proceed?');
+	});
+
+	it('prefixes with "Done:" for AI statement', () => {
+		const logs = [
+			{ id: '1', timestamp: 1000, source: 'ai' as const, text: 'Refactored the module.' },
+		];
+		const result = generateSmartSummary(logs, 'idle');
+		expect(result).toBe('Done: Refactored the module.');
+	});
+
+	it('falls back to last log text when no AI source found', () => {
+		const logs = [
+			{ id: '1', timestamp: 1000, source: 'user' as const, text: 'Fix the bug please' },
+		];
+		const result = generateSmartSummary(logs, 'idle');
+		expect(result).toBe('Fix the bug please');
+	});
+
+	it('truncates long summaries', () => {
+		const longText = 'A'.repeat(200);
+		const logs = [{ id: '1', timestamp: 1000, source: 'ai' as const, text: longText }];
+		const result = generateSmartSummary(logs, 'idle');
+		expect(result.length).toBe(90);
+		expect(result.endsWith('...')).toBe(true);
+	});
+});
+
+// ---------------------------------------------------------------------------
+// useAgentInbox — Filter Logic
+// ---------------------------------------------------------------------------
+
+describe('useAgentInbox — filter logic', () => {
+	it('filter "all" returns every tab from every session', () => {
+		const tab1 = makeTab({ id: 't1', hasUnread: true });
+		const tab2 = makeTab({ id: 't2', hasUnread: false });
+		const session = makeSession({ id: 's1', aiTabs: [tab1, tab2] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'newest'));
+		expect(result.current).toHaveLength(2);
+	});
+
+	it('filter "unread" returns only unread items', () => {
+		const tab1 = makeTab({ id: 't1', hasUnread: true });
+		const tab2 = makeTab({ id: 't2', hasUnread: false });
+		const session = makeSession({ id: 's1', aiTabs: [tab1, tab2] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'unread', 'newest'));
+		expect(result.current).toHaveLength(1);
+		expect(result.current[0].tabId).toBe('t1');
+		expect(result.current[0].hasUnread).toBe(true);
+	});
+
+	it('filter "read" returns only non-unread items', () => {
+		const tab1 = makeTab({ id: 't1', hasUnread: true });
+		const tab2 = makeTab({ id: 't2', hasUnread: false });
+		const session = makeSession({ id: 's1', aiTabs: [tab1, tab2] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'read', 'newest'));
+		expect(result.current).toHaveLength(1);
+		expect(result.current[0].tabId).toBe('t2');
+		expect(result.current[0].hasUnread).toBe(false);
+	});
+
+	it('filter "starred" returns only starred items', () => {
+		const tab1 = makeTab({ id: 't1', starred: true });
+		const tab2 = makeTab({ id: 't2', starred: false });
+		const session = makeSession({ id: 's1', aiTabs: [tab1, tab2] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'starred', 'newest'));
+		expect(result.current).toHaveLength(1);
+		expect(result.current[0].tabId).toBe('t1');
+		expect(result.current[0].starred).toBe(true);
+	});
+
+	it('skips sessions with falsy id', () => {
+		const session = makeSession({ id: '', aiTabs: [makeTab({ hasUnread: true })] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'newest'));
+		expect(result.current).toHaveLength(0);
+	});
+});
+
+// ---------------------------------------------------------------------------
+// useAgentInbox — Sort Logic
+// ---------------------------------------------------------------------------
+
+describe('useAgentInbox — sort logic', () => {
+	const now = Date.now();
+
+	it('sort "newest" orders by timestamp descending', () => {
+		const tab1 = makeTab({
+			id: 't1',
+			logs: [{ id: '1', timestamp: now - 1000, source: 'ai', text: 'a' }],
+		});
+		const tab2 = makeTab({
+			id: 't2',
+			logs: [{ id: '2', timestamp: now, source: 'ai', text: 'b' }],
+		});
+		const session = makeSession({ id: 's1', aiTabs: [tab1, tab2] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'newest'));
+		expect(result.current[0].tabId).toBe('t2');
+		expect(result.current[1].tabId).toBe('t1');
+	});
+
+	it('sort "oldest" orders by timestamp ascending', () => {
+		const tab1 = makeTab({
+			id: 't1',
+			logs: [{ id: '1', timestamp: now - 1000, source: 'ai', text: 'a' }],
+		});
+		const tab2 = makeTab({
+			id: 't2',
+			logs: [{ id: '2', timestamp: now, source: 'ai', text: 'b' }],
+		});
+		const session = makeSession({ id: 's1', aiTabs: [tab1, tab2] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'oldest'));
+		expect(result.current[0].tabId).toBe('t1');
+		expect(result.current[1].tabId).toBe('t2');
+	});
+
+	it('sort "grouped" groups by groupName then by timestamp within group', () => {
+		const groupA = makeGroup({ id: 'gA', name: 'Alpha' });
+		const groupB = makeGroup({ id: 'gB', name: 'Beta' });
+
+		const tab1 = makeTab({
+			id: 't1',
+			logs: [{ id: '1', timestamp: now - 2000, source: 'ai', text: 'a' }],
+		});
+		const tab2 = makeTab({
+			id: 't2',
+			logs: [{ id: '2', timestamp: now, source: 'ai', text: 'b' }],
+		});
+		const tab3 = makeTab({
+			id: 't3',
+			logs: [{ id: '3', timestamp: now - 1000, source: 'ai', text: 'c' }],
+		});
+
+		const sessionAlpha = makeSession({ id: 's1', name: 'S1', groupId: 'gA', aiTabs: [tab1] });
+		const sessionBeta1 = makeSession({ id: 's2', name: 'S2', groupId: 'gB', aiTabs: [tab2] });
+		const sessionBeta2 = makeSession({ id: 's3', name: 'S3', groupId: 'gB', aiTabs: [tab3] });
+
+		const { result } = renderHook(() =>
+			useAgentInbox([sessionAlpha, sessionBeta1, sessionBeta2], [groupA, groupB], 'all', 'grouped')
+		);
+
+		// Alpha group first, then Beta
+		expect(result.current[0].groupName).toBe('Alpha');
+		// Beta items sorted by newest first within group
+		expect(result.current[1].groupName).toBe('Beta');
+		expect(result.current[1].tabId).toBe('t2'); // newer
+		expect(result.current[2].groupName).toBe('Beta');
+		expect(result.current[2].tabId).toBe('t3'); // older
+	});
+
+	it('sort "grouped" puts ungrouped items last', () => {
+		const groupA = makeGroup({ id: 'gA', name: 'Alpha' });
+		const tabGrouped = makeTab({ id: 't1' });
+		const tabUngrouped = makeTab({ id: 't2' });
+
+		const s1 = makeSession({ id: 's1', groupId: 'gA', aiTabs: [tabGrouped] });
+		const s2 = makeSession({ id: 's2', aiTabs: [tabUngrouped] });
+
+		const { result } = renderHook(() => useAgentInbox([s1, s2], [groupA], 'all', 'grouped'));
+
+		expect(result.current[0].groupName).toBe('Alpha');
+		expect(result.current[1].groupName).toBeUndefined();
+	});
+
+	it('sort "byAgent" groups by sessionId, not sessionName', () => {
+		// Two sessions with same name but different IDs
+		const tab1 = makeTab({ id: 't1', hasUnread: true });
+		const tab2 = makeTab({ id: 't2', hasUnread: false });
+		const s1 = makeSession({ id: 'agent-aaa', name: 'Same Name', aiTabs: [tab1] });
+		const s2 = makeSession({ id: 'agent-bbb', name: 'Same Name', aiTabs: [tab2] });
+
+		const { result } = renderHook(() => useAgentInbox([s1, s2], [], 'all', 'byAgent'));
+
+		// agent-aaa has unread (1) so it should come first
+		expect(result.current[0].sessionId).toBe('agent-aaa');
+		expect(result.current[1].sessionId).toBe('agent-bbb');
+	});
+
+	it('sort "byAgent" puts agents with unreads first', () => {
+		const tabUnread = makeTab({ id: 't1', hasUnread: true });
+		const tabRead = makeTab({ id: 't2', hasUnread: false });
+		const sNoUnread = makeSession({ id: 'agent-zzz', name: 'Alpha', aiTabs: [tabRead] });
+		const sWithUnread = makeSession({ id: 'agent-aaa', name: 'Zulu', aiTabs: [tabUnread] });
+
+		const { result } = renderHook(() =>
+			useAgentInbox([sNoUnread, sWithUnread], [], 'all', 'byAgent')
+		);
+
+		// Agent with unread comes first regardless of alphabetical name
+		expect(result.current[0].sessionId).toBe('agent-aaa');
+		expect(result.current[1].sessionId).toBe('agent-zzz');
+	});
+});
+
+// ---------------------------------------------------------------------------
+// useAgentInbox — Summary Truncation
+// ---------------------------------------------------------------------------
+
+describe('useAgentInbox — summary truncation', () => {
+	it('truncates lastMessage to 90 characters', () => {
+		const longMessage = 'X'.repeat(200);
+		const tab = makeTab({
+			id: 't1',
+			logs: [{ id: '1', timestamp: 1000, source: 'ai', text: longMessage }],
+		});
+		const session = makeSession({ id: 's1', aiTabs: [tab] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'newest'));
+		expect(result.current[0].lastMessage.length).toBe(90);
+		expect(result.current[0].lastMessage.endsWith('...')).toBe(true);
+	});
+});
+
+// ---------------------------------------------------------------------------
+// useAgentInbox — Timestamp Fallback
+// ---------------------------------------------------------------------------
+
+describe('useAgentInbox — timestamp fallback', () => {
+	it('uses last log timestamp when available', () => {
+		const tab = makeTab({
+			id: 't1',
+			logs: [{ id: '1', timestamp: 42000, source: 'ai', text: 'hi' }],
+		});
+		const session = makeSession({ id: 's1', aiTabs: [tab] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'newest'));
+		expect(result.current[0].timestamp).toBe(42000);
+	});
+
+	it('falls back to tab createdAt when logs are empty', () => {
+		const tab = makeTab({ id: 't1', logs: [], createdAt: 99000 });
+		const session = makeSession({ id: 's1', aiTabs: [tab] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'newest'));
+		expect(result.current[0].timestamp).toBe(99000);
+	});
+
+	it('falls back to Date.now() when log timestamp and createdAt are invalid', () => {
+		const before = Date.now();
+		const tab = makeTab({ id: 't1', logs: [], createdAt: 0 });
+		const session = makeSession({ id: 's1', aiTabs: [tab] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'newest'));
+		const after = Date.now();
+
+		expect(result.current[0].timestamp).toBeGreaterThanOrEqual(before);
+		expect(result.current[0].timestamp).toBeLessThanOrEqual(after);
+	});
+
+	it('skips non-finite log timestamps and falls back', () => {
+		const tab = makeTab({
+			id: 't1',
+			logs: [{ id: '1', timestamp: NaN, source: 'ai', text: 'hi' }],
+			createdAt: 55000,
+		});
+		const session = makeSession({ id: 's1', aiTabs: [tab] });
+
+		const { result } = renderHook(() => useAgentInbox([session], [], 'all', 'newest'));
+		expect(result.current[0].timestamp).toBe(55000);
+	});
+});

From 01888d9e46a4c38138d7a3f49ff68ec92092dac3 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:51:02 -0300
Subject: [PATCH 20/43] MAESTRO: add AgentInbox component tests (render,
 filters, keyboard, focus mode)

18 tests across 6 describe blocks covering:
- List mode rendering with ARIA attributes
- Filter segmented control (All/Unread/Read/Starred)
- Keyboard navigation (ArrowUp/Down, Enter to navigate)
- Escape/close behavior (overlay click, close button)
- Focus mode entry (F key, double-click) and exit (Escape, Backspace)
- Reply textarea presence in focus mode

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../components/AgentInbox/AgentInbox.test.tsx | 511 ++++++++++++++++++
 1 file changed, 511 insertions(+)
 create mode 100644 src/__tests__/renderer/components/AgentInbox/AgentInbox.test.tsx

diff --git a/src/__tests__/renderer/components/AgentInbox/AgentInbox.test.tsx b/src/__tests__/renderer/components/AgentInbox/AgentInbox.test.tsx
new file mode 100644
index 000000000..c830ac91c
--- /dev/null
+++ b/src/__tests__/renderer/components/AgentInbox/AgentInbox.test.tsx
@@ -0,0 +1,511 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { render, screen, fireEvent, within, act } from '@testing-library/react';
+import type { Theme, Session, Group } from '../../../../renderer/types';
+import type { InboxItem } from '../../../../renderer/types/agent-inbox';
+
+// ---------------------------------------------------------------------------
+// Mocks — must be declared before component imports
+// ---------------------------------------------------------------------------
+
+vi.mock('../../../../renderer/contexts/LayerStackContext', () => ({
+	useLayerStack: () => ({
+		registerLayer: vi.fn(() => 'layer-inbox'),
+		unregisterLayer: vi.fn(),
+		updateLayerHandler: vi.fn(),
+	}),
+}));
+
+vi.mock('../../../../renderer/constants/modalPriorities', () => ({
+	MODAL_PRIORITIES: { AGENT_INBOX: 555 },
+}));
+
+const mockUpdateAgentInboxData = vi.fn();
+vi.mock('../../../../renderer/stores/modalStore', () => ({
+	useModalStore: vi.fn(() => null),
+	selectModalData: vi.fn(() => () => null),
+	getModalActions: () => ({
+		updateAgentInboxData: mockUpdateAgentInboxData,
+	}),
+}));
+
+vi.mock('../../../../renderer/utils/formatters', () => ({
+	formatRelativeTime: vi.fn(() => '2m ago'),
+}));
+
+vi.mock('../../../../renderer/utils/shortcutFormatter', () => ({
+	formatShortcutKeys: vi.fn((keys: string[]) => keys.join('+')),
+	isMacOS: vi.fn(() => false),
+}));
+
+vi.mock('../../../../renderer/utils/markdownConfig', () => ({
+	generateTerminalProseStyles: vi.fn(() => ''),
+}));
+
+// Mock MarkdownRenderer used in FocusModeView (named export)
+vi.mock('../../../../renderer/components/MarkdownRenderer', () => ({
+	MarkdownRenderer: ({ content }: { content: string }) => (
+		<span data-testid="markdown">{content}</span>
+	),
+}));
+
+// Mock @tanstack/react-virtual — return virtual items matching the item count
+vi.mock('@tanstack/react-virtual', () => ({
+	useVirtualizer: (opts: { count: number }) => ({
+		getVirtualItems: () =>
+			Array.from({ length: Math.min(opts.count, 50) }, (_, i) => ({
+				index: i,
+				start: i * 132,
+				size: 132,
+				key: `virtual-${i}`,
+			})),
+		getTotalSize: () => opts.count * 132,
+		scrollToIndex: vi.fn(),
+		measureElement: vi.fn(),
+	}),
+}));
+
+// ---------------------------------------------------------------------------
+// Import component AFTER mocks
+// ---------------------------------------------------------------------------
+import AgentInbox from '../../../../renderer/components/AgentInbox';
+
+// ---------------------------------------------------------------------------
+// Factories
+// ---------------------------------------------------------------------------
+
+const mockTheme: Theme = {
+	id: 'dark',
+	name: 'Dark',
+	mode: 'dark',
+	colors: {
+		bgMain: '#1a1a2e',
+		bgSidebar: '#16213e',
+		bgActivity: '#0f3460',
+		bgTerminal: '#1a1a2e',
+		textMain: '#eaeaea',
+		textDim: '#888',
+		accent: '#e94560',
+		accentForeground: '#ffffff',
+		error: '#ff6b6b',
+		border: '#333',
+		success: '#4ecdc4',
+		warning: '#ffd93d',
+		terminalCursor: '#e94560',
+	},
+};
+
+const makeTab = (overrides: Record<string, unknown> = {}) => ({
+	id: `tab-${Math.random().toString(36).slice(2, 8)}`,
+	agentSessionId: null,
+	name: null,
+	starred: false,
+	logs: [{ id: 'log-1', timestamp: Date.now(), source: 'ai' as const, text: 'Hello world' }],
+	inputValue: '',
+	stagedImages: [],
+	createdAt: 1000,
+	state: 'idle' as const,
+	hasUnread: true,
+	...overrides,
+});
+
+const makeSession = (overrides: Partial<Session> = {}): Session =>
+	({
+		id: `s-${Math.random().toString(36).slice(2, 8)}`,
+		name: 'Agent Alpha',
+		toolType: 'claude-code',
+		state: 'idle',
+		cwd: '/test',
+		fullPath: '/test',
+		projectRoot: '/test',
+		port: 0,
+		aiPid: 0,
+		terminalPid: 0,
+		inputMode: 'ai',
+		aiTabs: [makeTab()],
+		activeTabId: 'default-tab',
+		closedTabHistory: [],
+		aiLogs: [],
+		shellLogs: [],
+		workLog: [],
+		executionQueue: [],
+		contextUsage: 0,
+		isGitRepo: false,
+		changedFiles: [],
+		fileTree: [],
+		fileExplorerExpanded: [],
+		fileExplorerScrollPos: 0,
+		isLive: false,
+		...overrides,
+	}) as unknown as Session;
+
+const makeGroup = (overrides: Partial<Group> = {}): Group => ({
+	id: `g-${Math.random().toString(36).slice(2, 8)}`,
+	name: 'Group',
+	emoji: '',
+	collapsed: false,
+	...overrides,
+});
+
+// Default props factory
+const createDefaultProps = (overrides: Record<string, unknown> = {}) => ({
+	theme: mockTheme,
+	sessions: [] as Session[],
+	groups: [] as Group[],
+	onClose: vi.fn(),
+	onNavigateToSession: vi.fn(),
+	onQuickReply: vi.fn(),
+	onOpenAndReply: vi.fn(),
+	onMarkAsRead: vi.fn(),
+	onToggleThinking: vi.fn(),
+	...overrides,
+});
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe('AgentInbox', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+		// Mock requestAnimationFrame for auto-focus
+		vi.spyOn(window, 'requestAnimationFrame').mockImplementation((cb) => {
+			cb(0);
+			return 0;
+		});
+		vi.spyOn(window, 'cancelAnimationFrame').mockImplementation(() => {});
+	});
+
+	afterEach(() => {
+		vi.restoreAllMocks();
+	});
+
+	// ====================================================================
+	// 1. List mode renders inbox items
+	// ====================================================================
+
+	describe('list mode rendering', () => {
+		it('renders the dialog with correct ARIA attributes', () => {
+			const props = createDefaultProps();
+			render(<AgentInbox {...props} />);
+
+			const dialog = screen.getByRole('dialog');
+			expect(dialog).toBeInTheDocument();
+			expect(dialog).toHaveAttribute('aria-modal', 'true');
+			expect(dialog).toHaveAttribute('aria-label', 'Unified Inbox');
+		});
+
+		it('renders inbox items from sessions', () => {
+			const tab1 = makeTab({ id: 't1', hasUnread: true });
+			const tab2 = makeTab({ id: 't2', hasUnread: true });
+			const s1 = makeSession({ id: 's1', name: 'Agent One', aiTabs: [tab1] });
+			const s2 = makeSession({ id: 's2', name: 'Agent Two', aiTabs: [tab2] });
+
+			const props = createDefaultProps({ sessions: [s1, s2] });
+			render(<AgentInbox {...props} />);
+
+			// Items render with role="option"
+			const options = screen.getAllByRole('option');
+			expect(options.length).toBeGreaterThanOrEqual(2);
+		});
+
+		it('renders empty state when no sessions match filter', () => {
+			const tab = makeTab({ id: 't1', hasUnread: false });
+			const session = makeSession({ id: 's1', aiTabs: [tab] });
+
+			// Default filter is 'unread' — a session with no unread tabs shows empty
+			const props = createDefaultProps({ sessions: [session] });
+			render(<AgentInbox {...props} />);
+
+			const emptyState = screen.getByTestId('inbox-empty-state');
+			expect(emptyState).toBeInTheDocument();
+		});
+
+		it('renders session names in item cards', () => {
+			const tab = makeTab({ id: 't1', hasUnread: true });
+			const session = makeSession({ id: 's1', name: 'Claude Worker', aiTabs: [tab] });
+
+			const props = createDefaultProps({ sessions: [session] });
+			render(<AgentInbox {...props} />);
+
+			expect(screen.getByText('Claude Worker')).toBeInTheDocument();
+		});
+	});
+
+	// ====================================================================
+	// 2. Filter pills change visible items
+	// ====================================================================
+
+	describe('filter pills', () => {
+		it('renders filter segmented control with All/Unread/Read/Starred options', () => {
+			const props = createDefaultProps();
+			render(<AgentInbox {...props} />);
+
+			const filterControl = screen.getByLabelText('Filter agents');
+			expect(within(filterControl).getByText('All')).toBeInTheDocument();
+			expect(within(filterControl).getByText('Unread')).toBeInTheDocument();
+			expect(within(filterControl).getByText('Read')).toBeInTheDocument();
+			expect(within(filterControl).getByText('Starred')).toBeInTheDocument();
+		});
+
+		it('clicking "All" filter shows all items (unread + read)', () => {
+			const tabUnread = makeTab({ id: 't1', hasUnread: true });
+			const tabRead = makeTab({ id: 't2', hasUnread: false });
+			const s1 = makeSession({ id: 's1', name: 'Unread Agent', aiTabs: [tabUnread] });
+			const s2 = makeSession({ id: 's2', name: 'Read Agent', aiTabs: [tabRead] });
+
+			const props = createDefaultProps({ sessions: [s1, s2] });
+			render(<AgentInbox {...props} />);
+
+			// Default filter is 'unread' — only unread tab shows
+			const optionsBefore = screen.getAllByRole('option');
+			expect(optionsBefore).toHaveLength(1);
+
+			// Click 'All' filter (scoped to filter control)
+			const filterControl = screen.getByLabelText('Filter agents');
+			fireEvent.click(within(filterControl).getByText('All'));
+
+			// Now both should be visible
+			const optionsAfter = screen.getAllByRole('option');
+			expect(optionsAfter).toHaveLength(2);
+		});
+
+		it('clicking "Starred" filter shows only starred items', () => {
+			const tabStarred = makeTab({ id: 't1', hasUnread: true, starred: true });
+			const tabNormal = makeTab({ id: 't2', hasUnread: true, starred: false });
+			const s1 = makeSession({ id: 's1', name: 'Starred', aiTabs: [tabStarred] });
+			const s2 = makeSession({ id: 's2', name: 'Normal', aiTabs: [tabNormal] });
+
+			const props = createDefaultProps({ sessions: [s1, s2] });
+			render(<AgentInbox {...props} />);
+
+			// Click 'Starred' filter (scoped to filter control)
+			const filterControl = screen.getByLabelText('Filter agents');
+			fireEvent.click(within(filterControl).getByText('Starred'));
+
+			const options = screen.getAllByRole('option');
+			expect(options).toHaveLength(1);
+		});
+
+		it('clicking "Read" filter shows only non-unread items', () => {
+			const tabUnread = makeTab({ id: 't1', hasUnread: true });
+			const tabRead = makeTab({ id: 't2', hasUnread: false });
+			const session = makeSession({ id: 's1', aiTabs: [tabUnread, tabRead] });
+
+			const props = createDefaultProps({ sessions: [session] });
+			render(<AgentInbox {...props} />);
+
+			// Click 'Read' filter (scoped to filter control)
+			const filterControl = screen.getByLabelText('Filter agents');
+			fireEvent.click(within(filterControl).getByText('Read'));
+
+			const options = screen.getAllByRole('option');
+			expect(options).toHaveLength(1);
+		});
+	});
+
+	// ====================================================================
+	// 3. Keyboard navigation (up/down arrows, Enter to select)
+	// ====================================================================
+
+	describe('keyboard navigation', () => {
+		it('ArrowDown moves selection to next item', () => {
+			const tab1 = makeTab({ id: 't1', hasUnread: true });
+			const tab2 = makeTab({ id: 't2', hasUnread: true });
+			const s1 = makeSession({ id: 's1', name: 'First', aiTabs: [tab1] });
+			const s2 = makeSession({ id: 's2', name: 'Second', aiTabs: [tab2] });
+
+			const props = createDefaultProps({ sessions: [s1, s2] });
+			render(<AgentInbox {...props} />);
+
+			const listbox = screen.getByRole('listbox');
+
+			// First item should be selected initially
+			const optionsBefore = screen.getAllByRole('option');
+			expect(optionsBefore[0]).toHaveAttribute('aria-selected', 'true');
+
+			// Press ArrowDown on the listbox
+			fireEvent.keyDown(listbox, { key: 'ArrowDown' });
+
+			// Second item should now be selected
+			const optionsAfter = screen.getAllByRole('option');
+			expect(optionsAfter[1]).toHaveAttribute('aria-selected', 'true');
+		});
+
+		it('ArrowUp moves selection to previous item', () => {
+			const tab1 = makeTab({ id: 't1', hasUnread: true });
+			const tab2 = makeTab({ id: 't2', hasUnread: true });
+			const s1 = makeSession({ id: 's1', name: 'First', aiTabs: [tab1] });
+			const s2 = makeSession({ id: 's2', name: 'Second', aiTabs: [tab2] });
+
+			const props = createDefaultProps({ sessions: [s1, s2] });
+			render(<AgentInbox {...props} />);
+
+			const listbox = screen.getByRole('listbox');
+
+			// Move down first, then up
+			fireEvent.keyDown(listbox, { key: 'ArrowDown' });
+			fireEvent.keyDown(listbox, { key: 'ArrowUp' });
+
+			const options = screen.getAllByRole('option');
+			expect(options[0]).toHaveAttribute('aria-selected', 'true');
+		});
+
+		it('Enter on an item calls onNavigateToSession and onClose', () => {
+			const tab = makeTab({ id: 't1', hasUnread: true });
+			const session = makeSession({ id: 's1', name: 'Agent', aiTabs: [tab] });
+
+			const onNavigate = vi.fn();
+			const onClose = vi.fn();
+			const props = createDefaultProps({
+				sessions: [session],
+				onNavigateToSession: onNavigate,
+				onClose,
+			});
+			render(<AgentInbox {...props} />);
+
+			const listbox = screen.getByRole('listbox');
+			fireEvent.keyDown(listbox, { key: 'Enter' });
+
+			expect(onNavigate).toHaveBeenCalledWith('s1', 't1');
+			expect(onClose).toHaveBeenCalled();
+		});
+	});
+
+	// ====================================================================
+	// 4. Escape closes the modal
+	// ====================================================================
+
+	describe('Escape closes modal', () => {
+		it('clicking overlay background calls onClose', () => {
+			const onClose = vi.fn();
+			const props = createDefaultProps({ onClose });
+			render(<AgentInbox {...props} />);
+
+			// The overlay is the outermost div with modal-overlay class
+			const overlay = screen.getByRole('dialog').parentElement!;
+			fireEvent.click(overlay);
+
+			expect(onClose).toHaveBeenCalledTimes(1);
+		});
+
+		it('clicking close button calls onClose', () => {
+			const tab = makeTab({ id: 't1', hasUnread: true });
+			const session = makeSession({ id: 's1', aiTabs: [tab] });
+			const onClose = vi.fn();
+			const props = createDefaultProps({ sessions: [session], onClose });
+			render(<AgentInbox {...props} />);
+
+			// Close button has title="Close (Esc)"
+			const closeBtn = screen.getByTitle('Close (Esc)');
+			fireEvent.click(closeBtn);
+
+			expect(onClose).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	// ====================================================================
+	// 5. Focus mode entry (Enter or double-click)
+	// ====================================================================
+
+	describe('focus mode entry', () => {
+		it('pressing F enters focus mode', () => {
+			const tab = makeTab({ id: 't1', hasUnread: true });
+			const session = makeSession({ id: 's1', name: 'Agent', aiTabs: [tab] });
+
+			const props = createDefaultProps({ sessions: [session] });
+			render(<AgentInbox {...props} />);
+
+			const dialog = screen.getByRole('dialog');
+
+			// Press F on the dialog container to enter focus mode
+			fireEvent.keyDown(dialog, { key: 'f' });
+
+			// In focus mode, the listbox disappears and focus view renders
+			// We can detect focus mode by checking for the reply textarea
+			const textarea = screen.queryByLabelText('Reply to agent');
+			expect(textarea).toBeInTheDocument();
+		});
+
+		it('double-clicking an item enters focus mode', () => {
+			const tab = makeTab({ id: 't1', hasUnread: true });
+			const session = makeSession({ id: 's1', name: 'Agent', aiTabs: [tab] });
+
+			const props = createDefaultProps({ sessions: [session] });
+			render(<AgentInbox {...props} />);
+
+			// Double-click the first option
+			const option = screen.getByRole('option');
+			fireEvent.doubleClick(option);
+
+			// Should enter focus mode — reply textarea appears
+			const textarea = screen.queryByLabelText('Reply to agent');
+			expect(textarea).toBeInTheDocument();
+		});
+
+		it('Escape in focus mode returns to list mode', () => {
+			const tab = makeTab({ id: 't1', hasUnread: true });
+			const session = makeSession({ id: 's1', name: 'Agent', aiTabs: [tab] });
+
+			const props = createDefaultProps({ sessions: [session] });
+			render(<AgentInbox {...props} />);
+
+			const dialog = screen.getByRole('dialog');
+
+			// Enter focus mode
+			fireEvent.keyDown(dialog, { key: 'f' });
+			expect(screen.queryByLabelText('Reply to agent')).toBeInTheDocument();
+
+			// Press Escape — should go back to list mode, not close
+			fireEvent.keyDown(dialog, { key: 'Escape' });
+
+			// Listbox should be back
+			const listbox = screen.queryByRole('listbox');
+			expect(listbox).toBeInTheDocument();
+		});
+
+		it('Backspace in focus mode (not in textarea) returns to list mode', () => {
+			const tab = makeTab({ id: 't1', hasUnread: true });
+			const session = makeSession({ id: 's1', name: 'Agent', aiTabs: [tab] });
+
+			const props = createDefaultProps({ sessions: [session] });
+			render(<AgentInbox {...props} />);
+
+			const dialog = screen.getByRole('dialog');
+
+			// Enter focus mode
+			fireEvent.keyDown(dialog, { key: 'f' });
+			expect(screen.queryByLabelText('Reply to agent')).toBeInTheDocument();
+
+			// Focus the dialog container (not textarea) before pressing Backspace
+			dialog.focus();
+
+			// Press Backspace while dialog itself is focused (not textarea)
+			fireEvent.keyDown(dialog, { key: 'Backspace' });
+
+			// Should return to list mode
+			const listbox = screen.queryByRole('listbox');
+			expect(listbox).toBeInTheDocument();
+		});
+	});
+
+	// ====================================================================
+	// 6. Reply sends input to correct tab (simpler assertion)
+	// ====================================================================
+
+	describe('reply in focus mode', () => {
+		it('renders reply textarea in focus mode', () => {
+			const tab = makeTab({ id: 't1', hasUnread: true });
+			const session = makeSession({ id: 's1', name: 'Agent', aiTabs: [tab] });
+
+			const props = createDefaultProps({ sessions: [session] });
+			render(<AgentInbox {...props} />);
+
+			const dialog = screen.getByRole('dialog');
+			fireEvent.keyDown(dialog, { key: 'f' });
+
+			const textarea = screen.getByLabelText('Reply to agent');
+			expect(textarea).toBeInTheDocument();
+			expect(textarea.tagName).toBe('TEXTAREA');
+		});
+	});
+});

From ee926c208f329056236c57db4b61abc86df02ca4 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 11:54:57 -0300
Subject: [PATCH 21/43] MAESTRO: fix modalStore test to match new
 updateModalData behavior

updateModalData now stores data even on unopened modals (needed for
AgentInbox pattern). Updated test expectation accordingly.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/__tests__/renderer/stores/modalStore.test.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/__tests__/renderer/stores/modalStore.test.ts b/src/__tests__/renderer/stores/modalStore.test.ts
index b648e2b70..65a6b44b2 100644
--- a/src/__tests__/renderer/stores/modalStore.test.ts
+++ b/src/__tests__/renderer/stores/modalStore.test.ts
@@ -192,12 +192,13 @@ describe('modalStore', () => {
 			expect(data?.allowDelete).toBe(true);
 		});
 
-		it('does nothing for unopened modals', () => {
-			const { updateModalData, getData } = useModalStore.getState();
+		it('stores data even for unopened modals', () => {
+			const { updateModalData, getData, isOpen } = useModalStore.getState();
 
 			updateModalData('settings', { tab: 'general' });
 
-			expect(getData('settings')).toBeUndefined();
+			expect(getData('settings')).toEqual({ tab: 'general' });
+			expect(isOpen('settings')).toBe(false);
 		});
 
 		it('does not change open state', () => {

From 2c0b925da6fd2d9ddc52cf051a55e9699fa25427 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 12:18:59 -0300
Subject: [PATCH 22/43] MAESTRO: add Unified Inbox and Director's Notes
 shortcuts to docs

Added Alt+I (Unified Inbox) and Cmd+Shift+O (Director's Notes) to the
Global Shortcuts table in keyboard-shortcuts.md with footnote noting
Encore Feature requirement. Also added Unified Inbox to the Available
Features table in encore-features.md.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 docs/encore-features.md    | 9 ++++-----
 docs/keyboard-shortcuts.md | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/encore-features.md b/docs/encore-features.md
index 9b4928de7..81b7cfcb1 100644
--- a/docs/encore-features.md
+++ b/docs/encore-features.md
@@ -16,11 +16,10 @@ Open **Settings** (`Cmd+,` / `Ctrl+,`) and navigate to the **Encore Features** t
 
 ## Available Features
 
-| Feature                              | Shortcut                       | Description                                                     |
-| ------------------------------------ | ------------------------------ | --------------------------------------------------------------- |
-| [Director's Notes](./director-notes) | `Cmd+Shift+O` / `Ctrl+Shift+O` | Unified timeline of all agent activity with AI-powered synopses |
-
-More features will be added here as they ship.
+| Feature                              | Shortcut                       | Description                                                       |
+| ------------------------------------ | ------------------------------ | ----------------------------------------------------------------- |
+| [Director's Notes](./director-notes) | `Cmd+Shift+O` / `Ctrl+Shift+O` | Unified timeline of all agent activity with AI-powered synopses   |
+| Unified Inbox                        | `Opt+I` / `Alt+I`              | Cross-agent inbox to triage and reply to all active conversations |
 
 ## For Developers
 
diff --git a/docs/keyboard-shortcuts.md b/docs/keyboard-shortcuts.md
index 7dc5e6918..0333c1d9c 100644
--- a/docs/keyboard-shortcuts.md
+++ b/docs/keyboard-shortcuts.md
@@ -42,6 +42,10 @@ The command palette is your gateway to nearly every action in Maestro. Press `Cm
 | Maestro Symphony            | `Cmd+Shift+Y`         | `Ctrl+Shift+Y`         |
 | Cycle Focus Areas           | `Tab`                 | `Tab`                  |
 | Cycle Focus Backwards       | `Shift+Tab`           | `Shift+Tab`            |
+| Unified Inbox \*            | `Opt+I`               | `Alt+I`                |
+| Director's Notes \*         | `Cmd+Shift+O`         | `Ctrl+Shift+O`         |
+
+\* Requires the corresponding [Encore Feature](./encore-features) to be enabled in Settings.
 
 ## Panel Shortcuts
 

From 5a90acf5627d1bc2276b49cb04d8e7da13772955 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 13:43:15 -0300
Subject: [PATCH 23/43] fix: address CodeRabbit review findings for PR #476

- Fix resize handler stale closure via ref instead of sidebarWidth dep
- Simplify double rAF focus to single rAF
- Add runtime validation for filterMode/sortMode instead of unsafe cast
- Add aria-labels to nav buttons, close button, toggle controls, switches
- Call onMarkAsRead after quick-reply and open-and-reply actions
- Use groupId for sidebar grouping to prevent name-collision merges
- Fix sidebar ARIA: role=listbox container, role=separator for headers
- Make raw/markdown toggle keyboard-focusable with focus:opacity
- Exclude disabled buttons from Tab focus cycling in InboxListView
- Fix TabBar description Escape cancel being overridden by blur-save
- Reset textarea height on item switch in FocusModeView
- Guard against concurrent quick-reply race condition in App.tsx
- Pass enterToSendAI prop to AgentInbox for consistent reply behavior

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/App.tsx                          |   6 +-
 .../components/AgentInbox/FocusModeView.tsx   | 108 +++++++++---------
 .../components/AgentInbox/InboxListView.tsx   |   4 +-
 src/renderer/components/AgentInbox/index.tsx  |   5 +-
 src/renderer/components/SettingsModal.tsx     |   2 +
 src/renderer/components/TabBar.tsx            |   7 ++
 src/renderer/types/agent-inbox.ts             |  11 ++
 7 files changed, 86 insertions(+), 57 deletions(-)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index dd0c6aa12..396f5fa81 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -1427,6 +1427,9 @@ function MaestroConsoleInner() {
 	// Agent Inbox: Quick Reply — sends text to target session/tab via processInput
 	const handleAgentInboxQuickReply = useCallback(
 		(sessionId: string, tabId: string, text: string) => {
+			// Guard: ignore if a quick reply is already in progress
+			if (pendingInboxQuickReply) return;
+
 			// Save current active session so we can restore it after sending.
 			const previousActiveSessionId = activeSessionIdRef.current;
 
@@ -1452,7 +1455,7 @@ function MaestroConsoleInner() {
 			});
 			setActiveSessionId(sessionId);
 		},
-		[setSessions, setActiveSessionId, activeSessionIdRef]
+		[pendingInboxQuickReply, setSessions, setActiveSessionId, activeSessionIdRef]
 	);
 
 	// Agent Inbox: Open & Reply — navigates to session with pre-filled input
@@ -4266,6 +4269,7 @@ function MaestroConsoleInner() {
 							sessions={sessions}
 							groups={groups}
 							theme={theme}
+							enterToSendAI={enterToSendAI}
 							onClose={() => setAgentInboxOpen(false)}
 							onNavigateToSession={handleAgentInboxNavigateToSession}
 							onQuickReply={handleAgentInboxQuickReply}
diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index e15640a39..5b7044535 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -227,7 +227,8 @@ function FocusLogEntry({
 					<div className="flex justify-end">
 						<button
 							onClick={onToggleRaw}
-							className="p-1 rounded opacity-0 group-hover:opacity-50 hover:!opacity-100 transition-opacity"
+							aria-label={showRawMarkdown ? 'Show formatted' : 'Show plain text'}
+							className="p-1 rounded opacity-0 group-hover:opacity-50 focus:opacity-100 hover:!opacity-100 transition-opacity"
 							style={{ color: showRawMarkdown ? theme.colors.accent : theme.colors.textDim }}
 							title={showRawMarkdown ? 'Show formatted' : 'Show plain text'}
 						>
@@ -384,7 +385,7 @@ function FocusSidebar({
 		>();
 		const groupOrder: string[] = [];
 		items.forEach((itm, idx) => {
-			const groupKey = useGroupName ? (itm.groupName ?? 'Ungrouped') : itm.sessionId;
+			const groupKey = useGroupName ? (itm.groupId ?? itm.groupName ?? 'Ungrouped') : itm.sessionId;
 			const groupName = useGroupName ? (itm.groupName ?? 'Ungrouped') : itm.sessionName;
 			if (!groupMap.has(groupKey)) {
 				groupMap.set(groupKey, { groupName, items: [] });
@@ -424,7 +425,7 @@ function FocusSidebar({
 				</div>
 			)}
 			{/* Item list */}
-			<div className="flex-1 overflow-y-auto py-1">
+			<div role="listbox" aria-label="Inbox items" className="flex-1 overflow-y-auto py-1">
 				{(() => {
 					let activeGroup: string | null = null;
 					return rows.map((row, rowIdx) => {
@@ -434,8 +435,7 @@ function FocusSidebar({
 								<div
 									key={`header-${row.groupKey}-${rowIdx}`}
 									tabIndex={0}
-									role="option"
-									aria-selected={false}
+									role="separator"
 									onClick={() => {
 										setCollapsedGroups((prev) => {
 											const next = new Set(prev);
@@ -592,7 +592,7 @@ export default function FocusModeView({
 	onNavigateItem,
 	onQuickReply,
 	onOpenAndReply,
-	onMarkAsRead: _onMarkAsRead,
+	onMarkAsRead,
 	onToggleThinking,
 }: FocusModeViewProps) {
 	const statusColor = resolveStatusColor(item.state, theme);
@@ -600,6 +600,8 @@ export default function FocusModeView({
 
 	// ---- Resizable sidebar ----
 	const [sidebarWidth, setSidebarWidth] = useState(220);
+	const sidebarWidthRef = useRef(sidebarWidth);
+	sidebarWidthRef.current = sidebarWidth;
 	const isResizingRef = useRef(false);
 	const resizeCleanupRef = useRef<(() => void) | null>(null);
 
@@ -611,40 +613,39 @@ export default function FocusModeView({
 		};
 	}, []);
 
-	const handleResizeStart = useCallback(
-		(e: React.MouseEvent) => {
-			e.preventDefault();
-			isResizingRef.current = true;
-			const startX = e.clientX;
-			const startWidth = sidebarWidth;
-
-			const onMouseMove = (ev: MouseEvent) => {
-				if (!isResizingRef.current) return;
-				const newWidth = Math.max(160, Math.min(400, startWidth + (ev.clientX - startX)));
-				setSidebarWidth(newWidth);
-			};
-
-			const cleanup = () => {
-				isResizingRef.current = false;
-				document.removeEventListener('mousemove', onMouseMove);
-				document.removeEventListener('mouseup', onMouseUp);
-				document.body.style.cursor = '';
-				document.body.style.userSelect = '';
-				resizeCleanupRef.current = null;
-			};
-
-			const onMouseUp = () => {
-				cleanup();
-			};
-
-			resizeCleanupRef.current = cleanup;
-			document.addEventListener('mousemove', onMouseMove);
-			document.addEventListener('mouseup', onMouseUp);
-			document.body.style.cursor = 'col-resize';
-			document.body.style.userSelect = 'none';
-		},
-		[sidebarWidth]
-	);
+	const handleResizeStart = useCallback((e: React.MouseEvent) => {
+		e.preventDefault();
+		// Clean up any lingering listeners from rapid clicks
+		resizeCleanupRef.current?.();
+		isResizingRef.current = true;
+		const startX = e.clientX;
+		const startWidth = sidebarWidthRef.current;
+
+		const onMouseMove = (ev: MouseEvent) => {
+			if (!isResizingRef.current) return;
+			const newWidth = Math.max(160, Math.min(400, startWidth + (ev.clientX - startX)));
+			setSidebarWidth(newWidth);
+		};
+
+		const cleanup = () => {
+			isResizingRef.current = false;
+			document.removeEventListener('mousemove', onMouseMove);
+			document.removeEventListener('mouseup', onMouseUp);
+			document.body.style.cursor = '';
+			document.body.style.userSelect = '';
+			resizeCleanupRef.current = null;
+		};
+
+		const onMouseUp = () => {
+			cleanup();
+		};
+
+		resizeCleanupRef.current = cleanup;
+		document.addEventListener('mousemove', onMouseMove);
+		document.addEventListener('mouseup', onMouseUp);
+		document.body.style.cursor = 'col-resize';
+		document.body.style.userSelect = 'none';
+	}, []);
 	const contextColor = hasValidContext
 		? resolveContextUsageColor(item.contextUsage!, theme)
 		: undefined;
@@ -733,23 +734,19 @@ export default function FocusModeView({
 	const replyInputRef = useRef<HTMLTextAreaElement>(null);
 
 	// Auto-focus reply input when entering focus mode or switching items.
-	// Double rAF ensures focus fires after the browser paints the new item.
 	useEffect(() => {
-		let innerRafId: number | undefined;
-		const outerRafId = requestAnimationFrame(() => {
-			innerRafId = requestAnimationFrame(() => {
-				replyInputRef.current?.focus();
-			});
+		const rafId = requestAnimationFrame(() => {
+			replyInputRef.current?.focus();
 		});
-		return () => {
-			cancelAnimationFrame(outerRafId);
-			if (innerRafId !== undefined) cancelAnimationFrame(innerRafId);
-		};
+		return () => cancelAnimationFrame(rafId);
 	}, [item.sessionId, item.tabId]);
 
-	// Reset reply text when item changes (prev/next navigation)
+	// Reset reply text and textarea height when item changes (prev/next navigation)
 	useEffect(() => {
 		setReplyText('');
+		if (replyInputRef.current) {
+			replyInputRef.current.style.height = 'auto';
+		}
 	}, [item.sessionId, item.tabId]);
 
 	const handleQuickReply = useCallback(() => {
@@ -758,8 +755,9 @@ export default function FocusModeView({
 		if (onQuickReply) {
 			onQuickReply(item.sessionId, item.tabId, text);
 		}
+		onMarkAsRead?.(item.sessionId, item.tabId);
 		setReplyText('');
-	}, [replyText, item, onQuickReply]);
+	}, [replyText, item, onQuickReply, onMarkAsRead]);
 
 	const handleOpenAndReply = useCallback(() => {
 		const text = replyText.trim();
@@ -767,7 +765,8 @@ export default function FocusModeView({
 		if (onOpenAndReply) {
 			onOpenAndReply(item.sessionId, item.tabId, text);
 		}
-	}, [replyText, item, onOpenAndReply]);
+		onMarkAsRead?.(item.sessionId, item.tabId);
+	}, [replyText, item, onOpenAndReply, onMarkAsRead]);
 
 	// ---- Smooth transition on item change ----
 	const [isTransitioning, setIsTransitioning] = useState(false);
@@ -873,6 +872,7 @@ export default function FocusModeView({
 				{/* Right: Close button */}
 				<button
 					onClick={onClose}
+					aria-label="Close inbox"
 					className="p-1.5 rounded"
 					style={{ color: theme.colors.textDim }}
 					onMouseEnter={(e) => (e.currentTarget.style.backgroundColor = `${theme.colors.accent}20`)}
@@ -1152,6 +1152,7 @@ export default function FocusModeView({
 					onClick={() => onNavigateItem((currentIndex - 1 + items.length) % items.length)}
 					disabled={items.length <= 1}
 					aria-disabled={items.length <= 1 ? 'true' : undefined}
+					aria-label="Previous item"
 					className="flex items-center gap-1 text-xs px-3 py-1.5 rounded transition-colors"
 					style={{
 						border: `1px solid ${theme.colors.border}`,
@@ -1192,6 +1193,7 @@ export default function FocusModeView({
 					onClick={() => onNavigateItem((currentIndex + 1) % items.length)}
 					disabled={items.length <= 1}
 					aria-disabled={items.length <= 1 ? 'true' : undefined}
+					aria-label="Next item"
 					className="flex items-center gap-1 text-xs px-3 py-1.5 rounded transition-colors"
 					style={{
 						border: `1px solid ${theme.colors.border}`,
diff --git a/src/renderer/components/AgentInbox/InboxListView.tsx b/src/renderer/components/AgentInbox/InboxListView.tsx
index e5b59691a..40ad07e66 100644
--- a/src/renderer/components/AgentInbox/InboxListView.tsx
+++ b/src/renderer/components/AgentInbox/InboxListView.tsx
@@ -807,7 +807,9 @@ export default function InboxListView({
 	// Collect focusable header elements for Tab cycling
 	const getHeaderFocusables = useCallback((): HTMLElement[] => {
 		if (!headerRef.current) return [];
-		return Array.from(headerRef.current.querySelectorAll<HTMLElement>('button, [tabindex="0"]'));
+		return Array.from(
+			headerRef.current.querySelectorAll<HTMLElement>('button:not(:disabled), [tabindex="0"]')
+		);
 	}, []);
 
 	// Row-based keyboard handler — arrows navigate rows (headers + items)
diff --git a/src/renderer/components/AgentInbox/index.tsx b/src/renderer/components/AgentInbox/index.tsx
index 4a014e720..9489471f8 100644
--- a/src/renderer/components/AgentInbox/index.tsx
+++ b/src/renderer/components/AgentInbox/index.tsx
@@ -13,6 +13,7 @@ import type {
 	InboxFilterMode,
 	InboxSortMode,
 } from '../../types/agent-inbox';
+import { isValidFilterMode, isValidSortMode } from '../../types/agent-inbox';
 import { useModalLayer } from '../../hooks/ui/useModalLayer';
 import { MODAL_PRIORITIES } from '../../constants/modalPriorities';
 import { useModalStore, selectModalData } from '../../stores/modalStore';
@@ -70,10 +71,10 @@ export default function AgentInbox({
 	// ---- Filter/sort state (lifted from InboxListView for shared access) ----
 	const inboxData = useModalStore(selectModalData('agentInbox'));
 	const [filterMode, setFilterMode] = useState<InboxFilterMode>(
-		(inboxData?.filterMode as InboxFilterMode) ?? 'unread'
+		isValidFilterMode(inboxData?.filterMode) ? inboxData.filterMode : 'unread'
 	);
 	const [sortMode, setSortMode] = useState<InboxSortMode>(
-		(inboxData?.sortMode as InboxSortMode) ?? 'newest'
+		isValidSortMode(inboxData?.sortMode) ? inboxData.sortMode : 'newest'
 	);
 
 	// ---- Compute live items (used in list mode) ----
diff --git a/src/renderer/components/SettingsModal.tsx b/src/renderer/components/SettingsModal.tsx
index 007e5d4dc..3d26905a7 100644
--- a/src/renderer/components/SettingsModal.tsx
+++ b/src/renderer/components/SettingsModal.tsx
@@ -3686,6 +3686,7 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
 									</div>
 									<button
 										role="switch"
+										aria-label="Toggle Unified Inbox"
 										aria-checked={encoreFeatures.unifiedInbox}
 										onClick={(e) => {
 											e.stopPropagation();
@@ -3743,6 +3744,7 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
 									</div>
 									<button
 										role="switch"
+										aria-label="Toggle Tab Descriptions"
 										aria-checked={encoreFeatures.tabDescription}
 										onClick={(e) => {
 											e.stopPropagation();
diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index 1d5448082..0edb339ab 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -463,9 +463,11 @@ const Tab = memo(function Tab({
 
 	// Description editing handlers
 	const descriptionButtonRef = useRef<HTMLButtonElement>(null);
+	const skipBlurSaveRef = useRef(false);
 
 	const handleDescriptionSave = useCallback(
 		(value: string) => {
+			skipBlurSaveRef.current = false;
 			const trimmed = value.trim();
 			if (trimmed !== (tab.description ?? '')) {
 				onUpdateTabDescription?.(tabId, trimmed);
@@ -480,6 +482,7 @@ const Tab = memo(function Tab({
 	);
 
 	const handleDescriptionCancel = useCallback(() => {
+		skipBlurSaveRef.current = true;
 		setDescriptionDraft(tab.description ?? '');
 		setIsEditingDescription(false);
 		requestAnimationFrame(() => {
@@ -501,6 +504,10 @@ const Tab = memo(function Tab({
 	);
 
 	const handleDescriptionBlur = useCallback(() => {
+		if (skipBlurSaveRef.current) {
+			skipBlurSaveRef.current = false;
+			return;
+		}
 		handleDescriptionSave(descriptionDraft);
 	}, [descriptionDraft, handleDescriptionSave]);
 
diff --git a/src/renderer/types/agent-inbox.ts b/src/renderer/types/agent-inbox.ts
index c677396c2..c5c50562e 100644
--- a/src/renderer/types/agent-inbox.ts
+++ b/src/renderer/types/agent-inbox.ts
@@ -45,3 +45,14 @@ export const STATUS_COLORS: Record<SessionState, string> = {
 
 /** View mode inside the AgentInbox modal */
 export type InboxViewMode = 'list' | 'focus';
+
+const VALID_FILTER_MODES: readonly InboxFilterMode[] = ['all', 'unread', 'read', 'starred'];
+const VALID_SORT_MODES: readonly InboxSortMode[] = ['newest', 'oldest', 'grouped', 'byAgent'];
+
+export function isValidFilterMode(value: unknown): value is InboxFilterMode {
+	return typeof value === 'string' && (VALID_FILTER_MODES as readonly string[]).includes(value);
+}
+
+export function isValidSortMode(value: unknown): value is InboxSortMode {
+	return typeof value === 'string' && (VALID_SORT_MODES as readonly string[]).includes(value);
+}

From 9100dca7c0881a86d41fd403a269864475613461 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 13:50:40 -0300
Subject: [PATCH 24/43] fix: address remaining CodeRabbit findings (round 2)

- Add keyboard support to resize handle (ArrowLeft/Right, role=separator)
- Change sidebar group headers from role=separator to role=button with
  aria-expanded for proper collapsible semantics
- Use focus-visible instead of focus on raw/markdown toggle button
- Fix click model: single-click selects row, double-click enters focus mode
  (was: single-click navigated away, making double-click unreachable)
- Remove unnecessary `as any` casts in TabBar.test.tsx description fixtures

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../renderer/components/TabBar.test.tsx       |  4 +--
 .../components/AgentInbox/FocusModeView.tsx   | 26 +++++++++++++++++--
 .../components/AgentInbox/InboxListView.tsx   |  2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/__tests__/renderer/components/TabBar.test.tsx b/src/__tests__/renderer/components/TabBar.test.tsx
index 88eb29815..2a2aefab3 100644
--- a/src/__tests__/renderer/components/TabBar.test.tsx
+++ b/src/__tests__/renderer/components/TabBar.test.tsx
@@ -5787,7 +5787,7 @@ describe('TabBar description section', () => {
 				name: 'Tab 1',
 				agentSessionId: 'session-1',
 				description: 'My existing description',
-			} as any),
+			}),
 		];
 
 		render(
@@ -5878,7 +5878,7 @@ describe('TabBar description section', () => {
 				name: 'Tab 1',
 				agentSessionId: 'session-1',
 				description: 'Original description',
-			} as any),
+			}),
 		];
 
 		render(
diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index 5b7044535..b3252cff7 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -228,7 +228,7 @@ function FocusLogEntry({
 						<button
 							onClick={onToggleRaw}
 							aria-label={showRawMarkdown ? 'Show formatted' : 'Show plain text'}
-							className="p-1 rounded opacity-0 group-hover:opacity-50 focus:opacity-100 hover:!opacity-100 transition-opacity"
+							className="p-1 rounded opacity-0 group-hover:opacity-50 focus-visible:opacity-100 hover:!opacity-100 transition-opacity"
 							style={{ color: showRawMarkdown ? theme.colors.accent : theme.colors.textDim }}
 							title={showRawMarkdown ? 'Show formatted' : 'Show plain text'}
 						>
@@ -435,7 +435,8 @@ function FocusSidebar({
 								<div
 									key={`header-${row.groupKey}-${rowIdx}`}
 									tabIndex={0}
-									role="separator"
+									role="button"
+									aria-expanded={!collapsedGroups.has(row.groupKey)}
 									onClick={() => {
 										setCollapsedGroups((prev) => {
 											const next = new Set(prev);
@@ -987,6 +988,19 @@ export default function FocusModeView({
 				{/* Resize handle */}
 				<div
 					onMouseDown={handleResizeStart}
+					tabIndex={0}
+					role="separator"
+					aria-orientation="vertical"
+					aria-label="Resize sidebar"
+					onKeyDown={(e) => {
+						if (e.key === 'ArrowLeft') {
+							e.preventDefault();
+							setSidebarWidth((w) => Math.max(160, w - 16));
+						} else if (e.key === 'ArrowRight') {
+							e.preventDefault();
+							setSidebarWidth((w) => Math.min(400, w + 16));
+						}
+					}}
 					style={{
 						width: 4,
 						cursor: 'col-resize',
@@ -1002,6 +1016,14 @@ export default function FocusModeView({
 							e.currentTarget.style.backgroundColor = 'transparent';
 						}
 					}}
+					onFocus={(e) => {
+						e.currentTarget.style.backgroundColor = `${theme.colors.accent}30`;
+					}}
+					onBlur={(e) => {
+						if (!isResizingRef.current) {
+							e.currentTarget.style.backgroundColor = 'transparent';
+						}
+					}}
 				/>
 
 				{/* Main content: conversation body + reply input */}
diff --git a/src/renderer/components/AgentInbox/InboxListView.tsx b/src/renderer/components/AgentInbox/InboxListView.tsx
index 40ad07e66..0f364029c 100644
--- a/src/renderer/components/AgentInbox/InboxListView.tsx
+++ b/src/renderer/components/AgentInbox/InboxListView.tsx
@@ -1268,7 +1268,7 @@ export default function InboxListView({
 													item={row.item}
 													theme={theme}
 													isSelected={isRowSelected}
-													onClick={() => handleNavigate(row.item)}
+													onClick={() => setSelectedRowIndex(virtualRow.index)}
 													onDoubleClick={() => onEnterFocus(row.item)}
 												/>
 											</div>

From a86b2e190f735adf861bdc41d12a2e054eaf4cf3 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 15:20:48 -0300
Subject: [PATCH 25/43] fix: address CodeRabbit round 3 findings (focus
 styling, groupId, containerRef, line clamp)

---
 .../components/AgentInbox/FocusModeView.tsx         | 13 +++++++++++++
 .../components/AgentInbox/InboxListView.tsx         | 10 +++++++++-
 src/renderer/components/AgentInbox/index.tsx        |  5 -----
 src/renderer/components/TabBar.tsx                  |  2 +-
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index b3252cff7..a8f8dd240 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -329,6 +329,12 @@ function SidebarFilter({
 						key={opt.value}
 						onClick={() => onChange(opt.value)}
 						className="text-[11px] px-2.5 py-1 rounded-full cursor-pointer transition-all"
+						onFocus={(e) => {
+							e.currentTarget.style.boxShadow = `0 0 0 2px ${theme.colors.accent}`;
+						}}
+						onBlur={(e) => {
+							e.currentTarget.style.boxShadow = 'none';
+						}}
 						style={{
 							backgroundColor: isActive ? `${theme.colors.accent}25` : 'transparent',
 							color: isActive ? theme.colors.accentText : theme.colors.textDim,
@@ -457,10 +463,17 @@ function FocusSidebar({
 										}
 									}}
 									className="flex items-center gap-1.5 px-3 py-1.5 text-[10px] uppercase tracking-wider cursor-pointer"
+									onFocus={(e) => {
+										e.currentTarget.style.boxShadow = `inset 0 0 0 2px ${theme.colors.accent}`;
+									}}
+									onBlur={(e) => {
+										e.currentTarget.style.boxShadow = 'none';
+									}}
 									style={{
 										color: theme.colors.textDim,
 										fontWeight: 600,
 										backgroundColor: theme.colors.bgSidebar,
+										outline: 'none',
 									}}
 								>
 									{collapsedGroups.has(row.groupKey) ? (
diff --git a/src/renderer/components/AgentInbox/InboxListView.tsx b/src/renderer/components/AgentInbox/InboxListView.tsx
index 0f364029c..6cfe41a6d 100644
--- a/src/renderer/components/AgentInbox/InboxListView.tsx
+++ b/src/renderer/components/AgentInbox/InboxListView.tsx
@@ -59,7 +59,8 @@ function buildRows(items: InboxItem[], sortMode: InboxSortMode): ListRow[] {
 	for (const item of items) {
 		// For 'grouped': group by Left Bar group name
 		// For 'byAgent': group by sessionId (unique) and display sessionName
-		const groupKey = sortMode === 'byAgent' ? item.sessionId : (item.groupName ?? 'Ungrouped');
+		const groupKey =
+			sortMode === 'byAgent' ? item.sessionId : (item.groupId ?? item.groupName ?? 'Ungrouped');
 		const groupName = sortMode === 'byAgent' ? item.sessionName : (item.groupName ?? 'Ungrouped');
 		if (groupKey !== lastGroupKey) {
 			rows.push({ type: 'header', groupKey, groupName });
@@ -1059,6 +1060,7 @@ export default function InboxListView({
 
 			{/* Body — virtualized list */}
 			<div
+				ref={containerRef as React.RefObject<HTMLDivElement>}
 				role="listbox"
 				tabIndex={0}
 				onKeyDown={handleKeyDown}
@@ -1144,6 +1146,12 @@ export default function InboxListView({
 											type="button"
 											key={`header-${row.groupKey}`}
 											className="outline-none"
+											onFocus={(e) => {
+												e.currentTarget.style.boxShadow = `inset 0 0 0 2px ${theme.colors.accent}`;
+											}}
+											onBlur={(e) => {
+												e.currentTarget.style.boxShadow = 'none';
+											}}
 											style={{
 												position: 'absolute',
 												top: 0,
diff --git a/src/renderer/components/AgentInbox/index.tsx b/src/renderer/components/AgentInbox/index.tsx
index 9489471f8..92852c931 100644
--- a/src/renderer/components/AgentInbox/index.tsx
+++ b/src/renderer/components/AgentInbox/index.tsx
@@ -1,8 +1,3 @@
-/* POLISH-04 Token Audit (@architect)
- * Line 267: bgActivity for dialog container — CORRECT (content)
- * All other usages: CORRECT
- */
-
 import { useState, useEffect, useRef, useCallback } from 'react';
 import InboxListView from './InboxListView';
 import FocusModeView from './FocusModeView';
diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index 0edb339ab..c6ca7ab00 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -801,7 +801,7 @@ const Tab = memo(function Tab({
 													style={{
 														color: theme.colors.textMain,
 														display: '-webkit-box',
-														WebkitLineClamp: 2,
+														WebkitLineClamp: 3,
 														WebkitBoxOrient: 'vertical',
 														overflow: 'hidden',
 													}}

From cbf5ccc1838aa7d0adb2353538dbe529771d793b Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 16:21:16 -0300
Subject: [PATCH 26/43] fix: exclude aria-disabled elements from focusable
 header set

---
 src/renderer/components/AgentInbox/InboxListView.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/AgentInbox/InboxListView.tsx b/src/renderer/components/AgentInbox/InboxListView.tsx
index 6cfe41a6d..8f7f3b918 100644
--- a/src/renderer/components/AgentInbox/InboxListView.tsx
+++ b/src/renderer/components/AgentInbox/InboxListView.tsx
@@ -809,7 +809,9 @@ export default function InboxListView({
 	const getHeaderFocusables = useCallback((): HTMLElement[] => {
 		if (!headerRef.current) return [];
 		return Array.from(
-			headerRef.current.querySelectorAll<HTMLElement>('button:not(:disabled), [tabindex="0"]')
+			headerRef.current.querySelectorAll<HTMLElement>(
+				'button:not(:disabled), [tabindex="0"]:not([aria-disabled="true"])'
+			)
 		);
 	}, []);
 

From 046307a39c4178a72ba042de8aa0d89ca566fa30 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 16:43:08 -0300
Subject: [PATCH 27/43] fix: lock tab hover overlay width to 220px to prevent
 horizontal expansion

Long descriptions no longer push the overlay wider. The overlay is now
fixed at 220px width with word-break forcing text to wrap within bounds.
The existing 3-line clamp with ellipsis handles vertical truncation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/TabBar.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index c6ca7ab00..a4ae6c80a 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -731,7 +731,7 @@ const Tab = memo(function Tab({
 								borderBottom: `1px solid ${theme.colors.border}`,
 								borderBottomLeftRadius: '8px',
 								borderBottomRightRadius: '8px',
-								minWidth: '220px',
+								width: '220px',
 							}}
 						>
 							{/* Header with session name and ID - only show for tabs with sessions */}
@@ -804,6 +804,7 @@ const Tab = memo(function Tab({
 														WebkitLineClamp: 3,
 														WebkitBoxOrient: 'vertical',
 														overflow: 'hidden',
+														wordBreak: 'break-word',
 													}}
 												>
 													{tab.description}
@@ -1491,7 +1492,7 @@ const FileTab = memo(function FileTab({
 								borderBottom: `1px solid ${theme.colors.border}`,
 								borderBottomLeftRadius: '8px',
 								borderBottomRightRadius: '8px',
-								minWidth: '220px',
+								width: '220px',
 							}}
 						>
 							{/* Actions */}

From 45ae1d257a5b5d76001bc2a0f0de0c8fdf37c64c Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 16:51:14 -0300
Subject: [PATCH 28/43] fix: constrain tab description within overlay without
 changing overlay width

Reverted overlay width back to minWidth: 220px (production default).
Added overflow: hidden to description container so long descriptions
wrap within the overlay's natural width instead of expanding it.
The 3-line clamp with word-break handles vertical truncation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/TabBar.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index a4ae6c80a..09209e5ff 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -731,7 +731,7 @@ const Tab = memo(function Tab({
 								borderBottom: `1px solid ${theme.colors.border}`,
 								borderBottomLeftRadius: '8px',
 								borderBottomRightRadius: '8px',
-								width: '220px',
+								minWidth: '220px',
 							}}
 						>
 							{/* Header with session name and ID - only show for tabs with sessions */}
@@ -765,7 +765,10 @@ const Tab = memo(function Tab({
 
 							{/* Description section - only render when feature is enabled */}
 							{onUpdateTabDescription && (
-								<div className="px-3 py-2 border-b" style={{ borderColor: theme.colors.border }}>
+								<div
+									className="px-3 py-2 border-b"
+									style={{ borderColor: theme.colors.border, overflow: 'hidden' }}
+								>
 									{isEditingDescription ? (
 										<textarea
 											ref={(el) => el?.focus()}
@@ -1492,7 +1495,7 @@ const FileTab = memo(function FileTab({
 								borderBottom: `1px solid ${theme.colors.border}`,
 								borderBottomLeftRadius: '8px',
 								borderBottomRightRadius: '8px',
-								width: '220px',
+								minWidth: '220px',
 							}}
 						>
 							{/* Actions */}

From ed3a3858c8d2c5e13054b662a37e2a787551d51a Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 16:53:38 -0300
Subject: [PATCH 29/43] Revert "fix: constrain tab description within overlay
 without changing overlay width"

This reverts commit 45ae1d257a5b5d76001bc2a0f0de0c8fdf37c64c.
---
 src/renderer/components/TabBar.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index 09209e5ff..a4ae6c80a 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -731,7 +731,7 @@ const Tab = memo(function Tab({
 								borderBottom: `1px solid ${theme.colors.border}`,
 								borderBottomLeftRadius: '8px',
 								borderBottomRightRadius: '8px',
-								minWidth: '220px',
+								width: '220px',
 							}}
 						>
 							{/* Header with session name and ID - only show for tabs with sessions */}
@@ -765,10 +765,7 @@ const Tab = memo(function Tab({
 
 							{/* Description section - only render when feature is enabled */}
 							{onUpdateTabDescription && (
-								<div
-									className="px-3 py-2 border-b"
-									style={{ borderColor: theme.colors.border, overflow: 'hidden' }}
-								>
+								<div className="px-3 py-2 border-b" style={{ borderColor: theme.colors.border }}>
 									{isEditingDescription ? (
 										<textarea
 											ref={(el) => el?.focus()}
@@ -1495,7 +1492,7 @@ const FileTab = memo(function FileTab({
 								borderBottom: `1px solid ${theme.colors.border}`,
 								borderBottomLeftRadius: '8px',
 								borderBottomRightRadius: '8px',
-								minWidth: '220px',
+								width: '220px',
 							}}
 						>
 							{/* Actions */}

From a6ee0bcc6e974254b922a1fe1e5557cb63c01e59 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 16:55:44 -0300
Subject: [PATCH 30/43] fix: constrain tab description without changing overlay
 width

Locked overlay to exactly 220px (minWidth + maxWidth) so long
descriptions cannot expand it horizontally. Added overflow-hidden
to description container and word-break for proper text wrapping.
The existing 3-line clamp with ellipsis handles vertical truncation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/TabBar.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index a4ae6c80a..53f1a096f 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -731,7 +731,8 @@ const Tab = memo(function Tab({
 								borderBottom: `1px solid ${theme.colors.border}`,
 								borderBottomLeftRadius: '8px',
 								borderBottomRightRadius: '8px',
-								width: '220px',
+								minWidth: '220px',
+								maxWidth: '220px',
 							}}
 						>
 							{/* Header with session name and ID - only show for tabs with sessions */}
@@ -765,7 +766,10 @@ const Tab = memo(function Tab({
 
 							{/* Description section - only render when feature is enabled */}
 							{onUpdateTabDescription && (
-								<div className="px-3 py-2 border-b" style={{ borderColor: theme.colors.border }}>
+								<div
+									className="px-3 py-2 border-b overflow-hidden"
+									style={{ borderColor: theme.colors.border }}
+								>
 									{isEditingDescription ? (
 										<textarea
 											ref={(el) => el?.focus()}
@@ -1492,7 +1496,8 @@ const FileTab = memo(function FileTab({
 								borderBottom: `1px solid ${theme.colors.border}`,
 								borderBottomLeftRadius: '8px',
 								borderBottomRightRadius: '8px',
-								width: '220px',
+								minWidth: '220px',
+								maxWidth: '220px',
 							}}
 						>
 							{/* Actions */}

From ab4633319fc825459ea5a17270cda20b70e00ff3 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 17:08:50 -0300
Subject: [PATCH 31/43] fix: narrow InboxItem.toolType to ToolType union and
 add description normalization tests

Addresses remaining CodeRabbit findings from PR #476:
- agent-inbox.ts: toolType changed from `string` to `ToolType` for stronger type safety
- TabBar.test.tsx: added regression tests for whitespace-only description normalization

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../renderer/components/TabBar.test.tsx       | 67 +++++++++++++++++++
 src/renderer/types/agent-inbox.ts             |  4 +-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/src/__tests__/renderer/components/TabBar.test.tsx b/src/__tests__/renderer/components/TabBar.test.tsx
index 2a2aefab3..d0a81dc0d 100644
--- a/src/__tests__/renderer/components/TabBar.test.tsx
+++ b/src/__tests__/renderer/components/TabBar.test.tsx
@@ -5871,6 +5871,73 @@ describe('TabBar description section', () => {
 		expect(mockOnUpdateTabDescription).toHaveBeenCalledWith('tab-1', 'New description');
 	});
 
+	it('pressing Enter with whitespace-only description clears to empty string', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+				description: 'Old description',
+			}),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onUpdateTabDescription={mockOnUpdateTabDescription}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		const descButton = screen.getByLabelText('Edit tab description');
+		fireEvent.click(descButton);
+
+		const textarea = screen.getByLabelText('Tab description');
+		fireEvent.change(textarea, { target: { value: '   ' } });
+		fireEvent.keyDown(textarea, { key: 'Enter' });
+
+		expect(mockOnUpdateTabDescription).toHaveBeenCalledWith('tab-1', '');
+	});
+
+	it('pressing Enter with whitespace-only on tab without description does not call handler', () => {
+		const tabs = [
+			createTab({
+				id: 'tab-1',
+				name: 'Tab 1',
+				agentSessionId: 'session-1',
+			}),
+		];
+
+		render(
+			<TabBar
+				tabs={tabs}
+				activeTabId="tab-1"
+				theme={mockThemeDesc}
+				onTabSelect={mockOnTabSelect}
+				onTabClose={mockOnTabClose}
+				onNewTab={mockOnNewTab}
+				onUpdateTabDescription={mockOnUpdateTabDescription}
+			/>
+		);
+
+		openOverlay('Tab 1');
+
+		const descButton = screen.getByLabelText('Add tab description');
+		fireEvent.click(descButton);
+
+		const textarea = screen.getByLabelText('Tab description');
+		fireEvent.change(textarea, { target: { value: '   ' } });
+		fireEvent.keyDown(textarea, { key: 'Enter' });
+
+		expect(mockOnUpdateTabDescription).not.toHaveBeenCalled();
+	});
+
 	it('pressing Escape in textarea exits edit mode without calling handler', () => {
 		const tabs = [
 			createTab({
diff --git a/src/renderer/types/agent-inbox.ts b/src/renderer/types/agent-inbox.ts
index c5c50562e..ec38d0230 100644
--- a/src/renderer/types/agent-inbox.ts
+++ b/src/renderer/types/agent-inbox.ts
@@ -1,4 +1,4 @@
-import type { SessionState } from './index';
+import type { SessionState, ToolType } from './index';
 
 export interface InboxItem {
 	sessionId: string;
@@ -7,7 +7,7 @@ export interface InboxItem {
 	groupName?: string;
 	sessionName: string;
 	tabName?: string;
-	toolType: string;
+	toolType: ToolType;
 	gitBranch?: string;
 	contextUsage?: number; // 0-100, undefined = unknown
 	lastMessage: string; // truncated to 90 chars

From e6e2cd4d0cdc2659d9c5d566ccfcb5a86fa6ca49 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 17:38:28 -0300
Subject: [PATCH 32/43] fix: unify Focus Mode header to match MainPanel and
 polish Inbox modal

- Collapse two-bar header (header + subheader) into single h-16 px-6 bar
- Adopt app title bar pipe-separated pattern (Group | Name | Tab)
- Move metadata badges (git branch, context %, status, thinking) to right side
- Widen list-mode dialog from 780px to 900px
- Add backdrop-filter blur(6px) to modal overlay for focus effect

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../components/AgentInbox/FocusModeView.tsx   | 263 +++++++-----------
 src/renderer/components/AgentInbox/index.tsx  |   3 +-
 2 files changed, 107 insertions(+), 159 deletions(-)

diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index a8f8dd240..892341330 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -26,8 +26,7 @@ import { generateTerminalProseStyles } from '../../utils/markdownConfig';
  * Line 166: bgSidebar in user bubble color-mix — CORRECT (chrome blend for user messages)
  * Line 210: bgActivity for AI bubble — CORRECT (content)
  * Line 429: bgSidebar for sidebar group header — CORRECT (chrome)
- * Line 722: bgSidebar for focus header — CORRECT (chrome)
- * Line 818: bgActivity for subheader info bar — CORRECT (content)
+ * Line ~792: bgSidebar for unified focus header — CORRECT (chrome)
  * Line 904: bgSidebar for sidebar bg — CORRECT (chrome)
  * Line 1025: bgActivity → bgMain (textarea is nested input, needs contrast)
  * All other usages: CORRECT
@@ -538,16 +537,17 @@ function FocusSidebar({
 									if (!isCurrent) e.currentTarget.style.backgroundColor = 'transparent';
 								}}
 							>
-								{/* Status dot */}
-								<span
-									className="flex-shrink-0"
-									style={{
-										width: 6,
-										height: 6,
-										borderRadius: '50%',
-										backgroundColor: statusColor,
-									}}
-								/>
+								{/* Status dot with unread badge (matches Left Bar) */}
+								<div className="relative flex-shrink-0">
+									<div className="w-2 h-2 rounded-full" style={{ backgroundColor: statusColor }} />
+									{itm.hasUnread && (
+										<div
+											className="absolute -top-0.5 -right-0.5 w-1.5 h-1.5 rounded-full"
+											style={{ backgroundColor: theme.colors.accent }}
+											title="Unread messages"
+										/>
+									)}
+								</div>
 								{/* Name + preview vertical stack */}
 								<div className="flex-1 flex flex-col gap-0.5 min-w-0">
 									<span
@@ -568,20 +568,6 @@ function FocusSidebar({
 										</span>
 									)}
 								</div>
-								{/* Indicators: unread */}
-								{itm.hasUnread && (
-									<span
-										className="flex-shrink-0"
-										style={{
-											width: 6,
-											height: 6,
-											borderRadius: '50%',
-											backgroundColor: theme.colors.accent,
-											alignSelf: 'flex-start',
-											marginTop: 2,
-										}}
-									/>
-								)}
 							</div>
 						);
 					});
@@ -801,9 +787,9 @@ export default function FocusModeView({
 
 	return (
 		<div className="flex flex-col flex-1" style={{ minHeight: 0 }}>
-			{/* Header bar */}
+			{/* Header bar — single h-16 bar matching MainPanel */}
 			<div
-				className="flex items-center px-4 py-3 border-b"
+				className="h-16 border-b flex items-center justify-between px-6 shrink-0"
 				style={{
 					backgroundColor: theme.colors.bgSidebar,
 					borderColor: theme.colors.border,
@@ -813,7 +799,7 @@ export default function FocusModeView({
 				<button
 					aria-label="Return to inbox list"
 					onClick={onExitFocus}
-					className="flex items-center gap-1.5 text-sm font-medium"
+					className="flex items-center gap-1.5 text-sm font-medium shrink-0"
 					style={{
 						background: 'transparent',
 						border: 'none',
@@ -828,148 +814,109 @@ export default function FocusModeView({
 					<span>Inbox</span>
 				</button>
 
-				{/* Center: GROUP | Agent name · tab */}
-				<div
-					className="flex-1 flex items-center justify-center gap-1"
-					style={{ overflow: 'hidden' }}
-				>
-					{item.groupName && (
-						<>
-							<span
-								className="text-xs"
-								style={{
-									color: theme.colors.textDim,
-									whiteSpace: 'nowrap',
-									textTransform: 'uppercase',
-									letterSpacing: '0.5px',
-								}}
-							>
-								{item.groupName}
-							</span>
-							<span className="text-xs" style={{ color: theme.colors.textDim, padding: '0 4px' }}>
-								|
-							</span>
-						</>
-					)}
+				{/* Center: Group | Agent Name | Tab — matches app title bar pattern */}
+				<div className="flex-1 flex items-center justify-center min-w-0 mx-3">
 					<span
-						className="text-lg font-semibold"
-						style={{
-							color: theme.colors.textMain,
-							whiteSpace: 'nowrap',
-							overflow: 'hidden',
-							textOverflow: 'ellipsis',
-						}}
+						className="text-xs select-none truncate"
+						style={{ color: theme.colors.textDim, opacity: 0.5 }}
 					>
-						{truncate(item.sessionName, 30)}
+						{(() => {
+							const parts: string[] = [];
+							if (item.groupName) parts.push(item.groupName);
+							parts.push(item.sessionName);
+							if (item.tabName) parts.push(item.tabName);
+							return parts.join(' | ');
+						})()}
 					</span>
-					{item.tabName && (
-						<>
-							<span className="text-xs" style={{ color: theme.colors.textDim }}>
-								·
-							</span>
-							<span
-								className="text-xs"
-								style={{
-									color: theme.colors.textDim,
-									whiteSpace: 'nowrap',
-									overflow: 'hidden',
-									textOverflow: 'ellipsis',
-								}}
-							>
-								{item.tabName}
-							</span>
-						</>
-					)}
-					{/* TODO: cost badge — needs InboxItem.cost field */}
 				</div>
 
-				{/* Right: Close button */}
-				<button
-					onClick={onClose}
-					aria-label="Close inbox"
-					className="p-1.5 rounded"
+				{/* Right: metadata badges + thinking toggle + close */}
+				<div
+					className="flex items-center gap-2 shrink-0 text-xs"
 					style={{ color: theme.colors.textDim }}
-					onMouseEnter={(e) => (e.currentTarget.style.backgroundColor = `${theme.colors.accent}20`)}
-					onMouseLeave={(e) => (e.currentTarget.style.backgroundColor = 'transparent')}
-					title="Close (Esc)"
 				>
-					<X className="w-4 h-4" />
-				</button>
-			</div>
-
-			{/* Subheader info bar — 32px */}
-			<div
-				className="flex items-center justify-end px-4 py-2 gap-3 text-xs border-b"
-				style={{
-					borderColor: theme.colors.border,
-					backgroundColor: theme.colors.bgActivity,
-					color: theme.colors.textDim,
-				}}
-			>
-				{item.gitBranch && (
+					{item.gitBranch && (
+						<span
+							className="px-1.5 py-0.5 rounded hidden sm:inline"
+							style={{
+								fontFamily: "'SF Mono', 'Menlo', monospace",
+								backgroundColor: `${theme.colors.border}40`,
+								color: theme.colors.textDim,
+								fontSize: 11,
+							}}
+						>
+							{truncate(item.gitBranch, 20)}
+						</span>
+					)}
+					{hasValidContext && (
+						<span className="hidden sm:inline" style={{ color: contextColor, fontSize: 11 }}>
+							{item.contextUsage}%
+						</span>
+					)}
 					<span
-						className="px-1.5 py-0.5 rounded"
 						style={{
-							fontFamily: "'SF Mono', 'Menlo', monospace",
-							backgroundColor: `${theme.colors.border}40`,
-							color: theme.colors.textDim,
+							padding: '1px 8px',
+							borderRadius: 10,
+							backgroundColor: `${statusColor}20`,
+							color: statusColor,
+							whiteSpace: 'nowrap',
+							fontSize: 11,
 						}}
 					>
-						{truncate(item.gitBranch, 25)}
+						{STATUS_LABELS[item.state]}
 					</span>
-				)}
-				{hasValidContext && (
-					<span style={{ color: contextColor }}>Context: {item.contextUsage}%</span>
-				)}
-				<span
-					style={{
-						padding: '1px 8px',
-						borderRadius: 10,
-						backgroundColor: `${statusColor}20`,
-						color: statusColor,
-						whiteSpace: 'nowrap',
-					}}
-				>
-					{STATUS_LABELS[item.state]}
-				</span>
-				{/* Thinking toggle — 3-state: off → on → sticky → off */}
-				<button
-					onClick={cycleThinking}
-					className={`flex items-center gap-1.5 text-[10px] px-2 py-1 rounded-full cursor-pointer transition-all ${
-						showThinking !== 'off' ? '' : 'opacity-40 hover:opacity-70'
-					}`}
-					style={{
-						backgroundColor:
-							showThinking === 'sticky'
-								? `${theme.colors.warning}30`
-								: showThinking === 'on'
-									? `${theme.colors.accentText}25`
-									: 'transparent',
-						color:
-							showThinking === 'sticky'
-								? theme.colors.warning
-								: showThinking === 'on'
-									? theme.colors.accentText
-									: theme.colors.textDim,
-						border:
-							showThinking === 'sticky'
-								? `1px solid ${theme.colors.warning}50`
+					{/* Thinking toggle — 3-state: off → on → sticky → off */}
+					<button
+						onClick={cycleThinking}
+						className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded-full cursor-pointer transition-all ${
+							showThinking !== 'off' ? '' : 'opacity-40 hover:opacity-70'
+						}`}
+						style={{
+							backgroundColor:
+								showThinking === 'sticky'
+									? `${theme.colors.warning}30`
+									: showThinking === 'on'
+										? `${theme.colors.accentText}25`
+										: 'transparent',
+							color:
+								showThinking === 'sticky'
+									? theme.colors.warning
+									: showThinking === 'on'
+										? theme.colors.accentText
+										: theme.colors.textDim,
+							border:
+								showThinking === 'sticky'
+									? `1px solid ${theme.colors.warning}50`
+									: showThinking === 'on'
+										? `1px solid ${theme.colors.accentText}50`
+										: '1px solid transparent',
+						}}
+						title={
+							showThinking === 'off'
+								? 'Show Thinking - Click to stream AI reasoning'
 								: showThinking === 'on'
-									? `1px solid ${theme.colors.accentText}50`
-									: '1px solid transparent',
-					}}
-					title={
-						showThinking === 'off'
-							? 'Show Thinking - Click to stream AI reasoning'
-							: showThinking === 'on'
-								? 'Thinking (temporary) - Click for sticky mode'
-								: 'Thinking (sticky) - Click to turn off'
-					}
-				>
-					<Brain className="w-3 h-3" />
-					<span>Thinking</span>
-					{showThinking === 'sticky' && <Pin className="w-2.5 h-2.5" />}
-				</button>
+									? 'Thinking (temporary) - Click for sticky mode'
+									: 'Thinking (sticky) - Click to turn off'
+						}
+					>
+						<Brain className="w-3 h-3" />
+						<span>Thinking</span>
+						{showThinking === 'sticky' && <Pin className="w-2.5 h-2.5" />}
+					</button>
+					<button
+						onClick={onClose}
+						aria-label="Close inbox"
+						className="p-1.5 rounded ml-1"
+						style={{ color: theme.colors.textDim }}
+						onMouseEnter={(e) =>
+							(e.currentTarget.style.backgroundColor = `${theme.colors.accent}20`)
+						}
+						onMouseLeave={(e) => (e.currentTarget.style.backgroundColor = 'transparent')}
+						title="Close (Esc)"
+					>
+						<X className="w-4 h-4" />
+					</button>
+				</div>
 			</div>
 
 			{/* Prose styles for markdown rendering — injected once at container level */}
diff --git a/src/renderer/components/AgentInbox/index.tsx b/src/renderer/components/AgentInbox/index.tsx
index 92852c931..e70671103 100644
--- a/src/renderer/components/AgentInbox/index.tsx
+++ b/src/renderer/components/AgentInbox/index.tsx
@@ -190,7 +190,7 @@ export default function AgentInbox({
 		typeof window !== 'undefined' ? window.innerWidth * 0.92 : 1400,
 		1400
 	);
-	const dialogWidth = viewMode === 'focus' ? expandedWidth : isWide ? expandedWidth : 780;
+	const dialogWidth = viewMode === 'focus' ? expandedWidth : isWide ? expandedWidth : 900;
 	const dialogHeight = viewMode === 'focus' ? '85vh' : undefined;
 	const dialogMaxHeight = viewMode === 'focus' ? undefined : isWide ? '90vh' : '80vh';
 
@@ -264,6 +264,7 @@ export default function AgentInbox({
 	return (
 		<div
 			className="fixed inset-0 modal-overlay flex items-center justify-center z-[9999] animate-in fade-in duration-100"
+			style={{ backdropFilter: 'blur(6px)', WebkitBackdropFilter: 'blur(6px)' }}
 			onClick={handleClose}
 		>
 			<div

From 13e313f0e5541311525572ef8c62bbcf5ecad3cc Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 20:01:15 -0300
Subject: [PATCH 33/43] fix: prevent Focus Mode invasion when agents respond
 during inbox-zero triage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace numeric focusIndex with identity-based focusId tracking so that
items re-entering the filtered list (e.g. agent responds → hasUnread flips
back to true) no longer shift the focused item or steal textarea focus.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/AgentInbox/index.tsx | 81 +++++++++++++-------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/renderer/components/AgentInbox/index.tsx b/src/renderer/components/AgentInbox/index.tsx
index e70671103..a2f21a83e 100644
--- a/src/renderer/components/AgentInbox/index.tsx
+++ b/src/renderer/components/AgentInbox/index.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef, useCallback } from 'react';
+import { useState, useEffect, useRef, useCallback, useMemo } from 'react';
 import InboxListView from './InboxListView';
 import FocusModeView from './FocusModeView';
 import type { Theme, Session, Group, ThinkingMode } from '../../types';
@@ -60,7 +60,12 @@ export default function AgentInbox({
 
 	// ---- View mode state ----
 	const [viewMode, setViewMode] = useState<InboxViewMode>('list');
-	const [focusIndex, setFocusIndex] = useState(0);
+	// Identity-based focus tracking: survives items array reordering/membership changes.
+	// Prevents focus disruption when agents respond and items re-enter the filtered list.
+	const [focusId, setFocusId] = useState<{ sessionId: string; tabId: string } | null>(null);
+	// Sync ref for rapid keyboard navigation (prevents stale closure reads)
+	const focusIdRef = useRef(focusId);
+	focusIdRef.current = focusId;
 	const [selectedIndex, setSelectedIndex] = useState(0);
 
 	// ---- Filter/sort state (lifted from InboxListView for shared access) ----
@@ -103,6 +108,16 @@ export default function AgentInbox({
 			? resolveFrozenItems(frozenOrderRef.current)
 			: liveItems;
 
+	// Derive numeric index from identity at render time.
+	// If focusId's item left the array (deleted session), fall back to nearest valid index.
+	const safeFocusIndex = useMemo(() => {
+		if (!focusId || items.length === 0) return 0;
+		const idx = items.findIndex(
+			(i) => i.sessionId === focusId.sessionId && i.tabId === focusId.tabId
+		);
+		return idx >= 0 ? idx : Math.min(items.length - 1, 0);
+	}, [focusId, items]);
+
 	const handleSetFilterMode = useCallback(
 		(mode: InboxFilterMode) => {
 			setFilterMode(mode);
@@ -110,7 +125,7 @@ export default function AgentInbox({
 				// Re-snapshot: resolve new filter results immediately
 				// We need a render with the new filterMode first, so defer the snapshot
 				frozenOrderRef.current = [];
-				setFocusIndex(0);
+				setFocusId(null);
 			}
 		},
 		[viewMode]
@@ -121,29 +136,24 @@ export default function AgentInbox({
 		frozenOrderRef.current = [];
 	}, []);
 
-	// Re-snapshot after filter change empties the ref (needs liveItems from new filter)
+	// Re-snapshot after filter change empties the ref (needs liveItems from new filter).
+	// Also recover focusId when null (after filter change) to avoid permanent empty state.
 	useEffect(() => {
 		if (viewMode === 'focus' && frozenOrderRef.current.length === 0 && liveItems.length > 0) {
 			frozenOrderRef.current = liveItems.map((i) => ({
 				sessionId: i.sessionId,
 				tabId: i.tabId,
 			}));
+			// Recover focusId: after a filter change clears it, point to the first item
+			if (!focusIdRef.current && liveItems[0]) {
+				setFocusId({ sessionId: liveItems[0].sessionId, tabId: liveItems[0].tabId });
+			}
 		}
 	}, [viewMode, liveItems]);
 
-	// ---- Edge case: items shrink while in focus mode ----
-	useEffect(() => {
-		if (viewMode === 'focus' && items.length > 0 && focusIndex >= items.length) {
-			setFocusIndex(items.length - 1);
-		}
-	}, [items.length, focusIndex, viewMode]);
-
 	const handleEnterFocus = useCallback(
 		(item: InboxItem) => {
-			const idx = liveItems.findIndex(
-				(i) => i.sessionId === item.sessionId && i.tabId === item.tabId
-			);
-			setFocusIndex(idx >= 0 ? idx : 0);
+			setFocusId({ sessionId: item.sessionId, tabId: item.tabId });
 			// Freeze current order as simple identity pairs
 			frozenOrderRef.current = liveItems.map((i) => ({
 				sessionId: i.sessionId,
@@ -154,10 +164,16 @@ export default function AgentInbox({
 		[liveItems]
 	);
 
-	// ---- Navigate item wrapper ----
-	const handleNavigateItem = useCallback((idx: number) => {
-		setFocusIndex(idx);
-	}, []);
+	// ---- Navigate item wrapper (keeps numeric contract with FocusModeView) ----
+	const handleNavigateItem = useCallback(
+		(idx: number) => {
+			const target = items[idx];
+			if (target) {
+				setFocusId({ sessionId: target.sessionId, tabId: target.tabId });
+			}
+		},
+		[items]
+	);
 
 	// ---- Layer stack: viewMode-aware Escape ----
 	const handleLayerEscape = useCallback(() => {
@@ -190,7 +206,7 @@ export default function AgentInbox({
 		typeof window !== 'undefined' ? window.innerWidth * 0.92 : 1400,
 		1400
 	);
-	const dialogWidth = viewMode === 'focus' ? expandedWidth : isWide ? expandedWidth : 900;
+	const dialogWidth = viewMode === 'focus' ? expandedWidth : isWide ? expandedWidth : 1100;
 	const dialogHeight = viewMode === 'focus' ? '85vh' : undefined;
 	const dialogMaxHeight = viewMode === 'focus' ? undefined : isWide ? '90vh' : '80vh';
 
@@ -205,9 +221,22 @@ export default function AgentInbox({
 				e.preventDefault();
 				e.stopPropagation();
 				if (items.length > 1) {
-					setFocusIndex((prev) =>
-						e.key === '[' ? Math.max(prev - 1, 0) : Math.min(prev + 1, items.length - 1)
-					);
+					// Read from ref for accurate position during rapid keypresses
+					const currentId = focusIdRef.current;
+					const currentIdx = currentId
+						? items.findIndex(
+								(i) => i.sessionId === currentId.sessionId && i.tabId === currentId.tabId
+							)
+						: 0;
+					const safeIdx = currentIdx >= 0 ? currentIdx : 0;
+					const newIdx =
+						e.key === '[' ? Math.max(safeIdx - 1, 0) : Math.min(safeIdx + 1, items.length - 1);
+					const target = items[newIdx];
+					if (target) {
+						const newId = { sessionId: target.sessionId, tabId: target.tabId };
+						focusIdRef.current = newId; // Sync ref immediately for next rapid keypress
+						setFocusId(newId);
+					}
 				}
 			}
 		},
@@ -308,13 +337,13 @@ export default function AgentInbox({
 							isExpanded={isExpanded}
 							onToggleExpanded={setIsExpanded}
 						/>
-					) : items[focusIndex] ? (
+					) : items[safeFocusIndex] ? (
 						<FocusModeView
 							theme={theme}
-							item={items[focusIndex]}
+							item={items[safeFocusIndex]}
 							items={items}
 							sessions={sessions}
-							currentIndex={focusIndex}
+							currentIndex={safeFocusIndex}
 							enterToSendAI={enterToSendAI}
 							filterMode={filterMode}
 							setFilterMode={handleSetFilterMode}

From bfa1ae3575005ff17c5fa24cc2896de50eb59cbe Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 20:17:05 -0300
Subject: [PATCH 34/43] fix: polish Focus Mode footer with inline shortcut
 badges and wider sidebar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Embed ⌘[ and ⌘] kbd badges inside Prev/Next buttons
- Simplify center hint to just "Esc Back"
- Widen sidebar default from 220px to 300px, resize range 200-440px
- Correct shortcut tooltips from ⌘←/→ to ⌘[/]

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../components/AgentInbox/FocusModeView.tsx   | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index 892341330..496a2fe6e 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -599,7 +599,7 @@ export default function FocusModeView({
 	const hasValidContext = item.contextUsage !== undefined && !isNaN(item.contextUsage);
 
 	// ---- Resizable sidebar ----
-	const [sidebarWidth, setSidebarWidth] = useState(220);
+	const [sidebarWidth, setSidebarWidth] = useState(300);
 	const sidebarWidthRef = useRef(sidebarWidth);
 	sidebarWidthRef.current = sidebarWidth;
 	const isResizingRef = useRef(false);
@@ -623,7 +623,7 @@ export default function FocusModeView({
 
 		const onMouseMove = (ev: MouseEvent) => {
 			if (!isResizingRef.current) return;
-			const newWidth = Math.max(160, Math.min(400, startWidth + (ev.clientX - startX)));
+			const newWidth = Math.max(200, Math.min(440, startWidth + (ev.clientX - startX)));
 			setSidebarWidth(newWidth);
 		};
 
@@ -955,10 +955,10 @@ export default function FocusModeView({
 					onKeyDown={(e) => {
 						if (e.key === 'ArrowLeft') {
 							e.preventDefault();
-							setSidebarWidth((w) => Math.max(160, w - 16));
+							setSidebarWidth((w) => Math.max(200, w - 16));
 						} else if (e.key === 'ArrowRight') {
 							e.preventDefault();
-							setSidebarWidth((w) => Math.min(400, w + 16));
+							setSidebarWidth((w) => Math.min(440, w + 16));
 						}
 					}}
 					style={{
@@ -1129,13 +1129,13 @@ export default function FocusModeView({
 					borderColor: theme.colors.border,
 				}}
 			>
-				{/* Prev button */}
+				{/* Prev button with shortcut badge */}
 				<button
 					onClick={() => onNavigateItem((currentIndex - 1 + items.length) % items.length)}
 					disabled={items.length <= 1}
 					aria-disabled={items.length <= 1 ? 'true' : undefined}
 					aria-label="Previous item"
-					className="flex items-center gap-1 text-xs px-3 py-1.5 rounded transition-colors"
+					className="flex items-center gap-2 text-xs px-3 py-1.5 rounded transition-colors"
 					style={{
 						border: `1px solid ${theme.colors.border}`,
 						color: items.length > 1 ? theme.colors.textMain : theme.colors.textDim,
@@ -1150,13 +1150,22 @@ export default function FocusModeView({
 					onMouseLeave={(e) => {
 						e.currentTarget.style.backgroundColor = 'transparent';
 					}}
-					title="Previous item (⌘←)"
+					title="Previous item (⌘[)"
 				>
 					<ChevronLeft className="w-3 h-3" />
 					Prev
+					<kbd
+						className="text-[10px] px-1.5 py-0.5 rounded"
+						style={{
+							backgroundColor: `${theme.colors.border}60`,
+							color: theme.colors.textDim,
+						}}
+					>
+						⌘[
+					</kbd>
 				</button>
 
-				{/* Center: counter + keyboard hints */}
+				{/* Center: counter + Esc hint */}
 				<div className="flex flex-col items-center gap-0.5">
 					<span
 						aria-live="polite"
@@ -1166,17 +1175,17 @@ export default function FocusModeView({
 						{currentIndex + 1} / {items.length}
 					</span>
 					<span className="text-xs" style={{ color: theme.colors.textDim, opacity: 0.6 }}>
-						⌘←→ Navigate · Esc Back
+						Esc Back
 					</span>
 				</div>
 
-				{/* Next button */}
+				{/* Next button with shortcut badge */}
 				<button
 					onClick={() => onNavigateItem((currentIndex + 1) % items.length)}
 					disabled={items.length <= 1}
 					aria-disabled={items.length <= 1 ? 'true' : undefined}
 					aria-label="Next item"
-					className="flex items-center gap-1 text-xs px-3 py-1.5 rounded transition-colors"
+					className="flex items-center gap-2 text-xs px-3 py-1.5 rounded transition-colors"
 					style={{
 						border: `1px solid ${theme.colors.border}`,
 						color: items.length > 1 ? theme.colors.textMain : theme.colors.textDim,
@@ -1191,8 +1200,17 @@ export default function FocusModeView({
 					onMouseLeave={(e) => {
 						e.currentTarget.style.backgroundColor = 'transparent';
 					}}
-					title="Next item (⌘→)"
+					title="Next item (⌘])"
 				>
+					<kbd
+						className="text-[10px] px-1.5 py-0.5 rounded"
+						style={{
+							backgroundColor: `${theme.colors.border}60`,
+							color: theme.colors.textDim,
+						}}
+					>
+						⌘]
+					</kbd>
 					Next
 					<ChevronRight className="w-3 h-3" />
 				</button>

From 6a28299e320b648281e5f661db0e1e1bd73eccee Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Fri, 27 Feb 2026 20:26:17 -0300
Subject: [PATCH 35/43] fix: use responsive 75vw width for Inbox modal instead
 of hardcoded 1400px cap

Replaces the fixed expandedWidth calculation (Math.min(window.innerWidth * 0.92, 1400))
with a simple 75vw viewport-relative width. This scales naturally across all screen sizes
(~1440px on 4K/1920px effective) while the existing maxWidth: 95vw CSS acts as safety net.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/AgentInbox/index.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/renderer/components/AgentInbox/index.tsx b/src/renderer/components/AgentInbox/index.tsx
index a2f21a83e..d6a64d01a 100644
--- a/src/renderer/components/AgentInbox/index.tsx
+++ b/src/renderer/components/AgentInbox/index.tsx
@@ -202,11 +202,7 @@ export default function AgentInbox({
 
 	// ---- Compute dialog dimensions (focus mode or expanded → wide) ----
 	const isWide = isExpanded || viewMode === 'focus';
-	const expandedWidth = Math.min(
-		typeof window !== 'undefined' ? window.innerWidth * 0.92 : 1400,
-		1400
-	);
-	const dialogWidth = viewMode === 'focus' ? expandedWidth : isWide ? expandedWidth : 1100;
+	const dialogWidth = '75vw';
 	const dialogHeight = viewMode === 'focus' ? '85vh' : undefined;
 	const dialogMaxHeight = viewMode === 'focus' ? undefined : isWide ? '90vh' : '80vh';
 

From 061119df743e3ceff18374b9ef059dcbe4174b27 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Sat, 28 Feb 2026 03:42:35 -0300
Subject: [PATCH 36/43] fix: enable fuzzy search for slash command autocomplete
 in chat bar

Slash command filtering used startsWith() while the rest of the app
(File Search, Tab Switcher, @mentions) used fuzzyMatchWithScore.
Now typing partial/out-of-order characters like /cmpct finds /compact.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../renderer/components/InputArea.test.tsx    | 28 ++++++++++---------
 .../renderer/hooks/useInputKeyDown.test.ts    |  4 +--
 src/renderer/components/InputArea.tsx         | 23 +++++++++------
 src/renderer/hooks/input/useInputKeyDown.ts   |  3 +-
 4 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/__tests__/renderer/components/InputArea.test.tsx b/src/__tests__/renderer/components/InputArea.test.tsx
index a77a65881..b605e438b 100644
--- a/src/__tests__/renderer/components/InputArea.test.tsx
+++ b/src/__tests__/renderer/components/InputArea.test.tsx
@@ -694,10 +694,10 @@ describe('InputArea', () => {
 			});
 			render(<InputArea {...props} />);
 
-			// The second command (/help) should have accent background
-			// Find the parent div that has the background style (px-4 py-3 class)
-			const helpCmd = screen.getByText('/help').closest('.px-4');
-			expect(helpCmd).toHaveStyle({ backgroundColor: mockTheme.colors.accent });
+			// With fuzzy scoring, /help (shorter) scores higher than /clear for query "/"
+			// So order is: /help (0), /clear (1). Index 1 = /clear has accent background.
+			const clearCmd = screen.getByText('/clear').closest('.px-4');
+			expect(clearCmd).toHaveStyle({ backgroundColor: mockTheme.colors.accent });
 		});
 
 		it('updates selection on mouse enter', () => {
@@ -709,8 +709,9 @@ describe('InputArea', () => {
 			});
 			render(<InputArea {...props} />);
 
-			const helpCmd = screen.getByText('/help').closest('.px-4');
-			fireEvent.mouseEnter(helpCmd!);
+			// With fuzzy scoring, /help is at index 0, /clear at index 1
+			const clearCmd = screen.getByText('/clear').closest('.px-4');
+			fireEvent.mouseEnter(clearCmd!);
 
 			expect(setSelectedSlashCommandIndex).toHaveBeenCalledWith(1);
 		});
@@ -812,8 +813,9 @@ describe('InputArea', () => {
 			});
 			render(<InputArea {...props} />);
 
-			const helpCmd = screen.getByText('/help').closest('.px-4');
-			fireEvent.click(helpCmd!);
+			// With fuzzy scoring, /help is at index 0, /clear at index 1
+			const clearCmd = screen.getByText('/clear').closest('.px-4');
+			fireEvent.click(clearCmd!);
 
 			// Single click should update selection
 			expect(setSelectedSlashCommandIndex).toHaveBeenCalledWith(1);
@@ -841,13 +843,13 @@ describe('InputArea', () => {
 			});
 			render(<InputArea {...props} />);
 
-			// The second item (/help) should NOT have accent background since index 0 is selected
+			// With fuzzy scoring, order is: /help (0), /clear (1)
+			// Index 0 is selected, so /help has accent background
 			const helpCmd = screen.getByText('/help').closest('.px-4');
-			// Unselected items don't have the accent color background
-			expect(helpCmd).not.toHaveStyle({ backgroundColor: mockTheme.colors.accent });
-			// First item (selected) should have accent background
+			expect(helpCmd).toHaveStyle({ backgroundColor: mockTheme.colors.accent });
+			// /clear (index 1) should NOT have accent background
 			const clearCmd = screen.getByText('/clear').closest('.px-4');
-			expect(clearCmd).toHaveStyle({ backgroundColor: mockTheme.colors.accent });
+			expect(clearCmd).not.toHaveStyle({ backgroundColor: mockTheme.colors.accent });
 		});
 
 		it('scrolls selected item into view via refs', () => {
diff --git a/src/__tests__/renderer/hooks/useInputKeyDown.test.ts b/src/__tests__/renderer/hooks/useInputKeyDown.test.ts
index 4283d4dc0..f82a70ada 100644
--- a/src/__tests__/renderer/hooks/useInputKeyDown.test.ts
+++ b/src/__tests__/renderer/hooks/useInputKeyDown.test.ts
@@ -553,8 +553,8 @@ describe('Slash command autocomplete', () => {
 	it('filters out aiOnly commands in terminal mode', () => {
 		setActiveSession({ inputMode: 'terminal' });
 		// Only /run is aiOnly, so it should be filtered out
-		// Input is '/r' which only matches /run
-		const deps = createMockDeps({ inputValue: '/r', allSlashCommands: commands });
+		// Input is '/ru' which only fuzzy-matches /run (not /help or /clear)
+		const deps = createMockDeps({ inputValue: '/ru', allSlashCommands: commands });
 		const { result } = renderHook(() => useInputKeyDown(deps));
 		const e = createKeyEvent('Enter');
 
diff --git a/src/renderer/components/InputArea.tsx b/src/renderer/components/InputArea.tsx
index 041d87325..2a808f6e2 100644
--- a/src/renderer/components/InputArea.tsx
+++ b/src/renderer/components/InputArea.tsx
@@ -23,6 +23,7 @@ import {
 	formatEnterToSend,
 	formatEnterToSendTooltip,
 } from '../utils/shortcutFormatter';
+import { fuzzyMatchWithScore } from '../utils/search';
 import type { TabCompletionSuggestion, TabCompletionFilter } from '../hooks';
 import type {
 	SummarizeProgress,
@@ -318,14 +319,20 @@ export const InputArea = React.memo(function InputArea(props: InputAreaProps) {
 	// recalculating on every render - inputValue changes on every keystroke
 	const inputValueLower = useMemo(() => inputValue.toLowerCase(), [inputValue]);
 	const filteredSlashCommands = useMemo(() => {
-		return slashCommands.filter((cmd) => {
-			// Check if command is only available in terminal mode
-			if (cmd.terminalOnly && !isTerminalMode) return false;
-			// Check if command is only available in AI mode
-			if (cmd.aiOnly && isTerminalMode) return false;
-			// Check if command matches input
-			return cmd.command.toLowerCase().startsWith(inputValueLower);
-		});
+		return slashCommands
+			.map((cmd) => {
+				// Check if command is only available in terminal mode
+				if (cmd.terminalOnly && !isTerminalMode) return null;
+				// Check if command is only available in AI mode
+				if (cmd.aiOnly && isTerminalMode) return null;
+				// Fuzzy match command against input
+				const result = fuzzyMatchWithScore(cmd.command, inputValueLower);
+				if (!result.matches) return null;
+				return { cmd, score: result.score };
+			})
+			.filter((item): item is { cmd: SlashCommand; score: number } => item !== null)
+			.sort((a, b) => b.score - a.score)
+			.map((item) => item.cmd);
 	}, [slashCommands, isTerminalMode, inputValueLower]);
 
 	// Ensure selectedSlashCommandIndex is valid for the filtered list
diff --git a/src/renderer/hooks/input/useInputKeyDown.ts b/src/renderer/hooks/input/useInputKeyDown.ts
index e3c8fabf0..ae76a580d 100644
--- a/src/renderer/hooks/input/useInputKeyDown.ts
+++ b/src/renderer/hooks/input/useInputKeyDown.ts
@@ -12,6 +12,7 @@
 import { useCallback } from 'react';
 import type { TabCompletionSuggestion, TabCompletionFilter } from '../input/useTabCompletion';
 import type { AtMentionSuggestion } from '../input/useAtMentionCompletion';
+import { fuzzyMatch } from '../../utils/search';
 import { useInputContext } from '../../contexts/InputContext';
 import { useSessionStore, selectActiveSession } from '../../stores/sessionStore';
 import { useUIStore } from '../../stores/uiStore';
@@ -208,7 +209,7 @@ export function useInputKeyDown(deps: InputKeyDownDeps): InputKeyDownReturn {
 				const filteredCommands = allSlashCommands.filter((cmd) => {
 					if ('terminalOnly' in cmd && cmd.terminalOnly && !isTerminalMode) return false;
 					if ('aiOnly' in cmd && cmd.aiOnly && isTerminalMode) return false;
-					return cmd.command.toLowerCase().startsWith(inputValue.toLowerCase());
+					return fuzzyMatch(cmd.command, inputValue);
 				});
 
 				if (e.key === 'ArrowDown') {

From c0a2758553849d3cf9634dfe1d3d50d8ba64fb4b Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Sat, 28 Feb 2026 03:53:39 -0300
Subject: [PATCH 37/43] feat: add Unified Inbox entry to hamburger menu

Gated by encoreFeatures.unifiedInbox flag, with Inbox icon,
shortcut badge, and setAgentInboxOpen handler.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/components/SessionList.tsx | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/renderer/components/SessionList.tsx b/src/renderer/components/SessionList.tsx
index 492e40247..ab9611935 100644
--- a/src/renderer/components/SessionList.tsx
+++ b/src/renderer/components/SessionList.tsx
@@ -20,6 +20,7 @@ import {
 	Bot,
 	Clock,
 	ScrollText,
+	Inbox,
 	Cpu,
 	Menu,
 	Bookmark,
@@ -444,6 +445,7 @@ function HamburgerMenuContent({
 }: HamburgerMenuContentProps) {
 	const shortcuts = useSettingsStore((s) => s.shortcuts);
 	const directorNotesEnabled = useSettingsStore((s) => s.encoreFeatures.directorNotes);
+	const unifiedInboxEnabled = useSettingsStore((s) => s.encoreFeatures.unifiedInbox);
 	const {
 		setShortcutsHelpOpen,
 		setSettingsModalOpen,
@@ -453,6 +455,7 @@ function HamburgerMenuContent({
 		setUsageDashboardOpen,
 		setSymphonyModalOpen,
 		setDirectorNotesOpen,
+		setAgentInboxOpen,
 		setUpdateCheckModalOpen,
 		setAboutModalOpen,
 		setQuickActionOpen,
@@ -718,6 +721,33 @@ function HamburgerMenuContent({
 					)}
 				</button>
 			)}
+			{unifiedInboxEnabled && (
+				<button
+					onClick={() => {
+						setAgentInboxOpen(true);
+						setMenuOpen(false);
+					}}
+					className="w-full flex items-center gap-3 px-3 py-2.5 rounded-md hover:bg-white/10 transition-colors text-left"
+				>
+					<Inbox className="w-5 h-5" style={{ color: theme.colors.accent }} />
+					<div className="flex-1">
+						<div className="text-sm font-medium" style={{ color: theme.colors.textMain }}>
+							Unified Inbox
+						</div>
+						<div className="text-xs" style={{ color: theme.colors.textDim }}>
+							Unified tabs inbox
+						</div>
+					</div>
+					{shortcuts.agentInbox && (
+						<span
+							className="text-xs font-mono px-1.5 py-0.5 rounded"
+							style={{ backgroundColor: theme.colors.bgActivity, color: theme.colors.textDim }}
+						>
+							{formatShortcutKeys(shortcuts.agentInbox.keys)}
+						</span>
+					)}
+				</button>
+			)}
 			<div className="my-1 border-t" style={{ borderColor: theme.colors.border }} />
 			<button
 				onClick={() => {

From a28ac12cedc6f43e00be22a173197426b25cfbae Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Sat, 28 Feb 2026 05:08:16 -0300
Subject: [PATCH 38/43] fix: resolve all CodeRabbit review comments on PR #476
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix 1: Reply guards — only call onMarkAsRead if handler exists and executes
- Fix 2: Textarea disabled state when session unavailable
- Fix 3: Align groupId collapse key across buildRows, filter, and T-key toggle
- Fix 4: ARIA roles — role="button" on interactive sidebar headers (was "presentation")
- Fix 5: Focus ring styling on Focus/Expand buttons (consistent with Close)
- Fix 6: Guard stale pendingInboxQuickReply when target session is deleted
- Nice-to-have: sessionExists guard on textarea onKeyDown
- Nice-to-have: previousActiveSessionId guard in microtask
- Nice-to-have: Extract getGroupCollapseKey() helper for DRY

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/App.tsx                          |  10 +-
 .../components/AgentInbox/FocusModeView.tsx   | 141 +++++++++++++++---
 .../components/AgentInbox/InboxListView.tsx   |  25 +++-
 3 files changed, 151 insertions(+), 25 deletions(-)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 396f5fa81..caaf3c8e5 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -1408,6 +1408,11 @@ function MaestroConsoleInner() {
 	// Flush pending quick-reply once target session is active (deterministic, no RAF timing chain).
 	useEffect(() => {
 		if (!pendingInboxQuickReply) return;
+		// Guard: if the target session was removed before activation, clear the stale pending.
+		if (!sessions.some((s) => s.id === pendingInboxQuickReply.targetSessionId)) {
+			setPendingInboxQuickReply(null);
+			return;
+		}
 		if (activeSession?.id !== pendingInboxQuickReply.targetSessionId) return;
 
 		inboxProcessInputRef.current(pendingInboxQuickReply.text);
@@ -1416,13 +1421,14 @@ function MaestroConsoleInner() {
 
 		if (
 			previousActiveSessionId &&
-			previousActiveSessionId !== pendingInboxQuickReply.targetSessionId
+			previousActiveSessionId !== pendingInboxQuickReply.targetSessionId &&
+			sessions.some((s) => s.id === previousActiveSessionId)
 		) {
 			queueMicrotask(() => {
 				setActiveSessionId(previousActiveSessionId);
 			});
 		}
-	}, [pendingInboxQuickReply, activeSession?.id, setActiveSessionId]);
+	}, [pendingInboxQuickReply, activeSession?.id, setActiveSessionId, sessions]);
 
 	// Agent Inbox: Quick Reply — sends text to target session/tab via processInput
 	const handleAgentInboxQuickReply = useCallback(
diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index 496a2fe6e..0950d18f0 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -21,6 +21,8 @@ import { resolveContextUsageColor } from './InboxListView';
 import { formatRelativeTime } from '../../utils/formatters';
 import { MarkdownRenderer } from '../MarkdownRenderer';
 import { generateTerminalProseStyles } from '../../utils/markdownConfig';
+import { slashCommands } from '../../slashCommands';
+import { fuzzyMatchWithScore } from '../../utils/search';
 
 /* POLISH-04 Token Audit (@architect)
  * Line 166: bgSidebar in user bubble color-mix — CORRECT (chrome blend for user messages)
@@ -430,7 +432,7 @@ function FocusSidebar({
 				</div>
 			)}
 			{/* Item list */}
-			<div role="listbox" aria-label="Inbox items" className="flex-1 overflow-y-auto py-1">
+			<div role="list" aria-label="Inbox items" className="flex-1 overflow-y-auto py-1">
 				{(() => {
 					let activeGroup: string | null = null;
 					return rows.map((row, rowIdx) => {
@@ -505,8 +507,8 @@ function FocusSidebar({
 								key={`${itm.sessionId}-${itm.tabId}`}
 								ref={isCurrent ? currentRowRef : undefined}
 								tabIndex={0}
-								role="option"
-								aria-selected={isCurrent}
+								role="listitem"
+								aria-current={isCurrent ? 'true' : undefined}
 								onClick={() => onNavigateItem(idx)}
 								onKeyDown={(e) => {
 									if (e.key === 'Enter' || e.key === ' ') {
@@ -733,6 +735,31 @@ export default function FocusModeView({
 	const [replyText, setReplyText] = useState('');
 	const replyInputRef = useRef<HTMLTextAreaElement>(null);
 
+	// ---- Slash command autocomplete state ----
+	const [slashCommandOpen, setSlashCommandOpen] = useState(false);
+	const [selectedSlashCommandIndex, setSelectedSlashCommandIndex] = useState(0);
+
+	const replyTextLower = useMemo(() => replyText.toLowerCase(), [replyText]);
+	const filteredSlashCommands = useMemo(() => {
+		return slashCommands
+			.filter((cmd) => !cmd.terminalOnly) // Focus mode is always AI mode
+			.map((cmd) => {
+				const result = fuzzyMatchWithScore(cmd.command, replyTextLower);
+				if (!result.matches) return null;
+				return { cmd, score: result.score };
+			})
+			.filter(
+				(item): item is { cmd: (typeof slashCommands)[number]; score: number } => item !== null
+			)
+			.sort((a, b) => b.score - a.score)
+			.map((item) => item.cmd);
+	}, [replyTextLower]);
+
+	const safeSlashIndex = Math.min(
+		Math.max(0, selectedSlashCommandIndex),
+		Math.max(0, filteredSlashCommands.length - 1)
+	);
+
 	// Auto-focus reply input when entering focus mode or switching items.
 	useEffect(() => {
 		const rafId = requestAnimationFrame(() => {
@@ -741,9 +768,10 @@ export default function FocusModeView({
 		return () => cancelAnimationFrame(rafId);
 	}, [item.sessionId, item.tabId]);
 
-	// Reset reply text and textarea height when item changes (prev/next navigation)
+	// Reset reply text, slash command state, and textarea height when item changes (prev/next navigation)
 	useEffect(() => {
 		setReplyText('');
+		setSlashCommandOpen(false);
 		if (replyInputRef.current) {
 			replyInputRef.current.style.height = 'auto';
 		}
@@ -751,20 +779,16 @@ export default function FocusModeView({
 
 	const handleQuickReply = useCallback(() => {
 		const text = replyText.trim();
-		if (!text) return;
-		if (onQuickReply) {
-			onQuickReply(item.sessionId, item.tabId, text);
-		}
+		if (!text || !onQuickReply) return;
+		onQuickReply(item.sessionId, item.tabId, text);
 		onMarkAsRead?.(item.sessionId, item.tabId);
 		setReplyText('');
 	}, [replyText, item, onQuickReply, onMarkAsRead]);
 
 	const handleOpenAndReply = useCallback(() => {
 		const text = replyText.trim();
-		if (!text) return;
-		if (onOpenAndReply) {
-			onOpenAndReply(item.sessionId, item.tabId, text);
-		}
+		if (!text || !onOpenAndReply) return;
+		onOpenAndReply(item.sessionId, item.tabId, text);
 		onMarkAsRead?.(item.sessionId, item.tabId);
 	}, [replyText, item, onOpenAndReply, onMarkAsRead]);
 
@@ -1033,14 +1057,97 @@ export default function FocusModeView({
 
 					{/* Reply input bar */}
 					<div
-						className="flex items-center gap-2 px-4 py-3 border-t"
+						className="relative flex items-center gap-2 px-4 py-3 border-t"
 						style={{ borderColor: theme.colors.border }}
 					>
+						{/* Slash Command Autocomplete Dropdown */}
+						{slashCommandOpen && filteredSlashCommands.length > 0 && (
+							<div
+								className="absolute bottom-full left-0 right-0 mb-1 mx-4 border rounded-lg shadow-2xl overflow-hidden z-50"
+								style={{
+									backgroundColor: theme.colors.bgSidebar,
+									borderColor: theme.colors.border,
+								}}
+							>
+								<div
+									className="overflow-y-auto max-h-48 scrollbar-thin"
+									style={{ overscrollBehavior: 'contain' }}
+								>
+									{filteredSlashCommands.map((cmd, idx) => (
+										<button
+											type="button"
+											key={cmd.command}
+											className={`w-full px-4 py-2.5 text-left transition-colors ${
+												idx === safeSlashIndex ? 'font-semibold' : ''
+											}`}
+											style={{
+												backgroundColor:
+													idx === safeSlashIndex ? theme.colors.accent : 'transparent',
+												color: idx === safeSlashIndex ? theme.colors.bgMain : theme.colors.textMain,
+											}}
+											onMouseDown={(e) => {
+												// Use mouseDown instead of click to fire before textarea blur
+												e.preventDefault();
+												setReplyText(cmd.command);
+												setSlashCommandOpen(false);
+												replyInputRef.current?.focus();
+											}}
+											onMouseEnter={() => setSelectedSlashCommandIndex(idx)}
+										>
+											<div className="font-mono text-sm">{cmd.command}</div>
+											<div className="text-xs opacity-70 mt-0.5">{cmd.description}</div>
+										</button>
+									))}
+								</div>
+							</div>
+						)}
 						<textarea
 							ref={replyInputRef}
 							value={replyText}
-							onChange={(e) => setReplyText(e.target.value)}
+							onChange={(e) => {
+								const value = e.target.value;
+								setReplyText(value);
+								// Detect slash command trigger
+								if (value.startsWith('/') && !value.includes(' ') && !value.includes('\n')) {
+									if (!slashCommandOpen) setSelectedSlashCommandIndex(0);
+									setSlashCommandOpen(true);
+								} else {
+									setSlashCommandOpen(false);
+								}
+							}}
+							disabled={!sessionExists}
 							onKeyDown={(e) => {
+								if (!sessionExists) return;
+								// Slash command navigation
+								if (slashCommandOpen && filteredSlashCommands.length > 0) {
+									if (e.key === 'ArrowDown') {
+										e.preventDefault();
+										e.stopPropagation();
+										setSelectedSlashCommandIndex(
+											Math.min(safeSlashIndex + 1, filteredSlashCommands.length - 1)
+										);
+										return;
+									}
+									if (e.key === 'ArrowUp') {
+										e.preventDefault();
+										e.stopPropagation();
+										setSelectedSlashCommandIndex(Math.max(safeSlashIndex - 1, 0));
+										return;
+									}
+									if (e.key === 'Enter' && !e.shiftKey && !e.metaKey) {
+										e.preventDefault();
+										e.stopPropagation();
+										setReplyText(filteredSlashCommands[safeSlashIndex].command);
+										setSlashCommandOpen(false);
+										return;
+									}
+									if (e.key === 'Escape') {
+										e.preventDefault();
+										e.stopPropagation();
+										setSlashCommandOpen(false);
+										return;
+									}
+								}
 								if (e.key === 'Enter') {
 									if (enterToSendAI) {
 										// Enter sends, Shift+Enter = Open & Reply
@@ -1067,7 +1174,7 @@ export default function FocusModeView({
 								// CRITICAL: Prevent focus-mode keyboard shortcuts from firing while typing
 								e.stopPropagation();
 							}}
-							placeholder="Reply to agent..."
+							placeholder={sessionExists ? 'Reply to agent...' : 'Session unavailable'}
 							rows={1}
 							aria-label="Reply to agent"
 							className="flex-1 resize-none rounded-lg px-3 py-2 text-sm outline-none"
@@ -1088,7 +1195,7 @@ export default function FocusModeView({
 						{/* Quick Reply button (primary) */}
 						<button
 							onClick={handleQuickReply}
-							disabled={!replyText.trim()}
+							disabled={!sessionExists || !replyText.trim()}
 							className="p-2 rounded-lg transition-colors flex-shrink-0"
 							style={{
 								backgroundColor: replyText.trim()
@@ -1104,7 +1211,7 @@ export default function FocusModeView({
 						{/* Open & Reply button (secondary) */}
 						<button
 							onClick={handleOpenAndReply}
-							disabled={!replyText.trim()}
+							disabled={!sessionExists || !replyText.trim()}
 							className="p-1.5 rounded-lg transition-colors flex-shrink-0 text-xs"
 							style={{
 								border: `1px solid ${theme.colors.border}`,
diff --git a/src/renderer/components/AgentInbox/InboxListView.tsx b/src/renderer/components/AgentInbox/InboxListView.tsx
index 8f7f3b918..4b8f31051 100644
--- a/src/renderer/components/AgentInbox/InboxListView.tsx
+++ b/src/renderer/components/AgentInbox/InboxListView.tsx
@@ -72,6 +72,11 @@ function buildRows(items: InboxItem[], sortMode: InboxSortMode): ListRow[] {
 	return rows;
 }
 
+/** Derive the collapse key for a given item row — must stay aligned with buildRows groupKey. */
+function getGroupCollapseKey(item: InboxItem, sortMode: InboxSortMode): string {
+	return sortMode === 'byAgent' ? item.sessionId : (item.groupId ?? item.groupName ?? 'Ungrouped');
+}
+
 // ============================================================================
 // STATUS color resolver — maps STATUS_COLORS key to actual hex
 // ============================================================================
@@ -559,9 +564,7 @@ export default function InboxListView({
 			return allRows;
 		return allRows.filter((row) => {
 			if (row.type === 'header') return true;
-			const collapseKey =
-				sortMode === 'byAgent' ? row.item.sessionId : (row.item.groupName ?? 'Ungrouped');
-			return !collapsedGroups.has(collapseKey);
+			return !collapsedGroups.has(getGroupCollapseKey(row.item, sortMode));
 		});
 	}, [allRows, collapsedGroups, sortMode]);
 
@@ -885,9 +888,7 @@ export default function InboxListView({
 					if (row.type === 'header') {
 						toggleGroup(row.groupKey);
 					} else {
-						const groupKey =
-							sortMode === 'byAgent' ? row.item.sessionId : (row.item.groupName ?? 'Ungrouped');
-						toggleGroup(groupKey);
+						toggleGroup(getGroupCollapseKey(row.item, sortMode));
 					}
 				}
 				return;
@@ -1001,6 +1002,12 @@ export default function InboxListView({
 									e.currentTarget.style.backgroundColor = `${theme.colors.accent}15`;
 								}
 							}}
+							onFocus={(e) => {
+								e.currentTarget.style.outline = `2px solid ${theme.colors.accent}`;
+							}}
+							onBlur={(e) => {
+								e.currentTarget.style.outline = 'none';
+							}}
 							title="Enter Focus Mode (F)"
 						>
 							Focus ▶
@@ -1013,6 +1020,12 @@ export default function InboxListView({
 								(e.currentTarget.style.backgroundColor = `${theme.colors.accent}20`)
 							}
 							onMouseLeave={(e) => (e.currentTarget.style.backgroundColor = 'transparent')}
+							onFocus={(e) => {
+								e.currentTarget.style.outline = `2px solid ${theme.colors.accent}`;
+							}}
+							onBlur={(e) => {
+								e.currentTarget.style.outline = 'none';
+							}}
 							title={isExpanded ? 'Collapse' : 'Expand'}
 							aria-label={isExpanded ? 'Collapse modal' : 'Expand modal'}
 						>

From 1859d51b3fce0d9453013faa76f480275ed93dd4 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Sat, 28 Feb 2026 05:41:59 -0300
Subject: [PATCH 39/43] feat: add slash command autocomplete to Focus Mode
 reply input

Thread allSlashCommands (built-in + custom + speckit + openspec + agent)
from App.tsx through AgentInbox to FocusModeView. Includes fuzzy matching,
keyboard navigation (arrows/Enter/Escape), and dropdown rendering.
Perf-gated: filtering only runs when dropdown is open, ref-based onChange
skips no-op state updates to avoid keystroke lag.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/renderer/App.tsx                          |  1 +
 .../components/AgentInbox/FocusModeView.tsx   | 35 ++++++++++++++-----
 src/renderer/components/AgentInbox/index.tsx  |  8 +++++
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index caaf3c8e5..3481f2ade 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -4276,6 +4276,7 @@ function MaestroConsoleInner() {
 							groups={groups}
 							theme={theme}
 							enterToSendAI={enterToSendAI}
+							slashCommands={allSlashCommands}
 							onClose={() => setAgentInboxOpen(false)}
 							onNavigateToSession={handleAgentInboxNavigateToSession}
 							onQuickReply={handleAgentInboxQuickReply}
diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index 0950d18f0..7cefd0062 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -277,6 +277,12 @@ interface FocusModeViewProps {
 	sessions: Session[]; // For accessing AITab.logs
 	currentIndex: number; // Position of item in items[]
 	enterToSendAI?: boolean; // false = Cmd+Enter sends, true = Enter sends
+	slashCommands?: Array<{
+		command: string;
+		description: string;
+		terminalOnly?: boolean;
+		aiOnly?: boolean;
+	}>;
 	filterMode?: InboxFilterMode;
 	setFilterMode?: (mode: InboxFilterMode) => void;
 	sortMode?: InboxSortMode;
@@ -586,6 +592,7 @@ export default function FocusModeView({
 	sessions,
 	currentIndex,
 	enterToSendAI,
+	slashCommands: slashCommandsProp,
 	filterMode,
 	setFilterMode,
 	sortMode,
@@ -737,23 +744,31 @@ export default function FocusModeView({
 
 	// ---- Slash command autocomplete state ----
 	const [slashCommandOpen, setSlashCommandOpen] = useState(false);
+	const slashCommandOpenRef = useRef(false);
+	slashCommandOpenRef.current = slashCommandOpen;
 	const [selectedSlashCommandIndex, setSelectedSlashCommandIndex] = useState(0);
 
-	const replyTextLower = useMemo(() => replyText.toLowerCase(), [replyText]);
+	// Use prop (full merged list from App.tsx) with fallback to built-in commands
+	const effectiveSlashCommands = slashCommandsProp ?? slashCommands;
+
+	// PERF: Only run fuzzy matching when dropdown is open — avoids work on every keystroke
 	const filteredSlashCommands = useMemo(() => {
-		return slashCommands
+		if (!slashCommandOpen) return [];
+		const query = replyText.toLowerCase();
+		return effectiveSlashCommands
 			.filter((cmd) => !cmd.terminalOnly) // Focus mode is always AI mode
 			.map((cmd) => {
-				const result = fuzzyMatchWithScore(cmd.command, replyTextLower);
+				const result = fuzzyMatchWithScore(cmd.command, query);
 				if (!result.matches) return null;
 				return { cmd, score: result.score };
 			})
 			.filter(
-				(item): item is { cmd: (typeof slashCommands)[number]; score: number } => item !== null
+				(item): item is { cmd: (typeof effectiveSlashCommands)[number]; score: number } =>
+					item !== null
 			)
 			.sort((a, b) => b.score - a.score)
 			.map((item) => item.cmd);
-	}, [replyTextLower]);
+	}, [effectiveSlashCommands, replyText, slashCommandOpen]);
 
 	const safeSlashIndex = Math.min(
 		Math.max(0, selectedSlashCommandIndex),
@@ -1107,11 +1122,13 @@ export default function FocusModeView({
 							onChange={(e) => {
 								const value = e.target.value;
 								setReplyText(value);
-								// Detect slash command trigger
-								if (value.startsWith('/') && !value.includes(' ') && !value.includes('\n')) {
-									if (!slashCommandOpen) setSelectedSlashCommandIndex(0);
+								// Detect slash command trigger — use ref to avoid stale closure + skip no-op state updates
+								const shouldOpen =
+									value.startsWith('/') && !value.includes(' ') && !value.includes('\n');
+								if (shouldOpen && !slashCommandOpenRef.current) {
+									setSelectedSlashCommandIndex(0);
 									setSlashCommandOpen(true);
-								} else {
+								} else if (!shouldOpen && slashCommandOpenRef.current) {
 									setSlashCommandOpen(false);
 								}
 							}}
diff --git a/src/renderer/components/AgentInbox/index.tsx b/src/renderer/components/AgentInbox/index.tsx
index d6a64d01a..82d26c566 100644
--- a/src/renderer/components/AgentInbox/index.tsx
+++ b/src/renderer/components/AgentInbox/index.tsx
@@ -22,6 +22,12 @@ interface AgentInboxProps {
 	sessions: Session[];
 	groups: Group[];
 	enterToSendAI?: boolean;
+	slashCommands?: Array<{
+		command: string;
+		description: string;
+		terminalOnly?: boolean;
+		aiOnly?: boolean;
+	}>;
 	onClose: () => void;
 	onNavigateToSession?: (sessionId: string, tabId?: string) => void;
 	onQuickReply?: (sessionId: string, tabId: string, text: string) => void;
@@ -35,6 +41,7 @@ export default function AgentInbox({
 	sessions,
 	groups,
 	enterToSendAI,
+	slashCommands: slashCommandsProp,
 	onClose,
 	onNavigateToSession,
 	onQuickReply,
@@ -341,6 +348,7 @@ export default function AgentInbox({
 							sessions={sessions}
 							currentIndex={safeFocusIndex}
 							enterToSendAI={enterToSendAI}
+							slashCommands={slashCommandsProp}
 							filterMode={filterMode}
 							setFilterMode={handleSetFilterMode}
 							sortMode={sortMode}

From 0fcb4cbe73dba9aaa3ecf5377a8639e6a43fe089 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Sat, 28 Feb 2026 05:50:50 -0300
Subject: [PATCH 40/43] fix: resolve remaining CodeRabbit review findings on PR
 #476

- Fix ARIA role hierarchy in FocusModeView sidebar: change group headers
  from role="button" to role="presentation" (children of role="list"
  must be listitem or presentation, not button)
- Add fuzzy score-based sorting to slash command autocomplete in
  useInputKeyDown (was using boolean fuzzyMatch without scoring,
  now matches InputArea/FocusModeView pattern with fuzzyMatchWithScore)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../components/AgentInbox/FocusModeView.tsx   |  2 +-
 src/renderer/hooks/input/useInputKeyDown.ts   | 24 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index 7cefd0062..55a5bf36a 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -448,7 +448,7 @@ function FocusSidebar({
 								<div
 									key={`header-${row.groupKey}-${rowIdx}`}
 									tabIndex={0}
-									role="button"
+									role="presentation"
 									aria-expanded={!collapsedGroups.has(row.groupKey)}
 									onClick={() => {
 										setCollapsedGroups((prev) => {
diff --git a/src/renderer/hooks/input/useInputKeyDown.ts b/src/renderer/hooks/input/useInputKeyDown.ts
index ae76a580d..511fc5d92 100644
--- a/src/renderer/hooks/input/useInputKeyDown.ts
+++ b/src/renderer/hooks/input/useInputKeyDown.ts
@@ -12,7 +12,7 @@
 import { useCallback } from 'react';
 import type { TabCompletionSuggestion, TabCompletionFilter } from '../input/useTabCompletion';
 import type { AtMentionSuggestion } from '../input/useAtMentionCompletion';
-import { fuzzyMatch } from '../../utils/search';
+import { fuzzyMatchWithScore } from '../../utils/search';
 import { useInputContext } from '../../contexts/InputContext';
 import { useSessionStore, selectActiveSession } from '../../stores/sessionStore';
 import { useUIStore } from '../../stores/uiStore';
@@ -206,11 +206,23 @@ export function useInputKeyDown(deps: InputKeyDownDeps): InputKeyDownReturn {
 			// Handle slash command autocomplete
 			if (slashCommandOpen) {
 				const isTerminalMode = activeSession?.inputMode === 'terminal';
-				const filteredCommands = allSlashCommands.filter((cmd) => {
-					if ('terminalOnly' in cmd && cmd.terminalOnly && !isTerminalMode) return false;
-					if ('aiOnly' in cmd && cmd.aiOnly && isTerminalMode) return false;
-					return fuzzyMatch(cmd.command, inputValue);
-				});
+				const inputLower = inputValue.toLowerCase();
+				const filteredCommands = allSlashCommands
+					.filter((cmd) => {
+						if ('terminalOnly' in cmd && cmd.terminalOnly && !isTerminalMode) return false;
+						if ('aiOnly' in cmd && cmd.aiOnly && isTerminalMode) return false;
+						return true;
+					})
+					.map((cmd) => {
+						const result = fuzzyMatchWithScore(cmd.command, inputLower);
+						return result.matches ? { cmd, score: result.score } : null;
+					})
+					.filter(
+						(item): item is { cmd: (typeof allSlashCommands)[number]; score: number } =>
+							item !== null
+					)
+					.sort((a, b) => b.score - a.score)
+					.map((item) => item.cmd);
 
 				if (e.key === 'ArrowDown') {
 					e.preventDefault();

From 84ab90a5b122f64a42377d0710bbf9caa4361abe Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Sat, 28 Feb 2026 06:49:40 -0300
Subject: [PATCH 41/43] Guard app init when maestro bridge is unavailable

---
 .../hooks/useAppInitialization.test.ts        | 15 ++++++++
 src/renderer/hooks/ui/useAppInitialization.ts | 37 +++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/__tests__/renderer/hooks/useAppInitialization.test.ts b/src/__tests__/renderer/hooks/useAppInitialization.test.ts
index f321926f5..ee062e3da 100644
--- a/src/__tests__/renderer/hooks/useAppInitialization.test.ts
+++ b/src/__tests__/renderer/hooks/useAppInitialization.test.ts
@@ -294,6 +294,21 @@ describe('useAppInitialization', () => {
 
 			expect(result.current.ghCliAvailable).toBe(false);
 		});
+
+		it('should not crash when maestro bridge is unavailable', async () => {
+			const originalMaestro = (window as any).maestro;
+			(window as any).maestro = undefined;
+
+			try {
+				const { result } = renderHook(() => useAppInitialization());
+				await act(flushPromises);
+
+				expect(result.current.ghCliAvailable).toBe(false);
+				expect(mockCheckGhCli).not.toHaveBeenCalled();
+			} finally {
+				(window as any).maestro = originalMaestro;
+			}
+		});
 	});
 
 	// --- Windows warning modal ---
diff --git a/src/renderer/hooks/ui/useAppInitialization.ts b/src/renderer/hooks/ui/useAppInitialization.ts
index 05f636dac..fd5bc281e 100644
--- a/src/renderer/hooks/ui/useAppInitialization.ts
+++ b/src/renderer/hooks/ui/useAppInitialization.ts
@@ -82,8 +82,13 @@ export function useAppInitialization(): AppInitializationReturn {
 
 	// --- GitHub CLI availability check ---
 	useEffect(() => {
-		window.maestro.git
-			.checkGhCli()
+		const checkGhCli = window.maestro?.git?.checkGhCli;
+		if (!checkGhCli) {
+			setGhCliAvailable(false);
+			return;
+		}
+
+		checkGhCli()
 			.then((status) => {
 				setGhCliAvailable(status.installed && status.authenticated);
 			})
@@ -101,9 +106,10 @@ export function useAppInitialization(): AppInitializationReturn {
 		if (!settingsLoaded) return;
 		if (suppressWindowsWarning) return;
 		if (windowsWarningShownRef.current) return;
+		const getPowerStatus = window.maestro?.power?.getStatus;
+		if (!getPowerStatus) return;
 
-		window.maestro.power
-			.getStatus()
+		getPowerStatus()
 			.then((status) => {
 				if (status.platform === 'win32') {
 					windowsWarningShownRef.current = true;
@@ -117,8 +123,10 @@ export function useAppInitialization(): AppInitializationReturn {
 
 	// --- Load file gist URLs from settings ---
 	useEffect(() => {
-		window.maestro.settings
-			.get('fileGistUrls')
+		const getSetting = window.maestro?.settings?.get;
+		if (!getSetting) return;
+
+		getSetting('fileGistUrls')
 			.then((savedUrls) => {
 				if (savedUrls && typeof savedUrls === 'object') {
 					useTabStore.getState().setFileGistUrls(savedUrls as Record<string, GistInfo>);
@@ -134,23 +142,26 @@ export function useAppInitialization(): AppInitializationReturn {
 		const { fileGistUrls: current } = useTabStore.getState();
 		const updated = { ...current, [filePath]: gistInfo };
 		useTabStore.getState().setFileGistUrls(updated);
-		window.maestro.settings.set('fileGistUrls', updated);
+		window.maestro?.settings?.set('fileGistUrls', updated);
 	}, []);
 
 	// --- Sync beta updates setting to electron-updater ---
 	useEffect(() => {
 		if (settingsLoaded) {
-			window.maestro.updates.setAllowPrerelease(enableBetaUpdates);
+			window.maestro?.updates?.setAllowPrerelease(enableBetaUpdates);
 		}
 	}, [settingsLoaded, enableBetaUpdates]);
 
 	// --- Check for updates on startup ---
 	useEffect(() => {
 		if (settingsLoaded && checkForUpdatesOnStartup) {
+			const checkForUpdates = window.maestro?.updates?.check;
+			if (!checkForUpdates) return;
+
 			const timer = setTimeout(async () => {
 				try {
-					const result = await window.maestro.updates.check(enableBetaUpdates);
-					if (result.updateAvailable && !result.error) {
+					const result = await checkForUpdates(enableBetaUpdates);
+					if (result?.updateAvailable && !result.error) {
 						getModalActions().setUpdateCheckModalOpen(true);
 					}
 				} catch (error) {
@@ -168,12 +179,14 @@ export function useAppInitialization(): AppInitializationReturn {
 		const authToken = leaderboardRegistration?.authToken;
 		const email = leaderboardRegistration?.email;
 		if (!authToken || !email) return;
+		const syncLeaderboard = window.maestro?.leaderboard?.sync;
+		if (!syncLeaderboard) return;
 
 		const timer = setTimeout(async () => {
 			try {
-				const result = await window.maestro.leaderboard.sync({ email, authToken });
+				const result = await syncLeaderboard({ email, authToken });
 
-				if (result.success && result.found && result.data) {
+				if (result?.success && result.found && result.data) {
 					// Read fresh autoRunStats at call time
 					const currentStats = useSettingsStore.getState().autoRunStats;
 					if (result.data.cumulativeTimeMs > currentStats.cumulativeTimeMs) {

From e34f4d063575cbc4f991e6043dbbfc25ceff1136 Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Sat, 28 Feb 2026 08:01:12 -0300
Subject: [PATCH 42/43] fix: polish Focus Mode bubbles, LogViewer setState
 warning, Inbox state preservation, tab name trimming and textarea ref
 stability

---
 .../components/AgentInbox/FocusModeView.tsx   | 42 ++++++-------------
 src/renderer/components/LogViewer.tsx         | 14 +++----
 src/renderer/components/TabBar.tsx            |  5 ++-
 src/renderer/stores/modalStore.ts             | 13 +++++-
 src/renderer/utils/tabDisplayName.ts          |  5 ++-
 5 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/src/renderer/components/AgentInbox/FocusModeView.tsx b/src/renderer/components/AgentInbox/FocusModeView.tsx
index 55a5bf36a..9effa5432 100644
--- a/src/renderer/components/AgentInbox/FocusModeView.tsx
+++ b/src/renderer/components/AgentInbox/FocusModeView.tsx
@@ -2,8 +2,6 @@ import { useMemo, useRef, useEffect, useState, useCallback } from 'react';
 import {
 	ArrowLeft,
 	X,
-	Bot,
-	User,
 	ArrowUp,
 	ExternalLink,
 	ChevronLeft,
@@ -161,24 +159,22 @@ function FocusLogEntry({
 		);
 	}
 
-	// User entry — right-aligned with User icon
+	// User entry — right-aligned, matching main chat bubble style
 	if (isUser) {
 		return (
-			<div className="flex gap-2" style={{ flexDirection: 'row-reverse' }}>
+			<div className="flex gap-4 flex-row-reverse px-6 py-2">
 				<div
-					className="flex-shrink-0 w-6 h-6 rounded-full flex items-center justify-center"
-					style={{ backgroundColor: `${theme.colors.success}20` }}
+					className="w-20 shrink-0 text-[10px] pt-2 text-right"
+					style={{ color: theme.colors.textDim, opacity: 0.6 }}
 				>
-					<User className="w-3.5 h-3.5" style={{ color: theme.colors.success }} />
+					{formatRelativeTime(log.timestamp)}
 				</div>
 				<div
-					className="flex-1 min-w-0 p-4 rounded-xl border overflow-hidden text-sm"
+					className="flex-1 min-w-0 p-4 pb-10 rounded-xl rounded-tr-none border overflow-hidden text-sm"
 					style={{
 						backgroundColor: `color-mix(in srgb, ${theme.colors.accent} 20%, ${theme.colors.bgSidebar})`,
 						borderColor: `${theme.colors.accent}40`,
 						color: theme.colors.textMain,
-						maxWidth: '85%',
-						borderLeft: `3px solid ${theme.colors.success}`,
 					}}
 				>
 					<div
@@ -191,41 +187,35 @@ function FocusLogEntry({
 					>
 						{log.text}
 					</div>
-					<div className="flex justify-end mt-2">
-						<span className="text-[10px]" style={{ color: theme.colors.textDim, opacity: 0.6 }}>
-							{formatRelativeTime(log.timestamp)}
-						</span>
-					</div>
 				</div>
 			</div>
 		);
 	}
 
-	// AI / stdout entry — left-aligned with Bot icon + markdown
+	// AI / stdout entry — left-aligned, matching main chat bubble style
 	if (isAI) {
 		const handleCopy = (text: string) => {
 			navigator.clipboard.writeText(text).catch(() => {});
 		};
 
 		return (
-			<div className="flex gap-2 group">
+			<div className="flex gap-4 group px-6 py-2">
 				<div
-					className="flex-shrink-0 w-6 h-6 rounded-full flex items-center justify-center"
-					style={{ backgroundColor: `${theme.colors.accent}20` }}
+					className="w-20 shrink-0 text-[10px] pt-2 text-left"
+					style={{ color: theme.colors.textDim, opacity: 0.6 }}
 				>
-					<Bot className="w-3.5 h-3.5" style={{ color: theme.colors.accent }} />
+					{formatRelativeTime(log.timestamp)}
 				</div>
 				<div
-					className="flex-1 min-w-0 p-4 rounded-xl border overflow-hidden text-sm"
+					className="flex-1 min-w-0 p-4 pb-10 rounded-xl rounded-tl-none border overflow-hidden text-sm relative"
 					style={{
 						backgroundColor: theme.colors.bgActivity,
 						borderColor: theme.colors.border,
 						color: theme.colors.textMain,
-						borderLeft: `3px solid ${theme.colors.accent}`,
 					}}
 				>
 					{/* Raw/rendered toggle */}
-					<div className="flex justify-end">
+					<div className="absolute top-2 right-2">
 						<button
 							onClick={onToggleRaw}
 							aria-label={showRawMarkdown ? 'Show formatted' : 'Show plain text'}
@@ -255,12 +245,6 @@ function FocusLogEntry({
 					) : (
 						<MarkdownRenderer content={log.text} theme={theme} onCopy={handleCopy} />
 					)}
-
-					<div className="flex justify-end mt-2">
-						<span className="text-[10px]" style={{ color: theme.colors.textDim, opacity: 0.6 }}>
-							{formatRelativeTime(log.timestamp)}
-						</span>
-					</div>
 				</div>
 			</div>
 		);
diff --git a/src/renderer/components/LogViewer.tsx b/src/renderer/components/LogViewer.tsx
index 342a3ef38..2af390e81 100644
--- a/src/renderer/components/LogViewer.tsx
+++ b/src/renderer/components/LogViewer.tsx
@@ -98,16 +98,16 @@ export function LogViewer({
 				  ) => Set<'debug' | 'info' | 'warn' | 'error' | 'toast' | 'autorun'>)
 		) => {
 			setSelectedLevelsState((prev) => {
-				const newSet = typeof updater === 'function' ? updater(prev) : updater;
-				// Persist to settings
-				if (onSelectedLevelsChange) {
-					onSelectedLevelsChange(Array.from(newSet));
-				}
-				return newSet;
+				return typeof updater === 'function' ? updater(prev) : updater;
 			});
 		},
-		[onSelectedLevelsChange]
+		[]
 	);
+
+	// Persist selectedLevels to parent via effect (avoids setState-during-render warning)
+	useEffect(() => {
+		onSelectedLevelsChange?.(Array.from(selectedLevels));
+	}, [selectedLevels, onSelectedLevelsChange]);
 	const [expandedData, setExpandedData] = useState<Set<number>>(new Set());
 	const [showClearConfirm, setShowClearConfirm] = useState(false);
 	const searchInputRef = useRef<HTMLInputElement>(null);
diff --git a/src/renderer/components/TabBar.tsx b/src/renderer/components/TabBar.tsx
index 53f1a096f..77c49afeb 100644
--- a/src/renderer/components/TabBar.tsx
+++ b/src/renderer/components/TabBar.tsx
@@ -463,6 +463,9 @@ const Tab = memo(function Tab({
 
 	// Description editing handlers
 	const descriptionButtonRef = useRef<HTMLButtonElement>(null);
+	const descriptionTextareaRef = useCallback((el: HTMLTextAreaElement | null) => {
+		el?.focus();
+	}, []);
 	const skipBlurSaveRef = useRef(false);
 
 	const handleDescriptionSave = useCallback(
@@ -772,7 +775,7 @@ const Tab = memo(function Tab({
 								>
 									{isEditingDescription ? (
 										<textarea
-											ref={(el) => el?.focus()}
+											ref={descriptionTextareaRef}
 											value={descriptionDraft}
 											onChange={(e) => setDescriptionDraft(e.target.value)}
 											onKeyDown={handleDescriptionKeyDown}
diff --git a/src/renderer/stores/modalStore.ts b/src/renderer/stores/modalStore.ts
index 15c77a89a..e3e70f08e 100644
--- a/src/renderer/stores/modalStore.ts
+++ b/src/renderer/stores/modalStore.ts
@@ -772,8 +772,17 @@ export function getModalActions() {
 			open ? openModal('directorNotes') : closeModal('directorNotes'),
 
 		// Agent Inbox Modal (Unified Inbox)
-		setAgentInboxOpen: (open: boolean) =>
-			open ? openModal('agentInbox') : closeModal('agentInbox'),
+		// Preserve persisted view state (filter/sort/expand) when closing
+		setAgentInboxOpen: (open: boolean) => {
+			if (open) {
+				openModal('agentInbox');
+			} else {
+				const currentData = useModalStore.getState().getData('agentInbox');
+				const newModals = new Map(useModalStore.getState().modals);
+				newModals.set('agentInbox', { open: false, data: currentData });
+				useModalStore.setState({ modals: newModals });
+			}
+		},
 		updateAgentInboxData: (data: Record<string, unknown>) => updateModalData('agentInbox', data),
 
 		// Lightbox refs replacement - use updateModalData instead
diff --git a/src/renderer/utils/tabDisplayName.ts b/src/renderer/utils/tabDisplayName.ts
index e93447193..ce6878f55 100644
--- a/src/renderer/utils/tabDisplayName.ts
+++ b/src/renderer/utils/tabDisplayName.ts
@@ -10,8 +10,9 @@ import type { AITab } from '../types';
  * - Codex: "thread_abc123..." → "THR_ABC1" (prefix + 4 chars)
  */
 export function getTabDisplayName(tab: Pick<AITab, 'name' | 'agentSessionId'>): string {
-	if (tab.name) {
-		return tab.name;
+	const normalizedName = tab.name?.trim();
+	if (normalizedName) {
+		return normalizedName;
 	}
 	if (tab.agentSessionId) {
 		const id = tab.agentSessionId;

From 9a8eba62220cd425d9fbbd3f01f0e2763a3bc86b Mon Sep 17 00:00:00 2001
From: Felipe Gobbi <felipegobbi@192.168.68.63>
Date: Sat, 28 Feb 2026 10:33:32 -0300
Subject: [PATCH 43/43] fix: prevent infinite loop in Focus Mode quick reply
 and fix stats-db column names

The inbox quick reply effect (`App.tsx`) entered an infinite loop because
processInput() calls Zustand setSessions() (synchronous), which re-triggers
the effect before React commits the batched setPendingInboxQuickReply(null).
Added inboxQuickReplyFiredRef as a synchronous guard to prevent re-entry.

Also fixed stats-db column names from camelCase (startTime, createdAt) to
snake_case (start_time, created_at) to match the actual SQLite schema.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/main/stats/stats-db.ts | 12 ++++++------
 src/renderer/App.tsx       | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/stats/stats-db.ts b/src/main/stats/stats-db.ts
index b2cbbbd8e..cdd627949 100644
--- a/src/main/stats/stats-db.ts
+++ b/src/main/stats/stats-db.ts
@@ -797,19 +797,19 @@ export class StatsDB {
 	 */
 	getEarliestTimestamp(): number | null {
 		try {
-			// Query the minimum startTime from query_events table
+			// Query the minimum start_time from query_events table
 			const queryResult = this.database
-				.prepare('SELECT MIN(startTime) as earliest FROM query_events')
+				.prepare('SELECT MIN(start_time) as earliest FROM query_events')
 				.get() as { earliest: number | null } | undefined;
 
-			// Query the minimum startTime from auto_run_sessions table
+			// Query the minimum start_time from auto_run_sessions table
 			const autoRunResult = this.database
-				.prepare('SELECT MIN(startTime) as earliest FROM auto_run_sessions')
+				.prepare('SELECT MIN(start_time) as earliest FROM auto_run_sessions')
 				.get() as { earliest: number | null } | undefined;
 
-			// Query the minimum createdAt from session_lifecycle table
+			// Query the minimum created_at from session_lifecycle table
 			const lifecycleResult = this.database
-				.prepare('SELECT MIN(createdAt) as earliest FROM session_lifecycle')
+				.prepare('SELECT MIN(created_at) as earliest FROM session_lifecycle')
 				.get() as { earliest: number | null } | undefined;
 
 			// Find the minimum across all tables
diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 3481f2ade..6af346dda 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -1404,10 +1404,18 @@ function MaestroConsoleInner() {
 		previousActiveSessionId: string | null;
 		text: string;
 	} | null>(null);
+	// Synchronous guard ref — prevents the effect from re-firing before React commits
+	// the batched setPendingInboxQuickReply(null). Without this, the Zustand setSessions()
+	// inside processInput triggers a synchronous store update → sessions dep changes →
+	// effect re-runs → pendingInboxQuickReply is still non-null (batched) → infinite loop.
+	const inboxQuickReplyFiredRef = useRef(false);
 
 	// Flush pending quick-reply once target session is active (deterministic, no RAF timing chain).
 	useEffect(() => {
 		if (!pendingInboxQuickReply) return;
+		// Synchronous guard: processInput triggers Zustand setSessions (sync) which re-runs
+		// this effect before React commits the batched setPendingInboxQuickReply(null).
+		if (inboxQuickReplyFiredRef.current) return;
 		// Guard: if the target session was removed before activation, clear the stale pending.
 		if (!sessions.some((s) => s.id === pendingInboxQuickReply.targetSessionId)) {
 			setPendingInboxQuickReply(null);
@@ -1415,6 +1423,8 @@ function MaestroConsoleInner() {
 		}
 		if (activeSession?.id !== pendingInboxQuickReply.targetSessionId) return;
 
+		// Mark as fired BEFORE calling processInput to prevent re-entry
+		inboxQuickReplyFiredRef.current = true;
 		inboxProcessInputRef.current(pendingInboxQuickReply.text);
 		const previousActiveSessionId = pendingInboxQuickReply.previousActiveSessionId;
 		setPendingInboxQuickReply(null);
@@ -1436,6 +1446,9 @@ function MaestroConsoleInner() {
 			// Guard: ignore if a quick reply is already in progress
 			if (pendingInboxQuickReply) return;
 
+			// Reset the synchronous guard so the effect can fire for this new reply
+			inboxQuickReplyFiredRef.current = false;
+
 			// Save current active session so we can restore it after sending.
 			const previousActiveSessionId = activeSessionIdRef.current;