@morlay/dsh-desktop-shell 0.2.9 → 0.2.10-alpha.0

package/dist/{appconfig-CSZh3JG7.mjs → appconfig-Ci991oVH.mjs}

@@ -1,6 +1,6 @@
 import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
-//#region src/appconfig.ts
+// src/appconfig.ts
 const PROFILE_NAME = "desktop";
 const PROFILE_PATCH_NAME = "cordis.patch.yml";
 function isRecord(value) {
@@ -35,5 +35,4 @@ async function loadAppConfig(exeDir) {
 async function writeAppConfig(exeDir, config) {
 	await writeFile(join(exeDir, "appconfig.json"), `${JSON.stringify(config, void 0, 2)}\n`, { mode: 384 });
 }
-//#endregion
 export { writeAppConfig as i, PROFILE_PATCH_NAME as n, loadAppConfig as r, PROFILE_NAME as t };

package/dist/appconfig.d.mts

@@ -1,4 +1,3 @@
-//#region src/appconfig.d.ts
 export declare const PROFILE_NAME = "desktop";
 export declare const PROFILE_PATCH_NAME = "cordis.patch.yml";
 export interface AppWindowConfig {
@@ -17,5 +16,4 @@ export interface AppConfig {
   readonly window: AppWindowConfig;
 }
 export declare function loadAppConfig(exeDir: string): Promise<AppConfig>;
-export declare function writeAppConfig(exeDir: string, config: AppConfig): Promise<void>;
-//#endregion
+export declare function writeAppConfig(exeDir: string, config: AppConfig): Promise<void>;

package/dist/appconfig.mjs

@@ -1 +1 @@
-export { t as PROFILE_NAME, n as PROFILE_PATCH_NAME, r as loadAppConfig, i as writeAppConfig } from "./appconfig-CSZh3JG7.mjs";
+export { t as PROFILE_NAME, n as PROFILE_PATCH_NAME, r as loadAppConfig, i as writeAppConfig } from "./appconfig-Ci991oVH.mjs";

package/dist/{dshhome-DAJ9dkn2.mjs → dshhome-wAhMMZji.mjs}

@@ -1,6 +1,6 @@
 import { isAbsolute, join, resolve } from "node:path";
 import { homedir } from "node:os";
-//#region src/dshhome.ts
+// src/dshhome.ts
 function xdgDataHome() {
 	if (process.platform === "darwin") return join(homedir(), "Library", "Application Support");
 	const configured = process.env.XDG_DATA_HOME;
@@ -18,5 +18,4 @@ function resolveDshHome(config) {
 	if (override !== void 0 && override.trim() !== "") return resolve(override);
 	return resolveConfiguredHome(config.name, config.dataDir);
 }
-//#endregion
 export { resolveDshHome as n, xdgDataHome as r, resolveConfiguredHome as t };

package/dist/dshhome.d.mts

@@ -1,6 +1,4 @@
 import { AppConfig } from "./appconfig.mjs";
-//#region src/dshhome.d.ts
 export declare function xdgDataHome(): string;
 export declare function resolveConfiguredHome(name: string, spec: string): string | undefined;
-export declare function resolveDshHome(config: AppConfig): string | undefined;
-//#endregion
+export declare function resolveDshHome(config: AppConfig): string | undefined;

package/dist/dshhome.mjs

@@ -1 +1 @@
-export { t as resolveConfiguredHome, n as resolveDshHome, r as xdgDataHome } from "./dshhome-DAJ9dkn2.mjs";
+export { t as resolveConfiguredHome, n as resolveDshHome, r as xdgDataHome } from "./dshhome-wAhMMZji.mjs";

package/dist/index.d.mts

@@ -1,4 +1,3 @@
-//#region src/index.d.ts
 declare global {
   /** 壳的包根：由引导（`bootstrap.mjs`，它就在包根）写入；发布包里没有引导时为 undefined。 */
   var __DSH_SHELL_ROOT__: string | undefined;

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { t as DESKTOP_HOST_PACKAGE } from "./official-BmgBsdhq.mjs";
-import { r as loadAppConfig, t as PROFILE_NAME } from "./appconfig-CSZh3JG7.mjs";
-import { n as resolveDshHome } from "./dshhome-DAJ9dkn2.mjs";
-import { a as ensureSeedProfile, i as SEED_RUNTIME_DIR_NAME } from "./seed-Bxr0BsCk.mjs";
+import { t as DESKTOP_HOST_PACKAGE } from "./official-NWEpqAc6.mjs";
+import { r as loadAppConfig, t as PROFILE_NAME } from "./appconfig-Ci991oVH.mjs";
+import { n as resolveDshHome } from "./dshhome-wAhMMZji.mjs";
+import { a as ensureSeedProfile, i as SEED_RUNTIME_DIR_NAME } from "./seed-Z7k1Wt9H.mjs";
 import { createRequire } from "node:module";
 import { access, appendFile, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { basename, dirname, join, resolve } from "node:path";
@@ -10,7 +10,7 @@ import "rolldown";
 import { spawn } from "node:child_process";
 import { once } from "node:events";
 import { randomBytes } from "node:crypto";
-//#region src/electron.ts
+// src/electron.ts
 /**
 * `electron` 模块的**唯一入口**（壳自己的其它文件都从这里取）。
 *
@@ -31,13 +31,11 @@ const nativeTheme = electron.nativeTheme;
 const protocol = electron.protocol;
 const Menu = electron.Menu;
 const MenuItem = electron.MenuItem;
-//#endregion
-//#region ../dsh-desktop-host/src/preload-source.ts
+// ../dsh-desktop-host/src/preload-source.ts
 /** 壳取 preload 的路径（`GET` 它得到可执行的 CJS 字节）。 */
 const PRELOAD_SOURCE_PATH = "/@dsh/preload.cjs";
 join("dist", "preload.cjs");
-//#endregion
-//#region src/ipc.ts
+// src/ipc.ts
 const DESKTOP_IPC = {
 	directoryPick: "dsh-desktop:directory-pick",
 	nativeThemeSet: "dsh-desktop:native-theme-set",
@@ -61,20 +59,33 @@ function desktopScheme(name) {
 	if (!/^[a-z][a-z0-9+.-]*$/u.test(bare)) throw new Error(`dsh desktop: application name "${name}" does not yield a usable URL scheme (${bare})`);
 	return bare;
 }
-function assertDesktopSender(event, scheme, hostnames) {
+/**
+* 校验一次 IPC 来自**本应用的页面**：senderFrame 的 origin 必须在 `allowedOrigins` 里。
+*
+* 页面从宿主 webServer 的 origin（`http://127.0.0.1:<port>`）载入——早先那条自定义协议
+* `scheme://app/` 已经不再承载页面（它没有 origin，settings 的 describe 流拿不到答复）。所以这里比的是
+* origin，而不是 scheme + hostname：后者会让所有真实页面都被判成 unowned。
+* @param event - Electron 的 invoke 事件。
+* @param allowedOrigins - 允许的页面 origin（应用自己的宿主 origin）。
+*/
+function assertDesktopSender(event, allowedOrigins) {
 	const senderFrame = event.senderFrame;
 	if (senderFrame === null) throw new Error("dsh desktop: rejected IPC without a sender frame");
-	const url = new URL(senderFrame.url);
-	if (url.protocol !== `${scheme}:` || !hostnames.includes(url.hostname)) throw new Error("dsh desktop: rejected IPC from an unowned renderer");
+	let origin;
+	try {
+		origin = new URL(senderFrame.url).origin;
+	} catch {
+		throw new Error("dsh desktop: rejected IPC with an unreadable sender URL");
+	}
+	if (!allowedOrigins.includes(origin)) throw new Error("dsh desktop: rejected IPC from an unowned renderer");
 }
-//#endregion
-//#region src/directory-picker.ts
-function installDesktopDirectoryPicker(getWindow, scheme) {
+// src/directory-picker.ts
+function installDesktopDirectoryPicker(getWindow, getOrigin) {
 	const pending = /* @__PURE__ */ new WeakMap();
 	ipcMain.handle(DESKTOP_IPC.directoryPick, async (event) => {
 		const window = getWindow();
 		if (window === void 0 || window.isDestroyed() || event.sender !== window.webContents || event.senderFrame !== window.webContents.mainFrame) throw new Error("dsh desktop: rejected directory picker from an unowned renderer");
-		assertDesktopSender(event, scheme, ["app"]);
+		assertDesktopSender(event, [getOrigin()]);
 		const existing = pending.get(window);
 		if (existing !== void 0) return existing;
 		if (window.isMinimized()) window.restore();
@@ -87,12 +98,10 @@ function installDesktopDirectoryPicker(getWindow, scheme) {
 		return result;
 	});
 }
-//#endregion
-//#region ../dsh-desktop-host/src/paths.ts
+// ../dsh-desktop-host/src/paths.ts
 /** 应用 origin 下托管调试窗口前端产物的前缀。 */
 const DEVTOOLS_ASSETS_PREFIX = "/node-devtools";
-//#endregion
-//#region src/developer-endpoint.ts
+// src/developer-endpoint.ts
 /** DevTools 前端在托管前缀下的入口路径（与上游底部面板用的是同一份产物）。 */
 const DEVTOOLS_ENTRY = "devtools_app.html";
 /**
@@ -110,8 +119,7 @@ function nodeInspectorDevtoolsUrl(scheme, endpoint) {
 	if (!/^[\u0021-\u007e]+$/u.test(socket) || socket.includes("&") || socket.includes("#")) throw new Error(`dsh desktop: the inspector endpoint is not usable in a query: ${endpoint}`);
 	return `${scheme}://app${DEVTOOLS_ASSETS_PREFIX}/${DEVTOOLS_ENTRY}?ws=${socket}&panel=console&disableLocaleInfoBar=true`;
 }
-//#endregion
-//#region src/developer-menu.ts
+// src/developer-menu.ts
 function reportFailure(options, title, detail) {
 	console.error(`[dsh-shell] ${title}: ${detail}`);
 	const parent = options.mainWindow();
@@ -408,8 +416,7 @@ function isDesktopHostEvent(value) {
 	if (value.type === "inspected") return (value.url === null || typeof value.url === "string") && (value.message === void 0 || typeof value.message === "string");
 	return false;
 }
-//#endregion
-//#region src/host-process.ts
+// src/host-process.ts
 function errorOf(reason, fallback) {
 	return reason instanceof Error ? reason : new Error(fallback);
 }
@@ -802,8 +809,7 @@ var DesktopHostProcess = class {
 		this.responsePipe?.resume();
 	}
 };
-//#endregion
-//#region ../../../vendor/deepseek-harness/packages/client/shortcuts/src/binding.ts
+// ../../../vendor/deepseek-harness/packages/client/shortcuts/src/binding.ts
 const keyNames = {
 	Slash: "/",
 	Comma: ",",
@@ -889,8 +895,7 @@ function isWebBindingAllowed(binding, platform) {
 		}
 	].some((candidate) => bindingKey(binding) === bindingKey(normalizeBinding(candidate, platform)));
 }
-//#endregion
-//#region ../../../vendor/deepseek-harness/packages/util/values/src/partial-json.ts
+// ../../../vendor/deepseek-harness/packages/util/values/src/partial-json.ts
 /**
 * Lazily scanned view of one JSON object's top-level fields, built from text
 * that may still be streaming or from an already parsed object. Nothing is
@@ -1513,8 +1518,7 @@ function isHex(c) {
 		this.#current = null;
 	}
 });
-//#endregion
-//#region ../../../vendor/deepseek-harness/packages/util/values/src/index.ts
+// ../../../vendor/deepseek-harness/packages/util/values/src/index.ts
 /**
 * Mark an unreachable closed-union branch.
 * @param value - impossible value; an unhandled typed variant fails at the call site.
@@ -1525,8 +1529,7 @@ function assertNever(value, context) {
 	const rendered = JSON.stringify(value) ?? String(value);
 	throw new Error(`unreachable variant${context ? ` in ${context}` : ""}: ${rendered}`);
 }
-//#endregion
-//#region ../../../vendor/deepseek-harness/packages/client/shortcuts/src/configuration.ts
+// ../../../vendor/deepseek-harness/packages/client/shortcuts/src/configuration.ts
 /** Validated preference documents and deterministic conflict resolution, without browser dependencies. */
 const record = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const commandPattern = /^[a-z][a-zA-Z0-9-]*(?:\.[a-zA-Z][a-zA-Z0-9-]*)+$/u;
@@ -1773,8 +1776,7 @@ function parseShortcutDefinitions(value) {
 	}
 	return definitions;
 }
-//#endregion
-//#region ../../../vendor/deepseek-harness/packages/util/crypto/src/index.ts
+// ../../../vendor/deepseek-harness/packages/util/crypto/src/index.ts
 /**
 * Random v4 UUID, minted from `crypto.getRandomValues`.
 * @returns the UUID string.
@@ -1786,8 +1788,7 @@ function randomUUID() {
 	}).join("");
 	return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
-//#endregion
-//#region ../../../vendor/deepseek-harness/packages/client/shortcuts/src/persistence.ts
+// ../../../vendor/deepseek-harness/packages/client/shortcuts/src/persistence.ts
 /** Serialized preference transactions; storage owners publish only accepted writes or read diagnostics. */
 /**
 * Create a disabled initial snapshot for asynchronous adapter startup.
@@ -1935,8 +1936,7 @@ var ShortcutPersistence = class {
 		return this.snapshot;
 	}
 };
-//#endregion
-//#region ../../../vendor/deepseek-harness/packages/util/atomic-write/src/index.ts
+// ../../../vendor/deepseek-harness/packages/util/atomic-write/src/index.ts
 /**
 * Zero-dependency atomic file replacement and writer coordination.
 * `writeFileAtomic` writes a random-suffix sibling with exclusive create and
@@ -2010,8 +2010,7 @@ async function writeFileAtomic(filename, content, options) {
 		throw error;
 	}
 }
-//#endregion
-//#region src/keybindings.ts
+// src/keybindings.ts
 function desktopKeybindings(userData, platform, publish) {
 	const path = join(userData, "keybindings.json");
 	return new ShortcutPersistence({
@@ -2029,9 +2028,8 @@ function desktopKeybindings(userData, platform, publish) {
 		})
 	}, "desktop", platform, false, publish);
 }
-//#endregion
-//#region src/shortcuts.ts
-function installDesktopShortcuts(getWindow, userData, platform, scheme) {
+// src/shortcuts.ts
+function installDesktopShortcuts(getWindow, userData, platform, getOrigin) {
 	let definitions = [];
 	let recording = false;
 	let revision;
@@ -2045,7 +2043,7 @@ function installDesktopShortcuts(getWindow, userData, platform, scheme) {
 	};
 	const persistence = desktopKeybindings(userData, platform, publish);
 	const windowOf = (event) => {
-		assertDesktopSender(event, scheme, ["app"]);
+		assertDesktopSender(event, [getOrigin()]);
 		const window = getWindow();
 		if (window === void 0 || window.isDestroyed() || event.sender !== window.webContents) throw new Error("desktop shortcuts: rejected sender");
 		return window;
@@ -2207,8 +2205,7 @@ function installDesktopShortcuts(getWindow, userData, platform, scheme) {
 		}
 	};
 }
-//#endregion
-//#region src/shell-env.ts
+// src/shell-env.ts
 function rcFileFor(shell) {
 	switch (basename(shell)) {
 		case "bash": return "~/.bashrc";
@@ -2234,8 +2231,7 @@ function shellWrappedSpawn(command, args, options) {
 		detached: process.platform !== "win32"
 	});
 }
-//#endregion
-//#region src/index.ts
+// src/index.ts
 let focusPrimaryWindow = () => {};
 /** app 目录（dev 是装配目录、打包是 `Resources/app`）：由引导写进全局。 */
 function shellRoot() {
@@ -2493,7 +2489,7 @@ async function main() {
 		if (!app.isPackaged) shellLog(`${request.method} ${url.pathname} → ${String(response.status)}`);
 		return response;
 	});
-	installDesktopDirectoryPicker(() => mainWindow, SCHEME);
+	installDesktopDirectoryPicker(() => mainWindow, () => hostOrigin);
 	let nextStreamId = 1;
 	const streamEncoder = new TextEncoder();
 	const activeStreams = /* @__PURE__ */ new Map();
@@ -2508,7 +2504,7 @@ async function main() {
 		}
 	};
 	ipcMain.handle(DESKTOP_IPC.streamOpen, async (event, endpoint, payload) => {
-		assertDesktopSender(event, SCHEME, ["app"]);
+		assertDesktopSender(event, [hostOrigin]);
 		if (typeof endpoint !== "string") throw new Error("dsh desktop: stream endpoint must be text");
 		const active = host;
 		if (active === void 0) throw new Error("dsh desktop: Host is unavailable");
@@ -2593,7 +2589,7 @@ async function main() {
 		if (mainWindow === void 0 || event.sender !== mainWindow.webContents) return;
 		if (source === "light" || source === "dark" || source === "system") nativeTheme.themeSource = source;
 	});
-	const shortcuts = installDesktopShortcuts(() => mainWindow, app.getPath("userData"), process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : "linux", SCHEME);
+	const shortcuts = installDesktopShortcuts(() => mainWindow, app.getPath("userData"), process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : "linux", () => hostOrigin);
 	app.on("will-quit", () => {
 		shortcuts.dispose();
 	});
@@ -2693,5 +2689,4 @@ if ((() => {
 	dialog.showErrorBox("dsh desktop startup failed", message);
 	app.exit(1);
 });
-//#endregion
 export {};

package/dist/inline-packages.d.mts

@@ -1,4 +1,3 @@
-//#region src/inline-packages.d.ts
 /**
  * 壳产物里要**内联**的包（而不是留在产物外）。
  *
@@ -10,5 +9,4 @@
  * 这份名单是**一个事实**：壳自己的构建（[`tsdown.config.ts`](../../tsdown.config.ts)）与 `@local/dshdev` 的
  * 装配（`prepareShell`）都用它——两边不一致的话，装配出来的产物就会缺依赖。
  */
-export declare const SHELL_INLINE_PACKAGES: readonly string[];
-//#endregion
+export declare const SHELL_INLINE_PACKAGES: readonly string[];

package/dist/inline-packages.mjs

@@ -1,4 +1,4 @@
-//#region src/inline-packages.ts
+// src/inline-packages.ts
 /**
 * 壳产物里要**内联**的包（而不是留在产物外）。
 *
@@ -17,5 +17,4 @@ const SHELL_INLINE_PACKAGES = [
 	"@deepseek-ai/dsh-util-values",
 	"@deepseek-ai/dsh-util-crypto"
 ];
-//#endregion
 export { SHELL_INLINE_PACKAGES };

package/dist/{official-BmgBsdhq.mjs → official-NWEpqAc6.mjs}

@@ -1,5 +1,4 @@
-//#region src/official.ts
+// src/official.ts
 const DESKTOP_HOST_PACKAGE = "@morlay/dsh-desktop-host";
 const OFFICIAL_PROFILE_BUNDLES = ["@deepseek-ai/dsh-base", "@deepseek-ai/dsh-web-app"];
-//#endregion
 export { OFFICIAL_PROFILE_BUNDLES as n, DESKTOP_HOST_PACKAGE as t };

package/dist/official.d.mts

@@ -1,4 +1,2 @@
-//#region src/official.d.ts
 export declare const DESKTOP_HOST_PACKAGE = "@morlay/dsh-desktop-host";
-export declare const OFFICIAL_PROFILE_BUNDLES: readonly string[];
-//#endregion
+export declare const OFFICIAL_PROFILE_BUNDLES: readonly string[];

package/dist/official.mjs

@@ -1 +1 @@
-export { t as DESKTOP_HOST_PACKAGE, n as OFFICIAL_PROFILE_BUNDLES } from "./official-BmgBsdhq.mjs";
+export { t as DESKTOP_HOST_PACKAGE, n as OFFICIAL_PROFILE_BUNDLES } from "./official-NWEpqAc6.mjs";

package/dist/preload-app.cjs

@@ -32,8 +32,7 @@ function syncNativeTheme(platform, root, send) {
 	if (root.readyState === "loading") root.defaultView?.addEventListener("DOMContentLoaded", observe, { once: true });
 	else observe();
 }
-//#endregion
-//#region src/ipc.ts
+// src/ipc.ts
 /** 壳把宿主回环的 ws 端口经 preload 递进页面（`additionalArguments`，与 scheme 同一手法）。 */
 const DESKTOP_WS_PORT_ARGUMENT = "--dsh-desktop-ws-port";
 const DESKTOP_IPC = {
@@ -54,8 +53,7 @@ const DESKTOP_IPC = {
 	shortcutsChanged: "dsh-desktop:shortcuts-changed"
 };
 const DESKTOP_SCHEME_ARGUMENT = "--dsh-desktop-scheme";
-//#endregion
-//#region src/stream-uplink.ts
+// src/stream-uplink.ts
 function createStreamUplink(send, end) {
 	let streamId;
 	let closed = false;
@@ -80,8 +78,7 @@ function createStreamUplink(send, end) {
 		}
 	};
 }
-//#endregion
-//#region src/preload-app.ts
+// src/preload-app.ts
 const scheme = process.argv.find((argument) => argument.startsWith(`${DESKTOP_SCHEME_ARGUMENT}=`))?.slice(21);
 const wsPort = process.argv.find((argument) => argument.startsWith(`${DESKTOP_WS_PORT_ARGUMENT}=`))?.slice(22);
 if (scheme !== void 0 && scheme !== "") {
@@ -170,4 +167,3 @@ electron.contextBridge.exposeInMainWorld("dshDesktop", {
 syncNativeTheme(process.platform, document, (source) => {
 	electron.ipcRenderer.send(DESKTOP_IPC.nativeThemeSet, source);
 });
-//#endregion

package/dist/{profile-project-BgQILDbu.mjs → profile-project-DsOmRRGB.mjs}

@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { spawn } from "node:child_process";
-//#region src/profile-project.ts
+// src/profile-project.ts
 const PROFILE_WORKSPACE_NAME = "pnpm-workspace.yaml";
 const PROFILE_RUNTIME_REPORT_NAME = "desktop-runtime-packages.json";
 const PROFILE_VENDOR_DIR_NAME = "vendor";
@@ -67,5 +67,4 @@ function installProfile(options) {
 		});
 	});
 }
-//#endregion
 export { runtimeOverrides as a, installProfile as i, PROFILE_VENDOR_DIR_NAME as n, workspaceWithOverrides as o, PROFILE_WORKSPACE_NAME as r, PROFILE_RUNTIME_REPORT_NAME as t };

package/dist/profile-project.d.mts

@@ -1,5 +1,4 @@
 import { spawn } from "node:child_process";
-//#region src/profile-project.d.ts
 export declare const PROFILE_WORKSPACE_NAME = "pnpm-workspace.yaml";
 export declare const PROFILE_RUNTIME_REPORT_NAME = "desktop-runtime-packages.json";
 export declare const PROFILE_VENDOR_DIR_NAME = "vendor";
@@ -16,5 +15,4 @@ export interface ProfileInstallOptions {
   readonly profileDir: string;
   readonly spawn?: ProfileInstallSpawn;
 }
-export declare function installProfile(options: ProfileInstallOptions): Promise<void>;
-//#endregion
+export declare function installProfile(options: ProfileInstallOptions): Promise<void>;

package/dist/profile-project.mjs

@@ -1 +1 @@
-export { t as PROFILE_RUNTIME_REPORT_NAME, n as PROFILE_VENDOR_DIR_NAME, r as PROFILE_WORKSPACE_NAME, i as installProfile, a as runtimeOverrides, o as workspaceWithOverrides } from "./profile-project-BgQILDbu.mjs";
+export { t as PROFILE_RUNTIME_REPORT_NAME, n as PROFILE_VENDOR_DIR_NAME, r as PROFILE_WORKSPACE_NAME, i as installProfile, a as runtimeOverrides, o as workspaceWithOverrides } from "./profile-project-DsOmRRGB.mjs";

package/dist/{seed-Bxr0BsCk.mjs → seed-Z7k1Wt9H.mjs}

@@ -1,8 +1,8 @@
-import { n as PROFILE_PATCH_NAME, t as PROFILE_NAME } from "./appconfig-CSZh3JG7.mjs";
+import { n as PROFILE_PATCH_NAME, t as PROFILE_NAME } from "./appconfig-Ci991oVH.mjs";
 import { access, chmod, copyFile, lstat, mkdir, readFile, readdir, readlink, rm, symlink, unlink, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { spawn } from "node:child_process";
-//#region src/seed.ts
+// src/seed.ts
 const SEED_DIR_NAME = "dsh-home";
 const SEED_HASH_NAME = ".seed-hash";
 const SEED_RUNTIME_DIR_NAME = "runtime";
@@ -137,5 +137,4 @@ async function copySeed(source, target) {
 	};
 	await visit(source, "");
 }
-//#endregion
 export { ensureSeedProfile as a, SEED_RUNTIME_DIR_NAME as i, SEED_DIR_NAME as n, SEED_HASH_NAME as r, PROFILE_MODULES_ARCHIVE_NAME as t };

package/dist/seed.d.mts

@@ -1,4 +1,3 @@
-//#region src/seed.d.ts
 export declare const SEED_DIR_NAME = "dsh-home";
 export declare const SEED_HASH_NAME = ".seed-hash";
 export declare const SEED_RUNTIME_DIR_NAME = "runtime";
@@ -17,5 +16,4 @@ export type SeedOutcome = "seeded" | "up-to-date" | "no-seed";
  * @returns 种了（`seeded`）、已是最新（`up-to-date`）、或随包根本没有这份种（`no-seed`）。
  * @throws 归档解压失败、或解压后没有依赖面时。
  */
-export declare function ensureSeedProfile(seedDir: string, home: string): Promise<SeedOutcome>;
-//#endregion
+export declare function ensureSeedProfile(seedDir: string, home: string): Promise<SeedOutcome>;

package/dist/seed.mjs

@@ -1 +1 @@
-export { t as PROFILE_MODULES_ARCHIVE_NAME, n as SEED_DIR_NAME, r as SEED_HASH_NAME, i as SEED_RUNTIME_DIR_NAME, a as ensureSeedProfile } from "./seed-Bxr0BsCk.mjs";
+export { t as PROFILE_MODULES_ARCHIVE_NAME, n as SEED_DIR_NAME, r as SEED_HASH_NAME, i as SEED_RUNTIME_DIR_NAME, a as ensureSeedProfile } from "./seed-Z7k1Wt9H.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/dsh-desktop-shell",
-  "version": "0.2.9",
+  "version": "0.2.10-alpha.0",
   "description": "Electron shell for dsh desktop apps: serves the app's own <name>:// scheme, boots the desktop profile through the @morlay/dsh-desktop-host child over byte pipes, and installs the profile seed on first launch. The CLI that packages a workspace around it is @local/dshdev.",
   "keywords": [
     "desktop",
@@ -54,9 +54,9 @@
     "./locale/*.json": "./locale/*.json"
   },
   "dependencies": {
-    "@deepseek-ai/dsh-util-crypto": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-util-values": "^0.2.1-rc.1",
-    "@morlay/dsh-desktop-host": "0.2.9"
+    "@deepseek-ai/dsh-util-crypto": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-util-values": "^0.2.2-alpha.2",
+    "@morlay/dsh-desktop-host": "0.2.10-alpha.0"
   },
   "devDependencies": {
     "@local/devkit": "0.1.0",
@@ -65,12 +65,12 @@
     "electron": "44.7.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-app-boot": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-atomic-write": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-client-shortcuts": "^0.2.1-rc.1"
+    "@deepseek-ai/dsh-app-boot": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-atomic-write": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-client-shortcuts": "^0.2.2-alpha.2"
   },
   "engines": {
-    "dsh": ">= 0.2.1-rc.1 < 0.2.2",
+    "dsh": ">= 0.2.2-alpha.2 < 0.2.3",
     "node": ">=24.11.0"
   },
   "scripts": {

package/src/__tests__/ipc.spec.ts

@@ -22,13 +22,18 @@ describe("桌面标识取自 app 名", () => {
     }
   });
 
-  it("发送者校验用传入的 scheme，而不是写死的 dsh-app", () => {
-    const scheme = desktopScheme("dsh-custom-next");
-    expect(() => assertDesktopSender(sender(`${scheme}://app/`), scheme, ["app"])).not.toThrow();
-    expect(() => assertDesktopSender(sender("dsh-app://app/"), scheme, ["app"])).toThrow(
+  it("发送者校验比的是页面 origin（页面从宿主 origin 载入，不是自定义协议）", () => {
+    const origin = "http://127.0.0.1:51234";
+    expect(() => assertDesktopSender(sender(`${origin}/?token=x`), [origin])).not.toThrow();
+    // 自定义协议那条老路：页面早已不从它载入，不能再被当成本应用。
+    expect(() => assertDesktopSender(sender("dsh-custom-next://app/"), [origin])).toThrow(
       /unowned renderer/u,
     );
-    expect(() => assertDesktopSender(sender(`${scheme}://other/`), scheme, ["app"])).toThrow(
+    // 别的 origin（另一个本地端口、外部站点）同样拒绝。
+    expect(() => assertDesktopSender(sender("http://127.0.0.1:59999/"), [origin])).toThrow(
+      /unowned renderer/u,
+    );
+    expect(() => assertDesktopSender(sender("https://example.com/"), [origin])).toThrow(
       /unowned renderer/u,
     );
   });

package/src/directory-picker.ts

@@ -4,7 +4,7 @@ import { DESKTOP_IPC, assertDesktopSender } from "./ipc.ts";
 
 export function installDesktopDirectoryPicker(
   getWindow: () => BrowserWindowType | undefined,
-  scheme: string,
+  getOrigin: () => string,
 ): void {
   const pending = new WeakMap<BrowserWindowType, Promise<string | null>>();
   ipcMain.handle(DESKTOP_IPC.directoryPick, async (event) => {
@@ -17,7 +17,7 @@ export function installDesktopDirectoryPicker(
     ) {
       throw new Error("dsh desktop: rejected directory picker from an unowned renderer");
     }
-    assertDesktopSender(event, scheme, ["app"]);
+    assertDesktopSender(event, [getOrigin()]);
     const existing = pending.get(window);
     if (existing !== undefined) return existing;
     if (window.isMinimized()) window.restore();

package/src/index.ts

@@ -457,7 +457,7 @@ async function main(): Promise<void> {
     return response;
   });
 
-  installDesktopDirectoryPicker(() => mainWindow, SCHEME);
+  installDesktopDirectoryPicker(() => mainWindow, () => hostOrigin);
 
   // 桌面流载体：主进程自己构造 Request（body 是流——首行定 endpoint/payload，后续行是上行项），
   // 把响应体逐块推回页面——页面 fetch 到自定义协议的 POST body 在 Chromium 上不可靠。
@@ -481,7 +481,7 @@ async function main(): Promise<void> {
     }
   };
   ipcMain.handle(DESKTOP_IPC.streamOpen, async (event, endpoint: unknown, payload: unknown) => {
-    assertDesktopSender(event, SCHEME, ["app"]);
+    assertDesktopSender(event, [hostOrigin]);
     if (typeof endpoint !== "string") throw new Error("dsh desktop: stream endpoint must be text");
     const active = host;
     if (active === undefined) throw new Error("dsh desktop: Host is unavailable");
@@ -571,7 +571,7 @@ async function main(): Promise<void> {
     () => mainWindow,
     app.getPath("userData"),
     process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : "linux",
-    SCHEME,
+    () => hostOrigin,
   );
   app.on("will-quit", () => {
     shortcuts.dispose();

package/src/ipc.ts

@@ -44,15 +44,28 @@ export function desktopScheme(name: string): string {
   return bare;
 }
 
+/**
+ * 校验一次 IPC 来自**本应用的页面**：senderFrame 的 origin 必须在 `allowedOrigins` 里。
+ *
+ * 页面从宿主 webServer 的 origin（`http://127.0.0.1:<port>`）载入——早先那条自定义协议
+ * `scheme://app/` 已经不再承载页面（它没有 origin，settings 的 describe 流拿不到答复）。所以这里比的是
+ * origin，而不是 scheme + hostname：后者会让所有真实页面都被判成 unowned。
+ * @param event - Electron 的 invoke 事件。
+ * @param allowedOrigins - 允许的页面 origin（应用自己的宿主 origin）。
+ */
 export function assertDesktopSender(
   event: IpcMainInvokeEvent,
-  scheme: string,
-  hostnames: readonly string[],
+  allowedOrigins: readonly string[],
 ): void {
   const senderFrame = event.senderFrame;
   if (senderFrame === null) throw new Error("dsh desktop: rejected IPC without a sender frame");
-  const url = new URL(senderFrame.url);
-  if (url.protocol !== `${scheme}:` || !hostnames.includes(url.hostname)) {
+  let origin: string;
+  try {
+    origin = new URL(senderFrame.url).origin;
+  } catch {
+    throw new Error("dsh desktop: rejected IPC with an unreadable sender URL");
+  }
+  if (!allowedOrigins.includes(origin)) {
     throw new Error("dsh desktop: rejected IPC from an unowned renderer");
   }
 }

package/src/shortcuts.ts

@@ -33,7 +33,7 @@ export function installDesktopShortcuts(
   getWindow: () => BrowserWindowType | undefined,
   userData: string,
   platform: ShortcutPlatform,
-  scheme: string,
+  getOrigin: () => string,
 ): DesktopShortcuts {
   let definitions: readonly ShortcutDefinition[] = [];
   let recording = false;
@@ -63,7 +63,7 @@ export function installDesktopShortcuts(
   const persistence = desktopKeybindings(userData, platform, publish);
 
   const windowOf = (event: Electron.IpcMainInvokeEvent): BrowserWindowType => {
-    assertDesktopSender(event, scheme, ["app"]);
+    assertDesktopSender(event, [getOrigin()]);
     const window = getWindow();
     if (window === undefined || window.isDestroyed() || event.sender !== window.webContents)
       throw new Error("desktop shortcuts: rejected sender");