npm - bookmark-research - Versions diffs - 0.5.0-beta.12 → 0.5.0-beta.14 - Mend

bookmark-research 0.5.0-beta.12 → 0.5.0-beta.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/.agents/plugins/marketplace.json +1 -1
package/.codex-plugin/plugin.json +1 -1
package/README.md +11 -7
package/README.zh.md +11 -7
package/bin/bookmark-research.js +9 -1
package/docs/details.en.md +1 -1
package/docs/distribution.md +1 -1
package/docs/harness-compatibility.md +1 -1
package/docs/installation.en.md +5 -6
package/docs/installation.md +5 -6
package/docs/release-notes-0.5.0-beta.13.md +38 -0
package/docs/release-notes-0.5.0-beta.14.md +38 -0
package/package.json +3 -2
package/scripts/host_clients.py +17 -23
package/scripts/host_install.py +2 -2
package/scripts/install.py +4 -1
package/scripts/launcher.py +9 -2
package/src/dsh_client.py +206 -0
package/src/onboarding.py +119 -64

package/.agents/plugins/marketplace.json CHANGED Viewed

@@ -9,7 +9,7 @@
       "source": {
         "source": "npm",
         "package": "bookmark-research",
-        "version": "0.5.0-beta.12",
+        "version": "0.5.0-beta.14",
         "registry": "https://registry.npmjs.org"
       },
       "policy": {

package/.codex-plugin/plugin.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "bookmark-research",
-  "version": "0.5.0-beta.12",
+  "version": "0.5.0-beta.14",
   "description": "Check bookmark URLs or Canvas packages, compare sources with host-led research, and retain verifiable reports.",
   "author": {
     "name": "kwenxu"

package/README.md CHANGED Viewed

@@ -19,19 +19,19 @@ Works in **Codex, Claude Code, Pi and DSH (DeepSeek Harness)**.
 ## Requirements
 - Python 3.9+ with SQLite FTS5 (check with `bookmark-research doctor`)
-- The CLI of at least one client: Codex, Claude Code, Pi or DSH (DSH also needs `pnpm`)
+- The CLI of at least one client: Codex, Claude Code, Pi or DSH (DSH also needs `pnpm`, unless it is the DeepSeek Harness Desktop CLI, which carries its own)
 - Node 18+ and npm for release installation (including the GitHub convenience script)
 - No API key is needed to install or to query bookmarks locally
 ## Install
-**Current beta (`0.5.0-beta.12`)**, interactive on macOS, Linux and Windows:
+**Current beta (`0.5.0-beta.14`)**, interactive on macOS, Linux and Windows:
 ```sh
-npx bookmark-research@0.5.0-beta.12 install --source npm:bookmark-research@0.5.0-beta.12
+npx bookmark-research@0.5.0-beta.14 install
 ```
-This pins both the installer and the content. The `@latest` examples below follow the default channel, which remains `0.5.0-beta.3`; `@beta` currently points to `0.5.0-beta.12`. Changing only the npx selector does not change the installer's default content source.
+The installer pins the running package version and needs no `--source`. Re-running it upgrades an existing Claude Code, Pi or DSH installation in place, keeping preferences, keys and data; `@beta` currently points to `0.5.0-beta.14`. A Codex installation keeps the source and version it registered with, so change its version by removing that registration first (see **Update** below).
 **Default-channel interactive installation:**
@@ -54,7 +54,7 @@ For a permanent `bookmark-research` command: `npm install -g bookmark-research`.
 **One release source for all four hosts:** npm contains the shared runtime, Skill and host adapters. The installer downloads the release, prepares the selected host format, then invokes the host’s native commands. Updates retain an npm selector rather than an npx cache path. GitHub hosts source and installation catalogs; unpublished source uses the Python installer. See [distribution policy and official references](docs/distribution.md).
-**DSH installs the release directly:** the published package declares `dsh.bundle.patch`, so `dsh plugin --profile <name> add bookmark-research@<version>` — or the DSH plugin manager — installs it with no export first, resolving Python and MCP paths from the installed package. DeepSeek Harness Desktop reserves the `desktop` profile for its own carrier, so install that one with the app's CLI. See the [installation guide](docs/installation.en.md).
+**DSH installs the release directly:** the published package declares `dsh.bundle.patch`, so `dsh plugin --profile <name> add bookmark-research@<version>` — or the DSH plugin manager — installs it with no export first, resolving Python and MCP paths from the installed package. DeepSeek Harness Desktop reserves the `desktop` profile for its own carrier, so install that one with the app's CLI; the installer and the wizard locate that bundled CLI themselves on macOS, Windows and Linux, and fall back to it when the `dsh` on PATH has no pnpm. See the [installation guide](docs/installation.en.md).
 **Windows:** the installer writes the detected Python path into each client's MCP config, because Windows often has no working `python3`. Install Codex with `bookmark-research install codex` rather than adding the repository to Codex directly. `bookmark-research status` shows the interpreter in use.
@@ -81,7 +81,7 @@ No reinstall is needed. Settings and keys apply to every installed client; start
 | Task | Command |
 | --- | --- |
-| Menu: configure, check, install, update | `bookmark-research` |
+| Menu: configure, check, install, update | `bookmark-research` (alias `bookmark`, or `bookmark research`) |
 | Preferences and API keys | `bookmark-research setup` |
 | Installed clients, preferences, storage locations, recent research, key status | `bookmark-research status` |
 | Script preferences | `bookmark-research config show` · `bookmark-research config set --input prefs.json` |
@@ -89,6 +89,10 @@ No reinstall is needed. Settings and keys apply to every installed client; start
 Use `npx bookmark-research@latest …` if the command is not installed globally.
+**Open the configuration page.** In a terminal, `bookmark-research` (or its alias `bookmark`) with no arguments opens the menu: change preferences and API keys, check services, install into another client, update, or print status. `bookmark-research setup` goes straight to the guided wizard, and adding `--lang zh` shows the wizard and menu in Chinese. Preferences and keys are user-wide, so one change applies to every installed client; start a new client session afterwards.
+**Update.** `bookmark-research update` refreshes every installed client from its registered source and keeps preferences, keys and data. Re-running `npx bookmark-research@latest install` also upgrades an existing Claude Code, Pi or DSH installation in place. A Codex installation keeps the source and version it was registered with; to move it to another version, remove that registration first (`codex plugin marketplace remove bookmark-research`) and install again.
 **API keys are optional.** Enter them in `bookmark-research setup` (hidden input, checked immediately, saved in a private local file) or set environment variables, which take precedence. Keys are never accepted in chat, command arguments or JSON files.
 | Variable | Service | Without it |
@@ -139,7 +143,7 @@ A bundle of one Skill, one local MCP server, and the remote MCPs and services th
 Local MCP tools:
-This list describes the current source tree. `wiki_refresh` and `wiki_work` are available in local development builds and are not included in the published `0.5.0-beta.9` package. Implementation status and remaining work: [upgrade checklist](docs/upgrade-status-2026-10-11.md).
+This list describes the current source tree; `wiki_refresh` and `wiki_work` have shipped in every release since `0.5.0-beta.10`. Implementation status and remaining work: [upgrade checklist](docs/upgrade-status-2026-10-11.md).
 | Group | Tools |
 | --- | --- |

package/README.zh.md CHANGED Viewed

@@ -19,19 +19,19 @@
 ## 环境要求
 - Python 3.9+，含 SQLite FTS5（可用 `bookmark-research doctor` 检查）
-- 至少一个宿主的 CLI：Codex、Claude Code、Pi 或 DSH（DSH 另需 `pnpm`）
+- 至少一个宿主的 CLI：Codex、Claude Code、Pi 或 DSH（DSH 另需 `pnpm`；若用 DeepSeek Harness 桌面版自带 CLI，则它自带 pnpm，无需另装）
 - 发布版安装需要 Node 18+ 和 npm（GitHub 便捷脚本也需要）
 - 安装和本地查书签都不需要 API Key
 ## 安装
-**当前测试版（`0.5.0-beta.12`）**，支持 macOS、Linux、Windows 交互安装：
+**当前测试版（`0.5.0-beta.14`）**，支持 macOS、Linux、Windows 交互安装：
 ```sh
-npx bookmark-research@0.5.0-beta.12 install --source npm:bookmark-research@0.5.0-beta.12
+npx bookmark-research@0.5.0-beta.14 install
 ```
-这条命令同时固定安装器和插件内容。下面的 `@latest` 示例使用默认渠道，目前仍为 `0.5.0-beta.3`；`@beta` 当前指向 `0.5.0-beta.12`。只改 npx 的版本选择，不会改变安装器默认下载的内容来源。
+安装器会锁定当前运行的版本，无需再手动指定 `--source`。重跑该命令可就地升级已装的 Claude Code、Pi 或 DSH，偏好、Key 和数据都保留；`@beta` 标签当前指向 `0.5.0-beta.14`。Codex 会保留登记时的来源与版本，要换版本需先移除该登记（见下文 **更新**）。
 **默认渠道的交互安装：**
@@ -54,7 +54,7 @@ npx bookmark-research@latest install
 **四个宿主统一发布来源：** npm 包包含共享运行时、Skill 和宿主适配。安装器下载发布包，生成所选宿主格式，再调用宿主原生命令；更新记录 npm 来源，不依赖 npx 临时缓存。GitHub 提供源码和安装清单，未发布源码用 Python 安装器。见[发布约定与官方依据](docs/distribution.md)。
-**DSH 可直接安装发布包：** 发布包声明 `dsh.bundle.patch`，`dsh plugin --profile <名称> add bookmark-research@<版本>`（或 DSH 插件管理界面）无需先导出即可安装，Python 与 MCP 路径按安装位置解析。DeepSeek Harness 桌面版把 `desktop` profile 保留给自身载体，该 profile 请用桌面版自带 CLI 安装。详见[安装说明](docs/installation.md)。
+**DSH 可直接安装发布包：** 发布包声明 `dsh.bundle.patch`，`dsh plugin --profile <名称> add bookmark-research@<版本>`（或 DSH 插件管理界面）无需先导出即可安装，Python 与 MCP 路径按安装位置解析。DeepSeek Harness 桌面版把 `desktop` profile 保留给自身载体，该 profile 请用桌面版自带 CLI 安装；安装器与向导会在 macOS、Windows、Linux 上自行定位该 CLI，并在 PATH 中的 `dsh` 缺少 pnpm 时改用它。详见[安装说明](docs/installation.md)。
 **Windows：** Windows 上常常没有能用的 `python3`，所以安装器会把检测到的 Python 路径写进各宿主的 MCP 配置。Codex 请用 `bookmark-research install codex` 安装，不要直接把仓库加进 Codex。`bookmark-research status` 可以查看实际使用的 Python。
@@ -81,7 +81,7 @@ npx bookmark-research@latest install
 | 要做什么 | 命令 |
 | --- | --- |
-| 主菜单：配置、检查、安装、更新 | `bookmark-research` |
+| 主菜单：配置、检查、安装、更新 | `bookmark-research`（别名 `bookmark`，或 `bookmark research`） |
 | 修改偏好和 API Key | `bookmark-research setup` |
 | 查看已装宿主、偏好、保存位置、最近研究、Key 状态 | `bookmark-research status` |
 | 用脚本改偏好 | `bookmark-research config show` · `bookmark-research config set --input prefs.json` |
@@ -89,6 +89,10 @@ npx bookmark-research@latest install
 没有全局安装时，在前面加 `npx`，例如 `npx bookmark-research@latest setup`。
+**进入配置页。** 在终端里不带参数运行 `bookmark-research`（或别名 `bookmark`）即可打开菜单：修改配置与 API Key、检查服务、安装到其他宿主、更新、查看状态。`bookmark-research setup` 直接进入引导向导，加上 `--lang zh` 可让向导和菜单显示中文。偏好和 Key 是用户级的，改一次就对所有已安装宿主生效；改完新建宿主会话即可。
+**更新。** `bookmark-research update` 会按各自登记的来源刷新所有已安装宿主，并保留偏好、Key 和数据。重跑 `npx bookmark-research@latest install` 也会就地升级已装的 Claude Code、Pi 或 DSH。Codex 安装会保留登记时的来源与版本，要换版本需先移除该登记（`codex plugin marketplace remove bookmark-research`）再重新安装。
 **API Key 都是可选的。** 在 `bookmark-research setup` 里输入（隐藏显示，输完当场检查，保存在仅当前用户可读的本地文件），或者设置环境变量（优先于已保存的 Key）。Key 不接受对话、命令参数或 JSON 文件。
 | 环境变量 | 服务 | 不配置时 |
@@ -139,7 +143,7 @@ setup 还会问研究报告和证据放在哪里：统一目录（默认 `<数
 本地 MCP 的工具：
-下表对应当前源码。`wiki_refresh` 和 `wiki_work` 已进入本地开发构建，尚未包含在已发布的 `0.5.0-beta.9` npm 包中。已实现与剩余事项见[升级核对记录](docs/upgrade-status-2026-10-11.md)。
+下表对应当前源码；`wiki_refresh` 和 `wiki_work` 自 `0.5.0-beta.10` 起已包含在每个发布包中。已实现与剩余事项见[升级核对记录](docs/upgrade-status-2026-10-11.md)。
 | 分类 | 工具 |
 | --- | --- |

package/bin/bookmark-research.js CHANGED Viewed

@@ -22,8 +22,16 @@ if (!python) {
   process.exit(1);
 }
+// The same file is installed as `bookmark-research` and as the short alias
+// `bookmark`. A leading literal `research` is accepted in both spellings, so
+// `bookmark status`, `bookmark research status` and `bookmark-research status`
+// all run the same command, while `bookmark` or `bookmark research` alone
+// opens the menu.
+const args = process.argv.slice(2);
+if (args[0] === "research") args.shift();
 const [command, ...prefix] = python;
-const child = spawn(command, [...prefix, launcher, ...process.argv.slice(2)], { stdio: "inherit", windowsHide: true });
+const child = spawn(command, [...prefix, launcher, ...args], { stdio: "inherit", windowsHide: true });
 // The terminal delivers Ctrl+C to the whole process group; let Python handle it.
 process.on("SIGINT", () => {});
 child.on("exit", (code, signal) => process.exit(signal ? 130 : code ?? 1));

package/docs/details.en.md CHANGED Viewed

@@ -16,7 +16,7 @@ Reference material moved from the README: components, data model, research modes
 | **Host workflows** | [`hosts/`](../hosts/) and [`src/routing.py`](../src/routing.py) | Native Codex delegation, Claude workflow, Pi extension recipe and DSH workflow adapter |
 | **Professional research** | [`src/research_services.py`](../src/research_services.py) | Optional provider-owned background tasks, saved run IDs and secondary-report import |
 | **Wiki and evaluation** | [`src/wiki.py`](../src/wiki.py), [`src/evaluation.py`](../src/evaluation.py) | Reviewed knowledge, immutable revisions, source/link lint and metrics from explicit labels |
-| **Client integrations** | Native manifests, [`bin/bookmark-research.js`](../bin/bookmark-research.js), [`scripts/launcher.py`](../scripts/launcher.py), [`install.sh`](../install.sh), [`scripts/install.py`](../scripts/install.py) and [`scripts/export_bundle.py`](../scripts/export_bundle.py) | The `bookmark-research` command, guided installation and native install/update/verify for all four hosts |
+| **Client integrations** | Native manifests, [`bin/bookmark-research.js`](../bin/bookmark-research.js), [`scripts/launcher.py`](../scripts/launcher.py), [`install.sh`](../install.sh), [`scripts/install.py`](../scripts/install.py) and [`scripts/export_bundle.py`](../scripts/export_bundle.py) | The `bookmark-research` command (alias `bookmark`, or `bookmark research`), guided installation and native install/update/verify for all four hosts |
 The runtime requires Python 3.9+ and SQLite with FTS5; `doctor` checks these requirements. It uses the Python standard library and does not require a separate database service.

package/docs/distribution.md CHANGED Viewed

@@ -21,7 +21,7 @@
 候选版本在 `release/` 分支同步三个版本清单并运行 CI。该分支的 registry 集成测试使用当前已发布渠道版本，源码测试、原生安装测试和 npm 打包检查仍验证候选内容；主分支的 registry 测试始终验证 marketplace 固定版本。发布通过 CI 的 npm 包并核验 registry 后，再将候选分支合入主分支，避免默认安装清单提前指向未发布版本。
-测试版使用 npm 的 `beta` 标签；若创建 GitHub 版本说明，则标记为预发布。不会自动移动 npm 的 `latest` 标签。安装测试版时同时固定安装器与内容来源，例如 `npx bookmark-research@0.5.0-beta.12 install --source npm:bookmark-research@0.5.0-beta.12`。仅将 npx 改为 `@beta` 不会改变默认内容来源 `latest`；已固定的旧版安装也不会自动换成测试版。
+测试版使用 npm 的 `beta` 标签；若创建 GitHub 版本说明，则标记为预发布。安装测试版推荐直接使用 `npx bookmark-research@0.5.0-beta.14 install` 或 `npx bookmark-research@beta install`，启动器会自动读取当前运行包版本并固定内容来源，无需重复指定 `--source`。已存在的宿主配置支持无缝覆盖升级。
 ## 官方资料与项目实例

package/docs/harness-compatibility.md CHANGED Viewed

@@ -159,7 +159,7 @@ DSH 的原生运行插件是 Cordis 模块，可导出 `name`、`inject` 和 `ap
 发布包现在**自带** `bundle.patch.yml` 并在 `package.json` 声明 `dsh.bundle.patch`，因此 `dsh plugin --profile <name> add bookmark-research@<version>`（以及 DSH 插件管理界面）可以直接从 registry 安装；`dsh` 的 bundle 对账逻辑会把声明了 `dsh.bundle` 且 patch 存在的包自动加入 `dsh.profile.bundles`。层内不写死本机路径：`command`、`args`、`cwd` 与转发的环境变量都由入口模块 `hosts/dsh/plugin.js` 在加载时提供（`bookmarkResearchPaths.python/mcpArgs/env`），模块用与 npm 启动器相同的顺序发现 Python 3.9+／SQLite，所以导出副本、registry 安装和 Windows 都不需要重生成 patch。统一安装器仍导出带校验和的固定副本，用于可验证的托管安装；对不含该文件的旧发布包或旧 Git ref，导出器按模块的旧契约生成等价层，安装不回归。[D02][D03]
-DSH 桌面版把 profile 名 `desktop` 保留给 Electron 载体：启动器对该名字拒绝一切 boot／dump（`--dump-config` 亦然），只有载体自身可以管理其插件。因此对 `desktop` 的安装须用桌面版自带 CLI（`--dsh "<App>/Contents/Resources/runtime/cli/bin/dsh"`，它自带 pnpm，无需 PATH 中的 pnpm），安装器的验证改为读取持久层：profile 依赖指向该包、`dsh.bundle.patch` 与入口模块按包目录相对解析且文件存在、层内包含 Skill 与 MCP 行。2026-10-08 在本机（macOS、桌面运行时 0.2.0-rc.2、发布包 0.5.0-beta.5）实测：注册后 Skill 出现在宿主目录，`mcp__bookmark-research__*` 工具正常应答，运行中的 MCP 子进程解析到已安装包目录。[D02][D08]
+DSH 桌面版把 profile 名 `desktop` 保留给 Electron 载体：启动器对该名字拒绝一切 boot／dump（`--dump-config` 亦然），只有载体自身可以管理其插件。因此对 `desktop` 的安装须用桌面版自带 CLI（它自带 pnpm，无需 PATH 中的 pnpm）。安装器与向导会自行定位该 CLI——PATH 中的 `dsh`、macOS 的 `/Applications/DeepSeek Harness.app/Contents/Resources/runtime/cli/bin/dsh`（含 `~/Applications`）、Windows 的 `%LOCALAPPDATA%\Programs\DeepSeek Harness\resources\runtime\cli\bin\dsh.cmd` 与 `ProgramFiles` 同一布局、Linux 的 `/opt/DeepSeek Harness/resources/runtime/cli/bin/dsh`——并在 PATH 中的 CLI 缺少 pnpm 时改用桌面版，所以 `--dsh "<App>/Contents/Resources/runtime/cli/bin/dsh"` 现在只在非常规安装位置才需要。安装器的验证改为读取持久层：profile 依赖指向该包、`dsh.bundle.patch` 与入口模块按包目录相对解析且文件存在、层内包含 Skill 与 MCP 行。2026-10-08 在本机（macOS、桌面运行时 0.2.0-rc.2、发布包 0.5.0-beta.5）实测：注册后 Skill 出现在宿主目录，`mcp__bookmark-research__*` 工具正常应答，运行中的 MCP 子进程解析到已安装包目录。[D02][D08]
 导出及查看合并配置的形式是：

package/docs/installation.en.md CHANGED Viewed

@@ -6,7 +6,7 @@ Install the same plugin for English or Chinese use. See the [user guide](user-gu
 ## The `bookmark-research` command (recommended)
-After `npm install -g bookmark-research`, type `bookmark-research` to open a menu for preferences and API keys, service checks, installing into another client, updates and status. Subcommands work directly: `install [HOST...]`, `update`, `verify`, `setup`, `status`, `config show|set`, `doctor`. npm is the single release package for all four hosts and includes the Python installer, runtime, Skill and adapters, so Python 3.9+ is still required; it works on native Windows, macOS and Linux. Use `npx bookmark-research@latest install HOST` for a release, and the Python source installer for unpublished development changes. Without arguments and without a terminal (agents/CI) it prints status JSON instead of opening the menu.
+After `npm install -g bookmark-research`, type `bookmark-research` to open a menu for preferences and API keys, service checks, installing into another client, updates and status. The short alias `bookmark` is equivalent, and `bookmark research` matches `bookmark-research` (`bookmark` alone opens the menu; `bookmark research status` equals `bookmark-research status`). Subcommands work directly: `install [HOST...]`, `update`, `verify`, `setup`, `status`, `config show|set`, `doctor`. npm is the single release package for all four hosts and includes the Python installer, runtime, Skill and adapters, so Python 3.9+ is still required; it works on native Windows, macOS and Linux. Use `npx bookmark-research@latest install HOST` for a release, and the Python source installer for unpublished development changes. Without arguments and without a terminal (agents/CI) it prints status JSON instead of opening the menu.
 <a id="one-command-codex-installation"></a>
@@ -18,7 +18,7 @@ Requirements: Bash, Node.js/npm, Python 3.9+ with SQLite FTS5, and the selected
 curl -fsSL https://raw.githubusercontent.com/Browser-bookmark-hub/Bookmark-Research/main/install.sh | bash
 ```
-The terminal wizard detects available CLIs and lets you choose one or more hosts: arrow keys move, Space toggles, Enter confirms, and detected hosts are preselected. It then asks each host's scope/project/profile and shows a summary to confirm before installing. It works with piped installation by reading `/dev/tty`; without a capable terminal, or with `BOOKMARK_RESEARCH_PLAIN=1`, it uses plain numbered prompts. The npm installer checks the selected host before native registration. `--interactive` requires a terminal; `--non-interactive` never prompts. Without a terminal or an explicit host, the legacy default is Codex. Agents should pass `--host`.
+The terminal wizard detects available CLIs and lets you choose one or more hosts: arrow keys move, Space toggles, Enter confirms, and detected hosts are preselected. DSH counts as detected when either a usable `dsh` is on PATH or a DeepSeek Harness Desktop installation with its own pnpm is found, so the app's bundled CLI is offered without any flag; for DSH the wizard then lists the initialized profiles under `$DSH_HOME/profiles` with the source this plugin is already registered from and whether that bundle is enabled, and still accepts a new profile name. It then asks each host's scope/project/profile and shows a summary to confirm before installing. It works with piped installation by reading `/dev/tty`; without a capable terminal, or with `BOOKMARK_RESEARCH_PLAIN=1`, it uses plain numbered prompts. The npm installer checks the selected host before native registration. `--interactive` requires a terminal; `--non-interactive` never prompts. Without a terminal or an explicit host, the legacy default is Codex. Agents should pass `--host`.
 The first installation selects `npm:bookmark-research` (`latest`). All four hosts receive a clean export from that release through their native registration commands. The recorded source is the npm package and selector, not the temporary download or npx cache. `update` downloads that selector again; it does not need the original cache. GitHub serves this convenience script and source catalogs, not a separate release ZIP. Persistent host exports live under `${XDG_DATA_HOME:-~/.local/share}/bookmark-research/installations/` (override with `BOOKMARK_RESEARCH_INSTALL_DIR`; other hosts also accept `--install-dir`). Temporary downloads can then be removed. Start a new host session to load the Skill and tools.
@@ -52,7 +52,7 @@ The Codex branch manages `bookmark-research@bookmark-research`. If already insta
 ## Guided setup and readiness
-After installation, the wizard offers research depth, answer language, primary/fallback search providers, page readers, archive location, where research reports and evidence go (central folder, a custom central path, or beside the bookmark file/folder with fallback to the central folder; new tasks only), whether finished research updates the Wiki (suggest and ask first, automatic, off), check frequency and optional professional APIs. Enter keeps displayed preferences. API-key input is masked; each key is checked immediately and can be re-entered if the check fails. Keys are saved separately in `credentials.json` next to settings, with mode `0600`; this local file is not encrypted. `BOOKMARK_RESEARCH_CREDENTIALS` overrides its path, and environment variables override saved keys. No keys enter preferences, packages, receipts or readiness output. A ChatGPT/Codex login is separate from an OpenAI API key.
+After installation the wizard asks only a few questions: research depth, answer language, search and page-reading services (one ordered multiselect; unselected providers become the fallback search tier), where archives and research results are stored (default data folder, one custom folder for both, or research reports beside the bookmark file/folder with fallback to the central folder; new tasks only), and optional professional APIs. Wiki follow-up, the pre-research availability check and connectivity checks are enabled by default (suggest and ask first, 15-minute cache, automatic) and can be changed later with `setup` or `config set`. Enter keeps displayed preferences. API-key input is masked; each key is checked immediately and can be re-entered if the check fails. Keys are saved separately in `credentials.json` next to settings, with mode `0600`; this local file is not encrypted. `BOOKMARK_RESEARCH_CREDENTIALS` overrides its path, and environment variables override saved keys. No keys enter preferences, packages, receipts or readiness output. A ChatGPT/Codex login is separate from an OpenAI API key.
 Rerun setup at any time with `python3 <installed path>/src/cli.py setup`; the exact command (`getting_started.setup_command` in the JSON result) is printed after installation. From a checkout:
@@ -183,11 +183,10 @@ python3 scripts/install.py verify --host dsh --profile web
 The installer exports a relocatable `dsh.bundle` and calls `dsh plugin --profile web add PATH`. A released package also installs straight from the registry: it declares `dsh.bundle.patch` and ships that layer, so `dsh plugin --profile web add bookmark-research@VERSION` — or the DSH plugin manager — needs no export first. The layer resolves the interpreter, the working directory and the MCP argument list from the installed module, so nothing is tied to the machine that built it; the selected profile must still provide the Skill registry and the official `@deepseek-ai/dsh-mcp-client`.
-`dsh plugin` delegates to pnpm. A generic CLI therefore needs pnpm on PATH (`npm install -g pnpm` or `corepack enable pnpm`) and the installer stops before creating a profile without it; the DeepSeek Harness Desktop CLI carries its own pnpm and needs none. DeepSeek Harness Desktop reserves the `desktop` profile — its launcher refuses every boot and dump for that name — so install it with the app's own CLI, and verification reads the persisted layer instead of `--dump-config`:
+`dsh plugin` delegates to pnpm. A generic CLI therefore needs pnpm on PATH (`npm install -g pnpm` or `corepack enable pnpm`) and the installer stops before creating a profile without it; the DeepSeek Harness Desktop CLI carries its own pnpm and needs none. The installer and the guided wizard look for a usable CLI themselves, so `--dsh` is only needed when dsh and the app live somewhere unusual: `dsh` on PATH first, then the Desktop installation layout — `/Applications/DeepSeek Harness.app/Contents/Resources/runtime/cli/bin/dsh` (also `~/Applications`) on macOS, `%LOCALAPPDATA%\Programs\DeepSeek Harness\resources\runtime\cli\bin\dsh.cmd` and the `ProgramFiles` equivalent on Windows, and the community Linux package root `/opt/DeepSeek Harness/resources/runtime/cli/bin/dsh`. Desktop can also register that CLI as `dsh` from its **Manage dsh Command…** menu (macOS `/usr/local/bin/dsh`, Windows user PATH); Linux has no such registration, and an AppImage is not discovered. A CLI found on PATH that cannot run `dsh plugin` is replaced by an installed Desktop app, and the plan prints the exact CLI that will run. DeepSeek Harness Desktop reserves the `desktop` profile — its launcher refuses every boot and dump for that name, and the npm CLI refuses plugin management for it — so that profile is installed only with the app's own CLI, which the wizard pre-selects and names `desktop` for by default. Verification then reads the persisted layer instead of `--dump-config`:
 ```sh
-python3 scripts/install.py install --host dsh --profile desktop \
-  --dsh "<DSH app>/Contents/Resources/runtime/cli/bin/dsh"
+python3 scripts/install.py install --host dsh --profile desktop
 ```
 The legacy `cordis.patch.yml` still contains absolute paths and requires separate Skill discovery. Workflow execution separately requires the host service/engine; `hosts/dsh/workflow-call.py --research-id RID --run-key KEY` prepares a call without launching it.

package/docs/installation.md CHANGED Viewed

@@ -8,7 +8,7 @@ Bookmark Research 使用 Python 3.9+ 标准库和 SQLite FTS5。先安装 Python
 ## `bookmark-research` 命令（推荐）
-`npm install -g bookmark-research` 之后在终端输入 `bookmark-research`，即可打开主菜单：修改配置与 API Key、检查服务、安装到其他宿主、更新、查看状态。也可以直接带子命令：`install [宿主…]`、`update`、`verify`、`setup`、`status`、`config show|set`、`doctor`。npm 是四个宿主共用的唯一正式发布包，包含 Python 安装器、运行时、Skill 和适配文件，因此仍需 Python 3.9+；Windows 原生、macOS、Linux 都可以用。发布版使用 `npx bookmark-research@latest install HOST`；未发布源码使用 Python 源码安装器。不带参数且不在终端中运行时（agent／CI），它只输出状态 JSON，不弹菜单。
+`npm install -g bookmark-research` 之后在终端输入 `bookmark-research`，即可打开主菜单：修改配置与 API Key、检查服务、安装到其他宿主、更新、查看状态；短别名 `bookmark` 与 `bookmark research` 等价（`bookmark` 单独输入即打开菜单，`bookmark research status` 等同 `bookmark-research status`）。也可以直接带子命令：`install [宿主…]`、`update`、`verify`、`setup`、`status`、`config show|set`、`doctor`。npm 是四个宿主共用的唯一正式发布包，包含 Python 安装器、运行时、Skill 和适配文件，因此仍需 Python 3.9+；Windows 原生、macOS、Linux 都可以用。发布版使用 `npx bookmark-research@latest install HOST`；未发布源码使用 Python 源码安装器。不带参数且不在终端中运行时（agent／CI），它只输出状态 JSON，不弹菜单。
 ## 一条命令引导安装
@@ -18,7 +18,7 @@ Bookmark Research 使用 Python 3.9+ 标准库和 SQLite FTS5。先安装 Python
 curl -fsSL https://raw.githubusercontent.com/Browser-bookmark-hub/Bookmark-Research/main/install.sh | bash
 ```
-终端向导检测可用 CLI，可多选 Codex、Claude Code、Pi、DSH：方向键移动、空格勾选、回车确认，已检测到的宿主默认勾选；随后逐个询问作用域／项目／profile，并显示摘要确认后再安装。`curl | bash` 从 `/dev/tty` 读取回答，不会误读脚本或 Agent 的输入；终端不支持或设置 `BOOKMARK_RESEARCH_PLAIN=1` 时改用普通编号提示。npm 安装器会在原生登记前检查所选宿主。`--interactive` 要求终端，`--non-interactive` 不询问；没有终端且未指定宿主时保留默认 Codex 的旧行为，Agent 应显式传入 `--host`。
+终端向导检测可用 CLI，可多选 Codex、Claude Code、Pi、DSH：方向键移动、空格勾选、回车确认，已检测到的宿主默认勾选。DSH 在「PATH 中有可用的 `dsh`」或「找到自带 pnpm 的 DeepSeek Harness 桌面版」时都算检测到，因此桌面版自带 CLI 无需任何参数即可勾选；选中 DSH 后，向导会列出 `$DSH_HOME/profiles` 下已初始化的 profile，并标注本插件已登记的来源与是否已启用，也可另填新名称。随后逐个询问作用域／项目／profile，并显示摘要确认后再安装。`curl | bash` 从 `/dev/tty` 读取回答，不会误读脚本或 Agent 的输入；终端不支持或设置 `BOOKMARK_RESEARCH_PLAIN=1` 时改用普通编号提示。npm 安装器会在原生登记前检查所选宿主。`--interactive` 要求终端，`--non-interactive` 不询问；没有终端且未指定宿主时保留默认 Codex 的旧行为，Agent 应显式传入 `--host`。
 首次安装选择 `npm:bookmark-research`（`latest`）。四个宿主都从该发布包导出所需格式，再由原生命令登记与验证。安装记录保存 npm 包名和版本选择，不保存临时下载或 npx 缓存路径；更新会重新取得同一选择器指向的发布包。各宿主的持久导出保存在 `${XDG_DATA_HOME:-~/.local/share}/bookmark-research/installations/`；可用 `BOOKMARK_RESEARCH_INSTALL_DIR` 改位置，其他宿主也支持 `--install-dir`。随后清理临时下载目录，安装后新建宿主会话。
@@ -69,7 +69,7 @@ Codex 分支管理 `bookmark-research@bookmark-research`。已通过 `personal`
 ## 向导与就绪检查
-安装成功后可依次设置研究深度、答复语言、主要／备用搜索服务、正文读取服务、归档目录、研究报告和证据的位置（统一目录、自定义统一目录，或放在书签文件／文件夹旁边、放不了时退回统一目录；只影响新任务）、研究结束后是否整理进 Wiki（建议并先询问、自动、关闭）、检查频率和可选专业 API。回车保留显示的偏好。API Key 掩码输入并立即检查，失败可重新输入；密钥单独保存为配置旁权限 `0600` 的 `credentials.json`，是本地明文文件；可用 `BOOKMARK_RESEARCH_CREDENTIALS` 指定位置。环境变量优先于保存的密钥，密钥不进入偏好 JSON、安装包、安装记录或就绪检查输出。ChatGPT／Codex 登录与 OpenAI API Key 分开。
+安装成功后只需回答少数问题：研究深度、答复语言、搜索与正文读取服务（一个有序多选列表；未选中的服务自动作为备用搜索层）、归档与研究结果的存放位置（默认数据目录、自定义统一目录，或研究报告放在书签文件／文件夹旁边、放不了时退回统一目录；只影响新任务），以及可选专业 API。Wiki 整理、联网前的可用性检查与连通性检查都按默认值自动启用（分别为「建议并先询问」「15 分钟缓存」和自动检查），可随时在后续 `setup` 或 `config set` 中修改。回车保留显示的偏好。API Key 掩码输入并立即检查，失败可重新输入；密钥单独保存为配置旁权限 `0600` 的 `credentials.json`，是本地明文文件；可用 `BOOKMARK_RESEARCH_CREDENTIALS` 指定位置。环境变量优先于保存的密钥，密钥不进入偏好 JSON、安装包、安装记录或就绪检查输出。ChatGPT／Codex 登录与 OpenAI API Key 分开。
 以后随时运行 `python3 <安装路径>/src/cli.py setup` 重开向导，完整命令（JSON 结果中的 `getting_started.setup_command`）会在安装结束时打印；在源码中可运行：
@@ -246,11 +246,10 @@ python3 scripts/install.py install --host dsh --profile web
 python3 scripts/install.py verify --host dsh --profile web
 ```
-`dsh plugin` 由 pnpm 执行：通用 CLI 需要 PATH 中的 pnpm（`npm install -g pnpm` 或 `corepack enable pnpm`），缺少时安装器在创建 profile 前停止；DSH 桌面版 CLI 自带 pnpm，无需另装。桌面版把 profile 名 `desktop` 保留给 Electron 载体，其启动器对该名字拒绝 boot／dump，因此用桌面版自带 CLI 安装，验证改为读取持久层而非 `--dump-config`：
+`dsh plugin` 由 pnpm 执行：通用 CLI 需要 PATH 中的 pnpm（`npm install -g pnpm` 或 `corepack enable pnpm`），缺少时安装器在创建 profile 前停止；DSH 桌面版 CLI 自带 pnpm，无需另装。安装器与终端向导会自行寻找可用 CLI，只有 dsh 与桌面版装在非常规位置时才需要 `--dsh`：先找 PATH 中的 `dsh`，再按桌面版安装布局查找——macOS 为 `/Applications/DeepSeek Harness.app/Contents/Resources/runtime/cli/bin/dsh`（`~/Applications` 同样检查），Windows 为 `%LOCALAPPDATA%\Programs\DeepSeek Harness\resources\runtime\cli\bin\dsh.cmd` 及 `ProgramFiles` 下的同一布局，Linux 为社区打包的 `/opt/DeepSeek Harness/resources/runtime/cli/bin/dsh`。桌面版还能在 **Manage dsh Command…** 菜单里把该 CLI 登记为 `dsh`（macOS 写 `/usr/local/bin/dsh`，Windows 写入用户 PATH），Linux 没有这项登记，AppImage 也不会被探测到。PATH 中已有的 CLI 若无法执行 `dsh plugin`，会自动改用已安装的桌面版，并在安装计划中打印实际使用的 CLI。桌面版把 profile 名 `desktop` 保留给 Electron 载体，其启动器对该名字拒绝 boot／dump，npm CLI 也拒绝为它管理插件，因此该 profile 只能用桌面版自带 CLI 安装；向导会默认选中并预填 `desktop`。验证改为读取持久层而非 `--dump-config`：
 ```sh
-python3 scripts/install.py install --host dsh --profile desktop \
-  --dsh "<DSH 应用>/Contents/Resources/runtime/cli/bin/dsh"
+python3 scripts/install.py install --host dsh --profile desktop
 ```
 手动分发时使用 `export_bundle.py --format dsh`，再用上述原生命令安装稳定导出目录；不含该层的旧发布包或旧 Git ref 仍会按模块的旧契约生成等价层。保留的旧 `cordis.patch.yml` 仍含绝对路径，需单独配置 Skill 发现；移动后应重新生成。多组研究另需 workflow service、worker-thread engine 和 `workflow` tool。参见 [官方 MCP client 文档](https://github.com/deepseek-ai/deepseek-harness/blob/master/packages/mcp/mcp-client/README.md)。

package/docs/release-notes-0.5.0-beta.13.md ADDED Viewed

@@ -0,0 +1,38 @@
+# Bookmark Research 0.5.0 beta 13
+**Beta / 测试版.** Published through the npm `beta` channel and synced with `latest`.
+## Install
+Interactive multi-host installation and seamless upgrade:
+```sh
+npx bookmark-research@0.5.0-beta.13 install
+```
+or simply:
+```sh
+npx bookmark-research@beta install
+```
+Choose Codex, Claude Code, Pi or DSH in the interactive wizard. Existing user preferences, API credentials, research archives, and Wiki databases are strictly preserved during upgrade.
+For an existing DSH profile:
+```sh
+dsh plugin --profile <name> add bookmark-research@0.5.0-beta.13
+```
+## Changes
+- **Installer Version Locking Bug Fix**: Fixed a critical issue in `scripts/host_install.py` where installing an npm release would erroneously overwrite the requested version with an older receipt version (`old["ref"]`), preventing Claude Code and other hosts from upgrading. The ref retention logic is now strictly scoped to Git checkouts.
+- **Auto-Versioned Launcher Pinning**: Updated `scripts/launcher.py` to automatically detect and default `--source` to the running package's version (`npm:bookmark-research@{version}`). Users no longer need to type redundant `--source npm:bookmark-research@VERSION` flags when upgrading via `npx`.
+- **Seamless Upgrade Experience**: Enhanced host installer to cleanly update native bundles, validate plugins, and retain all existing user settings and configurations without requiring re-entering API keys.
+- **Comprehensive Regression Tests**: Added unit tests in `tests/test_host_install.py` and `tests/test_launcher.py` to prevent version regressions during upgrades.
+## Verification
+Full test suite passing across all platforms.
+Install from [npm](https://www.npmjs.com/package/bookmark-research/v/0.5.0-beta.13). GitHub provides source and release notes; npm is the shared release package for all four hosts.

package/docs/release-notes-0.5.0-beta.14.md ADDED Viewed

@@ -0,0 +1,38 @@
+# Bookmark Research 0.5.0 beta 14
+**Beta / 测试版.** Published through the npm `beta` channel.
+## Install
+Interactive multi-host installation and seamless upgrade:
+```sh
+npx bookmark-research@0.5.0-beta.14 install
+```
+or simply:
+```sh
+npx bookmark-research@beta install
+```
+Choose Codex, Claude Code, Pi or DSH in the interactive wizard. Existing user preferences, API credentials, research archives, and Wiki databases are strictly preserved during upgrade.
+For an existing DSH profile:
+```sh
+dsh plugin --profile <name> add bookmark-research@0.5.0-beta.14
+```
+## Changes
+- **Streamlined Setup Workflow**: Greatly simplified `onboarding.py` prompts, reducing redundant questions during initial installation and relying on well-tested, robust defaults for search concurrency, fallback strategies, and storage directories.
+- **DeepSeek Harness (DSH) Discovery (`src/dsh_client.py`)**: Added dedicated cross-platform client detection for DeepSeek Harness Desktop, automatically identifying bundled binaries and internal pnpm distributions across macOS, Windows, and Linux.
+- **Short CLI Alias (`bookmark`)**: Registered `bookmark` alongside `bookmark-research` in `package.json` bin definitions for more convenient CLI invocation.
+- **Enhanced Test Coverage**: Added comprehensive test suites in `tests/test_dsh_client.py` and updated onboarding and host install test suites (totaling 692 passing tests).
+## Verification
+Full test suite passing across all platforms.
+Install from [npm](https://www.npmjs.com/package/bookmark-research/v/0.5.0-beta.14). GitHub provides source and release notes; npm is the shared release package for all four hosts.

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "bookmark-research",
-  "version": "0.5.0-beta.12",
+  "version": "0.5.0-beta.14",
   "description": "Check bookmark URLs or Canvas packages, compare sources with host-led research, and retain verifiable reports.",
   "license": "GPL-3.0-only",
   "repository": {
@@ -16,7 +16,8 @@
     "deepseek-harness"
   ],
   "bin": {
-    "bookmark-research": "bin/bookmark-research.js"
+    "bookmark-research": "bin/bookmark-research.js",
+    "bookmark": "bin/bookmark-research.js"
   },
   "main": "./hosts/dsh/plugin.js",
   "engines": {

package/scripts/host_clients.py CHANGED Viewed

@@ -5,9 +5,15 @@ import os
 from pathlib import Path
 import shutil
 import subprocess
+import sys
 from export_bundle import NAME
+# The published package ships src/ beside scripts/, and the installed plugin runs
+# the same DSH discovery from src/ alone; keep one implementation of it.
+if str(Path(__file__).resolve().parents[1] / "src") not in sys.path:
+    sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
 SELECTOR = NAME + "@" + NAME
@@ -23,28 +29,6 @@ def executable(binary):
     return found
-def bundled_pnpm(binary):
-    """The package manager a DSH CLI carries itself, if it ships one.
-    DeepSeek Harness Desktop runs `dsh plugin` with its own bundled pnpm, so that
-    carrier needs no `pnpm` on PATH. A generic CLI installs profile plugins by
-    forwarding to the pnpm it finds instead.
-    """
-    found = executable(binary)
-    if not found:
-        return None
-    try:
-        path = Path(found).resolve()
-    except OSError:
-        return None
-    # Desktop layout: <resources>/runtime/cli/bin/dsh beside <resources>/runtime/pnpm.
-    for parent in list(path.parents)[:5]:
-        candidate = parent / "pnpm" / "bin" / "pnpm.mjs"
-        if candidate.is_file():
-            return candidate
-    return None
 def read_json(path, default=None):
     if not path.exists():
         return default
@@ -76,6 +60,12 @@ class HostClient:
                 raise ValueError("DSH uses --profile, not --scope or --project")
             if not profile or not all(c.isalnum() or c in "._-" for c in profile) or profile.startswith("."):
                 raise ValueError("DSH requires --profile NAME (letters, numbers, dots, underscores or hyphens)")
+            # The default name resolves to PATH first and then to an installed
+            # DeepSeek Harness Desktop, whose bundled CLI carries its own pnpm and
+            # is the only carrier that composes the reserved `desktop` profile.
+            from dsh_client import resolve
+            self.resolved = resolve(binary, profile=profile)
+            self.binary = self.resolved["binary"] or binary or "dsh"
             self.home = Path(os.environ.get("DSH_HOME", str(Path.home() / ".dsh"))).expanduser().resolve()
             self.settings = self.home / "profiles" / profile / "package.json"
         else:
@@ -103,7 +93,11 @@ class HostClient:
     def require(self):
         if not executable(self.binary):
             raise ValueError(self.host + " CLI was not found: " + self.binary)
-        if self.host == "dsh" and not shutil.which("pnpm") and bundled_pnpm(self.binary) is None:
+        if self.host == "dsh" and not self.resolved["usable"]:
+            if self.resolved["reason"] == "reserved":
+                raise ValueError("The DSH profile name desktop is composed only by the DeepSeek Harness Desktop CLI, and "
+                                 + self.binary + " is not it; pass the app's bundled CLI with --dsh (it carries its own pnpm), "
+                                 "or choose another profile name")
             # A generic dsh forwards `plugin` to pnpm; fail before creating a profile.
             raise ValueError("DSH installs profile plugins with pnpm, which was not found on PATH and is not bundled with "
                              + self.binary + "; install it (npm install -g pnpm, or corepack enable pnpm) and retry, "

package/scripts/host_install.py CHANGED Viewed

@@ -175,9 +175,9 @@ def _manage(action, client, base, source, ref, dry_run):
         return result
     if action == "install":
         requested = _source(source if source is not None else SOURCE_ROOT, ref)
-        if receipt and ref is None:
+        if receipt and ref is None and requested["sourceType"] == "git":
             old = receipt["source"]
-            if (requested["sourceType"], requested["source"]) == (old["sourceType"], old["source"]) and old.get("ref"):
+            if old.get("sourceType") == "git" and requested["source"] == old["source"] and old.get("ref"):
                 requested["ref"] = old["ref"]
     elif receipt:
         if source is not None:

package/scripts/install.py CHANGED Viewed

@@ -637,7 +637,10 @@ def main(argv=None):
             "目标宿主：codex、claude、pi 或 dsh；可重复或用逗号指定多个。终端中引导选择，非交互时默认 codex"))
         command.add_argument("--codex", default="codex", help=message("Codex CLI executable, optionally an absolute path", "Codex CLI 程序名或绝对路径"))
         for host in ("claude", "pi", "dsh"):
-            command.add_argument("--" + host, help=message("Path to the " + host + " CLI", host + " CLI 路径"))
+            detail = (" (default: a usable dsh on PATH, then a DeepSeek Harness Desktop installation)",
+                      "（默认依次使用 PATH 中可用的 dsh 与 DeepSeek Harness 桌面版自带的 CLI）") if host == "dsh" else ("", "")
+            command.add_argument("--" + host, help=message("Path to the " + host + " CLI" + detail[0],
+                                                           host + " CLI 路径" + detail[1]))
         command.add_argument("--scope", choices=("user", "project", "local"), help=message(
             "Claude/Pi scope; default user (local is Claude-only)", "Claude/Pi 作用域，默认 user；local 仅限 Claude"))
         command.add_argument("--project", help=message("Project directory for project/local scope", "project/local 作用域对应的项目目录"))

package/scripts/launcher.py CHANGED Viewed

@@ -23,6 +23,8 @@ USAGE = """usage: bookmark-research [--lang auto|en|zh] [COMMAND] [ARGS...]
 Other options are passed through, e.g. install claude dsh --profile web --non-interactive.
 API keys are never accepted as arguments: use setup or environment variables.
+`bookmark` is an alias for the same command: `bookmark` opens the menu and
+`bookmark research ...` equals `bookmark-research ...`.
 """
@@ -104,8 +106,13 @@ def _install_action(action, arguments, language):
     import install
     hosts, rest = _split(arguments)
     if action == "install" and not any(arg == "--source" or arg.startswith("--source=") for arg in rest):
-        from npm_source import DEFAULT_SOURCE
-        rest = [*rest, "--source", DEFAULT_SOURCE]
+        from export_bundle import NAME, read_plugin_manifest
+        try:
+            version = read_plugin_manifest(ROOT).get("version")
+        except Exception:
+            version = None
+        source_val = ("npm:" + NAME + "@" + version) if version else ("npm:" + NAME)
+        rest = [*rest, "--source", source_val]
     if not hosts and action != "install" and "--host" not in rest:
         targets = installed_targets()
         if not targets:

package/src/dsh_client.py ADDED Viewed

@@ -0,0 +1,206 @@
+"""Find the `dsh` command an installation should use, on every platform.
+A DSH profile installs plugins through pnpm: `dsh plugin` forwards its
+arguments to the pnpm it finds on PATH, so a CLI installed by npm alone cannot
+manage a profile without one. DeepSeek Harness Desktop ships the same CLI
+together with its own pnpm and runs package operations with that copy, so this
+carrier needs none. Desktop can also register its bundled CLI as `dsh` from its
+application menu — macOS writes `/usr/local/bin/dsh`, Windows prepends the
+bundled directory to the user PATH — but Linux has no such registration and a
+user may never run it, so the installation layouts are probed directly as well.
+DeepSeek Harness Desktop reserves the profile name `desktop` for its own
+carrier and rejects boot, config dump and (for the npm CLI) plugin management
+for that name, so installations into `desktop` can only use the app's bundled
+CLI.
+Only the standard library is imported here: the published package ships `src/`
+without `scripts/`, and the installed plugin runs `setup` from that copy.
+"""
+import json
+import os
+from pathlib import Path
+import shutil
+import sys
+def _windows(platform):
+    return platform.startswith("win")
+def _accessible(path, platform):
+    """A usable probe is a regular file, and on POSIX an executable one."""
+    try:
+        if not path.is_file():
+            return False
+    except OSError:
+        return False
+    return _windows(platform) or os.access(path, os.X_OK)
+def _with_extensions(path, platform, environment):
+    """A Windows path without an extension also names its PATHEXT candidate."""
+    names = [path]
+    if _windows(platform) and not path.suffix:
+        extensions = [item for item in environment.get("PATHEXT", ".COM;.EXE;.BAT;.CMD").split(";") if item]
+        names += [Path(str(path) + extension.lower()) for extension in extensions]
+        names += [Path(str(path) + extension.upper()) for extension in extensions]
+    return names
+def executable(binary, environment=None, platform=None):
+    """Resolve a CLI name or path the way the invoking shell would.
+    Windows Python misses extensionless full paths, so those retry through
+    PATHEXT instead of being reported missing.
+    """
+    if not binary:
+        return None
+    environment = os.environ if environment is None else environment
+    platform = sys.platform if platform is None else platform
+    text = str(binary)
+    separators = [item for item in (os.sep, os.altsep) if item]
+    path = Path(text).expanduser()
+    if not any(separator in text for separator in separators) and not path.is_absolute():
+        return shutil.which(text, path=environment.get("PATH"))
+    for candidate in _with_extensions(path, platform, environment):
+        if _accessible(candidate, platform):
+            return str(candidate)
+    return None
+def desktop_candidates(environment=None, platform=None):
+    """DeepSeek Harness Desktop's bundled CLI in each platform's install layout.
+    The packaged app always keeps it at `<resources>/runtime/cli/bin/`, so only
+    the resources root differs; `dsh.cmd` on Windows is the name the app's own
+    command registration checks for.
+    """
+    environment = os.environ if environment is None else environment
+    platform = sys.platform if platform is None else platform
+    if platform == "darwin":
+        roots = [Path("/Applications/DeepSeek Harness.app")]
+        home = environment.get("HOME")
+        if home:
+            roots.append(Path(home) / "Applications" / "DeepSeek Harness.app")
+        return [root / "Contents/Resources/runtime/cli/bin/dsh" for root in roots]
+    if _windows(platform):
+        bases = []
+        local = environment.get("LOCALAPPDATA")
+        if local:
+            # The official Windows installer is per-user, so this is the default.
+            bases.append(Path(local) / "Programs" / "DeepSeek Harness")
+        for key in ("ProgramFiles", "ProgramW6432", "ProgramFiles(x86)"):
+            value = environment.get(key)
+            if value:
+                bases.append(Path(value) / "DeepSeek Harness")
+        return [base / "resources" / "runtime" / "cli" / "bin" / "dsh.cmd" for base in bases]
+    # Desktop packaging is official for macOS and Windows; the Linux builds are
+    # community repackaging, which installs under one of these roots.
+    return [Path("/opt/DeepSeek Harness/resources/runtime/cli/bin/dsh"),
+            Path("/usr/lib/deepseek-harness/resources/runtime/cli/bin/dsh")]
+def bundled_pnpm(binary):
+    """The package manager a DSH CLI carries itself, if it ships one.
+    Desktop places it beside the bundled CLI — `resources/runtime/pnpm` next to
+    `resources/runtime/cli/bin/dsh`, or the primary runtime's copy of the same
+    distribution. A generic CLI installs profile plugins by forwarding to the
+    pnpm it finds on PATH instead.
+    """
+    if not binary:
+        return None
+    try:
+        path = Path(binary).resolve()
+    except OSError:
+        return None
+    relatives = (Path("pnpm/bin/pnpm.mjs"), Path("primary-runtime/dependencies/pnpm/bin/pnpm.mjs"))
+    # Desktop layout: <resources>/runtime/cli/bin/dsh beside <resources>/runtime.
+    for parent in list(path.parents)[:5]:
+        for relative in relatives:
+            candidate = parent / relative
+            if candidate.is_file():
+                return candidate
+    return None
+def profiles(package="bookmark-research", home=None):
+    """Initialized DSH profiles under `$DSH_HOME/profiles`, and this plugin in each.
+    `dsh plugin` initializes a profile on first use, so only a directory holding
+    a `package.json` is a profile; the pnpm store beside them is not. `dependency`
+    is the recorded spec for `package` and `enabled` says whether the composed
+    bundle list activates it, which is what tells an existing registration from a
+    fresh profile before the installer touches anything.
+    """
+    root = Path(home or os.environ.get("DSH_HOME", str(Path.home() / ".dsh"))).expanduser() / "profiles"
+    rows = []
+    if not root.is_dir():
+        return rows
+    for directory in sorted(root.iterdir()):
+        manifest = directory / "package.json"
+        if (directory.name.startswith(".") or directory.name == "node_modules"
+                or directory.is_symlink() or not manifest.is_file()):
+            continue
+        row = {"name": directory.name, "path": str(directory), "initialized": False,
+               "dependency": None, "enabled": False}
+        try:
+            value = json.loads(manifest.read_text(encoding="utf-8"))
+        except (OSError, ValueError):
+            rows.append(row)
+            continue
+        dependencies = value.get("dependencies") if isinstance(value, dict) else None
+        bundles = value.get("dsh", {}).get("profile", {}).get("bundles") if isinstance(value, dict) else None
+        dependency = dependencies.get(package) if isinstance(dependencies, dict) else None
+        row.update(initialized=True, dependency=dependency if isinstance(dependency, str) else None,
+                   enabled=isinstance(bundles, list) and package in bundles)
+        rows.append(row)
+    return rows
+def _client(binary, source, pnpm, reserved=False):
+    bundled = bundled_pnpm(binary) if binary else None
+    # The reserved `desktop` profile is composable only by the Desktop carrier,
+    # the one that ships its own package manager; the npm CLI refuses it.
+    blocked = reserved and bundled is None
+    usable = bool(binary) and (bool(pnpm) or bundled is not None) and not blocked
+    if usable:
+        reason = "ok"
+    elif not binary:
+        reason = "missing"
+    elif blocked:
+        reason = "reserved"
+    else:
+        reason = "pnpm"
+    return {"binary": binary, "source": source, "pnpm": pnpm,
+            "bundled_pnpm": str(bundled) if bundled is not None else None,
+            "usable": usable, "reason": reason}
+def resolve(binary=None, environment=None, platform=None, profile=None):
+    """Choose the `dsh` a profile installation should run.
+    An explicit path is never substituted: it is reported as unusable rather
+    than silently switching carriers. Otherwise a usable `dsh` on PATH wins, and
+    a PATH command that cannot run `dsh plugin` is replaced by a DeepSeek
+    Harness Desktop installation carrying its own pnpm. The reserved `desktop`
+    profile accepts only that Desktop carrier.
+    """
+    environment = os.environ if environment is None else environment
+    platform = sys.platform if platform is None else platform
+    pnpm = executable("pnpm", environment, platform)
+    if binary and str(binary) != "dsh":
+        return _client(executable(binary, environment, platform), "argument", pnpm)
+    reserved = str(profile or "").casefold() == "desktop"
+    on_path = executable("dsh", environment, platform)
+    located = [found for found in (executable(candidate, environment, platform)
+                                   for candidate in desktop_candidates(environment, platform)) if found]
+    available = ([_client(on_path, "path", pnpm, reserved)] if on_path else []) \
+        + [_client(found, "desktop", pnpm, reserved) for found in located]
+    for client in available:
+        if client["usable"]:
+            return client
+    # Report whichever carrier exists, so its path and reason still reach the user.
+    return available[0] if available else _client(None, None, pnpm, reserved)

package/src/onboarding.py CHANGED Viewed

@@ -9,6 +9,8 @@ import sys
 from pathlib import Path
 from credentials import Credentials
+from dsh_client import profiles as dsh_profiles
+from dsh_client import resolve as resolve_dsh
 from readiness import Readiness
 from settings import Settings
 from tui import Option, Prompter
@@ -25,6 +27,29 @@ def _profile_problem(value):
     return None
+def _dsh_hint(client):
+    """Why DSH is unavailable, or which carrier the wizard selected for it."""
+    if client["usable"]:
+        if client["source"] == "desktop":
+            return ("DeepSeek Harness Desktop CLI", "DeepSeek Harness 桌面版 CLI")
+        return ("", None)
+    if client["reason"] == "pnpm":
+        return ("needs pnpm: npm install -g pnpm, or corepack enable pnpm; the DSH Desktop CLI carries its own",
+                "需要 pnpm：npm install -g pnpm 或 corepack enable pnpm；DSH 桌面版 CLI 自带 pnpm")
+    return ("needs the dsh CLI: pass --dsh PATH (DeepSeek Harness Desktop keeps one under its app resources)",
+            "需要 dsh CLI：请用 --dsh PATH 指定（DeepSeek Harness 桌面版的 CLI 位于其应用资源目录）")
+def _profile_hint(row):
+    """What an initialized DSH profile already holds for this plugin."""
+    if not row["initialized"]:
+        return ("package.json is missing or unreadable", "package.json 缺失或无法读取")
+    if row["dependency"]:
+        return ("bookmark-research " + row["dependency"] + (" · enabled" if row["enabled"] else " · not enabled"),
+                "已装 bookmark-research " + row["dependency"] + (" · 已启用" if row["enabled"] else " · 未启用"))
+    return ("no bookmark-research yet", "尚未安装 bookmark-research")
 def _directory_problem(value):
     if not value or not Path(value).expanduser().is_dir():
         return ("Enter an existing directory.", "请输入已存在的目录。")
@@ -88,22 +113,29 @@ class Console(Prompter):
         requested = args.host
         if isinstance(requested, str):
             requested = [requested]
+        # Resolve the DSH carrier once, so the plan and the installation agree on
+        # which `dsh` runs: a generic CLI needs pnpm on PATH, while the DeepSeek
+        # Harness Desktop CLI bundles its own.
+        client = resolve_dsh(getattr(args, "dsh", None))
+        if client["source"] == "desktop":
+            args.dsh = client["binary"]
         if requested:
             hosts = list(dict.fromkeys(requested))
         else:
             found = {name: bool(shutil.which(getattr(args, name, None) or name)) for name, _, _ in HOSTS}
+            hints = {name: ("", None) if found[name] else ("CLI not found", "未找到 CLI") for name in found}
+            found["dsh"], hints["dsh"] = client["usable"], _dsh_hint(client)
             if not any(found.values()):
                 self.warn("No supported host CLI (codex, claude, pi, dsh) was found on PATH.",
                           "PATH 中未找到任何受支持的宿主 CLI（codex、claude、pi、dsh）。")
                 raise ValueError("No host CLI found; install Codex, Claude Code, Pi or DSH, "
                                  "or pass --codex/--claude/--pi/--dsh PATH to point at its executable")
-            hints = {name: ("", None) if found[name] else ("CLI not found", "未找到 CLI") for name in found}
-            if found["dsh"] and not shutil.which("pnpm"):
-                # dsh plugin forwards to pnpm; offering DSH without it only fails later.
-                found["dsh"], hints["dsh"] = False, ("needs pnpm: npm install -g pnpm", "需要 pnpm：npm install -g pnpm")
             hosts = self.multiselect("Install into which hosts?", "安装到哪些宿主？", [
                 Option(name, en, zh, *hints[name], disabled=not found[name]) for name, en, zh in HOSTS],
                 [name for name, _, _ in HOSTS if found[name]])
+        # A carrier that ships its own pnpm is the Desktop CLI, however it was found:
+        # only that CLI may manage the profile name Desktop reserves for itself.
+        desktop = client["bundled_pnpm"] is not None
         targets = []
         for host in hosts:
             label = next((en for name, en, _ in HOSTS if name == host), host)
@@ -121,8 +153,7 @@ class Console(Prompter):
                         label + ": project directory", label + "：项目目录", str(Path.cwd()), _directory_problem)
             elif host == "dsh":
                 # Never guess a DSH profile: it selects a distinct composed runtime.
-                target["profile"] = args.profile or self.input(
-                    "DSH profile name (for example web)", "DSH profile 名称（例如 web）", "", _profile_problem)
+                target["profile"] = args.profile or self.dsh_profile(desktop)
             targets.append(target)
         lines = []
         for target in targets:
@@ -130,12 +161,51 @@ class Console(Prompter):
             detail = ", ".join(key + "=" + target[key] for key in ("scope", "project", "profile") if target[key])
             lines.append((label + (": " + detail if detail else ""), label + ("：" + detail if detail else "")))
         self.note("Installation plan", "安装计划", lines)
+        if client["source"] == "desktop" and any(target["host"] == "dsh" for target in targets):
+            self.note("DSH CLI", "DSH CLI", [(client["binary"], client["binary"])])
         if not self.confirm("Install now?", "现在安装？", True):
             raise KeyboardInterrupt
         first = targets[0]
         args.host, args.scope, args.project, args.profile = first["host"], first["scope"], first["project"], first["profile"]
         return targets
+    def dsh_profile(self, desktop):
+        """Choose an initialized DSH profile, or name a new one.
+        `dsh plugin` initializes a profile on first use, so the profiles on disk
+        are the real targets; each is annotated with this plugin's recorded source
+        and whether its bundle list activates it. The reserved `desktop` profile
+        is composed only by the Desktop CLI, so another carrier never offers it.
+        """
+        check = self._profile(desktop)
+        question = ("DSH profile name (for example web)", "DSH profile 名称（例如 web）")
+        rows = dsh_profiles()
+        if not desktop:
+            rows = [row for row in rows if row["name"].casefold() != "desktop"]
+        if not rows:
+            return self.input(question[0], question[1], "desktop" if desktop else "", check)
+        options = [Option(row["name"], row["name"], row["name"], *_profile_hint(row)) for row in rows]
+        options.append(Option("", "Another profile name…", "其他 profile 名称…"))
+        default = "desktop" if any(row["name"] == "desktop" for row in rows) else None
+        chosen = self.select("Install into which DSH profile?", "安装到哪个 DSH profile？", options, default)
+        if chosen:
+            return chosen
+        return self.input(question[0], question[1], "desktop" if desktop else "", check)
+    @staticmethod
+    def _profile(desktop):
+        """Validate a DSH profile name, rejecting the reserved name for a generic CLI."""
+        def check(value):
+            problem = _profile_problem(value)
+            if problem:
+                return problem
+            if value.casefold() == "desktop" and not desktop:
+                return ("desktop is composed only by the DeepSeek Harness Desktop CLI: choose another profile name, "
+                        "or rerun with --dsh",
+                        "desktop 只能由 DeepSeek Harness 桌面版 CLI 组装：请换一个 profile 名称，或用 --dsh 重新运行")
+            return None
+        return check
     def install_target(self, args):
         return self.install_targets(args)[0]
@@ -161,40 +231,15 @@ class Onboarding:
         hints = {"exa": ("Exa search and reading", "Exa 搜索与阅读"), "parallel": ("Parallel search and extract", "Parallel 搜索与提取"),
                  "tavily": ("Tavily search and extract", "Tavily 搜索与提取"),
                  "jina": ("Jina Reader; search needs a key", "Jina Reader；搜索需要密钥")}
-        def options(names=Settings.PROVIDERS):
-            return [Option(name, name, name, *hints.get(name, ("", None))) for name in names]
-        providers = console.multiselect("Primary search providers (run concurrently)", "主要搜索服务（并发查询）",
-                                        options(), current["search"]["providers"])
-        fallbacks = console.multiselect("Fallback search providers (used when primaries return nothing)",
-                                        "备用搜索服务（主要服务无结果时使用）", options(),
-                                        current["search"]["fallback_providers"], required=False)
-        existing = Settings.fetch_providers(current)
-        primary = console.select("Primary page reader", "首选正文读取服务", options(), existing[0] if existing else None)
-        rest = [name for name in Settings.PROVIDERS if name != primary]
-        extra = console.multiselect("Fallback page readers", "备用正文读取服务", options(rest),
-                                    [name for name in existing if name != primary], required=False)
-        extra_ordered = [name for name in existing if name in extra] + [name for name in extra if name not in existing]
-        readers = [primary] + extra_ordered
-        archive = console.confirm("Archive ordinary page reads? Research task evidence is always retained.",
-                                  "自动归档普通网页读取？研究任务的证据始终保留。", current["archive"]["enabled"])
-        directory = current["archive"]["directory"]
-        if archive:
-            def check(value):
-                try:
-                    Settings.external_path(value, "Archive directory")
-                except ValueError:
-                    return ("Use an absolute directory outside plugins and canvas packages.", "请使用插件与画布包以外的绝对目录。")
-                return None
-            directory = console.input("Archive directory", "归档目录", directory, check)
-        output = self._output(current)
-        after = console.select("After research, update the Wiki?", "研究结束后整理进 Wiki？", [
-            Option("suggest", "Suggest", "建议", "suggest pages and ask first", "给出建议页面，先征求同意"),
-            Option("auto", "Automatic", "自动", "write reviewed claims without asking", "直接写入已审核的结论"),
-            Option("off", "Off", "关闭", "do not suggest Wiki updates", "不提示 Wiki 更新")], current["wiki"]["after_research"])
-        mode = console.select("Check availability before web research", "联网研究前的可用性检查", [
-            Option("cached", "Cached", "缓存", "refresh on first use, changes or expiry (15 minutes by default)", "首次、配置变化或过期时检查（默认 15 分钟）"),
-            Option("always", "Always", "总是", "check for every new research question", "每次开始研究问题时检查"),
-            Option("manual", "Manual", "手动", "only when explicitly requested", "仅手动检查")], current["readiness"]["mode"])
+        # One ordered list answers the former search, fallback-search and reader
+        # questions: selected providers run concurrently and also read pages,
+        # unselected providers stay as the fallback search tier.
+        options = [Option(name, name, name, *hints.get(name, ("", None))) for name in Settings.PROVIDERS]
+        primary = console.multiselect("Search and page-reading services (concurrent, in this order)",
+                                      "搜索与正文读取服务（并发执行，按此顺序）", options, current["search"]["providers"])
+        providers = list(primary)
+        fallbacks = [name for name in Settings.PROVIDERS if name not in providers]
+        storage = self._storage(current)
         config = current["professional_research"]
         service = console.select("Optional professional API (host-led research works without it)",
                                  "可选专业研究 API（宿主主导的研究不需要它）", [
@@ -216,35 +261,49 @@ class Onboarding:
         elif service == "parallel":
             console.say("Parallel processor remains " + config["parallel"]["processor"] + "; change it with config set if needed.",
                         "Parallel processor 沿用 " + config["parallel"]["processor"] + "；可通过 config set 修改。")
-        return {"research": {"depth": depth, "response_language": language}, "search": {"providers": providers, "fallback_providers": fallbacks},
-                "fetch": {"provider": readers[0], "providers": readers},
-                "archive": {"enabled": archive, "directory": directory}, "readiness": {"mode": mode}, "professional_research": services,
-                "output": output, "wiki": {"after_research": after}}
-    def _output(self, current):
-        """Ask where new research tasks go; an unchanged directory stays inherited from the data directory."""
-        console, saved = self.console, current["output"]
+        # Only changed values are returned, so an unchanged answer keeps the saved
+        # Wiki follow-up, readiness policy and archive toggle exactly as they were.
+        result = {"research": {"depth": depth, "response_language": language},
+                  "search": {"providers": providers, "fallback_providers": fallbacks},
+                  "fetch": {"provider": providers[0], "providers": providers},
+                  "professional_research": services}
+        result.update(storage)
+        return result
+    def _storage(self, current):
+        """Ask once where archives and research results live, and return only the changed keys."""
+        console, defaults = self.console, Settings.defaults()
+        archive_dir, output_dir = current["archive"]["directory"], current["output"]["directory"]
+        beside = current["output"]["mode"] == "beside_input"
         console.say("Location changes apply to new research tasks only; existing tasks stay where they are.",
                     "位置设置只影响新的研究任务；已有任务保留在原处。")
-        choice = console.select("Where should research reports and evidence go?", "研究报告和证据保存在哪里？", [
-            Option("central", "Central folder", "统一目录", saved["directory"], saved["directory"], hint_always=True),
-            Option("custom", "Central folder at a custom path", "统一目录（自定义路径）"),
-            Option("beside_input", "Beside the bookmark file or folder", "放在书签文件或文件夹旁边",
+        choice = console.select("Where should archives and research reports be stored?",
+                                "归档和研究报告保存在哪里？", [
+            Option("default", "Default data folder", "默认数据目录",
+                   archive_dir + " · " + output_dir, archive_dir + " · " + output_dir, hint_always=True),
+            Option("custom", "One custom folder for both (knowledge/ and research/)", "自定义统一目录（其下 knowledge/ 与 research/）"),
+            Option("beside_input", "Research reports beside the bookmark file or folder", "研究报告放在书签文件或文件夹旁边",
                    "falls back to the central folder when not possible", "无法放置时退回统一目录", hint_always=True)],
-            "beside_input" if saved["mode"] == "beside_input" else "central")
-        directory = saved["directory"]
+            "beside_input" if beside else "default")
         if choice == "custom":
             def check(value):
                 try:
-                    Settings.external_path(value, "Research output directory")
+                    Settings.external_path(value, "Storage directory")
                 except ValueError:
                     return ("Use an absolute directory outside plugins and canvas packages.", "请使用插件与画布包以外的绝对目录。")
                 return None
-            directory = str(Settings.external_path(
-                console.input("Research output directory", "研究结果目录", directory, check), "Research output directory"))
-        result = {"mode": "beside_input" if choice == "beside_input" else "central"}
-        if directory != saved["directory"]:
-            result["directory"] = directory
+            root = Settings.external_path(console.input("Storage directory", "存放目录",
+                                                        str(Path(archive_dir).parent), check), "Storage directory")
+            return {"archive": {"directory": str(root / "knowledge")},
+                    "output": {"mode": "central", "directory": str(root / "research")}}
+        if choice == "beside_input":
+            return {"output": {"mode": "beside_input"}} if not beside else {}
+        # Default folder: reset only a previously customised location.
+        result = {}
+        if archive_dir != defaults["archive"]["directory"]:
+            result["archive"] = {"directory": defaults["archive"]["directory"]}
+        if beside or output_dir != defaults["output"]["directory"]:
+            result["output"] = {"mode": "central", "directory": defaults["output"]["directory"]}
         return result
     def _keys(self, defaults=()):
@@ -359,10 +418,6 @@ class Onboarding:
             console.intro("Bookmark Research setup", "Bookmark Research 配置")
             self.settings.update(self._preferences())
             self._keys()
-            if checks and not test_retrieval:
-                test_retrieval = console.confirm(
-                    "Also test retrieval? Each provider gets one search and one example.com read; provider quota may be used.",
-                    "同时进行实际检索自检？每家服务一次搜索和一次 example.com 阅读，可能使用服务额度。", False)
         readiness = self._check(checks, test_retrieval, host, observed_tools)
         if console and checks:
             failed = [row for row in readiness["checks"] if row["status"] in self.FAILED]