dsh-connect-trae 1.0.0 → 1.0.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## Unreleased
+
+## 1.0.1 (2026-08-31)
+
+### Changes
+
+- 将 Cordis 插件运行 ID 从 `llm-trae` 统一调整为 `dsh-connect-trae`，与 npm 包名保持一致。已有 1.0.0 本地安装升级后如保留旧配置条目，需移除旧的 `llm-trae` 实例，避免重复加载。
+
+### Windows support
+
+- `src/identity.ts` 现按平台读取 `product.json`：macOS 保持原路径，新增 Windows 路径 `<LOCALAPPDATA>\Programs\<AppName>\resources\app\product.json`（缺失时回退 `<home>\AppData\Local`），Windows 上 `appVersion` 不再恒为 `undefined`，会随请求头发送 `x-app-version` / `x-ide-version`。
+- `src/identity.ts` 的 `osVersion` 在 Windows 上由 `win32 <release>` 规范化为 `Windows <release>`。
+- `src/identity.ts` / `src/model-cache.ts` 路径推导参数化（`platform` / `home` / `env` 可选注入，默认取真实环境），便于跨平台测试；所有平台判断统一使用同一平台源，避免 `x-device-type` 与 `x-os-version` 自相矛盾。
+- `src/model-cache.ts` 的 `state.vscdb` 路径按平台推导；该模块依赖 `sqlite3` 命令行，Windows 默认未安装，Raw Chat 探测会失败并安全回退（Raw Chat 默认关闭，不影响主流程），详见 README「Windows 说明」。
+- 新增 Windows / Linux / `sg` / `solo-sg` 的 identity 测试用例；修复 `tests/identity.spec.ts` 中依赖测试机平台类型的断言（现显式注入平台，Windows 真机与 CI 均可通过）。
+
 ## 1.0.0 (2026-08-30)
 
 ### Features

package/README.en.md

@@ -1,16 +1,29 @@
-# dsh-connect-trae
+<p align="center">
+  <img src="docs/assets/dsh-connect-trae-usage-card.png" width="860" alt="dsh-connect-trae settings panel" />
+</p>
 
-[English](README.en.md) | 中文
+<h1 align="center">dsh-connect-trae</h1>
 
-A [DeepSeek Harness (DSH)](https://github.com/deepseek-ai/deepseek-harness) bundle plugin that connects locally signed-in Trae CN models to the DSH model picker. Trae generates structured tool calls while DSH executes its own local tools, with a read-only Work/general credits and model-management panel.
+<p align="center"><b>Connect locally signed-in Trae models to DeepSeek Harness with local DSH tools and a read-only credits overview.</b></p>
 
-## Preview
+<p align="center">
+  <a href="README.md">中文</a> ·
+  <a href="#install">Install</a> ·
+  <a href="#how-it-works">How it works</a> ·
+  <a href="CHANGELOG.md">Changelog</a> ·
+  <a href="https://github.com/dingminhua/dsh-connect-trae/issues">Issues</a>
+</p>
 
 <p align="center">
-  <img src="docs/assets/dsh-connect-trae-usage-card.png" alt="DSH Connect Trae plugin card showing account selection, Work and general credits, and model management" width="900">
+  <a href="https://www.npmjs.com/package/dsh-connect-trae"><img src="https://img.shields.io/npm/v/dsh-connect-trae?style=flat-square&label=npm&color=cb3837" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/dsh-connect-trae"><img src="https://img.shields.io/npm/dm/dsh-connect-trae?style=flat-square&label=downloads" alt="npm downloads"></a>
+  <a href="https://github.com/dingminhua/dsh-connect-trae/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/dingminhua/dsh-connect-trae/ci.yml?branch=main&style=flat-square&label=tests" alt="test status"></a>
+  <a href="LICENSE"><img src="https://img.shields.io/github/license/dingminhua/dsh-connect-trae?style=flat-square" alt="MIT license"></a>
+  <a href="https://github.com/dingminhua/dsh-connect-trae/stargazers"><img src="https://img.shields.io/github/stars/dingminhua/dsh-connect-trae?style=flat-square" alt="GitHub stars"></a>
+  <a href="https://dshfind.com/plugins/dingminhua/dsh-connect-trae"><img src="https://dshfind.com/api/badge/dingminhua/dsh-connect-trae" alt="dshfind plugin"></a>
 </p>
 
-<p align="center"><sub>Settings → Plugins → DSH Connect Trae: switch local Trae accounts, view Work/general credits, and manage the Trae models enabled in DSH.</sub></p>
+A [DeepSeek Harness (DSH)](https://github.com/deepseek-ai/deepseek-harness) bundle plugin that connects locally signed-in Trae CN models to the DSH model picker. Trae generates structured tool calls while DSH executes its own local tools, with a read-only Work/general credits and model-management panel.
 
 ## Features
 
@@ -50,6 +63,13 @@ npm install dsh-connect-trae
 
 Restart the DSH process after install/update/uninstall.
 
+## Windows notes
+
+- **Account data directory**: the plugin reads `%APPDATA%\Trae CN` / `%APPDATA%\TRAE SOLO CN` → `User\globalStorage\storage.json` (unrelated to the install directory). The folder names match macOS, so no extra config is needed; if the name does not match, point the `authFile` + `edition` plugin options at the exact path.
+- **App version headers**: the plugin reads `appVersion` from `<LOCALAPPDATA>\Programs\<AppName>\resources\app\product.json` and sends `x-app-version` / `x-ide-version`; if unreadable, those headers are omitted (same as the previous behavior).
+- **Raw Chat probing (known limitation)**: `model-cache` depends on the `sqlite3` command-line tool, which is not installed by default on Windows; Raw Chat capability probing fails and falls back safely. Raw Chat is off by default and does not affect the main flow.
+- See `docs/WINDOWS_TOKEN_PROBE.md` for troubleshooting.
+
 ## Development
 
 ```sh

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <b>dsh-connect-trae</b>
+  <img src="docs/assets/dsh-connect-trae-usage-card.png" width="860" alt="dsh-connect-trae settings panel" />
 </p>
 
 <h1 align="center">dsh-connect-trae</h1>
@@ -16,19 +16,15 @@
 
 <p align="center">
   <a href="https://www.npmjs.com/package/dsh-connect-trae"><img src="https://img.shields.io/npm/v/dsh-connect-trae?style=flat-square&label=npm&color=cb3837" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/dsh-connect-trae"><img src="https://img.shields.io/npm/dm/dsh-connect-trae?style=flat-square&label=downloads" alt="npm downloads"></a>
+  <a href="https://github.com/dingminhua/dsh-connect-trae/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/dingminhua/dsh-connect-trae/ci.yml?branch=main&style=flat-square&label=tests" alt="test status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/github/license/dingminhua/dsh-connect-trae?style=flat-square" alt="MIT license"></a>
+  <a href="https://github.com/dingminhua/dsh-connect-trae/stargazers"><img src="https://img.shields.io/github/stars/dingminhua/dsh-connect-trae?style=flat-square" alt="GitHub stars"></a>
+  <a href="https://dshfind.com/plugins/dingminhua/dsh-connect-trae"><img src="https://dshfind.com/api/badge/dingminhua/dsh-connect-trae" alt="dshfind plugin"></a>
 </p>
 
 一个独立的 [DeepSeek Harness (DSH)](https://github.com/deepseek-ai/deepseek-harness) bundle 插件。它把本机已登录的 Trae 中国区账号接到 DSH 的模型选择器：模型负责生成结构化工具调用，`bash` / `read` / `write` / `edit` 等工具由 DSH 本地执行；同时提供**只读**的 Work/通用积分与模型管理界面。
 
-## 效果预览
-
-<p align="center">
-  <img src="docs/assets/dsh-connect-trae-usage-card.png" alt="DSH Connect Trae 插件卡片：Trae 账号、Work 与通用积分以及模型管理" width="900">
-</p>
-
-<p align="center"><sub>设置 → 插件配置 → DSH Connect Trae：切换本机 Trae 账号、查看 Work/通用积分，并管理 DSH 中启用的 Trae 模型。</sub></p>
-
 ## 功能特性
 
 - **Trae 模型接入** —— 把本机登录的 Trae 模型注册为 DSH 的 `trae` provider，模型选择器出现 `DeepSeek-V4-Flash`、`DeepSeek-V4-Pro` 等。
@@ -69,6 +65,13 @@ npm install dsh-connect-trae
 
 安装、更新或卸载 bundle 后，需要重启对应的 DSH 进程。
 
+## Windows 说明
+
+- **账号数据目录**：插件读取 `%APPDATA%\Trae CN` / `%APPDATA%\TRAE SOLO CN` 下的 `User\globalStorage\storage.json`（与安装目录无关）。目录名与 macOS 一致，无需额外配置；若目录名对不上，可用插件配置项 `authFile` + `edition` 直接指定完整路径。
+- **应用版本头**：插件从安装目录 `<LOCALAPPDATA>\Programs\<AppName>\resources\app\product.json` 读取 `appVersion`，随请求发送 `x-app-version` / `x-ide-version`；读不到时这些头不发送（与旧版行为一致）。
+- **Raw Chat 探测（已知限制）**：`model-cache` 依赖 `sqlite3` 命令行，Windows 默认未安装，Raw Chat 能力探测会失败并安全回退。Raw Chat 默认关闭，不影响主流程。
+- 排查指引见 `docs/WINDOWS_TOKEN_PROBE.md`。
+
 ## 开发
 
 ```sh

package/cordis.patch.yml

@@ -1,4 +1,4 @@
 # Register the Trae provider without changing the profile's default model.
 - insert:
-    - id: llm-trae
+    - id: dsh-connect-trae
       name: dsh-connect-trae

package/lib/index.d.ts

@@ -213,8 +213,16 @@ interface TraeIdentity {
   osVersion?: string;
   platform: NodeJS.Platform;
 }
+interface TraeIdentityReadOptions {
+  /** Platform override for testing; defaults to process.platform. */
+  platform?: NodeJS.Platform;
+  /** Home-directory override for testing; defaults to homedir(). */
+  home?: string;
+  /** Environment override for testing; defaults to process.env. */
+  env?: NodeJS.ProcessEnv;
+}
 /** Read stable identity from Trae-owned files without generating impersonated IDs. */
-declare function readTraeIdentity(candidate: TraeStorageCandidate): Promise<TraeIdentity>;
+declare function readTraeIdentity(candidate: TraeStorageCandidate, options?: TraeIdentityReadOptions): Promise<TraeIdentity>;
 /** Headers derived from actual persisted identity, never a new random identity per request. */
 declare function identityHeaders(identity: TraeIdentity): Record<string, string>;
 //#endregion
@@ -244,8 +252,20 @@ interface TraeCachedModelConfig {
 }
 /** Parse a safe subset of one cached model entry; credentials and endpoints are intentionally omitted. */
 declare function parseTraeCachedModel(value: unknown): TraeCachedModelConfig | undefined;
-/** Read Trae's own current user's model map via sqlite3 without exposing secrets. */
-declare function readTraeCachedModel(functionName: string, modelName: string, userId: string): Promise<TraeCachedModelConfig | undefined>;
+interface TraeCachedModelReadOptions {
+  /** Platform override for testing; defaults to process.platform. */
+  platform?: NodeJS.Platform;
+  /** Home-directory override for testing; defaults to homedir(). */
+  home?: string;
+  /** Environment override for testing; defaults to process.env. */
+  env?: NodeJS.ProcessEnv;
+}
+/**
+ * Read Trae's own current user's model map via sqlite3 without exposing
+ * secrets. The sqlite3 command line is a macOS prerequisite; on Windows it is
+ * typically absent, so the call fails and callers fall back gracefully.
+ */
+declare function readTraeCachedModel(functionName: string, modelName: string, userId: string, options?: TraeCachedModelReadOptions): Promise<TraeCachedModelConfig | undefined>;
 //#endregion
 //#region src/model-extra-config.d.ts
 interface TraeRawChatBehaviorConfig {
@@ -952,7 +972,7 @@ declare function traeWebUsage(deps: TraeUsageRouteOptions): Promise<TraeWebUsage
 declare function registerTraeUsageRoute(ctx: Context, deps: TraeUsageRouteOptions): void;
 //#endregion
 //#region src/index.d.ts
-declare const name = "llm-trae";
+declare const name = "dsh-connect-trae";
 declare const inject: string[];
 declare const TRAE_SETTINGS_NS: import("@deepseek-ai/dsh-settings").SettingsNamespace;
 interface Config {

package/lib/index.js

@@ -834,7 +834,10 @@ function deviceCenterId(storage) {
 	return ids.length === 1 ? ids[0] : void 0;
 }
 /** Read stable identity from Trae-owned files without generating impersonated IDs. */
-async function readTraeIdentity(candidate) {
+async function readTraeIdentity(candidate, options = {}) {
+	const platform = options.platform ?? process.platform;
+	const home = options.home ?? homedir();
+	const env = options.env ?? process.env;
 	const storage = JSON.parse(await readFile(candidate.path, "utf8"));
 	const appRoot = dirname(dirname(dirname(candidate.path)));
 	const machineFile = nonEmpty(await readFile(join(appRoot, "machineid"), "utf8").catch(() => ""));
@@ -845,16 +848,24 @@ async function readTraeIdentity(candidate) {
 	if (machineId === void 0) throw new Error(`Trae ${candidate.edition} has no stable machine identity`);
 	const deviceId = dcDevice ?? devDevice ?? createHash("sha256").update(machineId).digest("hex").slice(0, 32);
 	const buildVersion = nonEmpty(storage["iCubeLastVersion"]);
-	const productPaths = candidate.edition === "cn" || candidate.edition === "solo" ? [candidate.edition === "cn" ? "/Applications/Trae CN.app/Contents/Resources/app/product.json" : "/Applications/TRAE SOLO CN.app/Contents/Resources/app/product.json"] : [];
+	const appName = candidate.edition === "cn" ? "Trae CN" : candidate.edition === "solo" ? "TRAE SOLO CN" : void 0;
+	const productPaths = [];
+	if (appName !== void 0 && (platform === "darwin" || platform === "win32")) {
+		if (platform === "darwin") productPaths.push(join("/Applications", `${appName}.app`, "Contents", "Resources", "app", "product.json"));
+		else {
+			const localRoots = [env.LOCALAPPDATA, join(home, "AppData", "Local")].filter((value) => typeof value === "string" && value !== "").filter((value, index, all) => all.indexOf(value) === index);
+			for (const root of localRoots) productPaths.push(join(root, "Programs", appName, "resources", "app", "product.json"));
+		}
+	}
 	let product = {};
 	for (const path of productPaths) try {
 		product = JSON.parse(await readFile(path, "utf8"));
 		break;
 	} catch {}
 	const appVersion = nonEmpty(product["appVersion"]);
-	const deviceBrand = process.platform === "darwin" ? nonEmpty(process.env["TRAE_DEVICE_BRAND"]) : void 0;
+	const deviceBrand = platform === "darwin" ? nonEmpty(env["TRAE_DEVICE_BRAND"]) : void 0;
 	const deviceCpu = cpus()[0]?.model.split(" ")[0];
-	const osVersion = `${process.platform === "darwin" ? "macOS" : process.platform} ${release()}`;
+	const osVersion = `${platform === "darwin" ? "macOS" : platform === "win32" ? "Windows" : platform} ${release()}`;
 	return {
 		edition: candidate.edition,
 		machineId,
@@ -864,7 +875,7 @@ async function readTraeIdentity(candidate) {
 		...deviceBrand === void 0 ? {} : { deviceBrand },
 		...deviceCpu === void 0 ? {} : { deviceCpu },
 		osVersion,
-		platform: process.platform
+		platform
 	};
 }
 /** Headers derived from actual persisted identity, never a new random identity per request. */
@@ -2320,9 +2331,16 @@ function parseTraeCachedModel(value) {
 		...typeof raw["model_type"] === "string" ? { modelType: raw["model_type"] } : {}
 	};
 }
-/** Read Trae's own current user's model map via sqlite3 without exposing secrets. */
-async function readTraeCachedModel(functionName, modelName, userId) {
-	const database = join(homedir(), "Library", "Application Support", "Trae CN", "User", "globalStorage", "state.vscdb");
+/**
+* Read Trae's own current user's model map via sqlite3 without exposing
+* secrets. The sqlite3 command line is a macOS prerequisite; on Windows it is
+* typically absent, so the call fails and callers fall back gracefully.
+*/
+async function readTraeCachedModel(functionName, modelName, userId, options = {}) {
+	const platform = options.platform ?? process.platform;
+	const home = options.home ?? homedir();
+	const env = options.env ?? process.env;
+	const database = platform === "win32" ? join(env.APPDATA ?? join(home, "AppData", "Roaming"), "Trae CN", "User", "globalStorage", "state.vscdb") : join(home, "Library", "Application Support", "Trae CN", "User", "globalStorage", "state.vscdb");
 	const key = `${userId}_AI.agent.model.model_list_map`;
 	const sql = `select value from ItemTable where key=${JSON.stringify(key)} limit 1;`;
 	const { stdout } = await execFileAsync("sqlite3", [database, sql], { maxBuffer: 8388608 });
@@ -2915,7 +2933,7 @@ var UnconfiguredTraeUpstreamClient = class {
 };
 //#endregion
 //#region src/index.ts
-const name = "llm-trae";
+const name = "dsh-connect-trae";
 const inject = ["llm"];
 const TRAE_SETTINGS_NS = settingsNamespace("trae");
 const modelConfig = z.object({

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-connect-trae",
   "displayName": "DSH Connect Trae",
   "description": "Connect locally signed-in Trae models to DeepSeek Harness, plus a read-only usage/credits summary.",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "dingminhua",
   "copyright": "Copyright (c) 2026 LaoDing",
   "license": "MIT",