@morlay/dsh-desktop-shell 0.2.5 → 0.2.6

package/src/shortcuts.ts

@@ -0,0 +1,236 @@
+// 桌面快捷键的原生侧：设备偏好持久化 + 原生按键转发 + 关闭窗口动作。
+//
+// 上游 `@deepseek-ai/dsh-client-shortcuts` 在 desktop 运行时**要求** `window.dshDesktop.keyboard`
+// 存在（缺了就构造失败）；这里就是那份契约的实现——主进程按已绑定键过滤物理按键，把命中的手势经
+// IPC 交给渲染进程派发。
+import { ipcMain } from "./electron.ts";
+import type { BrowserWindow as BrowserWindowType, Input } from "electron";
+import {
+  bindingKey,
+  effectiveShortcuts,
+  parseShortcutDefinitions,
+  parseShortcutEdit,
+} from "@deepseek-ai/dsh-client-shortcuts/protocol";
+import type {
+  NormalizedBinding,
+  ShortcutConfigSnapshot,
+  ShortcutDefinition,
+  ShortcutPlatform,
+  ShortcutRevision,
+} from "@deepseek-ai/dsh-client-shortcuts/protocol";
+import { DESKTOP_IPC, assertDesktopSender } from "./ipc.ts";
+import { desktopKeybindings } from "./keybindings.ts";
+
+export interface DesktopShortcuts {
+  // 把一个窗口接进原生按键转发（每个新建的窗口都要接一次）。
+  attach(window: BrowserWindowType): void;
+  // 释放 IPC 与持久化（退出时调用）。
+  dispose(): void;
+}
+
+// 装上桌面快捷键的原生侧，返回窗口接入与释放操作；`scheme` 用于校验 IPC 来源。
+export function installDesktopShortcuts(
+  getWindow: () => BrowserWindowType | undefined,
+  userData: string,
+  platform: ShortcutPlatform,
+  scheme: string,
+): DesktopShortcuts {
+  let definitions: readonly ShortcutDefinition[] = [];
+  let recording = false;
+  let revision: ShortcutRevision | undefined;
+  let keys = new Set<string>();
+
+  // 只有「已绑定、无冲突、无问题」的键才拦：其余一律放行给页面自己的处理。
+  const publish = (snapshot: ShortcutConfigSnapshot): void => {
+    revision =
+      definitions.length === 0 || snapshot.status === "loading" ? undefined : snapshot.revision;
+    const rows =
+      snapshot.status === "loading"
+        ? []
+        : effectiveShortcuts(definitions, snapshot.document, "desktop", platform);
+    keys = new Set(
+      rows.flatMap((row) =>
+        row.binding !== null && row.issue === null && row.conflicts.length === 0
+          ? [bindingKey(row.binding)]
+          : [],
+      ),
+    );
+    const window = getWindow();
+    if (window !== undefined && !window.isDestroyed())
+      window.webContents.send(DESKTOP_IPC.shortcutsChanged, snapshot);
+  };
+
+  const persistence = desktopKeybindings(userData, platform, publish);
+
+  const windowOf = (event: Electron.IpcMainInvokeEvent): BrowserWindowType => {
+    assertDesktopSender(event, scheme, ["app"]);
+    const window = getWindow();
+    if (window === undefined || window.isDestroyed() || event.sender !== window.webContents)
+      throw new Error("desktop shortcuts: rejected sender");
+    return window;
+  };
+
+  ipcMain.handle(DESKTOP_IPC.shortcutsGet, (event, input: unknown) => {
+    windowOf(event);
+    definitions = parseShortcutDefinitions(input);
+    persistence.setDefinitions(definitions);
+    return persistence.readCurrent();
+  });
+  ipcMain.handle(DESKTOP_IPC.shortcutsEdit, (event, input: unknown, expected: unknown) => {
+    windowOf(event);
+    if (typeof expected !== "string") throw new Error("desktop shortcuts: invalid revision");
+    return persistence.edit(parseShortcutEdit(input), expected as ShortcutRevision);
+  });
+  ipcMain.handle(DESKTOP_IPC.shortcutsRecording, (event, active: unknown) => {
+    const window = windowOf(event);
+    if (typeof active !== "boolean") throw new Error("desktop shortcuts: invalid recording state");
+    recording = active;
+    window.webContents.setIgnoreMenuShortcuts(active);
+  });
+  ipcMain.handle(DESKTOP_IPC.shortcutsCloseWindow, (event, expected: unknown) => {
+    const window = windowOf(event);
+    if (expected !== revision || revision === undefined || recording) return;
+    if (!window.isFocused() || !window.isEnabled()) return;
+    window.close();
+  });
+
+  const attach = (window: BrowserWindowType): void => {
+    const contents = window.webContents;
+    let deadKey = false;
+    const held = new Set<string>();
+    const consumed = new Map<string, "press" | "repeat">();
+    const resetInput = (): void => {
+      deadKey = false;
+      held.clear();
+      consumed.clear();
+      if (!contents.isDestroyed()) contents.setIgnoreMenuShortcuts(false);
+    };
+    const clear = (): void => {
+      resetInput();
+      definitions = [];
+      keys.clear();
+      recording = false;
+      persistence.setDefinitions(null);
+    };
+    const beforeInput = (event: Electron.Event, input: Input): void => {
+      if (event.defaultPrevented) {
+        resetInput();
+        return;
+      }
+      if (
+        window !== getWindow() ||
+        !window.isFocused() ||
+        !window.isEnabled() ||
+        revision === undefined
+      ) {
+        contents.setIgnoreMenuShortcuts(false);
+        held.clear();
+        consumed.clear();
+        return;
+      }
+      const modifiers = (["control", "alt", "shift", "meta"] as const).filter(
+        (modifier) => input[modifier],
+      );
+      const key = bindingKey({ code: input.code, modifiers });
+      const match = keys.has(key);
+      contents.setIgnoreMenuShortcuts(recording || match);
+      const composing =
+        input.isComposing || input.key === "Dead" || deadKey || input.modifiers.includes("altgr");
+      if (input.type === "keyDown") deadKey = input.key === "Dead";
+      if (recording || composing) {
+        held.clear();
+        consumed.clear();
+        return;
+      }
+      let binding: NormalizedBinding = { code: input.code, modifiers };
+      let priority = false;
+      const modifierKey = /^(Control|Alt|Shift|Meta)(Left|Right)$/u.test(input.code);
+      if (input.type === "keyUp") {
+        // 组合键的第一个键到达过渲染进程，它的抬起也必须到达同一批输入处理。
+        if (consumed.get(input.code) === "press") event.preventDefault();
+        consumed.delete(input.code);
+        held.delete(input.code);
+        if (modifierKey) held.clear();
+        return;
+      }
+      if (!input.isAutoRepeat) consumed.delete(input.code);
+      if (modifierKey) {
+        held.clear();
+        return;
+      }
+      if (input.isAutoRepeat && consumed.has(input.code) && !match) {
+        event.preventDefault();
+        return;
+      }
+      if (input.isAutoRepeat && !held.has(input.code) && !match) return;
+      held.add(input.code);
+      const codes: [string, ...string[]] = [
+        input.code,
+        ...[...held].filter((value) => value !== input.code),
+      ];
+      codes.sort();
+      const pair = {
+        code: codes[0],
+        ...(codes[1] === undefined ? {} : { secondCode: codes[1] }),
+        modifiers,
+      };
+      priority = keys.has(key);
+      if (codes.length === 2 && keys.has(bindingKey(pair))) {
+        binding = pair;
+        priority = true;
+      }
+      if (!priority) return;
+      event.preventDefault();
+      if (!input.isAutoRepeat) {
+        if (binding.secondCode !== undefined) {
+          consumed.set(binding.code, "repeat");
+          consumed.set(binding.secondCode, "repeat");
+        }
+        consumed.set(input.code, "press");
+      }
+      // Electron 可能两个 keyup 都不再送来：已完成的按键不能拿来接下一个组合键。
+      held.clear();
+      contents.send(DESKTOP_IPC.shortcutsInput, {
+        kind: "keyboard",
+        revision,
+        code: binding.code,
+        ...(binding.secondCode === undefined ? {} : { secondCode: binding.secondCode }),
+        repeat: input.isAutoRepeat,
+        control: input.control,
+        alt: input.alt,
+        shift: input.shift,
+        meta: input.meta,
+      });
+    };
+    const navigation = (
+      event: Electron.Event<Electron.WebContentsDidStartNavigationEventParams>,
+    ): void => {
+      if (event.isMainFrame && !event.isSameDocument) clear();
+    };
+    const disposeInput = (): void => {
+      contents.off("did-start-navigation", navigation);
+      contents.off("before-input-event", beforeInput);
+      contents.off("blur", resetInput);
+      resetInput();
+    };
+    contents.on("did-start-navigation", navigation);
+    contents.on("before-input-event", beforeInput);
+    contents.on("blur", resetInput);
+    contents.once("destroyed", disposeInput);
+    window.once("closed", clear);
+  };
+
+  return {
+    attach,
+    dispose() {
+      for (const channel of [
+        DESKTOP_IPC.shortcutsGet,
+        DESKTOP_IPC.shortcutsEdit,
+        DESKTOP_IPC.shortcutsRecording,
+        DESKTOP_IPC.shortcutsCloseWindow,
+      ])
+        ipcMain.removeHandler(channel);
+      persistence.dispose();
+    },
+  };
+}

package/src/stream-uplink.ts

@@ -0,0 +1,41 @@
+// 页面侧 Gateway 流的上行通道：`open` 的 IPC 往返未回来时先把上行项排队，流 id 到位后按序发
+// 给主进程。
+//
+// 上行项是逻辑流的输入值（序列化成请求体的行由主进程做）；格式的 home 是 `@morlay/dsh-desktop-host/wire`。
+export interface StreamUplink {
+  // 绑定宿主侧的流 id；把排队中的项发出去。同一通道只绑一次。
+  bind(streamId: number): void;
+  // 一道上行项（Gateway 逻辑流的输入值）。
+  push(item: unknown): void;
+  // 上行结束：主进程据此结束宿主请求体（宿主侧的 uplink 迭代随之结束）。
+  close(): void;
+}
+
+// 造一条上行通道；`send` / `end` 是主进程方向的投递函数。
+export function createStreamUplink(
+  send: (streamId: number, item: unknown) => void,
+  end: (streamId: number) => void,
+): StreamUplink {
+  let streamId: number | undefined;
+  let closed = false;
+  const queued: unknown[] = [];
+  return {
+    bind(id) {
+      if (streamId !== undefined) throw new Error("dsh desktop: stream uplink is already bound");
+      streamId = id;
+      for (const item of queued) send(id, item);
+      queued.length = 0;
+      if (closed) end(id);
+    },
+    push(item) {
+      if (closed) return;
+      if (streamId === undefined) queued.push(item);
+      else send(streamId, item);
+    },
+    close() {
+      if (closed) return;
+      closed = true;
+      if (streamId !== undefined) end(streamId);
+    },
+  };
+}

package/dist/official-Cz9Mry1n.mjs

@@ -1,167 +0,0 @@
-//#region src/official-packages.generated.ts
-const OFFICIAL_PROFILE_PACKAGES = [
-	"@deepseek-ai/cordis-plugin-timer",
-	"@deepseek-ai/dsh-agent",
-	"@deepseek-ai/dsh-agent-default-model",
-	"@deepseek-ai/dsh-agent-loop",
-	"@deepseek-ai/dsh-agent-preset-registry",
-	"@deepseek-ai/dsh-api-account-controller",
-	"@deepseek-ai/dsh-api-gateway",
-	"@deepseek-ai/dsh-api-job-controller",
-	"@deepseek-ai/dsh-api-remotes",
-	"@deepseek-ai/dsh-api-session-controller",
-	"@deepseek-ai/dsh-api-settings-controller",
-	"@deepseek-ai/dsh-api-terminal-controller",
-	"@deepseek-ai/dsh-api-workspace-controller",
-	"@deepseek-ai/dsh-api-workspace-files",
-	"@deepseek-ai/dsh-attachment-local",
-	"@deepseek-ai/dsh-authorization",
-	"@deepseek-ai/dsh-bash-sandbox",
-	"@deepseek-ai/dsh-client-connection",
-	"@deepseek-ai/dsh-client-file-upload",
-	"@deepseek-ai/dsh-client-hmr",
-	"@deepseek-ai/dsh-client-locale",
-	"@deepseek-ai/dsh-client-modules",
-	"@deepseek-ai/dsh-client-product-analytics",
-	"@deepseek-ai/dsh-client-resources",
-	"@deepseek-ai/dsh-client-shortcuts",
-	"@deepseek-ai/dsh-client-ui-agent-preset",
-	"@deepseek-ai/dsh-client-ui-approval",
-	"@deepseek-ai/dsh-client-ui-attachment",
-	"@deepseek-ai/dsh-client-ui-brand-official",
-	"@deepseek-ai/dsh-client-ui-chat",
-	"@deepseek-ai/dsh-client-ui-commands",
-	"@deepseek-ai/dsh-client-ui-conversation",
-	"@deepseek-ai/dsh-client-ui-cordis",
-	"@deepseek-ai/dsh-client-ui-deliverables",
-	"@deepseek-ai/dsh-client-ui-goal",
-	"@deepseek-ai/dsh-client-ui-input-trigger",
-	"@deepseek-ai/dsh-client-ui-jobs",
-	"@deepseek-ai/dsh-client-ui-layout",
-	"@deepseek-ai/dsh-client-ui-message-feedback",
-	"@deepseek-ai/dsh-client-ui-model-selection",
-	"@deepseek-ai/dsh-client-ui-open-in-app",
-	"@deepseek-ai/dsh-client-ui-permission-presets",
-	"@deepseek-ai/dsh-client-ui-plan",
-	"@deepseek-ai/dsh-client-ui-plugin-manager",
-	"@deepseek-ai/dsh-client-ui-reference",
-	"@deepseek-ai/dsh-client-ui-renderer",
-	"@deepseek-ai/dsh-client-ui-session",
-	"@deepseek-ai/dsh-client-ui-settings",
-	"@deepseek-ai/dsh-client-ui-settings-account",
-	"@deepseek-ai/dsh-client-ui-settings-agent-loop",
-	"@deepseek-ai/dsh-client-ui-settings-general",
-	"@deepseek-ai/dsh-client-ui-settings-models",
-	"@deepseek-ai/dsh-client-ui-settings-plugin-inventory",
-	"@deepseek-ai/dsh-client-ui-settings-plugins",
-	"@deepseek-ai/dsh-client-ui-settings-session-log",
-	"@deepseek-ai/dsh-client-ui-settings-shell",
-	"@deepseek-ai/dsh-client-ui-settings-subagent",
-	"@deepseek-ai/dsh-client-ui-settings-web-search",
-	"@deepseek-ai/dsh-client-ui-shortcuts",
-	"@deepseek-ai/dsh-client-ui-sidebar",
-	"@deepseek-ai/dsh-client-ui-sidebar-browser",
-	"@deepseek-ai/dsh-client-ui-sidebar-documentpreview",
-	"@deepseek-ai/dsh-client-ui-sidebar-files",
-	"@deepseek-ai/dsh-client-ui-sidebar-right",
-	"@deepseek-ai/dsh-client-ui-sidebar-terminal",
-	"@deepseek-ai/dsh-client-ui-skill",
-	"@deepseek-ai/dsh-client-ui-subagent",
-	"@deepseek-ai/dsh-client-ui-theme",
-	"@deepseek-ai/dsh-client-ui-tool",
-	"@deepseek-ai/dsh-client-ui-trajectory",
-	"@deepseek-ai/dsh-client-ui-user-questions",
-	"@deepseek-ai/dsh-client-ui-workflow-run",
-	"@deepseek-ai/dsh-client-ui-workspace",
-	"@deepseek-ai/dsh-command-feedback",
-	"@deepseek-ai/dsh-commands",
-	"@deepseek-ai/dsh-compaction-image-offload",
-	"@deepseek-ai/dsh-config-editor",
-	"@deepseek-ai/dsh-cordis-client-runner",
-	"@deepseek-ai/dsh-cordis-host-runner",
-	"@deepseek-ai/dsh-credentials-local",
-	"@deepseek-ai/dsh-deepseek-account-platform",
-	"@deepseek-ai/dsh-deepseek-llm-api-extensions",
-	"@deepseek-ai/dsh-file-reference-local",
-	"@deepseek-ai/dsh-fs-observation-policy",
-	"@deepseek-ai/dsh-fs-sandbox",
-	"@deepseek-ai/dsh-goal",
-	"@deepseek-ai/dsh-goal-round-driver",
-	"@deepseek-ai/dsh-hmr",
-	"@deepseek-ai/dsh-host-directory-picker-auto",
-	"@deepseek-ai/dsh-host-open-in-app",
-	"@deepseek-ai/dsh-host-plugin-inventory",
-	"@deepseek-ai/dsh-host-product-telemetry-otel",
-	"@deepseek-ai/dsh-host-webserver",
-	"@deepseek-ai/dsh-jobs-local",
-	"@deepseek-ai/dsh-llm",
-	"@deepseek-ai/dsh-llm-deepseek-account",
-	"@deepseek-ai/dsh-llm-deepseek-api-key",
-	"@deepseek-ai/dsh-llm-pi-ai",
-	"@deepseek-ai/dsh-llm-retry",
-	"@deepseek-ai/dsh-mcp-resources",
-	"@deepseek-ai/dsh-message-feedback",
-	"@deepseek-ai/dsh-office-to-pdf",
-	"@deepseek-ai/dsh-otel",
-	"@deepseek-ai/dsh-permission-presets",
-	"@deepseek-ai/dsh-plugin-manager",
-	"@deepseek-ai/dsh-plugin-package-inventory-deepseek",
-	"@deepseek-ai/dsh-ptc-runtime-node",
-	"@deepseek-ai/dsh-pwsh-sandbox",
-	"@deepseek-ai/dsh-repeat-tool-reminder",
-	"@deepseek-ai/dsh-sandbox-local",
-	"@deepseek-ai/dsh-sandbox-policy",
-	"@deepseek-ai/dsh-session",
-	"@deepseek-ai/dsh-session-checkpoint-policy",
-	"@deepseek-ai/dsh-session-log-deepseek",
-	"@deepseek-ai/dsh-session-log-export",
-	"@deepseek-ai/dsh-session-persistence-jsonl",
-	"@deepseek-ai/dsh-session-projection",
-	"@deepseek-ai/dsh-session-projection-cache",
-	"@deepseek-ai/dsh-session-query-sqlite",
-	"@deepseek-ai/dsh-session-reference",
-	"@deepseek-ai/dsh-session-stats",
-	"@deepseek-ai/dsh-session-telemetry-otel",
-	"@deepseek-ai/dsh-session-title",
-	"@deepseek-ai/dsh-session-title-first-prompt-llm",
-	"@deepseek-ai/dsh-session-turn-outline",
-	"@deepseek-ai/dsh-settings",
-	"@deepseek-ai/dsh-shell-env",
-	"@deepseek-ai/dsh-skill",
-	"@deepseek-ai/dsh-spill-local",
-	"@deepseek-ai/dsh-spill-policy",
-	"@deepseek-ai/dsh-storage",
-	"@deepseek-ai/dsh-storage-domain",
-	"@deepseek-ai/dsh-storage-json",
-	"@deepseek-ai/dsh-subagent",
-	"@deepseek-ai/dsh-subagent-fork-in-process",
-	"@deepseek-ai/dsh-subagent-spawn-in-process",
-	"@deepseek-ai/dsh-subprocess-local",
-	"@deepseek-ai/dsh-system-prompt",
-	"@deepseek-ai/dsh-token-meter",
-	"@deepseek-ai/dsh-tool-call-timeout-policy",
-	"@deepseek-ai/dsh-tool-cordis",
-	"@deepseek-ai/dsh-tool-subagent",
-	"@deepseek-ai/dsh-tools",
-	"@deepseek-ai/dsh-typert-loader",
-	"@deepseek-ai/dsh-typert-registry",
-	"@deepseek-ai/dsh-user-approval",
-	"@deepseek-ai/dsh-user-questions",
-	"@deepseek-ai/dsh-web",
-	"@deepseek-ai/dsh-web-app",
-	"@deepseek-ai/dsh-web-fetch-http",
-	"@deepseek-ai/dsh-web-search-deepseek",
-	"@deepseek-ai/dsh-workspace",
-	"@deepseek-ai/dsh-workspace-changes"
-];
-//#endregion
-//#region src/official.ts
-const DESKTOP_HOST_PACKAGE = "@morlay/dsh-desktop-host";
-const OFFICIAL_RUNTIME_PACKAGES = [
-	"@deepseek-ai/dsh",
-	DESKTOP_HOST_PACKAGE,
-	...OFFICIAL_PROFILE_PACKAGES
-];
-const OFFICIAL_PROFILE_BUNDLES = ["@deepseek-ai/dsh-base", "@deepseek-ai/dsh-web-app"];
-//#endregion
-export { OFFICIAL_PROFILE_PACKAGES as i, OFFICIAL_PROFILE_BUNDLES as n, OFFICIAL_RUNTIME_PACKAGES as r, DESKTOP_HOST_PACKAGE as t };