dsh-connect-trae 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 2.0.2 (2026-09-15)
+
+### Fixes
+
+- **修复「Trae 目录里有、插件列表里没有」的整类问题**（issue #7：GLM-5.3 缺失）——根因是**模型调用的 `function` 选错了**，不是目录读取有误：
+  - Trae 把可调用目录**分散在多个 SOLO 模式 function 下**，且一个模型**只能通过列出它的那个 function 调用**。插件此前固定用 `solo_work_lite` 取目录与发请求，而 `glm-5.3` 只存在于 **`solo_work_remote`**：用前者调用会被上游拒绝（`4001 param is invalid`），用后者则正常流式返回（2026-09-15 受控实测，同一份请求体，仅 function 不同）。
+  - **目录发现改为多 function 并集**：CN 依序请求 `solo_work_remote` → `solo_work_lite`，国际请求 `solo_agent` → `solo_work_remote` → `solo_work_lite`；同一个 config 由**先列出的 function 拥有**（顺序即优先级）。某个 function 失败不再影响其它 function 的目录。
+  - **聊天请求按模型回放其来源 function**：每个模型随目录记下 `wireFunction`（并纳入设置 schema 持久化，重启后仍生效），调用时写回请求体——`glm-5.3` 因而会走 `solo_work_remote`。
+  - 顺带确认：CN 的两个登录（Trae CN IDE 与 TRAE SOLO CN）在同一 function 下拿到**完全相同**的列表，因此该修复对两者一致生效；国际版覆盖最全的仍是 `solo_agent`。
+  - 新增 4 个回归测试（多 function 并集、来源 function 标记、优先级归属、显式 function 覆盖默认值），230/230 全绿。
+- **目录拉取失败时重试一次**——Trae 的目录端点存在间歇性 401/限流（实测同一凭证数秒前 200、随后 401）。启动时若恰好撞上，live 目录会拉取失败并**静默回退到上次保存的快照**，从而丢掉自那次保存以来的所有新模型（本版要放出的 glm-5.3 就在其中，实测复现）。现在合并骨架（remote 目录）失败会先重试一次（800ms 间隔）再降级。
+
+## 2.0.1 (2026-09-15)
+
+### Fixes
+
+- **修复纯 CLI 环境（WSL2 等）下「账号已识别但模型目录拉不出来、聊天也全部失败」**（issue #5 后续反馈）——1.4.2 让凭据层认得了 `traecli` 的裸 JWT，但**身份层只认桌面版 `storage.json`**：只装 CLI 的机器上没有任何桌面安装，`x-machine-id` / `x-device-id` 的来源解析直接抛「Trae storage was not found」，而目录查询与聊天请求的构造都需要它，于是模型目录永远停在兜底列表、选中模型也无法对话。现在身份解析在「桌面安装全部不存在」时降级到 **CLI 家目录自身的持久化标识**：
+  - `~/.trae-cn/argv.json` 的 `crash-reporter-id`（CLI 首次运行时写入的稳定 UUID）作为设备 ID；
+  - `~/.trae-cn/builtin/ide_version.json` 的 `version` 作为 `x-app-version`；
+  - 由设备 ID + 主机名 + 用户名做 SHA-256 得到 64 字符 `x-machine-id`（与官方客户端形态一致）。
+  全部取自 CLI 自己写下的稳定值，**不是每次请求随机生成**（延续本项目既有红线）；有桌面安装时仍优先使用桌面 `machineid` / `telemetry.machineId`。文件存在但内容损坏时依旧暴露真实解析错误，不被降级掩盖。
+- 修复 CI 在 ubuntu-latest 上的测试失败：`auth.spec.ts` 的 edition 收窄用例断言了候选数量为 1，而 Linux 会对每个 edition 并列探测多个目录拼写（`trae-solo` / `TRAE SOLO`），候选数为 2 —— 该多候选是 1.4.2 为 Linux 特意加的设计。测试改为断言收窄语义本身（候选数 > 0 且全部属于该 edition 的桌面安装），并已对 darwin / linux / win32 三平台逐一验证。
+
 ## 2.0.0 (2026-09-15)
 
 ### Breaking Changes

package/lib/index.d.ts

@@ -109,6 +109,8 @@ interface TraeModelInfo {
   maxContextWindow?: number;
   /** The `config_name` `llm_utils_chat` accepts; absent means `id` is already the wire id. */
   wireConfigName?: string;
+  /** The directory function this model must be called through (see {@link TraeWireModel.function}). */
+  wireFunction?: string;
 }
 /** Bootstrap catalog: identity only where current Trae metadata has not been fetched yet. */
 declare const FALLBACK_TRAE_MODELS: readonly TraeModelInfo[];
@@ -147,6 +149,14 @@ interface TraeWireModel {
   contextWindow?: number;
   maxTokens?: number;
   reasoning?: TraeReasoningCapability;
+  /**
+   * The `get_detail_param` function this config_name came from. Trae splits its
+   * callable roster across several functions (SOLO modes), and a model is only
+   * callable through the function that actually lists it — glm-5.3 answers
+   * `solo_work_remote` but rejects `solo_work_lite` with 4001. The chat call
+   * therefore has to replay the directory's own function.
+   */
+  function?: string;
 }
 /**
  * Merge the two Trae model sources into one authoritative catalog.
@@ -477,6 +487,37 @@ declare function readTraeIdentity(candidate: TraeStorageCandidate, options?: Tra
  * a candidate that exists but fails to parse still surfaces its own error.
  */
 declare function pickTraeStorageIdentity(candidates: readonly TraeStorageCandidate[], options?: TraeIdentityReadOptions): Promise<TraeIdentity>;
+/**
+ * Deterministic identity for a machine that only has the Trae CLI (`traecli`).
+ *
+ * A CLI-only machine has no desktop `storage.json`, so the desktop identity
+ * reader has nothing to read — yet the request headers still need stable
+ * machine/device ids. Everything here comes from identifiers the CLI itself
+ * persists (never a per-request random value):
+ *
+ *   - `argv.json`'s `crash-reporter-id` — a stable per-install UUID the CLI
+ *     writes on first run; used directly as the device id.
+ *   - `builtin/ide_version.json`'s `version` — the CLI build, sent as
+ *     `x-app-version` (the desktop reader gets this from `product.json`).
+ *   - a SHA-256 over the device id, host name and user name for `machineId`,
+ *     matching the 64-char hex shape the official clients send.
+ *
+ * When `crash-reporter-id` is absent the device id falls back to the same
+ * hash (still deterministic). A machine with no CLI home at all keeps failing
+ * loudly — a fabricated identity is worse than a visible "not signed in".
+ */
+declare function readTraeCliIdentity(edition: TraeEdition, options?: TraeIdentityReadOptions): Promise<TraeIdentity>;
+/**
+ * Resolve the request identity for one region: the desktop storage identity
+ * when any desktop install exists, otherwise the CLI home's deterministic
+ * identity (see {@link readTraeCliIdentity}).
+ *
+ * This is the seam the WSL2 / CLI-only case needs: `traecli` writes its token
+ * to `~/.trae-cn/trae-jwt-token` and no `storage.json` exists anywhere, so
+ * desktop-only resolution used to fail every directory refresh and chat
+ * request even though the account itself was found.
+ */
+declare function resolveTraeIdentity(candidates: readonly TraeStorageCandidate[], edition: TraeEdition, 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
@@ -965,13 +1006,15 @@ declare function decodeTraeEvent(event: SseEvent): TraeStreamEvent;
 declare const TRAE_SOLO_FUNCTION = "solo_work_lite";
 declare const TRAE_SOLO_CHAT_PATH = "/api/agent/v3/llm_utils_chat";
 declare const TRAE_SOLO_MODELS_PATH = "/api/ide/v1/get_detail_param";
-declare function prepareSoloBody(source: string, defaultModel?: string): string;
+declare function prepareSoloBody(source: string, defaultModel?: string, functionName?: string): string;
 interface TraeSoloModel {
   id: string;
   name: string;
   contextWindow?: number;
   maxTokens?: number;
   reasoning?: TraeReasoningCapability;
+  /** The directory function that listed this config (replayed when calling it). */
+  function?: string;
 }
 interface TraeSoloClientOptions {
   credential(): Promise<TraeCredential>;
@@ -984,15 +1027,39 @@ declare class TraeSoloUpstreamClient {
   private readonly options;
   private readonly fetchImpl;
   constructor(options: TraeSoloClientOptions);
+  /**
+   * Read the callable roster for this credential's region.
+   *
+   * Every function in {@link TRAE_DIRECTORY_FUNCTIONS} is asked, in order, and
+   * their answers are unioned: the first function to list a `config_name` owns
+   * it. Trae splits its roster across SOLO modes, and a model is only callable
+   * through the function that lists it (glm-5.3 exists solely under
+   * `solo_work_remote` on the CN gateway). Asking one function therefore
+   * silently hides models that the other one serves. The remote directory
+   * remains the merge skeleton, so agent-internal entries (search_agent_*,
+   * paygo variants) never surface even though they appear here.
+   */
   fetchModels(signal?: AbortSignal): Promise<TraeSoloModel[]>;
-  chatStream(bodyJson: string, signal?: AbortSignal): Promise<TraeChatResult>;
+  /** Merge one function's config list into the shared catalogue (first wins). */
+  private collectModels;
+  chatStream(bodyJson: string, signal?: AbortSignal, functionName?: string): Promise<TraeChatResult>;
 }
 //#endregion
 //#region src/solo-bridge.d.ts
 /** Convert Trae's named SSE events into OpenAI chat-completion SSE chunks. */
 declare function bridgeTraeSoloStream(response: Response, model: string): Response;
-/** Resolves a display model id to the real llm_utils_chat config_name. */
-type TraeWireResolver = (displayId: string) => string | undefined;
+/**
+ * One resolved wire target: the `config_name` `llm_utils_chat` accepts, plus
+ * the directory function that listed it. Trae's roster is split across several
+ * SOLO-mode functions and a model is only callable through the one listing it
+ * (glm-5.3 answers only under `solo_work_remote`), so the chat call replays it.
+ */
+interface TraeWireTarget {
+  configName: string;
+  function?: string;
+}
+/** Resolves a display model id to its wire target (config_name + function). */
+type TraeWireResolver = (displayId: string) => TraeWireTarget | undefined;
 /** Native SOLO client wrapper used by the loopback OpenAI adapter. */
 declare class TraeSoloBridge implements TraeUpstreamClient {
   private readonly upstream;
@@ -1390,4 +1457,4 @@ declare function regionStateOf(config: Config, region: TraeRegion): TraeRegionSt
 declare const Config: z<Config>;
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, type RawChatDelta, type RawChatMessage, type RawChatTool, SseDecoder, type SseEvent, TRAE_AI_PROVIDER, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeAdapter, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, type TraeCheckinStatus, type TraeContextBudget, type TraeCredential, TraeCredentialStore, TraeDelegatingUpstreamClient, type TraeDiscoveredModel, type TraeDiscoveredReasoning, type TraeEdition, TraeFallbackUpstreamClient, type TraeFallbackUpstreamOptions, type TraeFusionRawChatEnvelope, TraeGatedUpstreamClient, type TraeGatedUpstreamOptions, type TraeIdentity, type TraeInputModality, type TraeModelDetailRequest, type TraeModelInfo, type TraeObservedModelConfig, TraeRawCapabilityController, type TraeRawCapabilityControllerOptions, type TraeRawCapabilitySnapshot, TraeRawCapabilityState, type TraeRawChatBehaviorConfig, type TraeRawChatCapability, type TraeRawChatClientOptions, type TraeRawChatConfig, type TraeRawChatFailureReason, type TraeRawChatRuntimeConfig, TraeRawChatUpstreamClient, type TraeRawDiagnostic, type TraeRawDiagnosticState, type TraeRawGateway, type TraeRawGatewayOptions, type TraeRawResolverResult, type TraeReasoningCapability, type TraeReasoningEffort, type TraeRefreshDevice, type TraeRegion, type TraeRegionGateways, TraeRegionState, type TraeShim, TraeSoloBridge, type TraeSoloClientOptions, TraeSoloRemoteCatalogClient, type TraeSoloRemoteCatalogOptions, TraeSoloUpstreamClient, type TraeStorageCandidate, type TraeStreamEvent, type TraeUpstreamClient, TraeUsageClient, type TraeUsageOptions, type TraeUsagePack, type TraeUsageRouteOptions, type TraeUsageSnapshot, type TraeUsageSummary, type TraeUsageView, type TraeWebActivity, type TraeWebCheckin, type TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, mergeTraeModelSources, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeIdentity, refreshTraeCredential, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage, withTraeRegion };
+export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, type RawChatDelta, type RawChatMessage, type RawChatTool, SseDecoder, type SseEvent, TRAE_AI_PROVIDER, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeAdapter, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, type TraeCheckinStatus, type TraeContextBudget, type TraeCredential, TraeCredentialStore, TraeDelegatingUpstreamClient, type TraeDiscoveredModel, type TraeDiscoveredReasoning, type TraeEdition, TraeFallbackUpstreamClient, type TraeFallbackUpstreamOptions, type TraeFusionRawChatEnvelope, TraeGatedUpstreamClient, type TraeGatedUpstreamOptions, type TraeIdentity, type TraeInputModality, type TraeModelDetailRequest, type TraeModelInfo, type TraeObservedModelConfig, TraeRawCapabilityController, type TraeRawCapabilityControllerOptions, type TraeRawCapabilitySnapshot, TraeRawCapabilityState, type TraeRawChatBehaviorConfig, type TraeRawChatCapability, type TraeRawChatClientOptions, type TraeRawChatConfig, type TraeRawChatFailureReason, type TraeRawChatRuntimeConfig, TraeRawChatUpstreamClient, type TraeRawDiagnostic, type TraeRawDiagnosticState, type TraeRawGateway, type TraeRawGatewayOptions, type TraeRawResolverResult, type TraeReasoningCapability, type TraeReasoningEffort, type TraeRefreshDevice, type TraeRegion, type TraeRegionGateways, TraeRegionState, type TraeShim, TraeSoloBridge, type TraeSoloClientOptions, TraeSoloRemoteCatalogClient, type TraeSoloRemoteCatalogOptions, TraeSoloUpstreamClient, type TraeStorageCandidate, type TraeStreamEvent, type TraeUpstreamClient, TraeUsageClient, type TraeUsageOptions, type TraeUsagePack, type TraeUsageRouteOptions, type TraeUsageSnapshot, type TraeUsageSummary, type TraeUsageView, type TraeWebActivity, type TraeWebCheckin, type TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, mergeTraeModelSources, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage, withTraeRegion };

package/lib/index.js

@@ -156,7 +156,8 @@ function mergeTraeModelSources(remote, wire) {
 				reasoning: model.reasoning,
 				reasoningEfforts: Object.fromEntries(model.reasoning.supported.map((effort) => [effort, effort === "low" ? "light" : effort === "xhigh" ? "extra_high" : "high"]))
 			},
-			...wireModel.id !== "" && wireModel.id !== model.id ? { wireConfigName: wireModel.id } : {}
+			...wireModel.id !== "" && wireModel.id !== model.id ? { wireConfigName: wireModel.id } : {},
+			...wireModel.function === void 0 ? {} : { wireFunction: wireModel.function }
 		});
 	}
 	return result;
@@ -1381,6 +1382,8 @@ async function readTraeIdentity(candidate, options = {}) {
 function isFileMissing(error) {
 	return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
 }
+/** Prefix of the "no candidate exists on disk" error; see {@link resolveTraeIdentity}. */
+const STORAGE_MISSING_PREFIX = "Trae storage was not found";
 /**
 * Try candidates in order and return the first that yields a valid identity;
 * fail hard only when none do. Mirrors the credential store's skip-missing
@@ -1399,9 +1402,96 @@ async function pickTraeStorageIdentity(candidates, options = {}) {
 		if (!isFileMissing(error)) anyPresent = true;
 	}
 	const tried = candidates.map((item) => item.path).join(" or ");
-	if (!anyPresent) throw new Error(`Trae storage was not found (${tried})`);
+	if (!anyPresent) throw new Error(`${STORAGE_MISSING_PREFIX} (${tried})`);
 	throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error(`Trae identity could not be resolved (${tried})`);
 }
+/** CLI dotfile home per edition; the CLI keeps its own home, not an Application Support entry. */
+const CLI_HOME_BY_EDITION = {
+	cn: ".trae-cn",
+	solo: ".trae-cn",
+	sg: ".trae",
+	"solo-sg": ".trae"
+};
+/**
+* Deterministic identity for a machine that only has the Trae CLI (`traecli`).
+*
+* A CLI-only machine has no desktop `storage.json`, so the desktop identity
+* reader has nothing to read — yet the request headers still need stable
+* machine/device ids. Everything here comes from identifiers the CLI itself
+* persists (never a per-request random value):
+*
+*   - `argv.json`'s `crash-reporter-id` — a stable per-install UUID the CLI
+*     writes on first run; used directly as the device id.
+*   - `builtin/ide_version.json`'s `version` — the CLI build, sent as
+*     `x-app-version` (the desktop reader gets this from `product.json`).
+*   - a SHA-256 over the device id, host name and user name for `machineId`,
+*     matching the 64-char hex shape the official clients send.
+*
+* When `crash-reporter-id` is absent the device id falls back to the same
+* hash (still deterministic). A machine with no CLI home at all keeps failing
+* loudly — a fabricated identity is worse than a visible "not signed in".
+*/
+async function readTraeCliIdentity(edition, options = {}) {
+	const platform = options.platform ?? process.platform;
+	const home = options.home ?? homedir();
+	const env = options.env ?? process.env;
+	const cliHome = join(home, CLI_HOME_BY_EDITION[edition]);
+	const argv = await readJsonFile(join(cliHome, "argv.json"));
+	const version = await readJsonFile(join(cliHome, "builtin", "ide_version.json"));
+	const crashReporterId = nonEmpty(argv?.["crash-reporter-id"]);
+	const host = nonEmpty(env["HOSTNAME"]) ?? await readHostname() ?? "unknown-host";
+	const user = nonEmpty(env["USER"]) ?? nonEmpty(env["USERNAME"]) ?? "unknown-user";
+	const deviceId = crashReporterId ?? createHash("sha256").update(`trae-cli\0${host}\0${user}`).digest("hex").slice(0, 32);
+	const machineId = createHash("sha256").update(`trae-cli-machine\0${deviceId}\0${host}`).digest("hex");
+	const appVersion = nonEmpty(version?.["version"]);
+	const deviceCpu = cpus()[0]?.model.split(" ")[0];
+	const osVersion = `${platform === "darwin" ? "macOS" : platform === "win32" ? "Windows" : platform} ${release()}`;
+	return {
+		edition,
+		machineId,
+		deviceId,
+		...appVersion === void 0 ? {} : { appVersion },
+		...deviceCpu === void 0 ? {} : { deviceCpu },
+		osVersion,
+		platform
+	};
+}
+/** Read and parse a JSON file, tolerating absence and malformed content. */
+async function readJsonFile(path) {
+	try {
+		const parsed = JSON.parse(await readFile(path, "utf8"));
+		return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : void 0;
+	} catch {
+		return;
+	}
+}
+/** OS host name, or undefined when unavailable. */
+async function readHostname() {
+	try {
+		const { hostname } = await import("node:os");
+		return nonEmpty(hostname());
+	} catch {
+		return;
+	}
+}
+/**
+* Resolve the request identity for one region: the desktop storage identity
+* when any desktop install exists, otherwise the CLI home's deterministic
+* identity (see {@link readTraeCliIdentity}).
+*
+* This is the seam the WSL2 / CLI-only case needs: `traecli` writes its token
+* to `~/.trae-cn/trae-jwt-token` and no `storage.json` exists anywhere, so
+* desktop-only resolution used to fail every directory refresh and chat
+* request even though the account itself was found.
+*/
+async function resolveTraeIdentity(candidates, edition, options = {}) {
+	try {
+		return await pickTraeStorageIdentity(candidates, options);
+	} catch (error) {
+		if (!(error instanceof Error) || !error.message.startsWith(STORAGE_MISSING_PREFIX)) throw error;
+		return readTraeCliIdentity(edition, options);
+	}
+}
 /** Headers derived from actual persisted identity, never a new random identity per request. */
 function identityHeaders(identity) {
 	return {
@@ -1729,6 +1819,25 @@ function applyReasoningEffort(body, effort, capability) {
 //#endregion
 //#region src/solo.ts
 const TRAE_SOLO_FUNCTION = "solo_work_lite";
+/**
+* Directory functions to union per region, in priority order.
+*
+* Trae spreads its callable roster across several SOLO-mode functions, and a
+* model is only usable through the one that lists it: `glm-5.3` is absent from
+* `solo_work_lite` but present in `solo_work_remote` (verified 2026-09-15 —
+* calling it through the former answers `4001 param is invalid`, through the
+* latter streams normally). Rather than betting on a single function, the
+* directory unions them; the first function to provide a config wins, so the
+* order below decides which wire name a model is called with.
+*/
+const TRAE_DIRECTORY_FUNCTIONS = {
+	cn: ["solo_work_remote", TRAE_SOLO_FUNCTION],
+	ai: [
+		"solo_agent",
+		"solo_work_remote",
+		TRAE_SOLO_FUNCTION
+	]
+};
 const TRAE_SOLO_CHAT_PATH = "/api/agent/v3/llm_utils_chat";
 const TRAE_SOLO_MODELS_PATH = "/api/ide/v1/get_detail_param";
 function classify(status) {
@@ -1742,14 +1851,14 @@ function classify(status) {
 function finitePositive$1(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : void 0;
 }
-function prepareSoloBody(source, defaultModel = "glm-5.2") {
+function prepareSoloBody(source, defaultModel = "glm-5.2", functionName) {
 	const input = JSON.parse(source);
 	const model = typeof input["model"] === "string" && input["model"].trim() !== "" ? input["model"].trim() : defaultModel;
 	const body = {
 		...Array.isArray(input["messages"]) ? { messages: input["messages"] } : {},
 		model,
 		config_name: model,
-		function: TRAE_SOLO_FUNCTION,
+		function: typeof input["function"] === "string" && input["function"] !== "" ? input["function"] : functionName ?? "solo_work_lite",
 		stream: true,
 		...Array.isArray(input["tools"]) ? { tools: input["tools"] } : {},
 		...typeof input["reasoning_effort"] === "string" ? { reasoning_effort: input["reasoning_effort"] } : {}
@@ -1791,32 +1900,60 @@ var TraeSoloUpstreamClient = class {
 		this.options = options;
 		this.fetchImpl = options.fetchImpl ?? fetch;
 	}
+	/**
+	* Read the callable roster for this credential's region.
+	*
+	* Every function in {@link TRAE_DIRECTORY_FUNCTIONS} is asked, in order, and
+	* their answers are unioned: the first function to list a `config_name` owns
+	* it. Trae splits its roster across SOLO modes, and a model is only callable
+	* through the function that lists it (glm-5.3 exists solely under
+	* `solo_work_remote` on the CN gateway). Asking one function therefore
+	* silently hides models that the other one serves. The remote directory
+	* remains the merge skeleton, so agent-internal entries (search_agent_*,
+	* paygo variants) never surface even though they appear here.
+	*/
 	async fetchModels(signal) {
 		const [credential, identity] = await Promise.all([this.options.credential(), this.options.identity()]);
 		const region = regionOfCredential(credential);
 		const base = this.options.baseUrl ?? REGION_GATEWAYS[region].chat;
-		const directoryFunction = region === "ai" ? "solo_agent" : TRAE_SOLO_FUNCTION;
-		const response = await this.fetchImpl(traeEndpoint(base, TRAE_SOLO_MODELS_PATH), {
-			method: "POST",
-			headers: {
-				...buildTraeCnHeaders(credential, identity),
-				Accept: "application/json"
-			},
-			body: JSON.stringify({
-				function: directoryFunction,
-				config_names: null,
-				need_prompt: false,
-				current_config_info: null,
-				poly_prompt: true,
-				mode_type: null,
-				agent_type: null
-			}),
-			signal: signal ?? AbortSignal.timeout(3e4)
-		});
-		if (!response.ok) throw new Error(`Trae SOLO models returned HTTP ${response.status}`);
-		const document = await response.json();
-		const list = Array.isArray(document["config_info_list"]) ? document["config_info_list"] : [];
-		const models = [];
+		const headers = {
+			...buildTraeCnHeaders(credential, identity),
+			Accept: "application/json"
+		};
+		const byId = /* @__PURE__ */ new Map();
+		const failures = [];
+		for (const directoryFunction of TRAE_DIRECTORY_FUNCTIONS[region]) {
+			let list;
+			try {
+				const response = await this.fetchImpl(traeEndpoint(base, TRAE_SOLO_MODELS_PATH), {
+					method: "POST",
+					headers,
+					body: JSON.stringify({
+						function: directoryFunction,
+						config_names: null,
+						need_prompt: false,
+						current_config_info: null,
+						poly_prompt: true,
+						mode_type: null,
+						agent_type: null
+					}),
+					signal: signal ?? AbortSignal.timeout(3e4)
+				});
+				if (!response.ok) throw new Error(`HTTP ${response.status}`);
+				const document = await response.json();
+				list = Array.isArray(document["config_info_list"]) ? document["config_info_list"] : [];
+			} catch (error) {
+				failures.push(`${directoryFunction}: ${String(error).slice(0, 80)}`);
+				continue;
+			}
+			this.collectModels(list, directoryFunction, byId);
+		}
+		const models = [...byId.values()];
+		if (models.length === 0) throw new Error(`Trae SOLO models response contained no models (${failures.join("; ") || "empty directory"})`);
+		return models;
+	}
+	/** Merge one function's config list into the shared catalogue (first wins). */
+	collectModels(list, directoryFunction, byId) {
 		for (const raw of list) {
 			if (typeof raw !== "object" || raw === null) continue;
 			const config = raw;
@@ -1834,21 +1971,21 @@ var TraeSoloUpstreamClient = class {
 				...config,
 				...detail
 			});
-			models.push({
+			if (byId.has(id)) continue;
+			byId.set(id, {
 				id,
 				name: typeof display["display_name"] === "string" && display["display_name"] !== "" ? display["display_name"] : id,
 				...contextWindow === void 0 ? {} : { contextWindow },
 				...maxTokens === void 0 ? {} : { maxTokens },
-				...reasoning === void 0 ? {} : { reasoning }
+				...reasoning === void 0 ? {} : { reasoning },
+				function: directoryFunction
 			});
 		}
-		if (models.length === 0) throw new Error("Trae SOLO models response contained no models");
-		return models;
 	}
-	async chatStream(bodyJson, signal) {
+	async chatStream(bodyJson, signal, functionName) {
 		let prepared;
 		try {
-			prepared = prepareSoloBody(bodyJson);
+			prepared = prepareSoloBody(bodyJson, void 0, functionName);
 		} catch {
 			return {
 				ok: false,
@@ -2141,11 +2278,17 @@ var TraeSoloBridge = class {
 			const input = JSON.parse(bodyJson);
 			if (typeof input["model"] === "string" && input["model"] !== "") model = input["model"];
 			const entry = this.catalog?.current().find((item) => item.id === model);
-			const wireModel = entry?.wireConfigName ?? this.wireResolver?.(model) ?? this.wireResolver?.(entry?.name ?? "") ?? model;
-			if (wireModel !== input["model"]) {
-				input["model"] = wireModel;
-				prepared = JSON.stringify(input);
-			}
+			const fromCatalog = entry?.wireConfigName === void 0 ? void 0 : {
+				configName: entry.wireConfigName,
+				...entry.wireFunction === void 0 ? {} : { function: entry.wireFunction }
+			};
+			const fromResolver = this.wireResolver?.(model) ?? this.wireResolver?.(entry?.name ?? "");
+			const target = fromCatalog ?? fromResolver;
+			const wireModel = target?.configName ?? model;
+			const wireFunction = target?.function ?? entry?.wireFunction;
+			if (wireModel !== input["model"]) input["model"] = wireModel;
+			if (wireFunction !== void 0 && input["function"] !== wireFunction) input["function"] = wireFunction;
+			if (wireModel !== JSON.parse(bodyJson)["model"] || wireFunction !== void 0) prepared = JSON.stringify(input);
 			if (typeof input["reasoning_effort"] === "string") {
 				const efforts = entry?.reasoningEfforts;
 				const requested = input["reasoning_effort"];
@@ -3378,7 +3521,8 @@ const modelConfig = z.object({
 	contextWindow: z.number().step(1).min(1),
 	maxTokens: z.number().step(1).min(1),
 	input: z.array(z.union(["text", "image"])),
-	creditMultiplier: z.number()
+	creditMultiplier: z.number(),
+	wireFunction: z.string()
 });
 const regionStateConfig = z.object({
 	lastCatalog: z.array(modelConfig).default([]),
@@ -3464,6 +3608,25 @@ function apply(ctx, config) {
 		if (explicit !== void 0) return explicit;
 		return legacyAccountRegion === region ? value.accountId : void 0;
 	};
+	/**
+	* Retry a directory read once. The gateways answer an intermittent 401 for a
+	* credential that works moments later (observed 2026-09-15), and a failed
+	* skeleton read would otherwise drop the runtime catalog back to the saved
+	* snapshot — hiding every model added since that save (issue #7's glm-5.3
+	* among them).
+	*/
+	async function withDirectoryRetry(read) {
+		try {
+			return await read();
+		} catch (first) {
+			await new Promise((resolve) => setTimeout(resolve, 800));
+			try {
+				return await read();
+			} catch {
+				throw first;
+			}
+		}
+	}
 	const stacks = {};
 	for (const region of REGION_KEYS) {
 		const catalog = new TraeCatalog(region);
@@ -3483,13 +3646,11 @@ function apply(ctx, config) {
 				preferred = (await store.current())?.edition;
 			} catch {}
 			const hint = (config.edition !== void 0 && config.edition !== "auto" ? config.edition : void 0) ?? preferred;
-			const candidates = config.authFile === void 0 ? traeStorageCandidates().filter((item) => item.source === "desktop" && (hint !== void 0 ? item.edition === hint : regionOfEdition(item.edition) === region)) : [{
+			return resolveTraeIdentity(config.authFile === void 0 ? traeStorageCandidates().filter((item) => item.source === "desktop" && (hint !== void 0 ? item.edition === hint : regionOfEdition(item.edition) === region)) : [{
 				edition: hint ?? (region === "ai" ? "sg" : "solo"),
 				path: config.authFile,
 				source: "desktop"
-			}];
-			if (candidates.length === 0) throw new Error("Trae storage was not found");
-			return pickTraeStorageIdentity(candidates);
+			}], hint ?? (region === "ai" ? "solo-sg" : "cn"));
 		};
 		/**
 		* Resolution failures degrade to omitting DeviceInfo (its being required
@@ -3567,8 +3728,7 @@ function apply(ctx, config) {
 			delegating,
 			usageClient: new TraeUsageClient({ credential: () => store.resolve() }),
 			discoverModels: async (signal) => {
-				const [remote, wireModels] = await Promise.all([remoteCatalog.fetchModels(signal), solo.fetchModels(signal)]);
-				const merged = mergeTraeModelSources(remote, wireModels);
+				const merged = mergeTraeModelSources(await withDirectoryRetry(() => remoteCatalog.fetchModels(signal)), await solo.fetchModels(signal));
 				wire.callableKeys.clear();
 				for (const model of merged) {
 					wire.callableKeys.add(model.id.trim().toLowerCase());
@@ -3578,8 +3738,12 @@ function apply(ctx, config) {
 				wire.byId.clear();
 				wire.byName.clear();
 				for (const model of merged) if (model.wireConfigName !== void 0) {
-					wire.byId.set(model.id, model.wireConfigName);
-					wire.byName.set(model.name.trim().toLowerCase(), model.wireConfigName);
+					const target = {
+						configName: model.wireConfigName,
+						...model.wireFunction === void 0 ? {} : { function: model.wireFunction }
+					};
+					wire.byId.set(model.id, target);
+					wire.byName.set(model.name.trim().toLowerCase(), target);
 				}
 				return merged;
 			},
@@ -3709,4 +3873,4 @@ function apply(ctx, config) {
 	});
 }
 //#endregion
-export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, SseDecoder, TRAE_AI_PROVIDER, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, TraeCatalog, TraeCredentialStore, TraeDelegatingUpstreamClient, TraeFallbackUpstreamClient, TraeGatedUpstreamClient, TraeRawCapabilityController, TraeRawCapabilityState, TraeRawChatUpstreamClient, TraeSoloBridge, TraeSoloRemoteCatalogClient, TraeSoloUpstreamClient, TraeUsageClient, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, mergeTraeModelSources, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeIdentity, refreshTraeCredential, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage, withTraeRegion };
+export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, SseDecoder, TRAE_AI_PROVIDER, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, TraeCatalog, TraeCredentialStore, TraeDelegatingUpstreamClient, TraeFallbackUpstreamClient, TraeGatedUpstreamClient, TraeRawCapabilityController, TraeRawCapabilityState, TraeRawChatUpstreamClient, TraeSoloBridge, TraeSoloRemoteCatalogClient, TraeSoloUpstreamClient, TraeUsageClient, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, mergeTraeModelSources, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage, withTraeRegion };

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": "2.0.0",
+  "version": "2.0.2",
   "author": "dingminhua",
   "copyright": "Copyright (c) 2026 LaoDing",
   "license": "MIT",