cli-jaw 2.0.3 → 2.0.5

package/public/locales/zh.json

@@ -141,7 +141,8 @@
     "chat.file.sentWithMsg": "\n\n用户消息：{text}",
     "chat.file.uploadFail": "文件上传失败：{msg}",
     "chat.requestFail": "请求失败（{status}）",
-    "chat.continue": "正在从上一个 worklog 继续。",
+    "chat.continue": "正在继续当前任务。",
+    "chat.noPendingContinue": "没有可继续的待处理工作。",
     "chat.voice.label": "🎤 [语音消息]",
     "skill.loadFail": "无法加载技能",
     "skill.count": "{active} 个启用 / 共 {total} 个",
@@ -460,5 +461,78 @@
     "help.promptTemplates.howTo.2": "重复工作流开始前选择相应模板。",
     "help.promptTemplates.example.1": "把同一套代码审查清单保存下来，避免每次重打。",
     "help.promptTemplates.avoid.1": "一次性的短指令直接写在聊天里更清楚时",
-    "help.promptTemplates.related.1": "提示模板弹窗"
+    "help.promptTemplates.related.1": "提示模板弹窗",
+    "help.chatInput.title": "聊天输入",
+    "help.chatInput.aria": "聊天输入帮助",
+    "help.chatComposer.aria": "聊天输入和键盘快捷键帮助",
+    "help.chatInput.intro": "用于发送任务指令、斜杠命令和附件的主要输入框。",
+    "help.chatInput.effect": "消息会按当前 CLI 和设置发送，附件也会随请求一起处理。",
+    "help.chatInput.use.1": "开始新任务或继续当前工作时",
+    "help.chatInput.use.2": "运行 /help 或 /pabcd 等斜杠命令时",
+    "help.chatInput.use.3": "需要同时发送文本和文件时",
+    "help.chatInput.howTo.1": "输入消息后点击 Send，或使用支持的发送快捷键。",
+    "help.chatInput.howTo.2": "用附件按钮或拖放添加文件后再发送。",
+    "help.chatInput.example.1": "输入“review this diff”，并附上相关文件。",
+    "help.chatInput.avoid.1": "只执行命令时，使用斜杠命令比模糊文字更安全。",
+    "help.chatInput.avoid.2": "不要把原始密钥或 token 直接粘贴到聊天里。",
+    "help.chatInput.related.1": "附件",
+    "help.chatInput.related.2": "键盘快捷键",
+    "help.orchestration.title": "PABCD",
+    "help.orchestration.aria": "PABCD 帮助",
+    "help.orchestration.intro": "PABCD 是把规划、审计、构建、检查和完成分开的工作流。",
+    "help.orchestration.effect": "每个阶段只做一件事，让大范围修改更安全、更容易审查。",
+    "help.orchestration.use.1": "任务会涉及多个文件或功能时",
+    "help.orchestration.use.2": "需要员工审计或实现验证时",
+    "help.orchestration.use.3": "希望先确认计划再改代码时",
+    "help.orchestration.howTo.1": "用 /pabcd 或 /orchestrate 进入规划阶段。",
+    "help.orchestration.howTo.2": "每个阶段结束后批准，才进入下一阶段。",
+    "help.orchestration.example.1": "先在 P 阶段规划，在 A 阶段审计，再在 B 阶段实现。",
+    "help.orchestration.avoid.1": "只需要一句回答或简单状态检查时",
+    "help.orchestration.avoid.2": "紧急任务应先缩小范围。",
+    "help.orchestration.related.1": "员工",
+    "help.orchestration.related.2": "键盘快捷键",
+    "help.attachments.title": "附件",
+    "help.attachments.aria": "附件帮助",
+    "help.attachments.intro": "把图片、文档、日志或代码文件随当前消息一起发送的区域。",
+    "help.attachments.effect": "附件会进入请求上下文，Agent 可以读取或分析它们。",
+    "help.attachments.use.1": "需要用截图或错误日志说明问题时",
+    "help.attachments.use.2": "需要直接审查文档或代码文件时",
+    "help.attachments.use.3": "多个相关文件需要一起发送时",
+    "help.attachments.howTo.1": "使用附件按钮，或把文件拖到聊天区域。",
+    "help.attachments.howTo.2": "发送前在预览中移除错误文件。",
+    "help.attachments.example.1": "把错误截图和日志文件一起发送，询问根因。",
+    "help.attachments.avoid.1": "不要附加凭证文件或包含 token 的文件。",
+    "help.attachments.avoid.2": "无关的大文件会降低分析质量。",
+    "help.attachments.related.1": "聊天输入",
+    "help.attachments.related.2": "记忆",
+    "help.diagrams.title": "图表",
+    "help.diagrams.aria": "图表帮助",
+    "help.diagrams.intro": "在回答中直接渲染 SVG、Mermaid 和交互式图表。",
+    "help.diagrams.effect": "复杂流程、结构和比较比纯文字更容易快速浏览。",
+    "help.diagrams.use.1": "需要文件变更地图或系统流程时",
+    "help.diagrams.use.2": "需要快速概览 PABCD 计划或审计结果时",
+    "help.diagrams.use.3": "需要放大或复制已渲染图表时",
+    "help.diagrams.howTo.1": "可用时使用图表按钮进行放大、复制或保存。",
+    "help.diagrams.howTo.2": "如果文字偏移或线条不可见，请报告渲染问题。",
+    "help.diagrams.example.1": "要求用方框和箭头展示工作范围。",
+    "help.diagrams.avoid.1": "精确原文或长代码用文本更清楚。",
+    "help.diagrams.avoid.2": "不要把包含秘密信息的屏幕直接可视化。",
+    "help.diagrams.related.1": "PABCD",
+    "help.diagrams.related.2": "附件",
+    "help.keyboardShortcuts.title": "键盘快捷键",
+    "help.keyboardShortcuts.aria": "键盘快捷键帮助",
+    "help.keyboardShortcuts.intro": "Jaw UI 和浏览器快捷键说明，用来减少重复点击。",
+    "help.keyboardShortcuts.effect": "输入、语音、帮助和仪表盘导航都可以用键盘更快完成。",
+    "help.keyboardShortcuts.use.1": "希望不用鼠标执行常用操作时",
+    "help.keyboardShortcuts.use.2": "需要确认快捷键是否会打断输入时",
+    "help.keyboardShortcuts.use.3": "寻找 Manager dashboard 快捷键设置时",
+    "help.keyboardShortcuts.howTo.1": "Classic Web：在聊天输入框中按 Enter 发送，Shift+Enter 换行，斜杠命令从同一个输入框里的 / 开始。",
+    "help.keyboardShortcuts.howTo.2": "Manager：不在编辑器中时，? 打开快捷键帮助；Alt+I、Alt+P、Alt+N 跳到 Instances、active Preview 和 Notes；Alt+K 与 Alt+J 选择上一个或下一个实例。",
+    "help.keyboardShortcuts.howTo.3": "Manager Notes：Cmd/Ctrl+S 保存，Cmd/Ctrl+E 在 Raw/Preview/WYSIWYG 间切换，Cmd/Ctrl+Shift+F 打开笔记搜索，Cmd/Ctrl+P 切换 quick switcher，Cmd/Ctrl+Delete 或 Cmd/Ctrl+Backspace 将选中的笔记或文件夹移到废纸篓。",
+    "help.keyboardShortcuts.example.1": "在聊天输入框按 Enter 发送；需要换行时使用 Shift+Enter。",
+    "help.keyboardShortcuts.example.2": "在 Manager 中，当焦点不在输入框或编辑器里时，按 ? 打开这个快捷键帮助。",
+    "help.keyboardShortcuts.avoid.1": "与浏览器默认快捷键冲突时，请换用其他组合。",
+    "help.keyboardShortcuts.avoid.2": "全局快捷键不应覆盖正在编辑的文本。",
+    "help.keyboardShortcuts.related.1": "聊天输入",
+    "help.keyboardShortcuts.related.2": "PABCD"
 }

package/public/manager/src/App.tsx

@@ -1,42 +1,26 @@
-import { type ReactNode, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { fetchInstances, fetchInstanceStatus, runLifecycleAction } from './api';
 import { pollUntilSettled } from './lifecycle-poll';
-import { ActivityDock } from './components/ActivityDock';
-import { CommandBar } from './components/CommandBar';
-import { CommandPalette } from './components/CommandPalette';
 import { InstanceDetailPanel } from './components/InstanceDetailPanel';
-import { InstanceDrawer } from './components/InstanceDrawer';
 import { InstanceListContent } from './components/InstanceListContent';
-import { InstanceNavigator } from './components/InstanceNavigator';
-import { ManagerShell } from './components/ManagerShell';
-import { MobileNav } from './components/MobileNav';
 import { ProfileChip } from './components/ProfileChip';
-import { SidebarRail } from './components/SidebarRail';
-import { HelpDrawer } from './help/HelpDrawer';
-import { Workbench } from './components/Workbench';
+import { AppChrome } from './AppChrome';
+import { type HelpTopicId } from './help/helpContent';
+import { isHelpShortcutEditableTarget } from './help/help-shortcuts';
 import { WorkbenchHeader } from './components/WorkbenchHeader';
-import { WorkspaceLayout } from './components/WorkspaceLayout';
-import { InstancePreview } from './InstancePreview';
-import { ElectronMetricsPanel } from './electron-metrics';
 import { loadPreviewEnabled, savePreviewEnabled } from './lib/preview-prefs';
 import { useHiddenUnload } from './lib/use-hidden-unload';
-import { DashboardSettingsSidebar, type DashboardSettingsSection } from './dashboard-settings/DashboardSettingsSidebar';
-import { DashboardSettingsWorkspace } from './dashboard-settings/DashboardSettingsWorkspace';
+import { type DashboardSettingsSection } from './dashboard-settings/DashboardSettingsSidebar';
 import { summarizeActivityTitleSupport } from './dashboard-settings/activity-title-support';
 import { dashboardSettingsUiFromView } from './dashboard-settings/dashboard-settings-ui';
-import { NotesSidebar } from './notes/NotesSidebar';
-import { NotesWorkspace } from './notes/NotesWorkspace';
+import { type NotesSidebarMode } from './notes/NotesSidebar';
 import { useNotesModel } from './notes/useNotesModel';
 import { publishInvalidation } from './sync/invalidation-bus';
 import { useInvalidationSubscription } from './sync/useInvalidationSubscription';
-import { IframeBridge } from './sync/IframeBridge';
-import { VisibilityBridge } from './sync/VisibilityBridge';
-import { DashboardBoardSidebar } from './dashboard-board/DashboardBoardSidebar';
-import { DashboardBoardWorkspace } from './dashboard-board/DashboardBoardWorkspace';
 import type { BoardView } from './dashboard-board/board-view';
-import { DashboardScheduleSidebar, type ScheduleGroup } from './dashboard-schedule/DashboardScheduleSidebar';
-import { DashboardScheduleWorkspace } from './dashboard-schedule/DashboardScheduleWorkspace';
-import { SCHEDULE_WORKSPACE_ENABLED, normalizeSidebarModeForBuild } from './dashboard-features';
+import { type ScheduleGroup } from './dashboard-schedule/DashboardScheduleSidebar';
+import { normalizeSidebarModeForBuild } from './dashboard-features';
+import { readInitialSidebarMode } from './dashboard-url-state';
 import { useDashboardRegistry } from './hooks/useDashboardRegistry';
 import { useDashboardView } from './hooks/useDashboardView';
 import { useActivityUnread } from './hooks/useActivityUnread';
@@ -46,27 +30,10 @@ import { useInstanceLabelEditor } from './hooks/useInstanceLabelEditor';
 import { useInstanceMessageEvents } from './hooks/useInstanceMessageEvents';
 import { useManagerEvents } from './hooks/useManagerEvents';
 import { formatUptime, instanceLabel } from './instance-label';
+import { useJawCeoDashboardBridge } from './jaw-ceo/useJawCeoDashboardBridge';
+import { actionForShortcutEvent, isManagerShortcutEditableTarget } from './manager-shortcuts';
 import { reconcileActiveProfileFilter } from './profile-filter';
-import type {
-    DashboardDetailTab,
-    DashboardInstance,
-    DashboardInstanceStatus,
-    DashboardLifecycleAction,
-    DashboardNotesAuthoringMode,
-    DashboardNotesViewMode,
-    DashboardProfile,
-    DashboardScanResult,
-    DashboardSidebarMode,
-} from './types';
-
-type WorkspaceSurfaceProps = {
-    active: boolean;
-    children: ReactNode;
-};
-
-function WorkspaceSurface(props: WorkspaceSurfaceProps) {
-    return <section className={`workspace-surface${props.active ? ' is-active' : ''}`} hidden={!props.active} aria-hidden={!props.active}>{props.children}</section>;
-}
+import type { DashboardDetailTab, DashboardInstance, DashboardInstanceStatus, DashboardLifecycleAction, DashboardNotesAuthoringMode, DashboardNotesViewMode, DashboardProfile, DashboardScanResult, DashboardShortcutAction, DashboardSidebarMode } from './types';
 
 export function App() {
     const [data, setData] = useState<DashboardScanResult | null>(null);
@@ -84,6 +51,8 @@ export function App() {
     const [activeProfileIds, setActiveProfileIds] = useState<string[]>([]);
     const [settingsDirty, setSettingsDirty] = useState(false);
     const [notesDirtyPath, setNotesDirtyPath] = useState<string | null>(null);
+    const [notesSidebarMode, setNotesSidebarMode] = useState<NotesSidebarMode>('files');
+    const [notesSearchFocusToken, setNotesSearchFocusToken] = useState(0);
     const [dashboardSettingsSection, setDashboardSettingsSection] = useState<DashboardSettingsSection>('display');
     const [boardView, setBoardView] = useState<BoardView>({ kind: 'overall' });
     const [scheduleGroup, setScheduleGroup] = useState<ScheduleGroup>('today');
@@ -91,16 +60,15 @@ export function App() {
     const [previewRefreshKey, setPreviewRefreshKey] = useState(0);
     const [autoUnloadNotice, setAutoUnloadNotice] = useState(false);
     const [helpOpen, setHelpOpen] = useState(false);
+    const [helpTopic, setHelpTopic] = useState<HelpTopicId | null>(null);
+    const openHelpTopic = useCallback((topic: HelpTopicId) => {
+        setHelpTopic(topic);
+        setHelpOpen(true);
+    }, []);
     useEffect(() => {
         savePreviewEnabled(previewEnabled);
     }, [previewEnabled]);
-    useHiddenUnload({
-        enabled: previewEnabled,
-        onUnload: () => {
-            setPreviewEnabled(false);
-            setAutoUnloadNotice(true);
-        },
-    });
+    useHiddenUnload({ enabled: previewEnabled, onUnload: () => { setPreviewEnabled(false); setAutoUnloadNotice(true); } });
     useEffect(() => {
         if (!autoUnloadNotice) return undefined;
         if (typeof document === 'undefined') return undefined;
@@ -150,34 +118,41 @@ export function App() {
         if (view.selectedPort == null) return filtered.find(instance => instance.ok) || null;
         return instances.find(instance => instance.port === view.selectedPort) || null;
     }, [filtered, instances, view.selectedPort]);
-
-    // activity-unread must see the *resolved* selected port so the
-    // auto-fallback instance (selectedPort == null) is also suppressed.
+    const activeJawCeoPort = selectedInstance?.port ?? view.selectedPort ?? null;
+    const jawCeoBridge = useJawCeoDashboardBridge({ selectedPort: activeJawCeoPort, managerEvents: managerEvents.events, messageEvents: messageActivity.events, onOpenWorker: handleOpenJawCeoWorker });
     const activePreviewPort = view.activeDetailTab === 'preview' && view.sidebarMode === 'instances'
         ? (selectedInstance?.port ?? null)
         : null;
+    const activityEvents = useMemo(() => {
+        return [...managerEvents.events, ...messageActivity.events];
+    }, [managerEvents.events, messageActivity.events]);
     const activityUnread = useActivityUnread({
-        events: [...managerEvents.events, ...messageActivity.events],
+        events: activityEvents,
         activityDockCollapsed: view.activityDockCollapsed,
         setActivityDockCollapsed: view.setActivityDockCollapsed,
         saveUi,
         activePreviewPort,
     });
-
     function cycleTheme(): void {
         const order: ('auto' | 'light' | 'dark')[] = ['auto', 'light', 'dark'];
         const next = order[(order.indexOf(theme.theme) + 1) % order.length];
         theme.setTheme(next);
     }
-
     function openSelectedInBrowser(): void {
         if (!selectedInstance) return;
         window.open(selectedInstance.url, '_blank', 'noopener,noreferrer');
     }
+    useEffect(() => { document.documentElement.lang = view.locale; }, [view.locale]);
 
     useEffect(() => {
-        document.documentElement.lang = view.locale;
-    }, [view.locale]);
+        function onKeyDown(event: KeyboardEvent): void {
+            if (event.key !== '?' || event.metaKey || event.ctrlKey || event.altKey) return;
+            if (isHelpShortcutEditableTarget(event.target)) return;
+            event.preventDefault(); openHelpTopic('shortcuts');
+        }
+        document.addEventListener('keydown', onKeyDown);
+        return () => document.removeEventListener('keydown', onKeyDown);
+    }, [openHelpTopic]);
 
     async function load(nextShowHidden = showHidden): Promise<void> {
         setLoading(true);
@@ -215,7 +190,7 @@ export function App() {
                 view.setSidebarCollapsed(ui.sidebarCollapsed);
                 view.setActivityDockCollapsed(ui.activityDockCollapsed);
                 view.setActivityDockHeight(ui.activityDockHeight);
-                const sidebarMode = normalizeSidebarModeForBuild(ui.sidebarMode);
+                const sidebarMode = normalizeSidebarModeForBuild(readInitialSidebarMode(window.location.search) ?? ui.sidebarMode);
                 view.setSidebarMode(sidebarMode);
                 if (sidebarMode !== ui.sidebarMode) void saveUi({ sidebarMode });
                 view.setNotesSelectedPath(ui.notesSelectedPath);
@@ -227,6 +202,8 @@ export function App() {
                 view.setShowInlineLabelEditor(ui.showInlineLabelEditor);
                 view.setShowSidebarRuntimeLine(ui.showSidebarRuntimeLine);
                 view.setShowSelectedRowActions(ui.showSelectedRowActions);
+                view.setDashboardShortcutsEnabled(ui.dashboardShortcutsEnabled);
+                view.setDashboardShortcutKeymap(ui.dashboardShortcutKeymap);
                 view.setLocale(ui.locale);
                 activityUnread.hydrateSeenAt(ui.activitySeenAt ?? null, ui.activitySeenByPort || {});
                 setActiveProfileIds(loaded.registry.activeProfileFilter || []);
@@ -282,6 +259,8 @@ export function App() {
         void saveUi({ selectedPort: instance.port, selectedTab: 'preview', activityDockCollapsed: true });
     }
 
+    function handleOpenJawCeoWorker(port: number): void { const instance = instances.find(row => row.port === port); if (instance) handlePreview(instance); }
+
     function handleSelectInstance(instance: DashboardInstance): void {
         if (!canLeaveDirtySettings()) return;
         setSettingsDirty(false);
@@ -341,6 +320,11 @@ export function App() {
         view.setNotesSelectedPath(path); void saveUi({ notesSelectedPath: path });
     }
 
+    function openNotesSidebarSearch(): void {
+        setNotesSidebarMode('search');
+        setNotesSearchFocusToken(token => token + 1);
+    }
+
     function handleNotesViewModeChange(mode: DashboardNotesViewMode): void {
         view.setNotesViewMode(mode); void saveUi({ notesViewMode: mode });
     }
@@ -363,15 +347,104 @@ export function App() {
         onSelectedPathChange: handleNotesSelectedPathChange,
     });
 
+    const notesSelectedNote = view.notesSelectedPath
+        ? notesModel.index?.notes.find(n => n.path === view.notesSelectedPath) ?? null
+        : null;
+
     function handleDashboardSettingsPatch(ui: NonNullable<Parameters<typeof saveUi>[0]>): void {
         if (ui.showLatestActivityTitles !== undefined) view.setShowLatestActivityTitles(ui.showLatestActivityTitles);
         if (ui.showInlineLabelEditor !== undefined) view.setShowInlineLabelEditor(ui.showInlineLabelEditor);
         if (ui.showSidebarRuntimeLine !== undefined) view.setShowSidebarRuntimeLine(ui.showSidebarRuntimeLine);
         if (ui.showSelectedRowActions !== undefined) view.setShowSelectedRowActions(ui.showSelectedRowActions);
+        if (ui.dashboardShortcutsEnabled !== undefined) view.setDashboardShortcutsEnabled(ui.dashboardShortcutsEnabled);
+        if (ui.dashboardShortcutKeymap !== undefined) view.setDashboardShortcutKeymap(ui.dashboardShortcutKeymap);
         if (ui.locale !== undefined) view.setLocale(ui.locale);
         void saveUi(ui);
     }
 
+    function selectRelativeInstance(direction: 1 | -1): void {
+        if (filtered.length === 0) return;
+        const currentPort = selectedInstance?.port ?? null;
+        const currentIndex = currentPort == null
+            ? -1
+            : filtered.findIndex(instance => instance.port === currentPort);
+        const baseIndex = currentIndex >= 0 ? currentIndex : direction > 0 ? -1 : 0;
+        const nextIndex = (baseIndex + direction + filtered.length) % filtered.length;
+        const next = filtered[nextIndex];
+        if (!next) return;
+        handleSelectInstance(next);
+    }
+
+    function runManagerShortcut(action: DashboardShortcutAction): void {
+        if (action === 'focusInstances') {
+            handleSidebarModeChange('instances');
+            view.setDrawerOpen(false);
+            return;
+        }
+        if (action === 'focusActiveSession') {
+            const target = selectedInstance?.ok
+                ? selectedInstance
+                : filtered.find(instance => instance.ok) || null;
+            if (target) handlePreview(target);
+            else handleSidebarModeChange('instances');
+            return;
+        }
+        if (action === 'focusNotes') {
+            handleSidebarModeChange('notes');
+            view.setDrawerOpen(false);
+            return;
+        }
+        if (action === 'previousInstance') {
+            selectRelativeInstance(-1);
+            return;
+        }
+        if (action === 'nextInstance') {
+            selectRelativeInstance(1);
+        }
+    }
+
+    useEffect(() => {
+        function onKeyDown(event: KeyboardEvent): void {
+            if (!view.dashboardShortcutsEnabled) return;
+            if (isManagerShortcutEditableTarget(event.target)) return;
+            const action = actionForShortcutEvent(event, view.dashboardShortcutKeymap);
+            if (!action) return;
+            event.preventDefault();
+            runManagerShortcut(action);
+        }
+        document.addEventListener('keydown', onKeyDown);
+        return () => document.removeEventListener('keydown', onKeyDown);
+    }, [
+        filtered,
+        selectedInstance,
+        view.dashboardShortcutsEnabled,
+        view.dashboardShortcutKeymap,
+        view.sidebarMode,
+        view.activeDetailTab,
+        settingsDirty,
+    ]);
+
+    useEffect(() => {
+        function onPreviewShortcut(event: MessageEvent): void {
+            if (!view.dashboardShortcutsEnabled) return;
+            const data = event.data;
+            if (!data || data.type !== 'jaw-preview-shortcut') return;
+            const synth = { key: data.key, altKey: !!data.altKey, ctrlKey: false, metaKey: false, shiftKey: !!data.shiftKey } as unknown as KeyboardEvent;
+            const action = actionForShortcutEvent(synth, view.dashboardShortcutKeymap);
+            if (action) runManagerShortcut(action);
+        }
+        window.addEventListener('message', onPreviewShortcut);
+        return () => window.removeEventListener('message', onPreviewShortcut);
+    }, [
+        filtered,
+        selectedInstance,
+        view.dashboardShortcutsEnabled,
+        view.dashboardShortcutKeymap,
+        view.sidebarMode,
+        view.activeDetailTab,
+        settingsDirty,
+    ]);
+
     async function handleLifecycle(action: DashboardLifecycleAction, instance: DashboardInstance): Promise<void> {
         const lifecycle = instance.lifecycle;
         if (!lifecycle) return;
@@ -420,51 +493,21 @@ export function App() {
     }
 
     const instanceListContent = (
-        <InstanceListContent
-            error={error}
-            loading={loading}
-            instances={instances}
-            filtered={filtered}
-            selectedInstance={selectedInstance}
-            data={data}
-            lifecycleBusyPort={lifecycleBusyPort}
-            transitioningPort={transitioningPort}
-            transitionAction={transitionAction}
-            activityUnreadByPort={activityUnread.unreadByPort}
-            latestTitleByPort={messageActivity.titlesByPort}
-            busyPorts={messageActivity.busyPorts}
-            showLatestActivityTitles={view.showLatestActivityTitles}
-            showInlineLabelEditor={view.showInlineLabelEditor}
-            showSidebarRuntimeLine={view.showSidebarRuntimeLine}
-            showSelectedRowActions={view.showSelectedRowActions}
-            profiles={profiles}
-            getLabel={instanceLabel}
-            formatUptime={formatUptime}
-            onSelect={handleSelectInstance}
-            onPreview={handlePreview}
-            onMarkActivitySeen={activityUnread.markPortSeen}
-            onInstanceLabelSave={labelEditor.saveInstanceLabel}
-            onLifecycle={(action, instance) => void handleLifecycle(action, instance)}
-        />
+        <InstanceListContent error={error} loading={loading} instances={instances} filtered={filtered}
+            selectedInstance={selectedInstance} data={data} lifecycleBusyPort={lifecycleBusyPort}
+            transitioningPort={transitioningPort} transitionAction={transitionAction}
+            activityUnreadByPort={activityUnread.unreadByPort} latestTitleByPort={messageActivity.titlesByPort}
+            busyPorts={messageActivity.busyPorts} showLatestActivityTitles={view.showLatestActivityTitles}
+            showInlineLabelEditor={view.showInlineLabelEditor} showSidebarRuntimeLine={view.showSidebarRuntimeLine}
+            showSelectedRowActions={view.showSelectedRowActions} profiles={profiles} getLabel={instanceLabel}
+            formatUptime={formatUptime} onSelect={handleSelectInstance} onPreview={handlePreview}
+            onMarkActivitySeen={activityUnread.markPortSeen} onInstanceLabelSave={labelEditor.saveInstanceLabel}
+            onLifecycle={(action, instance) => void handleLifecycle(action, instance)} />
     );
 
-    const workbenchHeader = <WorkbenchHeader instance={selectedInstance} previewEnabled={previewEnabled} onPreviewEnabledChange={setPreviewEnabled} onPreviewRefresh={() => setPreviewRefreshKey(key => key + 1)} />;
-    const dashboardSettingsUi = dashboardSettingsUiFromView(view, theme.theme);
-    const titleSupport = summarizeActivityTitleSupport(messageActivity.titleSupportByPort);
-
-    const profileChipStrip = (chipProfiles: DashboardProfile[]) => chipProfiles.length > 0 ? (
-        <div className="profile-chip-strip drawer-chip-strip" aria-label="Profile filters">
-            {chipProfiles.map(profile => (
-                <ProfileChip
-                    key={profile.profileId}
-                    profile={profile}
-                    active={activeProfileIds.includes(profile.profileId)}
-                    count={profileCounts[profile.profileId] || 0}
-                    onToggle={toggleProfile}
-                />
-            ))}
-        </div>
-    ) : null;
+    const workbenchHeader = <WorkbenchHeader instance={selectedInstance} previewEnabled={previewEnabled} onPreviewEnabledChange={setPreviewEnabled} onPreviewRefresh={() => setPreviewRefreshKey(key => key + 1)} onOpenHelpTopic={openHelpTopic} />;
+    const dashboardSettingsUi = dashboardSettingsUiFromView(view, theme.theme), titleSupport = summarizeActivityTitleSupport(messageActivity.titleSupportByPort);
+    const profileChipStrip = (chipProfiles: DashboardProfile[]) => chipProfiles.length > 0 ? <div className="profile-chip-strip drawer-chip-strip" aria-label="Profile filters">{chipProfiles.map(profile => <ProfileChip key={profile.profileId} profile={profile} active={activeProfileIds.includes(profile.profileId)} count={profileCounts[profile.profileId] || 0} onToggle={toggleProfile} />)}</div> : null;
 
     const detailContent = (tab: DashboardDetailTab) => (
         <InstanceDetailPanel
@@ -472,161 +515,10 @@ export function App() {
             data={data}
             activeTab={tab}
             onSettingsDirtyChange={setSettingsDirty}
-            onSettingsSaved={() => {
-                if (selectedInstance) void refreshInstance(selectedInstance.port);
-                publishInvalidation({ topics: ['instances'], reason: 'instance:settings-saved', source: 'ui', sourceId: 'app' });
-            }}
-            onRegistryPatch={(port, patch) => {
-                void registry.save({ instances: { [String(port)]: patch } }).then(() => {
-                    load();
-                    publishInvalidation({ topics: ['instances'], reason: 'instance:registry-patched', source: 'ui', sourceId: 'app' });
-                });
-            }}
+            onSettingsSaved={() => { if (selectedInstance) void refreshInstance(selectedInstance.port); publishInvalidation({ topics: ['instances'], reason: 'instance:settings-saved', source: 'ui', sourceId: 'app' }); }}
+            onRegistryPatch={(port, patch) => { void registry.save({ instances: { [String(port)]: patch } }).then(() => { load(); publishInvalidation({ topics: ['instances'], reason: 'instance:registry-patched', source: 'ui', sourceId: 'app' }); }); }}
         />
     );
 
-    return (
-        <>
-            <IframeBridge />
-            <VisibilityBridge />
-            <ManagerShell
-                sidebarCollapsed={view.sidebarCollapsed}
-                commandBar={(
-                    <CommandBar
-                        query={query}
-                        loading={loading}
-                        onQueryChange={setQuery}
-                        onRefresh={() => void load()}
-                        onOpenDrawer={() => view.setDrawerOpen(true)}
-                        theme={theme.theme}
-                        onThemeChange={theme.setTheme}
-                        onOpenPalette={palette.toggle}
-                    />
-                )}
-                workspace={(
-                    <WorkspaceLayout
-                        sidebarCollapsed={view.sidebarCollapsed}
-                        inspectorCollapsed={view.activityDockCollapsed}
-                        inspectorHeight={view.activityDockCollapsed ? 48 : view.activityDockHeight}
-                        drawerOpen={view.drawerOpen}
-                        onCloseDrawer={() => view.setDrawerOpen(false)}
-                        navigator={(
-                            <>
-                                <SidebarRail onlineCount={summary['online'] || 0} collapsed={view.sidebarCollapsed} mode={view.sidebarMode} scheduleWorkspaceEnabled={SCHEDULE_WORKSPACE_ENABLED} onModeChange={handleSidebarModeChange} onToggleSidebar={handleSidebarToggle} helpOpen={helpOpen} onToggleHelp={() => setHelpOpen(open => !open)} />
-                                <div id="manager-sidebar-list" className="manager-sidebar-list">
-                                    {view.sidebarMode === 'settings' ? (
-                                        <DashboardSettingsSidebar activeSection={dashboardSettingsSection} locale={view.locale} onSectionChange={setDashboardSettingsSection} />
-                                    ) : view.sidebarMode === 'notes' ? (
-                                        <NotesSidebar tree={notesModel.tree} loading={notesModel.loading} error={notesModel.error} notesRoot={notesModel.notesRoot} selectedPath={view.notesSelectedPath} dirtyPath={notesDirtyPath} treeWidth={view.notesTreeWidth} onSelectedPathChange={handleNotesSelectedPathChange} onRefreshTree={notesModel.refresh} />
-                                    ) : view.sidebarMode === 'board' ? (
-                                        <DashboardBoardSidebar view={boardView} onViewChange={setBoardView} instances={instances} titlesByPort={messageActivity.titlesByPort} busyPorts={messageActivity.busyPorts} />
-                                    ) : SCHEDULE_WORKSPACE_ENABLED && view.sidebarMode === 'schedule' ? (
-                                        <DashboardScheduleSidebar activeGroup={scheduleGroup} onGroupChange={setScheduleGroup} />
-                                    ) : (
-                                        <InstanceNavigator active={selectedInstance} hiddenCount={instances.filter(instance => instance.hidden).length} collapsed={view.sidebarCollapsed}>
-                                            {instanceListContent}
-                                        </InstanceNavigator>
-                                    )}
-                                </div>
-                            </>
-                        )}
-                        workbench={(
-                            <div className="workspace-surface-stack">
-                                {lifecycleMessage && (
-                                    <section className="state lifecycle-state" role="status">
-                                        <span>{lifecycleMessage}</span>
-                                        <button
-                                            type="button"
-                                            className="state-dismiss"
-                                            aria-label="Dismiss lifecycle message"
-                                            onClick={() => setLifecycleMessage(null)}
-                                        >
-                                            X
-                                        </button>
-                                    </section>
-                                )}
-                                <div className="workspace-surface-layer">
-                                    <WorkspaceSurface active={view.sidebarMode === 'instances'}>
-                                        <Workbench mode={view.activeDetailTab} onModeChange={handleTabChange} header={workbenchHeader} overview={detailContent('overview')} preview={(
-                                            <InstancePreview instance={selectedInstance} data={data} enabled={previewEnabled} refreshKey={previewRefreshKey} theme={theme.resolved} />
-                                        )} logs={detailContent('logs')} settings={detailContent('settings')} />
-                                    </WorkspaceSurface>
-                                    <WorkspaceSurface active={view.sidebarMode === 'notes'}>
-                                        <NotesWorkspace active={view.sidebarMode === 'notes'} selectedPath={view.notesSelectedPath} vaultIndex={notesModel.index} viewMode={view.notesViewMode} authoringMode={view.notesAuthoringMode} wordWrap={view.notesWordWrap} treeWidth={view.notesTreeWidth} onSelectedPathChange={handleNotesSelectedPathChange} onDirtyPathChange={setNotesDirtyPath} onViewModeChange={handleNotesViewModeChange} onAuthoringModeChange={handleNotesAuthoringModeChange} onWordWrapChange={handleNotesWordWrapChange} onTreeWidthChange={handleNotesTreeWidthChange} />
-                                    </WorkspaceSurface>
-                                    <WorkspaceSurface active={view.sidebarMode === 'settings'}>
-                                        <DashboardSettingsWorkspace activeSection={dashboardSettingsSection} ui={dashboardSettingsUi} titleSupport={titleSupport} onUiPatch={handleDashboardSettingsPatch} />
-                                    </WorkspaceSurface>
-                                    <WorkspaceSurface active={view.sidebarMode === 'board'}>
-                                        <DashboardBoardWorkspace active={view.sidebarMode === 'board'} view={boardView} onViewChange={setBoardView} instances={instances} selectedPort={selectedInstance?.port ?? null} titlesByPort={messageActivity.titlesByPort} busyPorts={messageActivity.busyPorts} />
-                                    </WorkspaceSurface>
-                                    {SCHEDULE_WORKSPACE_ENABLED ? (
-                                        <>
-                                            <WorkspaceSurface active={view.sidebarMode === 'schedule'}>
-                                                <DashboardScheduleWorkspace active={view.sidebarMode === 'schedule'} activeGroup={scheduleGroup} busyPorts={messageActivity.busyPorts} />
-                                            </WorkspaceSurface>
-                                        </>
-                                    ) : null}
-                                </div>
-                            </div>
-                        )}
-                        inspector={(
-                            <ActivityDock
-                                collapsed={view.activityDockCollapsed}
-                                height={view.activityDockHeight}
-                                loading={loading}
-                                error={error}
-                                lifecycleMessage={lifecycleMessage}
-                                selectedInstance={selectedInstance}
-                                registryMessage={registry.error || labelEditor.error || managerEvents.error}
-                                events={managerEvents.events}
-                                onToggle={handleActivityToggle}
-                                onHeightChange={handleActivityHeight}
-                            />
-                        )}
-                        mobileNav={<MobileNav activeTab={view.activeDetailTab} onOpenInstances={() => view.setDrawerOpen(true)} onSelectTab={handleTabChange} onToggleActivity={activityUnread.openAndMarkSeen} />}
-                        drawer={(
-                            <InstanceDrawer open={view.drawerOpen} profileFilters={profileChipStrip(profiles)} onClose={() => view.setDrawerOpen(false)}>
-                                {instanceListContent}
-                            </InstanceDrawer>
-                        )}
-                    />
-                )}
-                activityHeight={view.activityDockCollapsed ? 48 : view.activityDockHeight}
-            />
-            <CommandPalette
-                open={palette.open}
-                onClose={palette.close}
-                instances={instances}
-                getLabel={instanceLabel}
-                onSelectInstance={handleSelectInstance}
-                theme={theme.theme}
-                onCycleTheme={cycleTheme}
-                onRefresh={() => void load()}
-                onToggleHidden={() => {
-                    const next = !showHidden;
-                    setShowHidden(next);
-                    void load(next);
-                }}
-                showHidden={showHidden}
-                onOpenSelected={openSelectedInBrowser}
-                selectedInstance={selectedInstance}
-            />
-            <ElectronMetricsPanel onUnloadPreview={() => setPreviewEnabled(false)} />
-            <HelpDrawer open={helpOpen} mode={view.sidebarMode} onClose={() => setHelpOpen(false)} />
-            {autoUnloadNotice && (
-                <div className="preview-auto-unload-notice" role="status">
-                    Preview was unloaded after 5 minutes of inactivity. Toggle the preview switch to re-enable.
-                    <button
-                        type="button"
-                        className="preview-auto-unload-dismiss"
-                        aria-label="Dismiss preview auto-unload notice"
-                        onClick={() => setAutoUnloadNotice(false)}
-                    >
-                        ×
-                    </button>
-                </div>
-            )}
-        </>
-    );
+    return <AppChrome view={view} palette={palette} theme={theme} query={query} loading={loading} showHidden={showHidden} instances={instances} selectedInstance={selectedInstance} data={data} summary={summary} scheduleGroup={scheduleGroup} boardView={boardView} notesModel={notesModel} notesSelectedNote={notesSelectedNote} notesDirtyPath={notesDirtyPath} notesSidebarMode={notesSidebarMode} notesSearchFocusToken={notesSearchFocusToken} settingsSection={dashboardSettingsSection} dashboardSettingsUi={dashboardSettingsUi} titleSupport={titleSupport} activityEvents={activityEvents} busyPorts={messageActivity.busyPorts} titlesByPort={messageActivity.titlesByPort} lifecycleMessage={lifecycleMessage} error={error} registryMessage={registry.error || labelEditor.error || managerEvents.error} workbenchHeader={workbenchHeader} detailContent={detailContent} instanceListContent={instanceListContent} drawerProfileFilters={profileChipStrip(profiles)} jawCeoWorkbenchButton={jawCeoBridge.workbenchButton} jawCeoVoiceOverlay={jawCeoBridge.voiceOverlay} jawCeoConsoleContent={jawCeoBridge.consoleContent} previewEnabled={previewEnabled} previewRefreshKey={previewRefreshKey} autoUnloadNotice={autoUnloadNotice} helpOpen={helpOpen} helpTopic={helpTopic} setQuery={setQuery} setShowHidden={setShowHidden} setPreviewEnabled={setPreviewEnabled} setAutoUnloadNotice={setAutoUnloadNotice} setHelpOpen={setHelpOpen} setHelpTopic={setHelpTopic} onOpenHelpTopic={openHelpTopic} setNotesSidebarMode={setNotesSidebarMode} setBoardView={setBoardView} setScheduleGroup={setScheduleGroup} setDashboardSettingsSection={setDashboardSettingsSection} load={load} cycleTheme={cycleTheme} openSelectedInBrowser={openSelectedInBrowser} handleSelectInstance={handleSelectInstance} handleSidebarModeChange={handleSidebarModeChange} handleSidebarToggle={handleSidebarToggle} handleNotesSelectedPathChange={handleNotesSelectedPathChange} handleNotesViewModeChange={handleNotesViewModeChange} handleNotesAuthoringModeChange={handleNotesAuthoringModeChange} handleNotesWordWrapChange={handleNotesWordWrapChange} handleNotesTreeWidthChange={handleNotesTreeWidthChange} openNotesSidebarSearch={openNotesSidebarSearch} setNotesDirtyPath={setNotesDirtyPath} handleTabChange={handleTabChange} handleActivityToggle={handleActivityToggle} handleActivityHeight={handleActivityHeight} onDismissLifecycleMessage={() => setLifecycleMessage(null)} handleDashboardSettingsPatch={handleDashboardSettingsPatch} activityUnreadOpenAndMarkSeen={activityUnread.openAndMarkSeen} />;
 }