@forgeax/interface 0.5.0 → 0.7.0

package/dist/package/browser/lib/menu-registry.js

@@ -1,197 +1,3 @@
-/** menu-registry —— 顶部菜单栏的单一真值源 (SSOT for the menu bar).
- *
- *  一张注册表服务两个消费者 (压缩公理:消掉「Web 菜单和原生菜单是不是同一套?」):
- *    1. Web 端渲染器 (React) —— 通过 `snapshotMenu(...)` / `snapshotAllMenus()` + `onMenuChange`
- *       走 useSyncExternalStore 拿到当前菜单结构;
- *    2. Tauri 原生菜单桥接 —— 通过 `serializeMenusForNative(t)` 拿到已翻译、去函数、
- *       JSON 可序列化的原生菜单契约,一次性 build native menu / 每次注册表变化时 rebuild.
- *
- *  设计与 action-registry.ts 对齐 (模块级 Map 页级单例 + change listener):
- *    - 菜单项按 `menu`(顶层大类) + `group`(段落分组) + `order`(段内序) 三级组织;
- *    - 同 id 重复注册 = **替换** (幂等,HMR / StrictMode 双挂载安全,cleanup
- *      走身份检查避免误删);
- *    - 键位串遵循全仓 canonical combo 格式 (见 lib/global-shortcuts.ts `prettyCombo`),
- *      例:'Ctrl+S' / 'Ctrl+Shift+Z' / 'Ctrl+,'。Web 显示走 prettyCombo,原生菜单走
- *      `serializeMenusForNative` 内部的 accelerator 转换 (Ctrl→CmdOrCtrl,保留 Shift/Alt)。
- *
- *  分隔符策略 (评审):**注册者不显式发 separator sentinel** —— 只填 `group`,
- *  渲染器按 `snapshotMenu` 返回结果中相邻两项的 `group` 差异自行绘制分隔线;
- *  原生序列化则在 `serializeMenusForNative` 中把段边界翻成 `separatorBefore=true`。
- *  这样避免维护「三种分隔来源」(注册者手插 + 渲染器 + 原生桥)—— 一处派生 (§2 Derive)。
- */
-// ─── 注册表本体 (模块级 Map,页级单例) ────────────────────────────────────────
-const items = new Map();
-const changeListeners = new Set();
-function notifyChange() {
-    for (const cb of changeListeners) {
-        try {
-            cb();
-        }
-        catch {
-            /* listener 异常不传染 */
-        }
-    }
-}
-/** 注册一项菜单 —— 同 id 重复注册 = 替换 (幂等,HMR / StrictMode 双挂载安全)。
- *  返回 cleanup 函数;cleanup 幂等 (身份检查:仅当当前项仍是本次注册的 def
- *  才 delete,避免 A 注册→A 注销 后误删掉 B 的 same-id 覆盖)。
- *
- *  设计变更 (T7 集成):初版为 throw-on-duplicate,与 action-registry 的
- *  「替换即幂等」策略不一致 —— React StrictMode 会双执行 App.tsx 的
- *  bootstrapAppHost useEffect,两次 setup 并发跑到同一个模块级 Map 时必抛
- *  「duplicate menu item id」把整个菜单栏打空。改为 last-writer-wins 后
- *  两次 setup 都能顺利完成,先释放的 cleanup 通过身份检查不会误删,
- *  与 action-registry 的语义对齐 (§SSOT / 兄弟注册表一致性)。 */
-export function registerMenuItem(def) {
-    items.set(def.id, def);
-    notifyChange();
-    return () => {
-        if (items.get(def.id) === def) {
-            items.delete(def.id);
-            notifyChange();
-        }
-    };
-}
-/** 注册表变更订阅 —— 供 useSyncExternalStore / native bridge rebuild 消费。 */
-export function onMenuChange(listener) {
-    changeListeners.add(listener);
-    return () => {
-        changeListeners.delete(listener);
-    };
-}
-// ─── 派生视图:排序与快照 (SSOT 是 items Map;所有视图都是纯 derive) ─────────
-/** 排序规则:先按 group 的**首次出现顺序**分段,段内按 order 升序 (相同 order 用
- *  插入顺序破平局,稳定排序)。JS `Array.prototype.sort` 从 ES2019 起要求稳定,
- *  Bun/V8/JSC 均已合规,直接用即可。 */
-function sortMenuItems(list) {
-    const groupFirstIndex = new Map();
-    list.forEach((item, idx) => {
-        if (!groupFirstIndex.has(item.group))
-            groupFirstIndex.set(item.group, idx);
-    });
-    const decorated = list.map((item, idx) => ({ item, idx }));
-    decorated.sort((a, b) => {
-        const ga = groupFirstIndex.get(a.item.group);
-        const gb = groupFirstIndex.get(b.item.group);
-        if (ga !== gb)
-            return ga - gb;
-        if (a.item.order !== b.item.order)
-            return a.item.order - b.item.order;
-        return a.idx - b.idx; // 稳定破平局:插入顺序
-    });
-    return decorated.map((d) => d.item);
-}
-/** 取单个菜单的排序后条目 —— 渲染器直接消费。 */
-export function snapshotMenu(menu) {
-    const list = [];
-    for (const def of items.values()) {
-        if (def.menu === menu)
-            list.push(def);
-    }
-    return sortMenuItems(list);
-}
-const ALL_MENUS = ['brand', 'file', 'edit', 'window', 'build', 'select', 'help', 'publish'];
-/** 取所有菜单的排序后条目,按 MenuId 组织。 */
-export function snapshotAllMenus() {
-    const out = {};
-    for (const m of ALL_MENUS)
-        out[m] = snapshotMenu(m);
-    return out;
-}
-/** 键位串 → 原生 accelerator 转换。canonical 形如 'Ctrl+Shift+S';原生形 'CmdOrCtrl+Shift+S'
- *  (Tauri/Electron 通用惯例:Ctrl 走 CmdOrCtrl,让 macOS 走 ⌘、其它平台走 Ctrl)。 */
-function toNativeAccelerator(combo) {
-    return combo
-        .split('+')
-        .map((seg) => (seg === 'Ctrl' ? 'CmdOrCtrl' : seg))
-        .join('+');
-}
-/** 递归序列化一项 (含 children) —— 返回值必须完全无函数,可直接 JSON.stringify。 */
-function serializeItem(def, translate) {
-    if (def.when && !def.when())
-        return null; // 隐藏项直接 drop
-    // Static `children` OR a `dynamicChildren` derivation — both serialize the
-    // same way. dynamicChildren is evaluated at serialize time (native menu is
-    // rebuilt on every registry change, so it re-derives with the cache current
-    // at that moment). Web + native thus share one derivation (§Derive / §SSOT).
-    const childDefs = def.children && def.children.length > 0
-        ? def.children
-        : def.dynamicChildren
-            ? def.dynamicChildren()
-            : null;
-    // enabled: explicit predicate wins; a submenu opener (has children) defaults
-    // enabled even without a command; else `!!commandId`. Mirrors the web
-    // renderer's resolveEnabled so both bars agree on which items are clickable.
-    const enabledResolved = def.enabled
-        ? def.enabled()
-        : (childDefs && childDefs.length > 0)
-            ? true
-            : !!def.commandId;
-    const out = {
-        id: def.id,
-        label: translate(def.labelKey),
-        enabled: enabledResolved,
-    };
-    if (def.keybinding)
-        out.accelerator = toNativeAccelerator(def.keybinding);
-    if (def.danger)
-        out.danger = true;
-    if (childDefs && childDefs.length > 0) {
-        const kids = [];
-        for (const child of childDefs) {
-            const ser = serializeItem(child, translate);
-            if (ser)
-                kids.push(ser);
-        }
-        if (kids.length > 0)
-            out.children = kids;
-    }
-    return out;
-}
-/** 序列化全部菜单为原生契约 —— T5 (Tauri 桥) 的唯一入口。契约要点:
- *    - `when === false` 的项被 drop;
- *    - `enabled` 缺省时默认 = `!!commandId` (无命令 = 禁用);
- *    - `labelKey` 走 `translate` 翻译,函数不出墙;
- *    - `keybinding` 转 native accelerator (Ctrl→CmdOrCtrl,Shift/Alt 保留);
- *    - 段边界翻成 `separatorBefore=true` (每个菜单首项除外);
- *    - 输出**完全 JSON 可序列化** (JSON.stringify 无损 roundtrip,无函数残留)。 */
-export function serializeMenusForNative(translate) {
-    const out = [];
-    for (const menu of ALL_MENUS) {
-        const sorted = snapshotMenu(menu);
-        const serialized = [];
-        let prevGroup = null;
-        for (const def of sorted) {
-            const ser = serializeItem(def, translate);
-            if (!ser) {
-                // when=false 的项被 drop;下一项若换 group 依然按已见 group 判段边界。
-                prevGroup = def.group;
-                continue;
-            }
-            if (prevGroup !== null && def.group !== prevGroup)
-                ser.separatorBefore = true;
-            serialized.push(ser);
-            prevGroup = def.group;
-        }
-        out.push({ menu, items: serialized });
-    }
-    return out;
-}
-// ─── Vite HMR: preserve registrations across hot module swap ───────────────
-if (import.meta.hot) {
-    import.meta.hot.dispose((data) => {
-        data.menuItems = [...items.entries()];
-    });
-    const saved = import.meta.hot.data.menuItems;
-    if (saved) {
-        for (const [id, def] of saved)
-            items.set(id, def);
-        notifyChange();
-    }
-}
-// ─── 测试辅助 (生产代码不要调) ─────────────────────────────────────────────
-/** 清空注册表 —— 仅供单测 beforeEach 使用。 */
-export function __resetMenuRegistryForTest() {
-    items.clear();
-    changeListeners.clear();
-}
+// Interface-owned built-in menu descriptors and native wire types.
+// Runtime registration, ordering, subscriptions and disposal belong to host.menus.
+export {};

package/dist/package/browser/lib/menu-registry.test-utils.d.ts

@@ -0,0 +1,11 @@
+import { type ApplicationMenuItem } from '@forgeax/app-shell/application';
+import type { MenuId, MenuItemDef } from './menu-registry';
+export type { MenuItemDef } from './menu-registry';
+export declare const getTestMenus: () => import("@forgeax/app-shell/application").ApplicationMenuRegistry;
+export declare const setTestMenuTranslator: (next: (key: string) => string) => void;
+export declare const registerMenuItem: (def: MenuItemDef) => () => void;
+export declare const onMenuChange: (listener: () => void) => () => void;
+export declare const snapshotMenu: (menu: MenuId) => MenuItemDef[];
+export declare const snapshotAllMenus: () => Record<MenuId, readonly ApplicationMenuItem[]>;
+export declare function serializeMenusForNative(t: (key: string) => string): import("./menu-registry").NativeMenu[];
+export declare function __resetMenuRegistryForTest(): void;

package/dist/package/browser/lib/menu-registry.test-utils.js

@@ -0,0 +1,28 @@
+// Test data adapter only. Production readers receive their host registry.
+import { createApplicationMenuRegistry } from '@forgeax/app-shell/application';
+import { projectApplicationMenus, serializeApplicationMenusForNative } from './application-menu-projection';
+let menus = createApplicationMenuRegistry();
+let translate = (key) => key;
+export const getTestMenus = () => menus;
+export const setTestMenuTranslator = (next) => { translate = next; };
+function contribution(def) {
+    return {
+        ...def, groupOrder: 0,
+        get label() { return translate(def.labelKey); },
+        children: def.children?.map(contribution),
+        dynamicChildren: def.dynamicChildren ? () => def.dynamicChildren().map(contribution) : undefined,
+    };
+}
+export const registerMenuItem = (def) => menus.register(contribution(def));
+export const onMenuChange = (listener) => menus.subscribe(listener);
+export const snapshotMenu = (menu) => menus.snapshot(menu);
+export const snapshotAllMenus = () => projectApplicationMenus(menus.snapshot());
+export function serializeMenusForNative(t) {
+    translate = t;
+    return serializeApplicationMenusForNative(menus.snapshot());
+}
+export function __resetMenuRegistryForTest() {
+    menus.dispose();
+    menus = createApplicationMenuRegistry();
+    translate = key => key;
+}

package/dist/package/browser/lib/native-menu-bridge.d.ts

@@ -17,9 +17,11 @@
  *  ⚠️ Rust 侧收到的 payload 结构与 menu-registry.ts 的 `NativeMenu` 一致,
  *  但额外带一个可选 `title` —— 我们在这里补上,契约扩展在桥内闭环,不动 T1。
  */
+import type { ApplicationMenuRegistry } from '@forgeax/app-shell/application';
 /** 派发接口:与 host.commands.execute 兼容,fire-and-forget。 */
 export type MenuExecute = (id: string, args?: unknown) => void | Promise<unknown>;
 export interface InitNativeMenuBridgeOptions {
+    menus: ApplicationMenuRegistry;
     /** 命令派发器 —— 通常是 (id, args) => host.commands.execute(id, args)。 */
     execute: MenuExecute;
     /** i18n 翻译器 —— 通常是 useTranslation().t。 */
@@ -32,6 +34,18 @@ export interface InitNativeMenuBridgeOptions {
  *  导出给链路下游(命令落地后的 UI 环节)复用,让"事件没到"与"命令跑了但界面
  *  没出来"在同一个流里可区分。sink 未装上前只进 console。 */
 export declare function fxTrace(line: string): void;
-/** Public entry —— App.tsx 在 boot 完成后调用一次。返回 Promise 让调用方能
- *  await (不必须);浏览器形态立刻 resolve()。 */
-export declare function initNativeMenuBridge(opts: InitNativeMenuBridgeOptions): Promise<void>;
+/** The existing Tauri menu endpoint, injectable for lifecycle contract tests. */
+export interface NativeMenuTransport {
+    invoke(command: string, args: Record<string, unknown>): Promise<unknown>;
+    listen(listener: (id: string) => void): Promise<() => void>;
+}
+export interface NativeMenuBridgeDependencies {
+    loadTransport(): Promise<NativeMenuTransport>;
+    warmRecentGames(): Promise<void>;
+    subscribeLocale(listener: () => void): () => void;
+    reportError(error: unknown): void;
+}
+/** One mounted shell owns all native subscriptions, including asynchronous setup. */
+export declare function installNativeMenuBridge(opts: InitNativeMenuBridgeOptions, deps: NativeMenuBridgeDependencies): () => void;
+/** Browser shells install nothing. React effect cleanup also fences late imports. */
+export declare function initNativeMenuBridge(opts: InitNativeMenuBridgeOptions): () => void;

package/dist/package/browser/lib/native-menu-bridge.js

@@ -19,13 +19,14 @@
  */
 import { isTauri } from './platform/runtime';
 import { warmRecentGames } from './recent-games';
-import { onMenuChange, serializeMenusForNative, snapshotAllMenus, } from './menu-registry';
+import { subscribeLocale } from '../i18n';
+import { projectApplicationMenus, serializeApplicationMenusForNative } from './application-menu-projection';
 // ─── Menu id → command lookup (原生点击回吐用) ─────────────────────────────
 /** 展平所有菜单项 (含 children),建 id → def 的索引,供 menu:invoke 回吐时 O(1)
  *  查表。不缓存:每次点击都 fresh 一遍,让 when/enabled 变化立刻生效;菜单量级
  *  几十项,遍历开销可忽略。 */
-function findMenuItemById(id) {
-    const all = snapshotAllMenus();
+function findMenuItemById(id, menus) {
+    const all = projectApplicationMenus(menus.snapshot());
     for (const menuId of Object.keys(all)) {
         const found = findInList(all[menuId], id);
         if (found)
@@ -35,6 +36,8 @@ function findMenuItemById(id) {
 }
 function findInList(list, id) {
     for (const item of list) {
+        if ((item.when && !item.when()) || (item.enabled && !item.enabled()))
+            continue;
         if (item.id === id)
             return item;
         // Recurse into static children AND dynamic ones — a native click on a
@@ -67,85 +70,122 @@ export function fxTrace(line) {
     console.debug('[fx-trace]', line);
     traceSink?.(line);
 }
-/** 模块内简称。 */
-const trace = fxTrace;
-// ─── Push (registry → native) ─────────────────────────────────────────────
-/** 把当前注册表快照推给 Rust。失败时 warn 但不抛 —— 菜单更新失败不该让 boot
- *  炸掉;下次 onMenuChange 会重试。 */
-async function pushMenusToNative(invoke, translate) {
-    // Warm the recent-games cache so 打开最近's dynamicChildren serialize with a
-    // current list. Web warms on File-dropdown open; native has no such hook, so
-    // we warm here before every rebuild. Failures leave the last cache intact.
-    trace('push: warmRecentGames…');
-    await warmRecentGames();
-    trace('push: warmRecentGames done, serializing…');
-    const raw = serializeMenusForNative(translate);
-    // 补顶层 title —— 与 MenuBar.tsx 的 `t('menubar.${menu}')` 保持一致。
-    const payload = raw.map((m) => ({
-        ...m,
-        title: translate(`menubar.${m.menu}`),
-    }));
-    const fileIds = raw.find((m) => m.menu === 'file')?.items.map((i) => i.id) ?? [];
-    trace(`push: serialized menus=${payload.length} file.items=[${fileIds.join(',')}]`);
-    try {
-        await invoke('set_app_menu', { payload });
-        trace('push: set_app_menu resolved');
-    }
-    catch (err) {
-        trace(`push: set_app_menu REJECTED ${err?.message ?? String(err)}`);
-        console.warn('[native-menu-bridge] set_app_menu failed:', err?.message ?? err);
-    }
-}
-// ─── Init (唯一对外入口) ────────────────────────────────────────────────
-/** 幂等标记:StrictMode 双 invoke / boot 双路径都可能重入 init,原生只该被安装一次。
- *  一旦装上:后续调用直接返回。 */
-let installed = false;
-/** Public entry —— App.tsx 在 boot 完成后调用一次。返回 Promise 让调用方能
- *  await (不必须);浏览器形态立刻 resolve()。 */
-export async function initNativeMenuBridge(opts) {
-    if (!isTauri())
-        return; // web 形态 no-op
-    if (installed)
-        return;
-    installed = true;
-    const { translate } = opts;
-    // 懒加载 Tauri API —— 与 runtime.ts 的其它加载器同风格,避免把 chunk 塞进 web bundle。
-    const [{ invoke }, eventMod] = await Promise.all([
-        import('@tauri-apps/api/core'),
-        import('@tauri-apps/api/event'),
-    ]);
-    traceSink = (line) => { void invoke('fx_trace', { line }).catch(() => { }); };
-    trace('init: tauri api loaded, starting first push…');
-    // 1. 原生点击回吐 —— Rust 侧 on_menu_event emit 'menu:invoke' { id },
-    //    我们查注册表拿到 commandId + args,派发到 command bus。
-    //    先注册监听器再做首次 push:首次 push 会预热 listGames,若接口卡住,
-    //    旧菜单仍能响应点击,不会出现"菜单显示但点击无反应"的窗口。
-    await eventMod.listen('menu:invoke', (ev) => {
-        const id = ev.payload?.id;
-        trace(`recv: menu:invoke id=${String(id)}`);
-        if (!id)
-            return;
-        const def = findMenuItemById(id);
-        if (!def) {
-            // 原生菜单栏比 web 快照晚一拍时可能出现;下次 push 会对齐。
-            trace(`recv: id=${id} NOT FOUND in registry — dropped`);
-            console.warn('[native-menu-bridge] menu:invoke for unknown id:', id);
-            return;
+/** One mounted shell owns all native subscriptions, including asynchronous setup. */
+export function installNativeMenuBridge(opts, deps) {
+    let disposed = false;
+    const cleanups = [];
+    const report = (error) => {
+        try {
+            deps.reportError(error);
         }
-        if (!def.commandId) {
-            trace(`recv: id=${id} has no commandId (placeholder) — dropped`);
-            return; // 纯文本占位项,无命令。
+        catch { /* Reporting must not prevent cleanup. */ }
+    };
+    const safely = (cleanup) => {
+        try {
+            cleanup();
         }
-        trace(`dispatch: id=${id} → command '${def.commandId}' args=${JSON.stringify(def.args ?? null)}`);
-        void Promise.resolve(opts.execute(def.commandId, def.args)).then((r) => trace(`dispatch: '${def.commandId}' resolved ${JSON.stringify(r ?? null)}`), (e) => trace(`dispatch: '${def.commandId}' REJECTED ${e?.message ?? String(e)}`));
-    });
-    trace('init: menu:invoke listener registered — bridge live before first push');
-    // 2. 注册表变动 —— 后续 register/unregister/when 切换都会触发 rebuild。
-    //    在 change 时直接 fire-and-forget push;失败已在 pushMenusToNative 内吞。
-    onMenuChange(() => {
-        void pushMenusToNative(invoke, translate);
+        catch (error) {
+            report(error);
+        }
+    };
+    const retain = (cleanup) => {
+        if (disposed)
+            safely(cleanup);
+        else
+            cleanups.push(cleanup);
+    };
+    const dispose = () => {
+        if (disposed)
+            return;
+        disposed = true;
+        for (const cleanup of cleanups.splice(0).reverse())
+            safely(cleanup);
+    };
+    void (async () => {
+        const transport = await deps.loadTransport();
+        if (disposed)
+            return;
+        const sink = (line) => {
+            if (!disposed)
+                void transport.invoke('fx_trace', { line }).catch(() => { });
+        };
+        traceSink = sink;
+        retain(() => { if (traceSink === sink)
+            traceSink = null; });
+        // Subscribe before warming so existing native items remain responsive.
+        const off = await transport.listen(id => {
+            if (disposed || !id)
+                return;
+            try {
+                const item = findMenuItemById(id, opts.menus);
+                if (!item?.commandId)
+                    return;
+                void Promise.resolve(opts.execute(item.commandId, item.args)).catch(report);
+            }
+            catch (error) {
+                report(error);
+            }
+        });
+        retain(off);
+        if (disposed)
+            return;
+        // Serialize pushes: a slower old update must not overwrite a newer locale
+        // or host snapshot. Events arriving during warming are read in that push.
+        let dirty = false;
+        let running = false;
+        const refresh = () => {
+            if (disposed)
+                return;
+            dirty = true;
+            if (running)
+                return;
+            running = true;
+            void (async () => {
+                try {
+                    while (!disposed && dirty) {
+                        dirty = false;
+                        try {
+                            await deps.warmRecentGames();
+                            if (disposed)
+                                return;
+                            dirty = false;
+                            const payload = serializeApplicationMenusForNative(opts.menus.snapshot())
+                                .map(menu => ({ ...menu, title: opts.translate(`menubar.${menu.menu}`) }));
+                            await transport.invoke('set_app_menu', { payload });
+                        }
+                        catch (error) {
+                            report(error);
+                        }
+                    }
+                }
+                finally {
+                    running = false;
+                }
+            })();
+        };
+        retain(opts.menus.subscribe(refresh));
+        retain(deps.subscribeLocale(refresh));
+        refresh();
+    })().catch(error => { report(error); dispose(); });
+    return dispose;
+}
+/** Browser shells install nothing. React effect cleanup also fences late imports. */
+export function initNativeMenuBridge(opts) {
+    if (!isTauri())
+        return () => { };
+    return installNativeMenuBridge(opts, {
+        async loadTransport() {
+            const [core, events] = await Promise.all([
+                import('@tauri-apps/api/core'),
+                import('@tauri-apps/api/event'),
+            ]);
+            return {
+                invoke: (command, args) => core.invoke(command, args),
+                listen: listener => events.listen('menu:invoke', event => listener(event.payload?.id)),
+            };
+        },
+        warmRecentGames,
+        subscribeLocale: listener => subscribeLocale(listener),
+        reportError: error => console.warn('[native-menu-bridge]', error),
     });
-    // 3. 首次推送 —— 让原生菜单栏与当前注册表对齐。
-    await pushMenusToNative(invoke, translate);
-    trace('init: first push returned');
 }

package/dist/package/node/ApplicationShell.js

@@ -25,7 +25,7 @@ import { isTauri } from './lib/platform/runtime.js';
 
 export { ApplicationDetachedShell } from './ApplicationDetachedShell.js';
 function KeyboardRouter({ runtime }) {
-    useGlobalShortcuts(runtime.host.keybindings);
+    useGlobalShortcuts(runtime.host.keybindings, runtime.host.shortcuts);
     return null;
 }
 export function isApplicationOnboardingEnabled(onboarding) {
@@ -46,7 +46,8 @@ export function ApplicationShell({ runtime, onboarding }) {
     useEffect(() => {
         if (!isTauri())
             return;
-        void initNativeMenuBridge({
+        return initNativeMenuBridge({
+            menus: runtime.host.menus,
             execute: (id, args) => runtime.host.commands.execute(id, args),
             translate: t,
         });

package/dist/package/node/appHostBootstrap.js

@@ -21,7 +21,6 @@ import { foundationStorageExtension } from './core/extensions/foundation-storage
 import { builtinCommandsExtension } from './core/extensions/builtin-commands.js';
 import { hostCommandsExtension } from './core/extensions/host-commands.js';
 import { builtinMenusExtension } from './core/extensions/builtin-menus.js';
-import { editorCommandsExtension } from './core/extensions/editor-commands.js';
 import { panelsViewportExtension } from './core/extensions/panels-viewport.js';
 import { panelsChatExtension } from './core/extensions/panels-chat.js';
 import { chromeStatusBarExtension } from './core/extensions/chrome-statusbar.js';
@@ -62,9 +61,14 @@ export async function bootstrapAppHost(overrides = {}) {
         ...m,
         async setup(ctx) {
             control.beginSetup(m);
+            const menuCleanups = [];
             try {
                 const cleanups = [];
                 let pageCleanup;
+                for (const menu of m.contributes?.menus ?? []) {
+                    menuCleanups.push(host.menus.register(menu));
+                }
+                cleanups.push(...menuCleanups);
                 if (m.contributes?.panels) {
                     cleanups.push(control.contributePanels(m.id, m.contributes.panels));
                 }
@@ -95,6 +99,11 @@ export async function bootstrapAppHost(overrides = {}) {
                         await c();
                 };
             }
+            catch (error) {
+                for (const cleanup of menuCleanups.slice().reverse())
+                    await cleanup();
+                throw error;
+            }
             finally {
                 control.endSetup();
             }
@@ -108,7 +117,6 @@ export async function bootstrapAppHost(overrides = {}) {
         builtinCommandsExtension,
         hostCommandsExtension,
         builtinMenusExtension,
-        editorCommandsExtension,
         panelsViewportExtension,
         panelsChatExtension,
         chromeStatusBarExtension,

package/dist/package/node/application.js

@@ -2,7 +2,6 @@ import { bootstrapAppHost, } from './appHostBootstrap.js';
 import { bootStageAppMounted } from './boot/driver.js';
 import { changeLanguage, initI18n } from './i18n/index.js';
 import { useShellStore } from './store.js';
-import { registerKeyboardRouterDeps, } from './lib/global-shortcuts.js';
 /**
  * Lets a product replace one shell overlay with its own destination. Interface
  * owns observation, clearing and synchronous reentry; the product owns routing.
@@ -24,14 +23,6 @@ export function installApplicationOverlayRedirect(overlayId, onRedirect) {
         }
     });
 }
-/**
- * Configures product-owned editor callbacks consumed by Interface's single
- * keyboard router. Product assemblies use this public application boundary;
- * the router implementation remains private to Interface.
- */
-export function configureInterfaceKeyboardRouter(deps) {
-    registerKeyboardRouterDeps(deps);
-}
 /**
  * Starts the shared Interface application runtime without selecting a product
  * entry or product extensions. IDE and compatibility callers supply their own