dsh-connect-trae 1.0.1 → 1.1.0

package/lib/index.js

@@ -14,6 +14,161 @@ import { createServer } from "node:http";
 import { Readable } from "node:stream";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
+//#region src/catalog.ts
+/** Bootstrap catalog: identity only where current Trae metadata has not been fetched yet. */
+const FALLBACK_TRAE_MODELS = [
+	{
+		id: "auto",
+		name: "Auto"
+	},
+	{
+		id: "DeepSeek-V4-Flash",
+		name: "DeepSeek-V4-Flash"
+	},
+	{
+		id: "DeepSeek-V4-Pro",
+		name: "DeepSeek-V4-Pro"
+	},
+	{
+		id: "glm-5.2",
+		name: "GLM-5.2"
+	},
+	{
+		id: "kimi-k2.6",
+		name: "Kimi-K2.6"
+	}
+];
+/** Exact DSH modalities for one catalog entry; absent metadata is text-only. */
+function traeInputModalities(model) {
+	return [...model.input ?? ["text"]];
+}
+/** Apply the user's explicit image opt-ins; upstream and saved row hints are ignored. */
+function applyImageSelection(models, selected) {
+	return models.map((model) => ({
+		...model,
+		input: selected.has(model.id) ? ["text", "image"] : ["text"]
+	}));
+}
+/** Normalise a display name for cross-source joining. */
+function displayKey(name) {
+	return name.trim().toLowerCase();
+}
+/**
+* Merge the two Trae model sources into one authoritative catalog.
+*
+* `remote` (the solo.trae.cn `/models` directory) is the authoritative model
+* skeleton: it supplies the display id, display name, context windows, credit
+* multiplier, reasoning and multimodal flags. `wire` (from `get_detail_param`)
+* supplies the real `llm_utils_chat` `config_name` — the only id the chat
+* endpoint actually accepts. A remote row is only callable when it maps to a
+* wire `config_name`, so a remote row with no wire match is DROPPED (it would
+* otherwise be sent as an invalid `config_name` and rejected with 4001
+* "param is invalid"). Verified 2026-08-30: the Remote directory advertises
+* `Doubao-Seed-Code` and `glm-5.3`, neither of which is a current `config_name`;
+* both fail every request, so they must not be exposed.
+*
+* Joining is two-tier, in priority order:
+*  1. `wire.id` (the `config_name`) equals the remote id — the model's display
+*     id is already its wire id (the common case: glm-5.2, DeepSeek-V4-Flash,
+*     kimi-k3, …).
+*  2. `wire.name` (the `display_name`) equals the remote display name — for
+*     models whose display id differs from the wire id across Trae versions.
+* When the matched wire `config_name` differs from the remote id it is recorded
+* as `wireConfigName`; otherwise it is left undefined (id is already the wire id).
+*/
+function mergeTraeModelSources(remote, wire) {
+	const wireByName = /* @__PURE__ */ new Map();
+	const wireById = /* @__PURE__ */ new Map();
+	for (const model of wire) {
+		wireByName.set(displayKey(model.name), model);
+		wireById.set(displayKey(model.id), model);
+	}
+	const result = [];
+	for (const model of remote) {
+		const wireModel = wireById.get(displayKey(model.id)) ?? wireByName.get(displayKey(model.name));
+		if (wireModel === void 0) continue;
+		result.push({
+			id: model.id,
+			name: model.name,
+			...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
+			...model.maxContextWindow === void 0 ? {} : { maxContextWindow: model.maxContextWindow },
+			...model.creditMultiplier === void 0 ? {} : { creditMultiplier: model.creditMultiplier },
+			input: ["text"],
+			reasoningSupported: model.reasoningSupported,
+			...model.reasoning === void 0 ? {} : {
+				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 } : {}
+		});
+	}
+	return result;
+}
+/**
+* Apply the saved local budget. Trae advertises two windows per model (dev and
+* Max), so the budget may only switch a model to its own advertised Max value —
+* never to a fabricated number. Everything else keeps the dev window.
+*/
+function applyContextBudgets(catalog, budgets = {}) {
+	return catalog.map((model) => ({
+		...model,
+		...model.maxContextWindow !== void 0 && budgets[model.id] === model.maxContextWindow ? { contextWindow: model.maxContextWindow } : {}
+	}));
+}
+/** Convert Trae metadata into text-only model rows; image support is user-owned configuration. */
+function discoveredCatalog(models) {
+	const result = [];
+	for (const model of models) result.push({
+		id: model.id,
+		name: model.name,
+		...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
+		...model.maxContextWindow === void 0 ? {} : { maxContextWindow: model.maxContextWindow },
+		input: ["text"],
+		...model.creditMultiplier === void 0 ? {} : { creditMultiplier: model.creditMultiplier },
+		reasoningSupported: model.reasoningSupported,
+		...model.reasoning === void 0 ? {} : {
+			reasoning: model.reasoning,
+			reasoningEfforts: Object.fromEntries(model.reasoning.supported.map((effort) => [effort, effort === "low" ? "light" : effort === "xhigh" ? "extra_high" : "high"]))
+		}
+	});
+	return result;
+}
+/**
+* Drop rows saved by older releases that generated `@1m` variant models, so a
+* stale configuration cannot resurrect a variant the runtime no longer builds.
+*/
+function sanitizeCatalog(catalog) {
+	return catalog.filter((model) => {
+		if (model.id.endsWith("@1m")) return false;
+		const legacy = model;
+		return legacy.baseModelId === void 0 && legacy.maxContext !== true;
+	});
+}
+/**
+* Derive the runtime catalog from the last refreshed Trae directory plus the
+* user's explicit selection and context budgets. An empty selection falls back
+* to the whole directory: a plugin that has never been configured must still
+* serve models rather than nothing. This is the single source of truth for
+* what DSH actually exposes, so saving only the selection and budgets is
+* enough to rebuild it after a restart.
+*/
+function deriveCatalog(catalog, enabled, budgets = {}) {
+	return applyContextBudgets(enabled.size === 0 ? catalog : catalog.filter((model) => enabled.has(model.id)), budgets);
+}
+var TraeCatalog = class {
+	models = FALLBACK_TRAE_MODELS;
+	current() {
+		return this.models;
+	}
+	set(models) {
+		if (models.length === 0) throw new Error("trae model catalog cannot be empty");
+		this.models = models.map((model) => ({
+			...model,
+			...model.input === void 0 ? {} : { input: [...model.input] }
+		}));
+	}
+};
+//#endregion
 //#region src/adapter.ts
 const TRAE_PROVIDER = "trae";
 const TRAE_STREAM_IDLE_TIMEOUT_MS = 3e5;
@@ -47,7 +202,7 @@ function toPiModel(info, baseUrl) {
 		api: "openai-completions",
 		provider: TRAE_PROVIDER,
 		baseUrl,
-		input: [...info.input ?? ["text"]],
+		input: traeInputModalities(info),
 		cost: {
 			input: 0,
 			output: 0,
@@ -528,7 +683,6 @@ var TraeCredentialStore = class {
 	storagePathOverride;
 	edition;
 	accountId;
-	preferIds = [];
 	ownPath;
 	refresh;
 	refreshMarginMs;
@@ -551,16 +705,6 @@ var TraeCredentialStore = class {
 		this.accountId = accountId;
 		this.inflight = void 0;
 	}
-	/**
-	* Preferred account ordering used when no account is explicitly selected.
-	* The connector can only bill the `llm_utils_chat` channel against general
-	* credits, so accounts with zero general credits should not become the
-	* default or they fail with 4008 / empty responses.
-	*/
-	setPreferAccountIds(ids) {
-		this.preferIds = [...ids];
-		this.inflight = void 0;
-	}
 	candidates() {
 		if (this.storagePathOverride !== void 0) return [{
 			edition: this.edition === "auto" ? "cn" : this.edition,
@@ -569,13 +713,13 @@ var TraeCredentialStore = class {
 		const all = traeStorageCandidates();
 		return this.edition === "auto" ? all.filter((candidate) => candidate.edition === "cn" || candidate.edition === "solo") : all.filter((candidate) => candidate.edition === this.edition && (candidate.edition === "cn" || candidate.edition === "solo"));
 	}
-	/** First credential matching the preferred ordering, else the first live one. */
+	/**
+	* Deterministic default when no account is explicitly selected: the first
+	* discovered account. This is NOT credit-seeking — it never reorders accounts
+	* to find one with general credits. The plugin bills exactly the account the
+	* user selected, or the first account when nothing has been selected yet.
+	*/
 	preferred(credentials) {
-		if (credentials.length === 0) return void 0;
-		for (const id of this.preferIds) {
-			const match = credentials.find((credential) => traeAccountId(credential) === id);
-			if (match !== void 0) return match;
-		}
 		return credentials[0];
 	}
 	async accounts() {
@@ -594,7 +738,7 @@ var TraeCredentialStore = class {
 	async current() {
 		const credentials = await this.readAll();
 		if (this.accountId === void 0) return this.preferred(credentials);
-		return credentials.find((credential) => traeAccountId(credential) === this.accountId) ?? this.preferred(credentials);
+		return credentials.find((credential) => traeAccountId(credential) === this.accountId);
 	}
 	async resolve() {
 		const credential = await this.current();
@@ -685,104 +829,6 @@ var TraeCredentialStore = class {
 	}
 };
 //#endregion
-//#region src/catalog.ts
-/** Bootstrap catalog: identity only where current Trae metadata has not been fetched yet. */
-const FALLBACK_TRAE_MODELS = [
-	{
-		id: "auto",
-		name: "Auto"
-	},
-	{
-		id: "DeepSeek-V4-Flash",
-		name: "DeepSeek-V4-Flash"
-	},
-	{
-		id: "DeepSeek-V4-Pro",
-		name: "DeepSeek-V4-Pro"
-	},
-	{
-		id: "Doubao-Seed-Code",
-		name: "Doubao-Seed-Code",
-		input: ["text", "image"]
-	},
-	{
-		id: "kimi-k2.6",
-		name: "Kimi-K2.6",
-		input: ["text", "image"]
-	}
-];
-/** Convert verified Trae API metadata into normal models and optional 1M variants. */
-function discoveredCatalog(models, enabled1m = /* @__PURE__ */ new Set()) {
-	const result = [];
-	for (const model of models) {
-		const common = {
-			input: model.multimodal ? ["text", "image"] : ["text"],
-			...model.creditMultiplier === void 0 ? {} : { creditMultiplier: model.creditMultiplier },
-			reasoningSupported: model.reasoningSupported,
-			...model.reasoning === void 0 ? {} : {
-				reasoning: model.reasoning,
-				reasoningEfforts: Object.fromEntries(model.reasoning.supported.map((effort) => [effort, effort === "low" ? "light" : effort === "xhigh" ? "extra_high" : "high"]))
-			}
-		};
-		result.push({
-			id: model.id,
-			name: model.name,
-			...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
-			...model.maxContextWindow === void 0 ? {} : { maxContextWindow: model.maxContextWindow },
-			...common
-		});
-		if (model.maxContextWindow !== void 0 && enabled1m.has(model.id)) result.push({
-			id: `${model.id}@1m`,
-			name: `${model.name} 1M`,
-			contextWindow: model.maxContextWindow,
-			baseModelId: model.id,
-			maxContext: true,
-			...common
-		});
-	}
-	return result;
-}
-/**
-* Derive the runtime catalog from the last refreshed Trae directory plus the
-* user's explicit selection. Ordinary models whose `id` (Trae `name`) is
-* enabled survive; each 1M-capable enabled model produces a `@1m` variant.
-* This is the single source of truth for what DSH actually exposes, so saving
-* only the selection is enough to rebuild it after a restart.
-*/
-function deriveCatalog(catalog, enabled, enabled1m) {
-	const result = [];
-	for (const model of catalog) {
-		if (!enabled.has(model.id)) continue;
-		result.push(model);
-		if (enabled1m.has(model.id) && model.maxContextWindow !== void 0) result.push({
-			id: `${model.id}@1m`,
-			name: `${model.name} 1M`,
-			contextWindow: model.maxContextWindow,
-			baseModelId: model.id,
-			maxContext: true,
-			...model.input === void 0 ? {} : { input: [...model.input] },
-			...model.creditMultiplier === void 0 ? {} : { creditMultiplier: model.creditMultiplier },
-			...model.reasoningSupported === void 0 ? {} : { reasoningSupported: model.reasoningSupported },
-			...model.reasoning === void 0 ? {} : { reasoning: model.reasoning },
-			...model.reasoningEfforts === void 0 ? {} : { reasoningEfforts: model.reasoningEfforts }
-		});
-	}
-	return result;
-}
-var TraeCatalog = class {
-	models = FALLBACK_TRAE_MODELS;
-	current() {
-		return this.models;
-	}
-	set(models) {
-		if (models.length === 0) throw new Error("trae model catalog cannot be empty");
-		this.models = models.map((model) => ({
-			...model,
-			...model.input === void 0 ? {} : { input: [...model.input] }
-		}));
-	}
-};
-//#endregion
 //#region src/refresh.ts
 const CLIENT_ID_BY_EDITION = {
 	cn: "ono9krqynydwx5",
@@ -1200,7 +1246,7 @@ function applyReasoningEffort(body, effort, capability) {
 const TRAE_SOLO_FUNCTION = "solo_work_lite";
 const TRAE_SOLO_CHAT_PATH = "/api/agent/v3/llm_utils_chat";
 const TRAE_SOLO_MODELS_PATH = "/api/ide/v1/get_detail_param";
-function classify$1(status) {
+function classify(status) {
 	if (status === 401 || status === 403) return "authentication";
 	if (status === 402) return "hard_credit";
 	if (status === 429) return "soft_rate";
@@ -1208,13 +1254,21 @@ function classify$1(status) {
 	if (status >= 500) return "server";
 	return "client";
 }
+function finitePositive$1(value) {
+	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : void 0;
+}
 function prepareSoloBody(source, defaultModel = "glm-5.2") {
-	const body = JSON.parse(source);
-	const model = typeof body["model"] === "string" && body["model"].trim() !== "" ? body["model"].trim() : defaultModel;
-	body["model"] = model;
-	body["config_name"] = model;
-	body["function"] = TRAE_SOLO_FUNCTION;
-	body["stream"] = true;
+	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,
+		stream: true,
+		...Array.isArray(input["tools"]) ? { tools: input["tools"] } : {},
+		...typeof input["reasoning_effort"] === "string" ? { reasoning_effort: input["reasoning_effort"] } : {}
+	};
 	if (Array.isArray(body["messages"])) for (const raw of body["messages"]) {
 		if (typeof raw !== "object" || raw === null) continue;
 		const message = raw;
@@ -1283,8 +1337,11 @@ var TraeSoloUpstreamClient = class {
 			const display = typeof config["display_config"] === "object" && config["display_config"] !== null ? config["display_config"] : {};
 			const details = Array.isArray(config["model_detail_list"]) ? config["model_detail_list"] : [];
 			const detail = typeof details[0] === "object" && details[0] !== null ? details[0] : {};
-			const contextWindow = typeof detail["max_input_tokens"] === "number" ? detail["max_input_tokens"] : typeof config["max_input_tokens"] === "number" ? config["max_input_tokens"] : void 0;
-			const maxTokens = typeof detail["max_output_tokens"] === "number" ? detail["max_output_tokens"] : typeof config["max_output_tokens"] === "number" ? config["max_output_tokens"] : void 0;
+			const contextTokens = typeof config["context_window_tokens"] === "object" && config["context_window_tokens"] !== null ? config["context_window_tokens"] : {};
+			const promptMaxTokens = finitePositive$1(detail["prompt_max_tokens"]);
+			const devTokens = finitePositive$1(contextTokens["dev"]);
+			const contextWindow = promptMaxTokens ?? devTokens;
+			const maxTokens = finitePositive$1(detail["max_tokens"]);
 			const reasoning = parseReasoningCapability({
 				...config,
 				...detail
@@ -1335,10 +1392,17 @@ var TraeSoloUpstreamClient = class {
 			response
 		};
 		const text = (await response.text()).slice(0, 1024);
+		this.options.log?.("dsh-connect-trae: llm_utils_chat rejected", {
+			status: response.status,
+			model: JSON.parse(prepared)["model"],
+			configName: JSON.parse(prepared)["config_name"],
+			reasoningEffort: JSON.parse(prepared)["reasoning_effort"],
+			body: text
+		});
 		return {
 			ok: false,
 			status: response.status,
-			kind: classify$1(response.status),
+			kind: classify(response.status),
 			message: text || `Trae SOLO returned HTTP ${response.status}`
 		};
 	}
@@ -1485,7 +1549,8 @@ function bridgeTraeSoloStream(response, model) {
 	const encoder = new TextEncoder();
 	const sse = new SseDecoder();
 	let sawToolCalls = false;
-	let emittedDone = false;
+	let emittedFinishReason = false;
+	let upstreamEnded = false;
 	let upstreamError;
 	let usage;
 	const chunk = (delta, finishReason = null) => encoder.encode(`data: ${JSON.stringify({
@@ -1526,13 +1591,16 @@ function bridgeTraeSoloStream(response, model) {
 					...decoded.outputTokens === void 0 ? {} : { completion_tokens: decoded.outputTokens },
 					...decoded.totalTokens === void 0 ? {} : { total_tokens: decoded.totalTokens }
 				};
-				else if (decoded.type === "done" && !emittedDone) {
-					emittedDone = true;
-					if (upstreamError !== void 0) {
-						controller.error(upstreamError);
-						return;
+				else if (decoded.type === "done") {
+					upstreamEnded = true;
+					if (!emittedFinishReason) {
+						emittedFinishReason = true;
+						if (upstreamError !== void 0) {
+							controller.error(upstreamError);
+							return;
+						}
+						controller.enqueue(chunk({}, sawToolCalls ? "tool_calls" : decoded.finishReason || "stop"));
 					}
-					controller.enqueue(chunk({}, sawToolCalls ? "tool_calls" : decoded.finishReason));
 				}
 			};
 			try {
@@ -1542,11 +1610,14 @@ function bridgeTraeSoloStream(response, model) {
 					for (const event of sse.push(decoder.decode(next.value, { stream: true }))) consume(event);
 				}
 				for (const event of sse.finish()) consume(event);
-				if (upstreamError !== void 0 && !emittedDone) {
+				if (upstreamError !== void 0 && !upstreamEnded) {
 					controller.error(upstreamError);
 					return;
 				}
-				if (!emittedDone) controller.enqueue(chunk({}, sawToolCalls ? "tool_calls" : "stop"));
+				if (!emittedFinishReason) {
+					emittedFinishReason = true;
+					controller.enqueue(chunk({}, sawToolCalls ? "tool_calls" : "stop"));
+				}
 				controller.enqueue(encoder.encode("data: [DONE]\n\n"));
 				controller.close();
 			} catch (error) {
@@ -1567,14 +1638,34 @@ function bridgeTraeSoloStream(response, model) {
 /** Native SOLO client wrapper used by the loopback OpenAI adapter. */
 var TraeSoloBridge = class {
 	upstream;
-	constructor(upstream) {
+	catalog;
+	wireResolver;
+	constructor(upstream, catalog, wireResolver) {
 		this.upstream = upstream;
+		this.catalog = catalog;
+		this.wireResolver = wireResolver;
 	}
 	async chatStream(bodyJson, signal) {
 		let model = "glm-5.2";
+		let prepared = bodyJson;
 		try {
 			const input = JSON.parse(bodyJson);
-			if (typeof input["model"] === "string" && input["model"] !== "") model = input["model"].endsWith("@1m") ? input["model"].slice(0, -3) : input["model"];
+			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);
+			}
+			if (typeof input["reasoning_effort"] === "string") {
+				const efforts = entry?.reasoningEfforts;
+				const requested = input["reasoning_effort"];
+				const mapped = efforts?.[requested];
+				const allowed = efforts === void 0 ? [] : Object.values(efforts).filter((value) => typeof value === "string");
+				if (typeof mapped === "string") input["reasoning_effort"] = mapped;
+				else if (!allowed.includes(requested)) delete input["reasoning_effort"];
+				prepared = JSON.stringify(input);
+			}
 		} catch {
 			return {
 				ok: false,
@@ -1583,7 +1674,7 @@ var TraeSoloBridge = class {
 				message: "invalid JSON request"
 			};
 		}
-		const result = await this.upstream.chatStream(bodyJson, signal);
+		const result = await this.upstream.chatStream(prepared, signal);
 		if (!result.ok) return result;
 		return {
 			ok: true,
@@ -1650,147 +1741,20 @@ function parseTraeRemoteModel(value) {
 //#endregion
 //#region src/solo-remote.ts
 const TRAE_SOLO_REMOTE_BASE = "https://solo.trae.cn/api/remote/v1";
-const TRAE_SOLO_REMOTE_MODELS = [
-	{
-		name: "DeepSeek-V4-Flash",
-		displayName: "DeepSeek-V4-Flash",
-		multimodal: false
-	},
-	{
-		name: "DeepSeek-V4-Pro",
-		displayName: "DeepSeek-V4-Pro",
-		multimodal: false
-	},
-	{
-		name: "Doubao_1_6",
-		displayName: "Doubao-Seed-Code",
-		multimodal: true
-	},
-	{
-		name: "Doubao-Seed-2.0-Code",
-		displayName: "Doubao-Seed-2.0-Code",
-		multimodal: true
-	},
-	{
-		name: "kimi-k2.6",
-		displayName: "Kimi-K2.6",
-		multimodal: true
-	},
-	{
-		name: "kimi-k2.5",
-		displayName: "Kimi-K2.5",
-		multimodal: true
-	},
-	{
-		name: "qwen-3.6-plus",
-		displayName: "Qwen3.6-Plus",
-		multimodal: true
-	},
-	{
-		name: "qwen-3.5",
-		displayName: "Qwen3.5",
-		multimodal: true
-	},
-	{
-		name: "glm-5.1",
-		displayName: "GLM-5.1",
-		multimodal: false
-	},
-	{
-		name: "glm-5",
-		displayName: "GLM-5",
-		multimodal: false
-	},
-	{
-		name: "glm-5v-turbo",
-		displayName: "GLM-5V-Turbo",
-		multimodal: true
-	},
-	{
-		name: "minimax-m2.7",
-		displayName: "MiniMax-M2.7",
-		multimodal: false
-	},
-	{
-		name: "minimax-m2.5",
-		displayName: "MiniMax-M2.5",
-		multimodal: false
-	}
-];
 /**
-* Preserve DSH's complete text conversation in the one query accepted by the
-* SOLO Remote create-session endpoint. System instructions (including DSH's
-* workspace/cwd context), assistant history, tool-result text and the newest
-* user request stay ordered instead of collapsing to the last user message.
+* Read-only model catalog client for the SOLO Web API.
+*
+* This deliberately has no chat/session method: the Remote session protocol
+* only exposes a final answer and cannot preserve DSH's structured tool loop.
 */
-function serializeTraeConversation(messages) {
-	if (messages.length === 1 && messages[0]?.role === "user") return messages[0].content;
-	return messages.map((message) => `<dsh-message role="${message.role}">\n${message.content}\n</dsh-message>`).join("\n\n");
-}
-function decodeUserId(token) {
-	try {
-		return JSON.parse(Buffer.from(token.split(".")[1] ?? "", "base64").toString("utf8")).data?.id ?? "0";
-	} catch {
-		return "0";
-	}
-}
-function generateWebId() {
-	return String(Math.floor(Math.random() * 9e15) + 0x38d7ea4c68000);
-}
-function buildCommonParams(userId, webId, sessionId) {
-	return JSON.stringify({
-		language: "zh-cn",
-		app_language: "en",
-		quality: "stable",
-		app_version: "1.0.0.1300",
-		user_identity: "Free",
-		is_freshman: "0",
-		scope: "marscode",
-		tenant: "marscode",
-		region: "CN",
-		aiRegion: "CN",
-		solo_chat_mode: "code",
-		is_privacy_mode: 1,
-		privacy_mode: "on",
-		...sessionId === void 0 ? {} : { biz_session_id: sessionId },
-		web_id: webId,
-		biz_user_id: userId,
-		user_unique_id: userId
-	});
-}
-function extractContent(raw) {
-	try {
-		const parsed = JSON.parse(raw);
-		if (Array.isArray(parsed)) return parsed.filter((c) => typeof c === "object" && c !== null && c.type === "text").map((c) => c.text_content ?? "").join("");
-		if (typeof parsed === "object" && parsed !== null && Array.isArray(parsed.messages)) {
-			const parts = [];
-			for (const msg of parsed.messages) {
-				if (typeof msg !== "object" || msg === null) continue;
-				const pi = msg.plan_item;
-				if (typeof pi !== "object" || pi === null) continue;
-				const tc = pi.tool_call_info;
-				if (typeof tc !== "object" || tc === null) continue;
-				const tool = tc;
-				if (tool.name === "finish" && tool.params?.summary) parts.push(tool.params.summary);
-				else if (tool.result?.data?.summary && tool.name !== "finish") parts.push(tool.result.data.summary);
-			}
-			return parts.join("\n\n");
-		}
-	} catch {}
-	return raw;
-}
-var TraeSoloRemoteClient = class {
+var TraeSoloRemoteCatalogClient = class {
 	options;
 	fetchImpl;
 	baseUrl;
-	pollIntervalMs;
-	timeoutMs;
 	constructor(options) {
 		this.options = options;
 		this.fetchImpl = options.fetchImpl ?? fetch;
 		this.baseUrl = options.baseUrl ?? "https://solo.trae.cn/api/remote/v1";
-		this.pollIntervalMs = options.pollIntervalMs ?? 2e3;
-		this.timeoutMs = options.timeoutMs ?? 12e4;
 	}
 	async headers() {
 		return {
@@ -1803,77 +1767,6 @@ var TraeSoloRemoteClient = class {
 			"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
 		};
 	}
-	async chat(messages, model, signal) {
-		const headers = await this.headers();
-		const token = (await this.options.credential()).accessToken;
-		const userId = decodeUserId(token);
-		const webId = generateWebId();
-		const modelInfo = TRAE_SOLO_REMOTE_MODELS.find((m) => m.name.toLowerCase() === model.toLowerCase()) ?? {
-			name: model,
-			displayName: model,
-			multimodal: false
-		};
-		const conversation = serializeTraeConversation(messages);
-		const body = {
-			mode: "code",
-			environment_id: "default",
-			env: "remote",
-			auto_create_project: false,
-			origin: "web",
-			initial_message: {
-				chat_session_id: "",
-				content: [],
-				query: JSON.stringify([{
-					type: "text",
-					data: { content: conversation }
-				}]),
-				model_name: modelInfo.name,
-				agent_type: "solo_agent_remote",
-				model_selection_strategy: "manual",
-				custom_model: {
-					name: modelInfo.name,
-					multimodal: modelInfo.multimodal,
-					is_default: false,
-					display_name: modelInfo.displayName,
-					config_name: modelInfo.name,
-					config_source: 1,
-					provider: "",
-					ak: "",
-					sk: "",
-					base_url: "",
-					auth_type: 0,
-					use_remote_service: true
-				},
-				common_params: buildCommonParams(userId, webId)
-			}
-		};
-		const createResponse = await this.fetchImpl(`${this.baseUrl}/chat_sessions`, {
-			method: "POST",
-			headers,
-			body: JSON.stringify(body),
-			signal: signal ?? AbortSignal.timeout(3e4)
-		});
-		const createJson = await createResponse.json();
-		if (!createResponse.ok || createJson.code !== 0 || !createJson.data?.chat_session_id) throw new Error(`SOLO remote session creation failed (http ${createResponse.status}): ${createJson.message ?? "unknown error"}`);
-		const sessionId = createJson.data.chat_session_id;
-		const start = Date.now();
-		while (Date.now() - start < this.timeoutMs) {
-			if (signal?.aborted) throw new Error("SOLO remote polling aborted");
-			await new Promise((resolve) => setTimeout(resolve, this.pollIntervalMs));
-			const messageResponse = await this.fetchImpl(`${this.baseUrl}/chat_sessions/${sessionId}/messages?page_size=50`, {
-				headers,
-				...signal === void 0 ? {} : { signal }
-			});
-			if (!messageResponse.ok) continue;
-			const assistant = ((await messageResponse.json()).data?.items ?? []).find((item) => item.role === "assistant");
-			if (assistant && assistant.status !== "in_progress" && assistant.status !== "failed") return {
-				content: extractContent(assistant.content ?? ""),
-				sessionId
-			};
-			if (assistant?.status === "failed") throw new Error("SOLO remote assistant message failed");
-		}
-		throw new Error("SOLO remote polling timed out");
-	}
 	async fetchModels(signal) {
 		const headers = await this.headers();
 		const response = await this.fetchImpl(`${this.baseUrl}/models?functions=solo_agent_remote,solo_work_remote`, {
@@ -1891,6 +1784,7 @@ var TraeSoloRemoteClient = class {
 			seen.add(model.id);
 			models.push(model);
 		}
+		if (models.length === 0) throw new Error("SOLO remote models response contained no models");
 		return models;
 	}
 };
@@ -2239,7 +2133,7 @@ function rawCapabilityDiagnostic(enabled, capability, checkedAtMs) {
 //#endregion
 //#region src/fallback-upstream.ts
 /**
-* Raw Chat first, SOLO Remote second. Fallback is intentionally narrow:
+* Optional primary route first, native SOLO tool-call route second. Fallback is intentionally narrow:
 * only definitive pre-stream schema/route incompatibilities may retry the same
 * user request. Authentication, credit, rate, cancellation, transport/server
 * failures, and every successful Response are never replayed.
@@ -2606,7 +2500,6 @@ async function traeWebUsage(deps) {
 			...model.input === void 0 ? {} : { input: [...model.input] }
 		})),
 		enabledModelIds: [...deps.enabledModelIds()],
-		enabled1mModelIds: [...deps.enabled1mModelIds()],
 		...deps.rawDiagnostic === void 0 ? {} : { rawChat: deps.rawDiagnostic() }
 	};
 	try {
@@ -2797,125 +2690,6 @@ function buildTraeFusionRawChatEnvelope(arg, config) {
 	};
 }
 //#endregion
-//#region src/solo-remote-bridge.ts
-function classify(status) {
-	if (status === 401 || status === 403) return "authentication";
-	if (status === 402) return "hard_credit";
-	if (status === 429) return "soft_rate";
-	if (status === 404) return "not_found";
-	if (status >= 500) return "server";
-	return "client";
-}
-/**
-* Bridges the SOLO remote polling-based API into the shim's stream interface.
-* The remote API uses create-session + poll-messages rather than raw SSE,
-* so this bridge converts the final result into a synthetic OpenAI SSE stream.
-*/
-var TraeSoloRemoteBridge = class {
-	remote;
-	constructor(remote) {
-		this.remote = remote;
-	}
-	async chatStream(bodyJson, signal) {
-		let parsed;
-		try {
-			parsed = JSON.parse(bodyJson);
-		} catch {
-			return {
-				ok: false,
-				status: 400,
-				kind: "client",
-				message: "invalid JSON request"
-			};
-		}
-		if (!Array.isArray(parsed.messages) || parsed.messages.length === 0) return {
-			ok: false,
-			status: 400,
-			kind: "client",
-			message: "messages are required"
-		};
-		const messages = parsed.messages.flatMap((message) => {
-			if (typeof message.role !== "string") return [];
-			if (typeof message.content === "string") return [{
-				role: message.role,
-				content: message.content
-			}];
-			if (!Array.isArray(message.content)) return [];
-			const content = message.content.flatMap((part) => {
-				if (typeof part !== "object" || part === null) return [];
-				const item = part;
-				const text = typeof item.text === "string" ? item.text : typeof item.content === "string" ? item.content : void 0;
-				return text === void 0 ? [] : [text];
-			}).join("\n");
-			return content === "" ? [] : [{
-				role: message.role,
-				content
-			}];
-		});
-		if (messages.length === 0) return {
-			ok: false,
-			status: 400,
-			kind: "client",
-			message: "text messages are required"
-		};
-		const model = typeof parsed.model === "string" && parsed.model !== "" ? parsed.model : "DeepSeek-V4-Flash";
-		const upstreamModel = model.endsWith("@1m") ? model.slice(0, -3) : model;
-		try {
-			const chunks = buildOpenAISseChunks((await this.remote.chat(messages, upstreamModel, signal)).content, model);
-			const encoder = new TextEncoder();
-			const stream = new ReadableStream({ start(controller) {
-				for (const chunk of chunks) controller.enqueue(encoder.encode(chunk));
-				controller.close();
-			} });
-			return {
-				ok: true,
-				response: new Response(stream, {
-					status: 200,
-					headers: { "Content-Type": "text/event-stream" }
-				})
-			};
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			const status = /timed out/i.test(message) ? 504 : /session creation failed/i.test(message) ? 502 : 502;
-			return {
-				ok: false,
-				status,
-				kind: classify(status),
-				message: message.slice(0, 400)
-			};
-		}
-	}
-};
-function buildOpenAISseChunks(content, model) {
-	const id = `chatcmpl-${randomUUID().replaceAll("-", "").slice(0, 24)}`;
-	const created = Math.floor(Date.now() / 1e3);
-	const chunks = [];
-	if (content !== "") chunks.push(`data: ${JSON.stringify({
-		id,
-		object: "chat.completion.chunk",
-		created,
-		model,
-		choices: [{
-			index: 0,
-			delta: { content },
-			finish_reason: null
-		}]
-	})}\n\n`);
-	chunks.push(`data: ${JSON.stringify({
-		id,
-		object: "chat.completion.chunk",
-		created,
-		model,
-		choices: [{
-			index: 0,
-			delta: {},
-			finish_reason: "stop"
-		}]
-	})}\n\n`);
-	chunks.push("data: [DONE]\n\n");
-	return chunks;
-}
-//#endregion
 //#region src/upstream.ts
 /**
 * Safe first-stage upstream. Real Trae traffic stays disabled until one
@@ -2955,18 +2729,26 @@ const Config = z.object({
 	accountId: z.string().description("Selected local Trae account id (never a token)"),
 	lastCatalog: z.array(modelConfig).description("Last refreshed Trae raw model directory shown by the plugin card"),
 	enabledModelIds: z.array(z.string()).default([]).description("Trae model ids the user enabled"),
-	enabled1mModels: z.array(z.string()).default([]).description("Trae model ids whose 1M variants are enabled"),
+	contextBudgets: z.dict(z.number().step(1).min(1)).default({}).description("Local DSH context budget per Trae model"),
+	imageModelIds: z.array(z.string()).default([]).description("Trae model ids the user explicitly enabled for image input"),
 	models: z.array(modelConfig).description("Legacy generated Trae model list")
 });
 function apply(ctx, config) {
 	const catalog = new TraeCatalog();
 	const enabledSet = (value) => new Set(value.enabledModelIds ?? []);
-	const enabled1mSet = (value) => new Set(value.enabled1mModels ?? []);
-	const configuredModels = (value) => {
-		if (value.lastCatalog?.length) return deriveCatalog(value.lastCatalog, enabledSet(value), enabled1mSet(value));
-		return value.models?.length ? value.models : FALLBACK_TRAE_MODELS;
+	const imageSet = (value) => new Set(value.imageModelIds ?? []);
+	const callableKeys = /* @__PURE__ */ new Set();
+	const dropDeadModels = (rows) => {
+		if (callableKeys.size === 0) return rows;
+		return rows.filter((model) => callableKeys.has(model.id.trim().toLowerCase()) || callableKeys.has(model.name.trim().toLowerCase()));
+	};
+	const derive = (value, raw) => {
+		const selectedImages = imageSet(value);
+		const derived = deriveCatalog(applyImageSelection(sanitizeCatalog(dropDeadModels(raw)), selectedImages), enabledSet(value), value.contextBudgets ?? {});
+		return derived.length > 0 ? derived : applyImageSelection(dropDeadModels(FALLBACK_TRAE_MODELS), selectedImages);
 	};
-	const displayModels = (value) => value.lastCatalog?.length ? value.lastCatalog : value.models?.length ? value.models : FALLBACK_TRAE_MODELS;
+	const configuredModels = (value) => value.lastCatalog?.length ? derive(value, value.lastCatalog) : value.models?.length ? derive(value, value.models) : applyImageSelection(dropDeadModels(FALLBACK_TRAE_MODELS), imageSet(value));
+	const displayModels = (value) => value.lastCatalog?.length ? dropDeadModels(sanitizeCatalog(value.lastCatalog)) : value.models?.length ? dropDeadModels(sanitizeCatalog(value.models)) : dropDeadModels(FALLBACK_TRAE_MODELS);
 	const store = new TraeCredentialStore({
 		...config.authFile === void 0 ? {} : { storagePath: config.authFile },
 		edition: config.edition ?? "auto",
@@ -2984,10 +2766,14 @@ function apply(ctx, config) {
 	const solo = new TraeSoloUpstreamClient({
 		credential: () => store.resolve(),
 		identity,
-		baseUrl: "https://trae-api-cn.mchost.guru"
+		baseUrl: "https://trae-api-cn.mchost.guru",
+		log: (message, detail) => ctx.logger.warn(message, detail)
 	});
-	const remote = new TraeSoloRemoteClient({ credential: () => store.resolve() });
-	const upstream = new TraeSoloBridge(solo);
+	const remoteCatalog = new TraeSoloRemoteCatalogClient({ credential: () => store.resolve() });
+	const wireById = /* @__PURE__ */ new Map();
+	const wireByName = /* @__PURE__ */ new Map();
+	const wireResolver = (displayId) => wireById.get(displayId) ?? wireByName.get(displayId.trim().toLowerCase());
+	const upstream = new TraeSoloBridge(solo, catalog, wireResolver);
 	const delegating = new TraeDelegatingUpstreamClient(upstream);
 	const shim = createTraeShim({
 		catalog,
@@ -3027,41 +2813,32 @@ function apply(ctx, config) {
 			ctx.logger.warn("dsh-connect-trae: Raw gateway unavailable; continuing with native SOLO tool-call channel", error);
 		}
 	})();
-	const selectPreferredGeneralAccount = async () => {
-		try {
-			const accounts = await store.accounts();
-			const scored = [];
-			for (const account of accounts) try {
-				store.selectAccount(account.id);
-				const credential = await store.resolve();
-				const snapshot = await new TraeUsageClient({ credential: async () => credential }).snapshot();
-				const general = Math.round(snapshot.packs.filter((pack) => pack.availableEndpoint === 0).reduce((sum, pack) => sum + Math.max(0, (pack.creditsLimit ?? 0) - (pack.consumedCredits ?? 0)), 0) * 1e4) / 1e4;
-				scored.push({
-					id: account.id,
-					general
-				});
-			} catch (error) {
-				ctx.logger.warn(`dsh-connect-trae: account ${account.id} unavailable for default selection`, error);
-			}
-			scored.sort((a, b) => b.general - a.general);
-			store.setPreferAccountIds(scored.filter((item) => item.general > 0).map((item) => item.id));
-			store.setSource(config.authFile, config.edition ?? "auto", config.accountId);
-		} catch (error) {
-			ctx.logger.warn("dsh-connect-trae: default account selection failed; continuing", error);
-		}
-	};
 	const usageClient = new TraeUsageClient({ credential: () => store.resolve() });
 	let current = () => config;
 	let invalidateAdapter = () => {};
 	const discoverModels = async (signal) => {
-		return discoveredCatalog(await remote.fetchModels(signal), /* @__PURE__ */ new Set());
+		const [remote, wire] = await Promise.all([remoteCatalog.fetchModels(signal), solo.fetchModels(signal)]);
+		const merged = mergeTraeModelSources(remote, wire);
+		callableKeys.clear();
+		for (const model of merged) {
+			callableKeys.add(model.id.trim().toLowerCase());
+			callableKeys.add(model.name.trim().toLowerCase());
+		}
+		wireById.clear();
+		wireByName.clear();
+		for (const model of merged) if (model.wireConfigName !== void 0) {
+			wireById.set(model.id, model.wireConfigName);
+			wireByName.set(model.name.trim().toLowerCase(), model.wireConfigName);
+		}
+		const next = applyImageSelection(merged, imageSet(current()));
+		catalog.set(next);
+		return merged;
 	};
 	ctx.inject(["webServer"], (webCtx) => registerTraeUsageRoute(webCtx, {
 		store,
 		client: usageClient,
 		displayModels: () => displayModels(current()),
 		enabledModelIds: () => current().enabledModelIds ?? [],
-		enabled1mModelIds: () => current().enabled1mModels ?? [],
 		discoverModels,
 		rawDiagnostic: () => rawDiagnostic()
 	}));
@@ -3083,7 +2860,11 @@ function apply(ctx, config) {
 	});
 	shim.ready.then(async () => {
 		if (stopped) return;
-		await selectPreferredGeneralAccount();
+		try {
+			await discoverModels();
+		} catch (error) {
+			ctx.logger.warn("dsh-connect-trae: wire-id resolution failed at startup; falling back to display ids", error);
+		}
 		catalog.set(configuredModels(current()));
 		const trae = createTraeAdapter({
 			shim,
@@ -3099,11 +2880,12 @@ function apply(ctx, config) {
 			releaseAdapter = ctx.llm.registerAdapter([TRAE_PROVIDER], trae.adapter);
 			ctx.llm.registerModelDiscovery(TRAE_SETTINGS_NS, async (request) => {
 				if (request.provider !== "trae") return [];
-				return (await discoverModels(request.signal)).map((model) => ({
+				return applyImageSelection(await discoverModels(request.signal), imageSet(current())).map((model) => ({
 					id: model.id,
 					name: model.name,
 					...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
-					...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens }
+					...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens },
+					inputModalities: traeInputModalities(model)
 				}));
 			});
 			releaseDirectory = ctx.llm.registerConfigurableProviders([{
@@ -3133,4 +2915,4 @@ function apply(ctx, config) {
 	});
 }
 //#endregion
-export { Config, FALLBACK_TRAE_MODELS, SseDecoder, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROVIDER, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_SOLO_REMOTE_MODELS, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, TraeCatalog, TraeCredentialStore, TraeDelegatingUpstreamClient, TraeFallbackUpstreamClient, TraeGatedUpstreamClient, TraeRawCapabilityController, TraeRawCapabilityState, TraeRawChatUpstreamClient, TraeSoloBridge, TraeSoloRemoteBridge, TraeSoloRemoteClient, TraeSoloUpstreamClient, TraeUsageClient, UnconfiguredTraeUpstreamClient, apply, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, discoveredCatalog, hashTraeRawChatArg, identityHeaders, inject, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeIdentity, refreshTraeCredential, registerTraeUsageRoute, resolveTraeRawRuntime, traeEndpoint, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage };
+export { Config, FALLBACK_TRAE_MODELS, SseDecoder, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROVIDER, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, 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, hashTraeRawChatArg, identityHeaders, inject, mergeTraeModelSources, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeIdentity, refreshTraeCredential, registerTraeUsageRoute, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage };