cli-jaw 2.17.41 → 2.17.42

package/public/dist/settings/index.html

@@ -5,8 +5,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Settings</title>
   <script src="/manager/theme-boot.js"></script>
-  <script type="module" crossorigin src="/dist/assets/settings-DXA5L4DR.js"></script>
-  <link rel="stylesheet" crossorigin href="/dist/assets/settings-embedding-BSA42oKM.css">
+  <script type="module" crossorigin src="/dist/assets/settings-85n9NjvX.js"></script>
+  <link rel="stylesheet" crossorigin href="/dist/assets/settings-embedding-LIMq5ebM.css">
 </head>
 <body>
   <div id="settings-root"></div>

package/public/js/features/settings.ts

@@ -1,4 +1,5 @@
 // settings.ts — barrel re-export (preserves all import paths)
+import { isLocalPreviewRelayOrigin } from '../preview-parent-origin.js';
 export { loadSettings, updateSettings, setPerm, onCliChange, saveActiveCliSettings, onFlushCliChange, loadFlushAgentSidebar } from './settings-core.js';
 export { setTelegram, setForwardAll, setTelegramMentionOnly, saveTelegramSettings } from './settings-telegram.js';
 export { setDiscord, setDiscordForwardAll, setDiscordAllowBots, setDiscordMentionOnly, saveDiscordSettings } from './settings-discord.js';
@@ -66,12 +67,27 @@ export function initSettingsFrame(): () => void {
         if (event.data?.type === 'jaw-settings-ready') sendTheme();
         if (event.data?.type === 'settings:back') closeSettingsPage();
     };
+    // The manager asks this instance to open its own settings page. Two guards live fifteen
+    // lines apart on purpose and must NOT be collapsed into one:
+    //   receive() above talks to our OWN iframe, which is same-origin by construction.
+    //   relay() below talks to the manager, which under the default origin-port preview
+    //   transport runs on a different loopback PORT — so a strict origin equality check
+    //   would silently drop every message. isLocalPreviewRelayOrigin accepts any loopback
+    //   origin, which is the same predicate the STT and capability relays already use.
+    const relay = (event: MessageEvent): void => {
+        if (event.source !== window.parent) return;
+        if (!isLocalPreviewRelayOrigin(event.origin)) return;
+        if (event.data?.type !== 'jaw-preview-settings-open') return;
+        toggleSettingsPage(true);
+    };
     frame.addEventListener('load', sendTheme);
     window.addEventListener('message', receive);
+    window.addEventListener('message', relay);
     sendTheme();
     return () => {
         observer.disconnect();
         frame.removeEventListener('load', sendTheme);
         window.removeEventListener('message', receive);
+        window.removeEventListener('message', relay);
     };
 }

package/public/manager/src/App.tsx

@@ -57,7 +57,7 @@ export function App() { if (readTrayRemindersMode(window.location.search) && REM
     const [transitioningPort, setTransitioningPort] = useState<number | null>(null);
     const [transitionAction, setTransitionAction] = useState<DashboardLifecycleAction | null>(null);
     const [activeProfileIds, setActiveProfileIds] = useState<string[]>([]);
-    const { settingsDirty, panelSettingsDirty, dashboardSettingsDirty, setSettingsDirty, onSettingsDirtyChange, onPanelSettingsDirtyChange } = useSettingsDirtyState();
+    const { settingsDirty, dashboardSettingsDirty, setSettingsDirty, onSettingsDirtyChange } = useSettingsDirtyState();
     const [notesDirtyPath, setNotesDirtyPath] = useState<string | null>(null);
     const [notesSidebarMode, setNotesSidebarMode] = useState<NotesSidebarMode>('files');
     const [notesSearchFocusToken, setNotesSearchFocusToken] = useState(0);
@@ -194,9 +194,9 @@ export function App() { if (readTrayRemindersMode(window.location.search) && REM
                 const loaded = await registry.refresh();
                 const ui = loaded.registry.ui;
                 const restored = hydrateInstanceSettings(ui);
-                view.setSelectedPort(ui.selectedPort); view.setActiveDetailTab(restored.selectedTab); view.setInstanceSettingsOpen(restored.instanceSettingsOpen); view.setSidebarCollapsed(ui.sidebarCollapsed);
+                view.setSelectedPort(ui.selectedPort); view.setActiveDetailTab(restored.selectedTab); view.setSidebarCollapsed(ui.sidebarCollapsed);
                 view.setActivityDockCollapsed(ui.activityDockCollapsed); view.setActivityDockHeight(ui.activityDockHeight);
-                const sidebarMode = normalizeSidebarModeForBuild(readInitialSidebarMode(window.location.search) ?? ui.sidebarMode);
+                const sidebarMode = normalizeSidebarModeForBuild(readInitialSidebarMode(window.location.search) ?? restored.sidebarMode); // restored carries the legacy settings request
                 view.setSidebarMode(sidebarMode);
                 if (sidebarMode !== ui.sidebarMode) void saveUi({ sidebarMode });
                 view.setNotesSelectedPath(ui.notesSelectedPath); view.setNotesViewMode(ui.notesViewMode); view.setNotesAuthoringMode(ui.notesAuthoringMode ?? 'plain');
@@ -243,8 +243,8 @@ export function App() { if (readTrayRemindersMode(window.location.search) && REM
         setActiveProfileIds(next);
         void registry.save({ activeProfileFilter: next });
     }
-    const { canLeaveDirtySettings, guardSettingsTransition, setInstanceSettingsOpen } = createInstanceSettingsNavigation({
-        view, settingsDirty, panelSettingsDirty, dashboardSettingsDirty, clearDirty: entry => onSettingsDirtyChange(entry, false), saveUi, selectedPort: selectedInstance?.port ?? null,
+    const { canLeaveDirtySettings, guardSettingsTransition, setDashboardSettingsOpen } = createInstanceSettingsNavigation({
+        view, settingsDirty, dashboardSettingsDirty, clearDirty: entry => onSettingsDirtyChange(entry, false), saveUi, selectedPort: selectedInstance?.port ?? null,
     });
 
     function handlePreview(instance: DashboardInstance, openDefaultSession = false): void {
@@ -263,7 +263,7 @@ export function App() { if (readTrayRemindersMode(window.location.search) && REM
         void saveUi({ selectedPort: instance.port });
     }
     function handleTabChange(tab: DashboardDetailTab): void {
-        if (tab === 'settings') { setInstanceSettingsOpen(true); return; }
+        if (tab === 'settings') { setDashboardSettingsOpen(true); return; } // retired tab -> rail workspace
         if (view.activeDetailTab === 'preview' && tab !== 'preview') {
             const port = view.selectedPort;
             if (port != null) activityUnread.markPortSeen(port);
@@ -385,7 +385,7 @@ export function App() { if (readTrayRemindersMode(window.location.search) && REM
             handleTabChange,
             setPreviewRefreshKey,
             handleSidebarToggle,
-            toggleInstanceSettings: () => setInstanceSettingsOpen(!view.instanceSettingsOpen),
+            toggleInstanceSettings: () => setDashboardSettingsOpen(view.sidebarMode !== 'settings'),
         });
     }
     useEffect(() => {
@@ -395,7 +395,7 @@ export function App() { if (readTrayRemindersMode(window.location.search) && REM
             runManagerShortcut(action);
         });
         return unsubscribe;
-    }, [filtered, selectedInstance, view.dashboardShortcutsEnabled, view.sidebarMode, view.activeDetailTab, view.instanceSettingsOpen, settingsDirty, panelSettingsDirty, dashboardSettingsDirty]);
+    }, [filtered, selectedInstance, view.dashboardShortcutsEnabled, view.sidebarMode, view.activeDetailTab, settingsDirty, dashboardSettingsDirty]);
 
     useEffect(() => {
         function onKeyDown(event: KeyboardEvent): void {
@@ -416,7 +416,7 @@ export function App() { if (readTrayRemindersMode(window.location.search) && REM
         }
         document.addEventListener('keydown', onKeyDown);
         return () => document.removeEventListener('keydown', onKeyDown);
-    }, [filtered, selectedInstance, view.dashboardShortcutsEnabled, view.dashboardShortcutKeymap, view.sidebarMode, view.activeDetailTab, view.instanceSettingsOpen, settingsDirty, panelSettingsDirty, dashboardSettingsDirty]);
+    }, [filtered, selectedInstance, view.dashboardShortcutsEnabled, view.dashboardShortcutKeymap, view.sidebarMode, view.activeDetailTab, settingsDirty, dashboardSettingsDirty]);
 
     async function handleLifecycle(action: DashboardLifecycleAction, instance: DashboardInstance): Promise<void> {
         const lifecycle = instance.lifecycle;
@@ -489,11 +489,9 @@ export function App() { if (readTrayRemindersMode(window.location.search) && REM
             instance={selectedInstance}
             data={data}
             activeTab={tab}
-            onSettingsDirtyChange={onPanelSettingsDirtyChange}
-            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 <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} notesHighlightedPath={notesHighlightedPath} 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} onPickProject={(port) => void projectPicker.pick(port)} projectPickBusy={projectPicker.busyPort != null} onRefreshPreview={() => setPreviewRefreshKey(key => key + 1)} onInstanceSettingsOpenChange={setInstanceSettingsOpen} onSettingsDirtyChange={onSettingsDirtyChange} detailContent={detailContent} instanceListContent={instanceListContent} drawerProfileFilters={profileChipStrip(profiles)} jawCeoWorkbenchButton={jawCeoBridge.workbenchButton} jawCeoVoiceOverlay={jawCeoBridge.voiceOverlay} jawCeo={jawCeoBridge.ceo} jawCeoVoice={jawCeoBridge.voice} jawCeoOpen={jawCeoBridge.open} jawCeoSelectedPort={activeJawCeoPort} onJawCeoOpenChange={jawCeoBridge.setOpen} onJawCeoOpenWorker={handleOpenJawCeoWorker} 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} openNotesFromPreview={openNotesFromPreview} handleNotesViewModeChange={handleNotesViewModeChange} handleNotesAuthoringModeChange={handleNotesAuthoringModeChange} handleNotesWordWrapChange={handleNotesWordWrapChange} handleNotesVimModeChange={handleNotesVimModeChange} handleNotesTreeWidthChange={handleNotesTreeWidthChange} handleNotesGraphSettingsChange={handleNotesGraphSettingsChange} openNotesSidebarSearch={openNotesSidebarSearch} setNotesDirtyPath={setNotesDirtyPath} handleTabChange={handleTabChange} handleActivityToggle={handleActivityToggle} handleActivityHeight={handleActivityHeight} onDismissLifecycleMessage={() => setLifecycleMessage(null)} handleDashboardSettingsPatch={handleDashboardSettingsPatch} activityUnreadOpenAndMarkSeen={activityUnread.openAndMarkSeen} panelInitialState={panelInitialState} onPanelStateChange={handlePanelStateChange} onShortcutAction={runManagerShortcut} />;
+    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} notesHighlightedPath={notesHighlightedPath} 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} onPickProject={(port) => void projectPicker.pick(port)} projectPickBusy={projectPicker.busyPort != null} onRefreshPreview={() => setPreviewRefreshKey(key => key + 1)} onSettingsDirtyChange={onSettingsDirtyChange} detailContent={detailContent} instanceListContent={instanceListContent} drawerProfileFilters={profileChipStrip(profiles)} jawCeoWorkbenchButton={jawCeoBridge.workbenchButton} jawCeoVoiceOverlay={jawCeoBridge.voiceOverlay} jawCeo={jawCeoBridge.ceo} jawCeoVoice={jawCeoBridge.voice} jawCeoOpen={jawCeoBridge.open} jawCeoSelectedPort={activeJawCeoPort} onJawCeoOpenChange={jawCeoBridge.setOpen} onJawCeoOpenWorker={handleOpenJawCeoWorker} 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} openNotesFromPreview={openNotesFromPreview} handleNotesViewModeChange={handleNotesViewModeChange} handleNotesAuthoringModeChange={handleNotesAuthoringModeChange} handleNotesWordWrapChange={handleNotesWordWrapChange} handleNotesVimModeChange={handleNotesVimModeChange} handleNotesTreeWidthChange={handleNotesTreeWidthChange} handleNotesGraphSettingsChange={handleNotesGraphSettingsChange} openNotesSidebarSearch={openNotesSidebarSearch} setNotesDirtyPath={setNotesDirtyPath} handleTabChange={handleTabChange} handleActivityToggle={handleActivityToggle} handleActivityHeight={handleActivityHeight} onDismissLifecycleMessage={() => setLifecycleMessage(null)} handleDashboardSettingsPatch={handleDashboardSettingsPatch} activityUnreadOpenAndMarkSeen={activityUnread.openAndMarkSeen} panelInitialState={panelInitialState} onPanelStateChange={handlePanelStateChange} onShortcutAction={runManagerShortcut} />;
 }

package/public/manager/src/AppChrome.tsx

@@ -54,8 +54,7 @@ type AppChromeProps = {
     onPickProject: (port: number) => void;
     projectPickBusy: boolean;
     onRefreshPreview: () => void;
-    onInstanceSettingsOpenChange: (open: boolean) => void;
-    onSettingsDirtyChange: (entry: 'panel' | 'dashboard', dirty: boolean) => void;
+    onSettingsDirtyChange: (entry: 'dashboard', dirty: boolean) => void;
     detailContent: (tab: DashboardDetailTab) => ReactNode;
     instanceListContent: ReactNode;
     drawerProfileFilters: ReactNode;
@@ -148,7 +147,7 @@ export function AppChrome(props: AppChromeProps) {
                         boardView={props.boardView} onBoardViewChange={props.setBoardView} scheduleGroup={props.scheduleGroup} onScheduleGroupChange={props.setScheduleGroup}
                         instances={props.instances} selectedInstance={props.selectedInstance} data={props.data} titlesByPort={props.titlesByPort}
                         busyPorts={props.busyPorts} activeDetailTab={props.view.activeDetailTab} onDetailTabChange={props.handleTabChange}
-                        workbenchHeader={<WorkbenchHeader instance={props.selectedInstance} previewEnabled={props.previewEnabled} onPreviewEnabledChange={props.setPreviewEnabled} onPreviewRefresh={props.onRefreshPreview} onOpenHelpTopic={props.onOpenHelpTopic} onPickProject={props.onPickProject} projectPickBusy={props.projectPickBusy} />} instanceSettingsOpen={props.view.instanceSettingsOpen} onInstanceSettingsOpenChange={props.onInstanceSettingsOpenChange} onSettingsDirtyChange={props.onSettingsDirtyChange} detailContent={props.detailContent} previewEnabled={props.previewEnabled}
+                        workbenchHeader={<WorkbenchHeader instance={props.selectedInstance} previewEnabled={props.previewEnabled} onPreviewEnabledChange={props.setPreviewEnabled} onPreviewRefresh={props.onRefreshPreview} onOpenHelpTopic={props.onOpenHelpTopic} onPickProject={props.onPickProject} projectPickBusy={props.projectPickBusy} />} onSettingsDirtyChange={props.onSettingsDirtyChange} detailContent={props.detailContent} previewEnabled={props.previewEnabled}
                         previewRefreshKey={props.previewRefreshKey} previewTheme={props.theme.resolved} onOpenNotesFromPreview={props.openNotesFromPreview} lifecycleMessage={props.lifecycleMessage}
                         onDismissLifecycleMessage={props.onDismissLifecycleMessage} instanceListContent={props.instanceListContent} loading={props.loading}
                         jawCeoWorkbenchButton={props.jawCeoWorkbenchButton} jawCeoVoiceOverlay={props.jawCeoVoiceOverlay}

package/public/manager/src/InstancePreview.tsx

@@ -20,6 +20,9 @@ type InstancePreviewProps = {
     docPanelCapable?: boolean;
     previewInsertTextRequest?: PreviewInsertTextRequest | null;
     onPreviewInsertTextResult?: (id: string, result: PreviewInsertTextResult) => void;
+    /** One-shot id; a new value asks the mounted preview to open its own settings page. */
+    previewSettingsOpenRequest?: string | null;
+    onPreviewSettingsOpenResult?: (id: string, result: PreviewInsertTextResult) => void;
 };
 
 const PREVIEW_IFRAME_SANDBOX = 'allow-forms allow-modals allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts allow-downloads';
@@ -149,6 +152,23 @@ function postPreviewSttToggle(frame: HTMLIFrameElement | null, src: string): voi
     }
 }
 
+/**
+ * Ask the instance to open ITS OWN settings page. The manager never renders instance settings;
+ * it only sends this request, and the instance decides. Fire-and-forget like the STT toggle:
+ * there is nothing to await, and the instance owns the outcome.
+ */
+function postPreviewSettingsOpen(frame: HTMLIFrameElement | null, src: string): void {
+    const targetWindow = frame?.contentWindow;
+    if (!targetWindow) return;
+    const targetOrigin = previewTargetOrigin(src, frame);
+    if (!targetOrigin || targetOrigin === 'null') return;
+    try {
+        targetWindow.postMessage({ type: 'jaw-preview-settings-open' }, targetOrigin);
+    } catch (error) {
+        console.warn('[manager-preview] settings open request skipped', error);
+    }
+}
+
 function postPreviewVisible(frame: HTMLIFrameElement | null, src: string): void {
     const targetWindow = frame?.contentWindow;
     if (!targetWindow) return;
@@ -252,6 +272,7 @@ export function InstancePreview(props: InstancePreviewProps) {
     const iframeRef = useRef<HTMLIFrameElement | null>(null);
     const loadedSrcRef = useRef<string | null>(null);
     const handledInsertRequestRef = useRef<string | null>(null);
+    const handledSettingsRequestRef = useRef<string | null>(null);
     const [pathDropStatus, setPathDropStatus] = useState<string | null>(null);
     const [folderDragActive, setFolderDragActive] = useState(false);
     const state = buildPreviewState(
@@ -295,6 +316,32 @@ export function InstancePreview(props: InstancePreviewProps) {
             .catch(error => finish({ ok: false, error: (error as Error).message }));
     }, [disabledReason, props.enabled, props.instance, props.onPreviewInsertTextResult, props.previewInsertTextRequest, state.canPreview, state.src]);
 
+    useEffect(() => {
+        const id = props.previewSettingsOpenRequest;
+        if (!id || handledSettingsRequestRef.current === id) return;
+        handledSettingsRequestRef.current = id;
+        const finish = (result: PreviewInsertTextResult): void => {
+            props.onPreviewSettingsOpenResult?.(id, result);
+        };
+        // Deliberately independent of props.active: the preview iframe stays mounted when the
+        // Preview tab is not showing, so the request still lands. What it cannot survive is an
+        // unmounted or still-loading frame, which is what these guards report.
+        if (!props.instance?.ok) {
+            finish({ ok: false, error: 'selected instance is not online' });
+            return;
+        }
+        if (!props.enabled || !state.canPreview || !state.src) {
+            finish({ ok: false, error: disabledReason || 'turn Preview on to open this instance\u2019s settings' });
+            return;
+        }
+        if (loadedSrcRef.current !== state.src) {
+            finish({ ok: false, error: 'selected instance preview is still loading' });
+            return;
+        }
+        postPreviewSettingsOpen(iframeRef.current, state.src);
+        finish({ ok: true });
+    }, [disabledReason, props.enabled, props.instance, props.onPreviewSettingsOpenResult, props.previewSettingsOpenRequest, state.canPreview, state.src]);
+
     const handleFolderPathDrop = useCallback(async (event: React.DragEvent): Promise<void> => {
         if (!hasFolderPanelDragPayload(event.dataTransfer)) return;
         event.preventDefault();

package/public/manager/src/SidebarRailRouter.tsx

@@ -5,7 +5,6 @@ import { InstanceNavigator } from './components/InstanceNavigator';
 import { MobileNav } from './components/MobileNav';
 import { SidebarRail } from './components/SidebarRail';
 import { Workbench } from './components/Workbench';
-import { WorkbenchSettingsToggle } from './components/WorkbenchHeader';
 import { WorkspaceLayout } from './components/WorkspaceLayout';
 import { lazy } from 'react';
 import { RightSidebar } from './panels/RightSidebar';
@@ -141,9 +140,7 @@ type Props = {
     titlesByPort: Record<number, string>;
     busyPorts: Set<number>;
     activeDetailTab: DashboardDetailTab;
-    instanceSettingsOpen: boolean;
-    onInstanceSettingsOpenChange: (open: boolean) => void;
-    onSettingsDirtyChange: (entry: 'panel' | 'dashboard', dirty: boolean) => void;
+    onSettingsDirtyChange: (entry: 'dashboard', dirty: boolean) => void;
     onSettingsSaved?: () => void;
     onDetailTabChange: (tab: DashboardDetailTab) => void;
     workbenchHeader: ReactNode;
@@ -274,27 +271,13 @@ function renderBottomTabContent(tab: BottomPanelTab, controls: BottomPanelRender
 }
 
 export function SidebarRailRouter(props: Props) {
-    const panelDirty = useCallback((dirty: boolean) => props.onSettingsDirtyChange('panel', dirty), [props.onSettingsDirtyChange]);
     const dashboardDirty = useCallback((dirty: boolean) => props.onSettingsDirtyChange('dashboard', dirty), [props.onSettingsDirtyChange]);
     const selected = props.selectedInstance;
     const settingsTarget = selected ? { port: selected.port, instanceUrl: selected.url } : {};
     const managerSettings = { ui: props.dashboardSettingsUi, titleSupport: props.titleSupport, onUiPatch: props.onDashboardSettingsPatch };
-    const settingsVisible = props.sidebarMode === 'settings' || (props.sidebarMode === 'instances' && props.instanceSettingsOpen);
-    const returnToOverview = useRef(false);
-    const closeInstanceSettings = () => {
-        returnToOverview.current = true;
-        props.onInstanceSettingsOpenChange(false);
-    };
-    useEffect(() => {
-        // A declined dirty guard keeps settings open and leaves the workspace intact.
-        if (!props.instanceSettingsOpen && returnToOverview.current) {
-            returnToOverview.current = false;
-            props.onDetailTabChange('overview');
-        }
-    }, [props.instanceSettingsOpen, props.onDetailTabChange]);
-    const panelSettings = <SettingsPage onBack={closeInstanceSettings} key={selected?.port ?? 'manager-only'} {...settingsTarget}
-        manager={managerSettings} scopes={selected ? ['instance', 'manager'] : ['manager']}
-        onDirtyChange={panelDirty} {...(props.onSettingsSaved ? { onSaved: props.onSettingsSaved } : {})} />;
+    // The rail gear is the only settings entry point, and it renders manager scope only.
+    // Instance settings belong to the instance; see wp4 for how the manager reaches them.
+    const settingsVisible = props.sidebarMode === 'settings';
     const panelLayout = usePanelLayout();
     // Per-Files-tab resource state lives in the tab metadata (020 §5 Option B).
     // The registry's rightFolderRootPath remains the fallback root for tabs
@@ -316,6 +299,11 @@ export function SidebarRailRouter(props: Props) {
     const [previewInsertTextRequest, setPreviewInsertTextRequest] = useState<PreviewInsertTextRequest | null>(null);
     const previewInsertSeqRef = useRef(0);
     const previewInsertResolversRef = useRef(new Map<string, (result: PreviewInsertTextResult) => void>());
+    // Instance settings live in the instance. The manager only asks the mounted preview to
+    // open its own page; a one-shot id keeps repeat clicks addressable.
+    const [previewSettingsOpenRequest, setPreviewSettingsOpenRequest] = useState<string | null>(null);
+    const previewSettingsSeqRef = useRef(0);
+    const [instanceSettingsNotice, setInstanceSettingsNotice] = useState<string | null>(null);
     // 030 v2/v3: keep the server registry in sync, deliver shares to the
     // selected instance's runtime-context, and relay screenshot commands.
     useEmbeddedBrowserTargetSync(isElectron, props.selectedInstance?.port ?? null);
@@ -355,6 +343,16 @@ export function SidebarRailRouter(props: Props) {
         resolve(result);
     }, []);
 
+    const requestInstanceSettings = useCallback((): void => {
+        setInstanceSettingsNotice(null);
+        previewSettingsSeqRef.current += 1;
+        setPreviewSettingsOpenRequest(`settings-open-${previewSettingsSeqRef.current}`);
+    }, []);
+    const handlePreviewSettingsOpenResult = useCallback((id: string, result: PreviewInsertTextResult): void => {
+        setPreviewSettingsOpenRequest(current => current === id ? null : current);
+        setInstanceSettingsNotice(result.ok ? null : result.error);
+    }, []);
+
     // CEO: handled through right sidebar tab system now. CEO is hidden in v1,
     // but we keep the overlay console for non-Electron surfaces.
     const ceoConsoleOpen = !isElectron && props.jawCeoOpen;
@@ -493,10 +491,6 @@ export function SidebarRailRouter(props: Props) {
     return (
         <NotesCommandProvider>
         {props.jawCeoVoiceOverlay}
-        <WorkbenchSettingsToggle open={settingsVisible} onToggle={() => {
-            if (props.sidebarMode === 'settings') props.onSidebarModeChange('instances');
-            else props.onInstanceSettingsOpenChange(!props.instanceSettingsOpen);
-        }} />
         <WorkspaceLayout
             navigatorLabel={props.viewMode === 'code' && props.sidebarMode === 'instances' ? 'Code sessions' : undefined}
             sidebarCollapsed={settingsVisible || props.sidebarCollapsed}
@@ -598,11 +592,17 @@ export function SidebarRailRouter(props: Props) {
                             <button type="button" className="state-dismiss" aria-label="Dismiss dropped file message" onClick={() => setDropNotice(null)}>X</button>
                         </section>
                     )}
+                    {instanceSettingsNotice && (
+                        <section className="state lifecycle-state" role="status">
+                            <span>{instanceSettingsNotice}</span>
+                            <button type="button" className="state-dismiss" aria-label="Dismiss instance settings message" onClick={() => setInstanceSettingsNotice(null)}>X</button>
+                        </section>
+                    )}
                     <div className="workspace-surface-layer">
                         <WorkspaceSurface active={props.sidebarMode === 'instances' && props.viewMode === 'jaw'}>
-                            <Workbench mode={props.activeDetailTab} onModeChange={props.onDetailTabChange} header={props.workbenchHeader} modeActions={props.jawCeoWorkbenchButton} active={props.sidebarMode === 'instances' && props.viewMode === 'jaw'} settingsOpen={props.instanceSettingsOpen} onSettingsClose={() => props.onInstanceSettingsOpenChange(false)} overview={props.detailContent('overview')} preview={(
-                                <InstancePreview instance={props.selectedInstance} data={props.data} enabled={props.previewEnabled} active={props.sidebarMode === 'instances' && !props.instanceSettingsOpen && props.activeDetailTab === 'preview'} refreshKey={props.previewRefreshKey} theme={props.previewTheme} {...(props.onOpenNotesFromPreview ? { onOpenNotesFromPreview: props.onOpenNotesFromPreview } : {})} onOpenDocFromPreview={handleRightPreviewFile} onPreviewDroppedFiles={handlePreviewDroppedFiles} docPanelCapable={desktopPanelsAvailable} previewInsertTextRequest={previewInsertTextRequest} onPreviewInsertTextResult={handlePreviewInsertTextResult} />
-                            )} logs={props.detailContent('logs')} settings={panelSettings} />
+                            <Workbench mode={props.activeDetailTab} onModeChange={props.onDetailTabChange} header={props.workbenchHeader} modeActions={(<>{props.jawCeoWorkbenchButton}<button type="button" className="workbench-instance-settings-request" aria-label="Instance settings" title="Open this instance's own settings page" disabled={!props.selectedInstance?.ok} onClick={requestInstanceSettings}>Settings</button></>)} active={props.sidebarMode === 'instances' && props.viewMode === 'jaw'} overview={props.detailContent('overview')} preview={(
+                                <InstancePreview instance={props.selectedInstance} data={props.data} enabled={props.previewEnabled} active={props.sidebarMode === 'instances' && props.activeDetailTab === 'preview'} refreshKey={props.previewRefreshKey} theme={props.previewTheme} {...(props.onOpenNotesFromPreview ? { onOpenNotesFromPreview: props.onOpenNotesFromPreview } : {})} onOpenDocFromPreview={handleRightPreviewFile} onPreviewDroppedFiles={handlePreviewDroppedFiles} docPanelCapable={desktopPanelsAvailable} previewInsertTextRequest={previewInsertTextRequest} onPreviewInsertTextResult={handlePreviewInsertTextResult} previewSettingsOpenRequest={previewSettingsOpenRequest} onPreviewSettingsOpenResult={handlePreviewSettingsOpenResult} />
+                            )} logs={props.detailContent('logs')} />
                         </WorkspaceSurface>
                         {props.viewMode === 'code' && props.sidebarMode === 'instances' ? (
                             <WorkspaceSurface active>
@@ -615,10 +615,14 @@ export function SidebarRailRouter(props: Props) {
                             <NotesWorkspace active={props.sidebarMode === 'notes'} selectedPath={props.notesSelectedPath} selectedNote={props.notesSelectedNote} vaultIndex={props.notesModel.index} viewMode={props.notesViewMode} authoringMode={props.notesAuthoringMode} wordWrap={props.notesWordWrap} vimMode={props.notesVimMode} treeWidth={props.notesTreeWidth} notesGraphSettings={props.notesGraphSettings} tagFilter={props.notesModel.tagFilter} onOpenSidebarSearch={props.onOpenNotesSearch} onSelectedPathChange={props.onNotesSelectedPathChange} onDirtyPathChange={props.onNotesDirtyPathChange} onViewModeChange={props.onNotesViewModeChange} onAuthoringModeChange={props.onNotesAuthoringModeChange} onWordWrapChange={props.onNotesWordWrapChange} onVimModeChange={props.onNotesVimModeChange} onTreeWidthChange={props.onNotesTreeWidthChange} onNotesGraphSettingsChange={props.onNotesGraphSettingsChange} onTagSelect={props.notesModel.setTagFilter} onWikiLinkNavigate={props.onNotesSelectedPathChange} />
                         </WorkspaceSurface>
                         <WorkspaceSurface active={props.sidebarMode === 'settings'}>
+                            {/* Manager scope only. The selected instance is still supplied because
+                                'Dashboard meta' edits that instance's manager-registry row and is
+                                otherwise unreachable; scopes={['manager']} is what keeps every
+                                instance-owned page out of this surface. */}
                             {props.sidebarMode === 'settings' && <SettingsPage key={selected?.port ?? 'manager-only'} {...settingsTarget}
                                 onBack={() => props.onSidebarModeChange('instances')} title="Dashboard settings"
                                 initialId={({ display: 'manager-display', activity: 'manager-activity', developer: 'manager-developer', embedding: 'manager-embedding', telegramHub: 'telegram-hub' } as const)[props.settingsSection]}
-                                manager={managerSettings} scopes={selected ? ['instance', 'manager'] : ['manager']} onDirtyChange={dashboardDirty}
+                                manager={managerSettings} scopes={['manager']} onDirtyChange={dashboardDirty}
                                 {...(props.onSettingsSaved ? { onSaved: props.onSettingsSaved } : {})} />}
                         </WorkspaceSurface>
                         <WorkspaceSurface active={props.sidebarMode === 'board'}>
@@ -652,7 +656,7 @@ export function SidebarRailRouter(props: Props) {
                 />
             )}
             sidePanel={(!isElectron && ceoConsoleOpen) ? jawCeoPanel : undefined}
-            mobileNav={<MobileNav activeTab={props.instanceSettingsOpen ? 'settings' : props.activeDetailTab} onOpenInstances={props.onOpenDrawer} onSelectTab={props.onSelectTab} onToggleActivity={props.onToggleActivityFromMobile} />}
+            mobileNav={<MobileNav activeTab={props.activeDetailTab} onOpenInstances={props.onOpenDrawer} onSelectTab={props.onSelectTab} onToggleActivity={props.onToggleActivityFromMobile} />}
             drawer={(
                 <InstanceDrawer open={props.drawerOpen} profileFilters={props.drawerProfileFilters} onClose={props.onCloseDrawer}>
                     {props.instanceListContent}

package/public/manager/src/code/CodeComposer.tsx

@@ -1,4 +1,6 @@
-import { useRef, useState, type KeyboardEvent } from 'react';
+import { useCallback, useRef, useState, type KeyboardEvent } from 'react';
+import { MicGlyph, SendGlyph, StopGlyph } from './ProviderGlyph';
+import { useDictation } from './use-dictation';
 
 type CodeComposerProps = {
     inputText: string;
@@ -18,6 +20,12 @@ export function CodeComposer(props: CodeComposerProps) {
     const sending = useRef(false);
     const cancelling = useRef(false);
     const [error, setError] = useState<string | null>(null);
+    // Dictated text is appended to the draft, never sent on its own.
+    const appendDictation = useCallback((text: string) => {
+        const current = props.inputText;
+        props.onInputChange(current ? `${current.replace(/\s+$/, '')} ${text}` : text);
+    }, [props.inputText, props.onInputChange]);
+    const dictation = useDictation(appendDictation, props.readOnly);
     async function submit() {
         if (!props.canSend || !props.inputText.trim() || sending.current) return;
         sending.current = true;
@@ -50,10 +58,27 @@ export function CodeComposer(props: CodeComposerProps) {
                 rows={2} readOnly={props.readOnly} />
             <span className="code-composer-hint">Enter to send · Shift+Enter for a new line</span>
         </div>
-        {props.busy ? <button type="button" className="code-composer-send code-composer-stop" aria-label="Stop current turn"
-            disabled={!props.canStop || props.stopping} onClick={() => void stop()}>{props.stopping ? 'Stopping…' : 'Stop'}</button>
-            : <button type="button" className="code-composer-send" aria-label="Send prompt"
-                disabled={!props.canSend || !props.inputText.trim()} onClick={() => void submit()}>{props.pending ? 'Sending…' : 'Send'}</button>}
-        {error && <div className="code-action-error" role="alert">{error}</div>}
+        <div className="code-composer-actions">
+            <button type="button" className={`code-composer-icon-button${dictation.status === 'recording' ? ' is-recording' : ''}`}
+                aria-label={dictation.status === 'recording' ? 'Stop dictation' : 'Dictation'}
+                aria-pressed={dictation.status === 'recording'}
+                disabled={dictation.status === 'unsupported' || dictation.status === 'transcribing' || props.readOnly}
+                title={dictation.reason} onClick={dictation.toggle}>
+                <MicGlyph muted={dictation.status === 'unsupported'} />
+            </button>
+            {props.busy
+                ? <button type="button" className="code-composer-send code-composer-stop" aria-label="Stop current turn"
+                    title={props.stopping ? 'Stopping' : 'Stop current turn'}
+                    disabled={!props.canStop || props.stopping} onClick={() => void stop()}><StopGlyph /></button>
+                : <button type="button" className="code-composer-send" aria-label="Send prompt"
+                    title={props.pending ? 'Sending' : 'Send prompt'}
+                    disabled={!props.canSend || !props.inputText.trim()} onClick={() => void submit()}><SendGlyph /></button>}
+        </div>
+        {/* An icon button cannot announce progress on its own. */}
+        {(props.stopping || props.pending || dictation.status === 'recording' || dictation.status === 'transcribing') &&
+            <span className="code-composer-status" role="status">
+                {props.stopping ? 'Stopping…' : props.pending ? 'Sending…'
+                    : dictation.status === 'recording' ? 'Recording…' : 'Transcribing…'}</span>}
+        {(error || dictation.error) && <div className="code-action-error" role="alert">{error ?? dictation.error}</div>}
     </div>;
 }

package/public/manager/src/code/CodeSessionList.tsx

@@ -2,6 +2,7 @@ import { useId, useRef, useState } from 'react';
 import type { CodeSessionInfo } from '../../../../src/code-mode/wire';
 import type { CodeControllerModel } from './code-controller-types';
 import { CODE_RUNTIME_LABELS, CODE_SESSION_LABELS, codeCanResume, codeSessionBusy } from './code-types';
+import { codeSessionAttention, codeSessionAttentionLabel, groupCodeSessions } from './session-order';
 
 function SessionRow({ session: s, controller: c }: { session: CodeSessionInfo; controller: CodeControllerModel }) {
     const [renaming, setRenaming] = useState(false);
@@ -14,6 +15,7 @@ function SessionRow({ session: s, controller: c }: { session: CodeSessionInfo; c
     const active = c.selectedId === s.sessionId;
     const busy = codeSessionBusy(s);
     const count = active && c.synced ? c.permissions.length : s.pendingPermissionCount;
+    const attention = codeSessionAttention(count);
     async function action(run: () => Promise<void>, after?: () => void) {
         if (guard.current) return;
         guard.current = true; setPending(true); setError(null);
@@ -27,8 +29,13 @@ function SessionRow({ session: s, controller: c }: { session: CodeSessionInfo; c
             aria-current={active ? 'true' : undefined} onClick={() => void action(() => c.selectSession(s.sessionId))}>
             <span className="code-session-cwd">{s.title || 'Untitled session'}</span>
             <span className="code-session-meta" title={s.cwd}>{CODE_RUNTIME_LABELS[s.provider]} · {s.cwd}</span>
-            <span className={`code-session-status code-session-status-${s.status}`}>{CODE_SESSION_LABELS[s.status]}</span>
-            <span className="code-session-attention">{count === undefined ? 'Approval status unknown' : count > 0 ? `${count} pending approval${count === 1 ? '' : 's'}` : 'No pending approvals'}</span>
+            {/* Ready is the common case and stays silent. A status on every row
+                is a status on no row, and it costs the one session that is
+                actually doing something its visibility. */}
+            <span className={`code-session-status code-session-status-${s.status}`}
+                data-quiet={s.status === 'idle' ? 'true' : undefined}>{CODE_SESSION_LABELS[s.status]}</span>
+            <span className={`code-session-attention code-session-attention-${attention.kind}`}
+                data-quiet={attention.kind === 'none' ? 'true' : undefined}>{codeSessionAttentionLabel(attention)}</span>
         </button>
         {renaming ? <form className="code-session-rename" onSubmit={event => {
             event.preventDefault(); if (title.trim()) void action(() => c.rename(s.sessionId, title.trim()), finishRename);
@@ -63,8 +70,19 @@ export function CodeSessionList({ controller: c }: { controller: CodeControllerM
     const [paging, setPaging] = useState(false);
     const pagingRef = useRef(false);
     const visible = c.sessions.filter(s => `${s.title ?? ''} ${s.cwd} ${CODE_RUNTIME_LABELS[s.provider]}`.toLowerCase().includes(search.toLowerCase()));
-    const groups = new Map<string, CodeSessionInfo[]>();
-    for (const s of visible) { const key = grouped ? s.cwd : ''; const rows = groups.get(key) ?? []; rows.push(s); groups.set(key, rows); }
+    // Two orderings, deliberately: by workspace when the reader asks for it,
+    // otherwise by lifecycle. Neither uses last activity, so answering a prompt
+    // in one session does not move it under the reader's cursor -- which is
+    // what the server's own last-used ordering would do.
+    const groups = grouped
+        ? [...visible.reduce((map, s) => {
+            const rows = map.get(s.cwd) ?? []; rows.push(s); map.set(s.cwd, rows); return map;
+        }, new Map<string, CodeSessionInfo[]>())].map(([cwd, sessions]) => ({ title: cwd, key: cwd, sessions }))
+        : groupCodeSessions(visible).map(group => ({
+            key: group.section,
+            title: group.section === 'archived' ? 'Archived' : '',
+            sessions: group.sessions,
+        }));
     async function loadMore() {
         if (pagingRef.current) return;
         pagingRef.current = true; setPaging(true); setError(null);
@@ -90,9 +108,9 @@ export function CodeSessionList({ controller: c }: { controller: CodeControllerM
         <button type="button" className={`code-session-item${c.selectedId === null ? ' active' : ''}`} aria-current={c.selectedId === null ? 'true' : undefined}
             onClick={c.newSession}><span className="code-session-cwd">New session draft</span><span className="code-session-meta">Preserved unsent draft</span></button>
         {c.loading && <div className="code-session-list-loading" role="status">Loading sessions…</div>}
-        {[...groups].map(([cwd, sessions]) => <section className="code-session-group" key={cwd}>
-            {grouped && <h3 className="code-session-group-title" title={cwd}>{cwd}</h3>}
-            <ul className="code-session-list-items">{sessions.map(s => <SessionRow key={s.sessionId} session={s} controller={c} />)}</ul>
+        {groups.map(group => <section className="code-session-group" key={group.key}>
+            {group.title && <h3 className="code-session-group-title" title={group.title}>{group.title}</h3>}
+            <ul className="code-session-list-items">{group.sessions.map(s => <SessionRow key={s.sessionId} session={s} controller={c} />)}</ul>
         </section>)}
         {!c.loading && !visible.length && <p className="code-session-list-empty">{search ? 'No loaded sessions match. Clear search or load more.' : 'No sessions here. Start with the new session draft.'}</p>}
         {c.hasMoreSessions && <button type="button" className="code-inline-action" disabled={paging} onClick={() => void loadMore()}>{paging ? 'Loading…' : 'Load more sessions'}</button>}

package/public/manager/src/code/CodeToastHost.tsx

@@ -0,0 +1,49 @@
+import { useEffect, useRef, useState } from 'react';
+import { codeToastAutoDismisses, type CodeToast } from './code-toasts';
+
+function ToastCard({ toast, onDismiss }: { toast: CodeToast; onDismiss(id: string): void }) {
+    const [held, setHeld] = useState(false);
+    const card = useRef<HTMLDivElement>(null);
+    useEffect(() => {
+        // Held while the reader is pointing at it or has tabbed into it: a
+        // notice that expires mid-read is worse than one that lingers, and
+        // unmounting a card that owns focus drops the caret to the document
+        // body and loses the reader's place in the composer.
+        if (held || !codeToastAutoDismisses(toast)) return;
+        const timer = setTimeout(() => onDismiss(toast.id), toast.durationMs);
+        return () => clearTimeout(timer);
+        // The revision restarts the timer when the same notice is pushed again.
+    }, [toast.id, toast.revision, toast.durationMs, onDismiss, held]);
+    return <div ref={card} className={`code-toast code-toast-${toast.variant}`}
+        onPointerEnter={() => setHeld(true)} onPointerLeave={() => setHeld(false)}
+        onFocusCapture={() => setHeld(true)}
+        onBlurCapture={event => { if (!card.current?.contains(event.relatedTarget as Node | null)) setHeld(false); }}>
+        <span className="code-toast-message">{toast.message}</span>
+        {/* A short static name: the button sits inside the live region, so a
+            label repeating the message would announce the whole notice twice. */}
+        <button type="button" className="code-toast-dismiss" aria-label="Dismiss notice"
+            onClick={() => onDismiss(toast.id)}>×</button>
+    </div>;
+}
+
+/**
+ * Notices float over the top of the transcript rather than pushing the composer
+ * down, so reading one never moves the thing the reader is typing into.
+ *
+ * Two regions, not one: an assertive live region interrupts, and mixing an
+ * alert into a polite region is unreliable because the container's politeness
+ * is what applies to an insertion. Errors go in the assertive one.
+ */
+export function CodeToastHost({ toasts, onDismiss }: { toasts: readonly CodeToast[]; onDismiss(id: string): void }) {
+    // The region is always mounted, even empty. A live region that arrives in
+    // the DOM together with its first content is not announced -- assistive tech
+    // has to already be observing it when the insertion happens, which is also
+    // why it is not hidden while empty. One region, because every notice this
+    // surface raises is polite; anything that must interrupt stays inline where
+    // it can also stay on screen.
+    return <div className="code-toast-host">
+        <div className="code-toast-region" role="status">
+            {toasts.map(toast => <ToastCard key={toast.id} toast={toast} onDismiss={onDismiss} />)}
+        </div>
+    </div>;
+}