dsh-oauth-login 0.2.4 → 0.2.7

package/INSTALL.md

@@ -2,21 +2,34 @@
 
 [中文](INSTALL.zh.md). Product pages: [README.md](README.md) (中文), [README.en.md](README.en.md).
 
-Stock DeepSeek Harness **0.1.5-rc.3** users install with official `dsh` and **pnpm**:
+## DSH Studio desktop app (recommended)
+
+Open **Settings → Plugins → Add plugin** and enter this in “Package name or address”:
+
+```text
+github:aa2246740/dsh-oauth-login#v0.2.7
+```
+
+The in-app plugin manager owns the Desktop profile and bundled package manager. This release includes built `lib/`; normal use needs no clone, build, or DSHX installation. Follow the app if it asks you to reload or reopen.
+
+## Web CLI
+
+Stock DeepSeek Harness **0.2.0-rc.2** users install to the Web profile with the official CLI:
 
 ```sh
-dsh plugin --profile web add github:aa2246740/dsh-oauth-login
+dsh plugin --profile web add github:aa2246740/dsh-oauth-login#v0.2.7
 ```
 
 If `dsh` is not on PATH:
 
 ```sh
-npx @deepseek-ai/dsh plugin --profile web add github:aa2246740/dsh-oauth-login
+npx @deepseek-ai/dsh plugin --profile web add github:aa2246740/dsh-oauth-login#v0.2.7
 ```
 
 That `github:` spec works because the package declares `dsh.bundle.patch` and
 commits built `lib/`. Official add runs pnpm in `$DSH_HOME/profiles/web` and
-appends the package to `dsh.profile.bundles`. Then restart that Host and reload
+appends the package to `dsh.profile.bundles`. This command writes only `web`,
+not the Desktop App profile. Reopen an already-running Web Host once and reload
 the page. You do not need Creator Mode or a second toolchain.
 
 Use `file:` only when editing a local clone. Keep the prefix. A bare

package/INSTALL.zh.md

@@ -2,19 +2,31 @@
 
 [English](INSTALL.md)。说明和截图在 [README.md](README.md)，英文在 [README.en.md](README.en.md)。
 
-官方 DeepSeek Harness **0.1.5-rc.3** 用户用官方 `dsh` 和 **pnpm** 安装：
+## DSH Studio 桌面 App（推荐）
+
+打开 **设置 → 插件 → 添加插件**，在“包名或地址”中输入：
+
+```text
+github:aa2246740/dsh-oauth-login#v0.2.7
+```
+
+应用内插件管理器负责 Desktop profile 和内置包管理器。本发布已包含编译好的 `lib/`；普通使用不需要 clone、构建或安装 DSHX。若应用提示刷新或重新打开，请按提示完成。
+
+## Web CLI
+
+官方 DeepSeek Harness **0.2.0-rc.2** 用户用官方 CLI 安装到 Web profile：
 
 ```sh
-dsh plugin --profile web add github:aa2246740/dsh-oauth-login
+dsh plugin --profile web add github:aa2246740/dsh-oauth-login#v0.2.7
 ```
 
 没有 `dsh` 时：
 
 ```sh
-npx @deepseek-ai/dsh plugin --profile web add github:aa2246740/dsh-oauth-login
+npx @deepseek-ai/dsh plugin --profile web add github:aa2246740/dsh-oauth-login#v0.2.7
 ```
 
-这条 `github:` 命令能装上，是因为包装了 `dsh.bundle.patch`，并且仓库提交了编好的 `lib/`。官方 add 在 `$DSH_HOME/profiles/web` 里跑 pnpm，再把这个包装进 `dsh.profile.bundles`。装完重启这个 Host，刷新页面。不需要 Creator Mode，也不需要另装一套工具。
+这条 `github:` 命令能装上，是因为包装了 `dsh.bundle.patch`，并且仓库提交了编好的 `lib/`。官方 add 在 `$DSH_HOME/profiles/web` 里跑 pnpm，再把这个包装进 `dsh.profile.bundles`。这条命令只写 `web` profile，不能修改 Desktop App 的 profile；已运行的 Web Host 需要重新打开一次，再刷新网页。不需要 Creator Mode，也不需要另装一套工具。
 
 本机改源码时再用 `file:`，并且必须保留前缀。直接写 `./dsh-oauth-login` 会变成符号链接；本插件有意从 profile 复用 DSH 运行时的 peer dependency，因此必须使用 `file:` 副本，才能正确解析依赖。
 

package/README.en.md

@@ -2,11 +2,25 @@
 
 [中文](README.md) | English
 
+## Install
+
+### DSH Studio desktop app (recommended)
+
+Open **Settings → Plugins → Add plugin** and enter this in “Package name or address”:
+
+```text
+github:aa2246740/dsh-oauth-login#v0.2.7
+```
+
+The desktop plugin manager owns the Desktop profile and bundled package manager. This release includes built `lib/`; normal use needs no clone, build, or DSHX installation. Follow the app if it asks you to reload or reopen after installation.
+
+### Web CLI
+
 ```sh
-dsh plugin --profile web add github:aa2246740/dsh-oauth-login
+dsh plugin --profile web add github:aa2246740/dsh-oauth-login#v0.2.7
 ```
 
-You need official `dsh` on PATH (or `npx @deepseek-ai/dsh`) and **pnpm**. Then restart that Host and reload the page. `dsh plugin add` writes the profile. It does not hot-load a running Host.
+This official CLI command writes only the `web` profile; it cannot modify the Desktop App profile. For an already-running Web Host, reopen that Host once and reload the page.
 
 OAuth login for ChatGPT, Claude, Grok, Copilot, OpenRouter, and Kimi on [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness), plus Zhipu GLM Coding Plan via its official plan API key. Credentials go only to `$DSH_HOME/.dsh-oauth-auth.json`.
 
@@ -26,17 +40,17 @@ The UI is **Settings → 订阅登录**.
 
 ## Install
 
-Node 22.19+ and official DeepSeek Harness **0.1.5-rc.3** (`@deepseek-ai/dsh@0.1.5-rc.3`, tag `dsh-v0.1.5-rc.3`).
+Node 22.19+ and official DeepSeek Harness **0.2.0-rc.2** (`@deepseek-ai/dsh@0.2.0-rc.2`, tag `dsh-v0.2.0-rc.2`, SHA `639ed015397290b3745d163aafe02ffee4aa3f84`). The `@deepseek-ai/dsh` peer is `>=0.2.0-rc.1 <0.2.1`: it accepts `0.2.0-rc.2` and stable `0.2.0`, and rejects `0.2.0` alphas and `0.1.7-rc.2`.
 
-That `github:` command works because this package declares `dsh.bundle.patch` and commits built `lib/`. Official `dsh plugin add` runs pnpm in `$DSH_HOME/profiles/web` and appends this package to `dsh.profile.bundles`. You do not need Creator Mode or a second toolchain.
+That `github:` command works because this package declares `dsh.bundle.patch` and commits built `lib/`. You do not need Creator Mode or a second toolchain.
 
 If `dsh` is not on PATH:
 
 ```sh
-npx @deepseek-ai/dsh plugin --profile web add github:aa2246740/dsh-oauth-login
+npx @deepseek-ai/dsh plugin --profile web add github:aa2246740/dsh-oauth-login#v0.2.7
 ```
 
-Use `file:` only when you are editing a local clone (do not drop the prefix):
+Use `file:` only when you are editing a local clone (development/local testing; do not drop the prefix):
 
 ```sh
 git clone https://github.com/aa2246740/dsh-oauth-login.git

package/README.md

@@ -2,11 +2,25 @@
 
 中文 | [English](README.en.md)
 
+## 安装
+
+### DSH Studio 桌面 App（推荐）
+
+打开 **设置 → 插件 → 添加插件**，在“包名或地址”中输入：
+
+```text
+github:aa2246740/dsh-oauth-login#v0.2.7
+```
+
+桌面端插件管理器负责 Desktop profile 和内置包管理器。本发布已包含编译好的 `lib/`；普通使用不需要 clone、构建或安装 DSHX。若应用提示刷新或重新打开，请按提示完成。
+
+### Web CLI
+
 ```sh
-dsh plugin --profile web add github:aa2246740/dsh-oauth-login
+dsh plugin --profile web add github:aa2246740/dsh-oauth-login#v0.2.7
 ```
 
-PATH 上需要官方 `dsh`（没有的话用 `npx @deepseek-ai/dsh`）和 **pnpm**。装完重启这个 Host，刷新页面。`dsh plugin add` 只写 profile，不会热挂正在跑的 Host。
+这条官方 CLI 命令只写入 `web` profile，不能修改 Desktop App 的 profile。对于已经运行的 Web Host，请重新打开该 Host 一次，再刷新网页。
 
 把 ChatGPT、Claude、Grok、Copilot、OpenRouter、Kimi 的 OAuth 登录和智谱 GLM Coding Plan 接到 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness)。凭据只写 `$DSH_HOME/.dsh-oauth-auth.json`。
 
@@ -26,17 +40,17 @@ PATH 上需要官方 `dsh`（没有的话用 `npx @deepseek-ai/dsh`）和 **pnpm
 
 ## 安装
 
-需要 Node 22.19+，以及能跑起来的官方 DeepSeek Harness **0.1.5-rc.3**（`@deepseek-ai/dsh@0.1.5-rc.3`，tag `dsh-v0.1.5-rc.3`）。
+需要 Node 22.19+，以及能跑起来的官方 DeepSeek Harness **0.2.0-rc.2**（`@deepseek-ai/dsh@0.2.0-rc.2`，tag `dsh-v0.2.0-rc.2`，SHA `639ed015397290b3745d163aafe02ffee4aa3f84`）。`@deepseek-ai/dsh` peer 为 `>=0.2.0-rc.1 <0.2.1`：接受 `0.2.0-rc.2` 和稳定版 `0.2.0`，拒绝 `0.2.0` alpha，也拒绝 `0.1.7-rc.2`。
 
-这条 `github:` 命令能装上，是因为包装了 `dsh.bundle.patch`，并且仓库提交了编好的 `lib/`。官方 `dsh plugin add` 在 `$DSH_HOME/profiles/web` 里跑 pnpm，再把这个包装进 `dsh.profile.bundles`。不需要 Creator Mode，也不需要另装一套工具。
+这条 `github:` 命令能装上，是因为包装了 `dsh.bundle.patch`，并且仓库提交了编好的 `lib/`。不需要 Creator Mode，也不需要另装一套工具。
 
 没有 `dsh` 时：
 
 ```sh
-npx @deepseek-ai/dsh plugin --profile web add github:aa2246740/dsh-oauth-login
+npx @deepseek-ai/dsh plugin --profile web add github:aa2246740/dsh-oauth-login#v0.2.7
 ```
 
-本机改源码时再用 `file:`（不要写成裸的 `./`）：
+本机改源码时再用 `file:`（开发/本地测试；不要写成裸的 `./`）：
 
 ```sh
 git clone https://github.com/aa2246740/dsh-oauth-login.git

package/lib/bin.js

@@ -4,7 +4,7 @@ import { realpathSync } from "node:fs";
 import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import { LlmError, RetryPolicySchema } from "@deepseek-ai/dsh-llm";
-import { createModels } from "@earendil-works/pi-ai";
+import { createModels, getCurrentTools, normalizeContext } from "@earendil-works/pi-ai";
 import "@deepseek-ai/dsh-llm-pi-ai";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { basename, dirname, join, resolve } from "node:path";
@@ -543,6 +543,10 @@ const OPENROUTER_REFRESH_MS = 9e5;
 const OPENROUTER_COOLDOWN_MS = 6e4;
 //#endregion
 //#region src/native-tools.ts
+/**
+* OAuth routes that already have provider-hosted search / image tools.
+* DSH's web_search function tool would hide those and bill a second key.
+*/
 /** DSH model-facing tools that steal traffic from a subscribed provider. */
 const DSH_WEB_TOOL_NAMES = ["web_search", "web_fetch"];
 /** Matching tool-web prompt sections. */
@@ -665,10 +669,15 @@ function wrapOnPayload(existing, providerId, api, policy = DEFAULT_NATIVE_TOOL_P
 	};
 }
 function filterPiContext(context, providerId, api, policy = DEFAULT_NATIVE_TOOL_POLICY) {
-	if (nativePlan(providerId, api, policy) === void 0 || context.tools === void 0) return context;
+	if (nativePlan(providerId, api, policy) === void 0) return context;
 	return {
 		...context,
-		tools: context.tools.filter((tool) => !isDshWebToolName(tool.name))
+		...context.tools === void 0 ? {} : { tools: context.tools.filter((tool) => !isDshWebToolName(tool.name)) },
+		messages: context.messages.map((message) => message.role !== "system" ? message : {
+			...message,
+			...message.toolsAdded === void 0 ? {} : { toolsAdded: message.toolsAdded.filter((tool) => !isDshWebToolName(tool.name)) },
+			...message.toolsRemoved === void 0 ? {} : { toolsRemoved: message.toolsRemoved.filter((tool) => !isDshWebToolName(tool.name)) }
+		})
 	};
 }
 /**
@@ -680,7 +689,7 @@ function filterPiContext(context, providerId, api, policy = DEFAULT_NATIVE_TOOL_
 * when the provider serializer later emits `tools: []`.
 */
 function prepareNativeToolRequest(context, options, providerId, api, policy = DEFAULT_NATIVE_TOOL_POLICY) {
-	if (context.tools === void 0 || nativePlan(providerId, api, policy) === void 0) return {
+	if (context.tools === void 0 && getCurrentTools(context.messages).length === 0 || nativePlan(providerId, api, policy) === void 0) return {
 		context,
 		options
 	};
@@ -1382,12 +1391,12 @@ function harnessProvider(spec, native = DEFAULT_NATIVE_TOOL_POLICY, catalog) {
 		stream: (model, context, options) => {
 			const request = prepareNativeToolRequest(context, options ?? {}, spec.id, model.api, native);
 			const guarded = spec.id === "openrouter" ? prepareOpenRouterOptions(model, request.options, catalog) : request.options;
-			return base.stream(model, request.context, guarded);
+			return base.stream(model, normalizeContext(request.context), guarded);
 		},
 		streamSimple: (model, context, options) => {
 			const request = prepareNativeToolRequest(context, options ?? {}, spec.id, model.api, native);
 			const guarded = spec.id === "openrouter" ? prepareOpenRouterOptions(model, request.options, catalog) : request.options;
-			return base.streamSimple(model, request.context, guarded);
+			return base.streamSimple(model, normalizeContext(request.context), guarded);
 		}
 	};
 }

package/lib/client.js

@@ -1168,23 +1168,22 @@ window.__ModuleLoader__.load({
 				if (event.relatedTarget instanceof Node && rootRef.current?.contains(event.relatedTarget)) return;
 				close();
 			};
-			const settleSelection = (accepted) => {
-				if (accepted) {
+			const settleSelection = (result) => {
+				if (result === void 0) return;
+				if (result.ok) {
 					if (rootRef.current !== null) close(true);
 					return;
 				}
-				const message = directory.getSnapshot().error;
-				if (message !== null) {
-					noticeSeq.current += 1;
-					window.clearTimeout(noticeTimer.current);
-					setNotice({
-						seq: noticeSeq.current,
-						text: t("error.action", { message })
-					});
-					noticeTimer.current = window.setTimeout(() => {
-						setNotice(null);
-					}, 4e3);
-				}
+				const { error } = result;
+				noticeSeq.current += 1;
+				window.clearTimeout(noticeTimer.current);
+				setNotice({
+					seq: noticeSeq.current,
+					text: error.code === "session/writer-held" ? t("error.sessionInUse") : t("error.action", { message: `${error.code}: ${error.message}` })
+				});
+				noticeTimer.current = window.setTimeout(() => {
+					setNotice(null);
+				}, 4e3);
 			};
 			const choose = (selection) => {
 				const info = selection.provider === "pi-openrouter" ? metadata.get(selection.model) : void 0;
@@ -1898,7 +1897,7 @@ window.__ModuleLoader__.load({
 						load: () => {
 							if (available) directory.load().catch(() => {});
 						},
-						select: (selection) => available ? directory.select(selection).then(() => true, () => false) : Promise.resolve(false),
+						select: (selection) => available ? directory.select(selection) : Promise.resolve(void 0),
 						ts
 					};
 				}