cli-jaw 2.1.0 → 2.1.2

package/public/manager/src/InstancePreview.tsx

@@ -12,6 +12,7 @@ type InstancePreviewProps = {
     refreshKey: number;
     theme: PreviewTheme;
     onOpenNotesFromPreview?: (path: string) => void;
+    onOpenDocFromPreview?: (absolutePath: string) => void;
 };
 
 type PreviewOpenNotesMessage = {
@@ -114,6 +115,21 @@ function postPreviewSttToggle(frame: HTMLIFrameElement | null, src: string): voi
     }
 }
 
+function postPreviewVisible(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-visibility', visible: true },
+            targetOrigin,
+        );
+    } catch (error) {
+        console.warn('[manager-preview] visibility sync skipped', error);
+    }
+}
+
 function isEditableShortcutTarget(target: EventTarget | null): boolean {
     if (!(target instanceof HTMLElement)) return false;
     if (target.isContentEditable) return true;
@@ -198,11 +214,22 @@ export function InstancePreview(props: InstancePreviewProps) {
             props.onOpenNotesFromPreview?.(path);
         }
         window.addEventListener('message', onPreviewOpenNotes);
+        function onPreviewOpenDoc(event: MessageEvent): void {
+            if (event.source !== iframeRef.current?.contentWindow) return;
+            if (!state.src || !previewFrameOriginMatches(event.origin, state.src, iframeRef.current)) return;
+            const data = event.data as { type?: unknown; path?: unknown } | null;
+            if (!data || data.type !== 'jaw-preview-open-doc') return;
+            const path = typeof data.path === 'string' ? data.path.trim() : '';
+            if (!path) return;
+            props.onOpenDocFromPreview?.(path);
+        }
+        window.addEventListener('message', onPreviewOpenDoc);
         return () => {
             window.removeEventListener('message', onPreviewSend);
             window.removeEventListener('message', onPreviewOpenNotes);
+            window.removeEventListener('message', onPreviewOpenDoc);
         };
-    }, [props.enabled, props.instance, props.onOpenNotesFromPreview, state.canPreview, state.src]);
+    }, [props.enabled, props.instance, props.onOpenNotesFromPreview, props.onOpenDocFromPreview, state.canPreview, state.src]);
 
     useEffect(() => {
         if (!props.active || !props.enabled || !state.canPreview || !state.src) return undefined;
@@ -221,16 +248,8 @@ export function InstancePreview(props: InstancePreviewProps) {
     useEffect(() => {
         const wasActive = prevActiveRef.current;
         prevActiveRef.current = props.active;
-        if (!wasActive && props.active && iframeRef.current?.contentWindow && state.src) {
-            const origin = previewTargetOrigin(state.src, iframeRef.current);
-            if (origin && origin !== 'null') {
-                try {
-                    iframeRef.current.contentWindow.postMessage(
-                        { type: 'jaw-preview-visibility', visible: true },
-                        origin,
-                    );
-                } catch { /* cross-origin guard */ }
-            }
+        if (!wasActive && props.active && state.src) {
+            postPreviewVisible(iframeRef.current, state.src);
         }
     }, [props.active, state.src]);
 
@@ -250,6 +269,12 @@ export function InstancePreview(props: InstancePreviewProps) {
                     onLoad={() => {
                         loadedSrcRef.current = state.src;
                         syncTheme();
+                        // Every (re)mount is a fresh document. The active-tab
+                        // effect only pings on a !wasActive→active transition, so
+                        // an instance switch (port/key changes, active stays true)
+                        // remounts without re-settling. Ping here so the embedded
+                        // chat runs its jaw-preview-visibility re-settle path.
+                        if (state.src) postPreviewVisible(iframeRef.current, state.src);
                     }}
                 />
             )}

package/public/manager/src/SidebarRailRouter.tsx

@@ -243,7 +243,7 @@ export function SidebarRailRouter(props: Props) {
                     <div className="workspace-surface-layer">
                         <WorkspaceSurface active={props.sidebarMode === 'instances'}>
                             <Workbench mode={props.activeDetailTab} onModeChange={props.onDetailTabChange} header={props.workbenchHeader} modeActions={props.jawCeoWorkbenchButton} 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 } : {})} />
+                                <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} />
                             )} logs={props.detailContent('logs')} settings={props.detailContent('settings')} />
                         </WorkspaceSurface>
                         <WorkspaceSurface active={props.sidebarMode === 'notes'}>

package/public/manager/src/doc-panel/DocPanel.tsx

@@ -103,7 +103,20 @@ export function DocPanel(props: { filePath?: string | undefined }) {
     return (
         <div className="doc-panel">
             <div className="doc-toolbar">
-                <span className="doc-file-name">{props.filePath.split('/').pop()}</span>
+                <span className="doc-file-name" title={props.filePath}>{props.filePath.split('/').pop()}</span>
+                <button
+                    type="button"
+                    className="doc-copy-path"
+                    title="Copy full path"
+                    onClick={() => {
+                        void navigator.clipboard.writeText(props.filePath!).then(() => {
+                            const btn = document.querySelector('.doc-copy-path');
+                            if (btn) { btn.textContent = 'Copied'; setTimeout(() => { btn.textContent = 'Path'; }, 1200); }
+                        });
+                    }}
+                >
+                    Path
+                </button>
             </div>
             <div className="doc-content">
                 <DocContent filePath={props.filePath} content={content} />

package/public/manager/src/doc-panel/doc-panel.css

@@ -30,6 +30,22 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    flex: 1;
+}
+.doc-copy-path {
+    font-size: 10px;
+    padding: 1px 6px;
+    border: 1px solid var(--border-subtle);
+    border-radius: 3px;
+    background: transparent;
+    color: var(--text-dim);
+    cursor: pointer;
+    flex-shrink: 0;
+    margin-left: 6px;
+}
+.doc-copy-path:hover {
+    background: var(--border-subtle);
+    color: var(--text-base);
 }
 .doc-content {
     flex: 1;

package/public/manager/src/hooks/useInstanceMessageEvents.ts

@@ -57,20 +57,9 @@ function titleSupportFromEnvelope(data: MessageEnvelope['data']): DashboardActiv
     return 'activity' in data || 'latestAssistant' in data ? 'ready' : 'legacy';
 }
 
-const BUSY_STALE_MS = 2 * 60 * 60_000;
-
-function parseUtcTimestamp(raw: string): number {
-    const iso = raw.includes('T') ? raw : raw.replace(' ', 'T');
-    return Date.parse(iso.endsWith('Z') ? iso : iso + 'Z');
-}
-
-function isActivityBusy(data: MessageEnvelope['data']): boolean {
-    if (!data || !('activity' in data)) return false;
-    const activity = data.activity;
-    if (!activity || activity.role !== 'user') return false;
-    const updatedAt = parseUtcTimestamp(activity.updatedAt);
-    if (Number.isNaN(updatedAt)) return false;
-    return Date.now() - updatedAt < BUSY_STALE_MS;
+function isProcessBusy(data: MessageEnvelope['data']): boolean {
+    if (!data || typeof data !== 'object') return false;
+    return 'processBusy' in data && data.processBusy === true;
 }
 
 async function fetchLatestAssistantMessage(port: number): Promise<{
@@ -86,7 +75,7 @@ async function fetchLatestAssistantMessage(port: number): Promise<{
         latest: notifiableAssistantFromEnvelope(body.data),
         title: activityTitleFromEnvelope(body.data),
         support: titleSupportFromEnvelope(body.data),
-        busy: isActivityBusy(body.data),
+        busy: isProcessBusy(body.data),
     };
 }
 

package/public/manager/src/manager-components.css

@@ -87,7 +87,7 @@ h2 { font-size: 13px; }
 .command-actions { justify-self: end; }
 .is-electron-titlebar {
     -webkit-app-region: drag;
-    padding-left: 80px;
+    padding-left: 96px;
 }
 .is-electron-titlebar button,
 .is-electron-titlebar input,

package/public/manager/src/manager-polish.css

@@ -55,7 +55,7 @@
     padding: 6px 10px;
 }
 .command-bar.is-electron-titlebar {
-    padding-left: 80px;
+    padding-left: 96px;
 }
 
 .command-primary {

package/public/manager/src/manager-shortcut-runner.ts

@@ -0,0 +1,107 @@
+import type { DashboardDetailTab, DashboardInstance, DashboardShortcutAction, DashboardSidebarMode } from './types';
+import { panelShortcutBus } from './panels/panel-shortcut-bus';
+import { getDesktop } from './panels/desktop-bridge';
+
+/**
+ * Dependencies the manager keyboard-shortcut runner needs from <App>.
+ * Extracted from App.tsx to keep the component under the dashboard line budget;
+ * behaviour is identical — App passes current render values on every call.
+ */
+export interface ManagerShortcutRunnerDeps {
+    selectedInstance: DashboardInstance | null;
+    filtered: DashboardInstance[];
+    activeDetailTab: DashboardDetailTab;
+    setDrawerOpen: (open: boolean) => void;
+    handleSidebarModeChange: (mode: DashboardSidebarMode) => void;
+    handlePreview: (instance: DashboardInstance) => void;
+    selectRelativeInstance: (direction: 1 | -1) => void;
+    handleTabChange: (tab: DashboardDetailTab) => void;
+    setPreviewRefreshKey: (updater: (key: number) => number) => void;
+    handleSidebarToggle: () => void;
+}
+
+export function runManagerShortcut(action: DashboardShortcutAction, deps: ManagerShortcutRunnerDeps): void {
+    if (panelShortcutBus.dispatch(action)) return;
+    if (action === 'focusInstances') {
+        deps.handleSidebarModeChange('instances');
+        deps.setDrawerOpen(false);
+        return;
+    }
+    if (action === 'focusActiveSession') {
+        const target = deps.selectedInstance?.ok
+            ? deps.selectedInstance
+            : deps.filtered.find(instance => instance.ok) || null;
+        if (target) deps.handlePreview(target);
+        else deps.handleSidebarModeChange('instances');
+        return;
+    }
+    if (action === 'focusNotes') {
+        deps.handleSidebarModeChange('notes');
+        deps.setDrawerOpen(false);
+        return;
+    }
+    if (action === 'previousInstance') {
+        deps.selectRelativeInstance(-1);
+        return;
+    }
+    if (action === 'nextInstance') {
+        deps.selectRelativeInstance(1);
+        return;
+    }
+    if (action === 'closeFocusedTab') {
+        const active = document.activeElement;
+        if (active?.closest('.browser-webview-stack, .browser-tab-strip')) {
+            document.dispatchEvent(new CustomEvent('jaw:shortcut-action', { detail: 'closeBrowserTab' }));
+        } else if (active?.closest('.terminal-panel, .xterm')) {
+            document.dispatchEvent(new CustomEvent('jaw:shortcut-action', { detail: 'closeTerminalTab' }));
+        } else if (active?.closest('.bottom-panel')) {
+            panelShortcutBus.dispatch('closeActiveBottomTab');
+        } else if (active?.closest('.right-panel')) {
+            panelShortcutBus.dispatch('toggleRightPanel');
+        }
+        return;
+    }
+    if (action === 'switchTab1') { deps.handleTabChange('overview'); return; }
+    if (action === 'switchTab2') { deps.handleTabChange('preview'); return; }
+    if (action === 'switchTab3') { deps.handleTabChange('logs'); return; }
+    if (action === 'switchTab4') { deps.handleTabChange('settings'); return; }
+    if (action === 'previousTab' || action === 'nextTab') {
+        const tabs: DashboardDetailTab[] = ['overview', 'preview', 'logs', 'settings'];
+        const idx = tabs.indexOf(deps.activeDetailTab);
+        const dir = action === 'nextTab' ? 1 : -1;
+        deps.handleTabChange(tabs[(idx + dir + tabs.length) % tabs.length]);
+        return;
+    }
+    if (action === 'browserReload' || action === 'browserHardReload' || action === 'browserFocusUrl' || action === 'browserBack' || action === 'browserForward') {
+        const el = document.activeElement;
+        if (el?.closest('.browser-webview-stack, .browser-tab-strip, .browser-panel')) {
+            document.dispatchEvent(new CustomEvent('jaw:shortcut-action', { detail: action }));
+            return;
+        }
+        // Focus is NOT in the browser panel → reload acts on the preview or app.
+        // Preview focus refreshes the preview for both soft and hard (the iframe
+        // has no separate hard-reload concept).
+        if (action === 'browserReload' || action === 'browserHardReload') {
+            if (el?.closest('.preview-panel')) {
+                deps.setPreviewRefreshKey(key => key + 1);
+            } else if (action === 'browserReload') {
+                getDesktop()?.reloadWindow?.();
+            } else {
+                getDesktop()?.hardReloadWindow?.();
+            }
+        }
+        // browserFocusUrl / Back / Forward are browser-only → no-op outside the panel.
+        return;
+    }
+    if (action === 'terminalClear' || action === 'terminalNewTab') {
+        const el = document.activeElement;
+        if (el?.closest('.terminal-panel, .xterm')) {
+            document.dispatchEvent(new CustomEvent('jaw:shortcut-action', { detail: action }));
+        }
+        return;
+    }
+    if (action === 'toggleLeftSidebar') {
+        deps.handleSidebarToggle();
+        return;
+    }
+}

package/public/manager/src/manager-shortcuts.ts

@@ -134,12 +134,27 @@ export function shortcutMatches(event: KeyboardEvent, raw: string): boolean {
         && resolveEventKey(event) === parsed.key;
 }
 
+/**
+ * Actions whose keyboard shortcut is owned by the Electron application menu
+ * accelerator (single source of truth), so the renderer keydown matcher must
+ * NOT also match them — otherwise ⌘R fires twice (menu + keydown). The actions
+ * stay in MANAGER_SHORTCUT_ACTIONS so the menu can still dispatch them by name;
+ * only the renderer-side keyboard binding is suppressed. This also makes a
+ * persisted user keymap carrying Meta+R harmless, and preserves the browser's
+ * native ⌘R in a pure web build (no menu, no match → no preventDefault).
+ */
+export const RENDERER_DISABLED_SHORTCUT_ACTIONS = new Set<DashboardShortcutAction>([
+    'browserReload',
+    'browserHardReload',
+]);
+
 export function actionForShortcutEvent(
     event: KeyboardEvent,
     keymap: unknown,
 ): DashboardShortcutAction | null {
     const shortcuts = normalizeManagerShortcutKeymap(keymap);
     for (const action of MANAGER_SHORTCUT_ACTIONS) {
+        if (RENDERER_DISABLED_SHORTCUT_ACTIONS.has(action)) continue;
         if (shortcutMatches(event, shortcuts[action])) return action;
         if (MANAGER_SHORTCUT_ALIASES[action]?.some(shortcut => shortcutMatches(event, shortcut))) return action;
     }

package/public/manager/src/panels/desktop-bridge.ts

@@ -91,6 +91,8 @@ export type CliJawDesktopApi = {
     permissions?: PermissionDiagnosticsBridgeApi | undefined;
     shortcuts?: ShortcutBridgeApi | undefined;
     browser?: BrowserBridgeApi | undefined;
+    reloadWindow?: (() => void) | undefined;
+    hardReloadWindow?: (() => void) | undefined;
 };
 
 export function getDesktop(): CliJawDesktopApi | null {

package/public/manager/src/settings/SettingsSidebar.tsx

@@ -21,9 +21,9 @@ const CATEGORIES: SidebarEntry[] = [
     { id: 'channels-discord', label: 'Channels — Discord', group: 'channels' },
     { id: 'heartbeat', label: 'Heartbeat & schedules', group: 'automation' },
     { id: 'memory', label: 'Memory', group: 'automation' },
+    { id: 'mcp', label: 'MCP servers', group: 'mcp' },
     { id: 'speech', label: 'Speech & keys', group: 'integrations' },
     { id: 'prompts', label: 'Prompts', group: 'integrations' },
-    { id: 'mcp', label: 'MCP servers', group: 'integrations' },
     { id: 'browser', label: 'Browser / CDP', group: 'integrations' },
     { id: 'network', label: 'Network', group: 'network-security' },
     { id: 'permissions', label: 'Permissions', group: 'network-security' },

package/public/manager/src/settings/components/sidebar-filter.ts

@@ -14,6 +14,7 @@ export type SidebarEntry = {
 export const SIDEBAR_GROUP_ORDER: ReadonlyArray<SettingsCategoryGroup> = [
     'runtime',
     'identity',
+    'mcp',
     'channels',
     'automation',
     'integrations',
@@ -24,6 +25,7 @@ export const SIDEBAR_GROUP_ORDER: ReadonlyArray<SettingsCategoryGroup> = [
 export const SIDEBAR_GROUP_LABELS: Record<SettingsCategoryGroup, string> = {
     runtime: 'Runtime',
     identity: 'Identity',
+    mcp: 'MCP',
     channels: 'Channels',
     automation: 'Automation',
     integrations: 'Integrations',