dsh-provider-qoder 0.4.1 → 0.4.3

package/lib/index.js

@@ -1,9 +1,9 @@
 import z from "@deepseek-ai/schemastery";
-import { EMPTY_RESPONSE_CODE, LlmAdapter, LlmError, ProviderRequestId, ReasoningEffortId, ToolCallId, attributionHeaders, contentHasImage } from "@deepseek-ai/dsh-llm";
+import { CONTEXT_WINDOW_EXCEEDED_CODE, EMPTY_RESPONSE_CODE, LlmAdapter, LlmError, ProviderRequestId, QUOTA_EXCEEDED_CODE, ReasoningEffortId, ToolCallId, attributionHeaders, contentHasImage, isContextWindowExceededError, isQuotaExceededError } from "@deepseek-ai/dsh-llm";
 import crypto, { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { homedir, hostname } from "node:os";
+import { dirname, join, resolve } from "node:path";
 import { WebError } from "@deepseek-ai/dsh-web";
 import { SettingsConflictError } from "@deepseek-ai/dsh-settings";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
@@ -32,6 +32,9 @@ const reasoningEffortOrder = /* @__PURE__ */ new Map([
 function positiveNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : void 0;
 }
+function nonNegativeNumber(value) {
+	return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
+}
 function contextOptionsOf(value) {
 	if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
 	const options = {};
@@ -42,8 +45,8 @@ function contextOptionsOf(value) {
 		const isDefault = typeof entry.is_default === "boolean" ? entry.is_default : void 0;
 		if (tokenCount === void 0) continue;
 		options[key] = {
-			...tokenCount === void 0 ? {} : { tokenCount },
-			...isDefault === void 0 ? {} : { isDefault }
+			tokenCount,
+			...isDefault !== void 0 ? { isDefault } : {}
 		};
 	}
 	if (Object.keys(options).length === 0) return void 0;
@@ -96,9 +99,9 @@ function normalizeQoderModels(payload, onConflict) {
 		const contextWindow = (defaultOptions.length === 1 ? defaultOptions[0].tokenCount : void 0) ?? positiveNumber(raw.max_input_tokens) ?? 18e4;
 		const maxContextWindow = Math.max(positiveNumber(raw.max_input_tokens) ?? 0, contextWindow, ...Object.values(contextOptions ?? {}).map((option) => option.tokenCount ?? 0));
 		const isReasoning = thinkingDefault(raw.thinking_config, raw.is_reasoning === true, onConflict);
-		const priceFactor = typeof raw.price_factor === "number" && Number.isFinite(raw.price_factor) && raw.price_factor >= 0 ? raw.price_factor : typeof raw.priceFactor === "number" && Number.isFinite(raw.priceFactor) && raw.priceFactor >= 0 ? raw.priceFactor : void 0;
-		const rawOriginalPrice = typeof raw.original_price_factor === "number" && Number.isFinite(raw.original_price_factor) && raw.original_price_factor >= 0 ? raw.original_price_factor : typeof raw.originPriceFactor === "number" && Number.isFinite(raw.originPriceFactor) && raw.originPriceFactor >= 0 ? raw.originPriceFactor : void 0;
-		const promotionPrice = typeof raw.promotion === "object" && raw.promotion !== null && raw.promotion.active === true && typeof raw.promotion.before_promotion_price_factor === "number" ? raw.promotion.before_promotion_price_factor : void 0;
+		const priceFactor = nonNegativeNumber(raw.price_factor) ?? nonNegativeNumber(raw.priceFactor);
+		const rawOriginalPrice = nonNegativeNumber(raw.original_price_factor) ?? nonNegativeNumber(raw.originPriceFactor);
+		const promotionPrice = typeof raw.promotion === "object" && raw.promotion !== null && raw.promotion.active === true ? nonNegativeNumber(raw.promotion.before_promotion_price_factor) : void 0;
 		const originalPriceFactor = rawOriginalPrice ?? promotionPrice;
 		const isFree = raw.is_free === true || raw.isFree === true || Array.isArray(raw.tags) && raw.tags.includes("limited_time_free") || priceFactor === 0;
 		const reasoning = reasoningEffortsOf(raw.thinking_config);
@@ -187,28 +190,40 @@ function selectedContextTier(model) {
 function effectiveContextWindow(model) {
 	return selectedContextTier(model)?.tokenCount ?? model.contextWindow;
 }
+/** Clone a model catalog entry, detaching any contextOptions object. */
+function cloneCatalogModel(model) {
+	return {
+		...model,
+		...model.contextOptions !== void 0 ? { contextOptions: { ...model.contextOptions } } : {}
+	};
+}
+/** Carry subscriber context choices only while the refreshed catalog supports them. */
+function mergeAdvertisedContext(remembered, advertised, updated) {
+	const merged = { ...updated };
+	delete merged.contextOptions;
+	delete merged.contextTier;
+	if (advertised.contextOptions !== void 0) merged.contextOptions = { ...advertised.contextOptions };
+	const tier = selectedContextTier({
+		contextTier: remembered.contextTier,
+		contextOptions: merged.contextOptions
+	});
+	if (tier !== void 0) {
+		merged.contextTier = tier.key;
+		merged.contextWindow = tier.tokenCount;
+	} else if (advertised.contextWindow !== void 0) merged.contextWindow = remembered.contextTier !== void 0 ? advertised.contextWindow : Math.min(remembered.contextWindow ?? advertised.contextWindow, advertised.contextWindow);
+	return merged;
+}
 function mergeQoderDiscoveryMetadata(configured, discovered) {
 	const catalog = new Map(discovered.map((model) => [model.id, model]));
 	return configured.map((model) => {
 		const advertised = catalog.get(model.id);
-		if (advertised === void 0) return {
-			...model,
-			...model.contextOptions !== void 0 ? { contextOptions: { ...model.contextOptions } } : {}
-		};
+		if (advertised === void 0) return cloneCatalogModel(model);
 		const merged = { ...model };
-		for (const key of discoveredMetadataKeys) delete merged[key];
-		for (const key of discoveredMetadataKeys) if (advertised[key] !== void 0) {
-			const val = advertised[key];
-			Object.assign(merged, { [key]: key === "contextOptions" && typeof val === "object" && val !== null ? { ...val } : val });
-		}
-		const tier = selectedContextTier(merged);
-		if (tier !== void 0) {
-			merged.contextWindow = tier.tokenCount;
-			return merged;
-		}
-		delete merged.contextTier;
-		if (advertised.contextWindow !== void 0) merged.contextWindow = Math.min(model.contextWindow ?? advertised.contextWindow, advertised.contextWindow);
-		return merged;
+		for (const key of discoveredMetadataKeys) if (key !== "contextOptions") {
+			delete merged[key];
+			if (advertised[key] !== void 0) Object.assign(merged, { [key]: advertised[key] });
+		}
+		return mergeAdvertisedContext(model, advertised, merged);
 	});
 }
 function hasSameQoderDiscoveryMetadata(left, right) {
@@ -333,10 +348,177 @@ function getQoderWebSearchUrl(region = "global") {
 * @module dsh-provider-qoder/qoder/errors
 */
 var QoderLlmError = class extends LlmError {
+	upstreamCode;
+	source;
+	httpStatus;
 	constructor(message, code = "UNKNOWN_ERROR", options) {
 		super(message, code, options);
 	}
 };
+const modelBusinessErrors = {
+	"103": {
+		code: "PROVIDER_ERROR",
+		message: "Qoder rejected a duplicate model request."
+	},
+	"105": {
+		code: "AUTH",
+		message: "Qoder subscriber authentication has expired."
+	},
+	"110": {
+		code: QUOTA_EXCEEDED_CODE,
+		message: "Qoder daily usage limit has been reached."
+	},
+	"112": {
+		code: QUOTA_EXCEEDED_CODE,
+		message: "Qoder personal Credits are exhausted."
+	},
+	"114": {
+		code: QUOTA_EXCEEDED_CODE,
+		message: "Qoder free trial account limit has been reached."
+	},
+	"115": {
+		code: QUOTA_EXCEEDED_CODE,
+		message: "Qoder free subscriber quota limit has been reached."
+	},
+	"116": {
+		code: QUOTA_EXCEEDED_CODE,
+		message: "Qoder Teams administrator Credits are exhausted."
+	},
+	"117": {
+		code: QUOTA_EXCEEDED_CODE,
+		message: "Qoder Teams member Credits are exhausted."
+	},
+	"119": {
+		code: QUOTA_EXCEEDED_CODE,
+		message: "Qoder Vela model free usage limit has been reached."
+	},
+	"122": {
+		code: QUOTA_EXCEEDED_CODE,
+		message: "Qoder billing group Credits limit has been reached."
+	},
+	"406": {
+		code: "PROVIDER_ERROR",
+		message: "Qoder rejected the request through its content safety policy."
+	},
+	"416": {
+		code: "INVALID_REQUEST",
+		message: "Qoder cannot satisfy the requested range."
+	},
+	"430": {
+		code: "INVALID_REQUEST",
+		message: "Qoder does not support this request; check client compatibility."
+	},
+	"10605": {
+		code: "RATE_LIMIT",
+		message: "Qoder model is queued."
+	},
+	"100400": {
+		code: "PROVIDER_ERROR",
+		message: "Qoder custom model service failed."
+	},
+	"100401": {
+		code: "AUTH",
+		message: "Qoder custom model authentication failed."
+	},
+	"100403": {
+		code: "PROVIDER_ERROR",
+		message: "Qoder custom model is unavailable."
+	}
+};
+/** Decode only model rejection diagnostics, with bounded depth, work and JSON size. */
+function modelErrorDetails(raw, status) {
+	let upstreamCode;
+	let codeDepth = -1;
+	let detail;
+	let textCode;
+	let delayMs;
+	let remaining = 100;
+	const seen = /* @__PURE__ */ new Set();
+	function visit(value, depth) {
+		if (depth > 10 || --remaining < 0) return;
+		if (typeof value === "string") {
+			const text = value.trim();
+			if (!text) return;
+			if (text.length <= 16 * 1024) try {
+				visit(JSON.parse(text), depth + 1);
+				return;
+			} catch {}
+			const diagnostic = text.slice(0, 16 * 1024);
+			if (isContextWindowExceededError(diagnostic)) textCode = CONTEXT_WINDOW_EXCEEDED_CODE;
+			else if (textCode === void 0 && isQuotaExceededError(diagnostic)) textCode = QUOTA_EXCEEDED_CODE;
+			detail = text.slice(0, 300);
+			return;
+		}
+		if (!value || typeof value !== "object" || Array.isArray(value) || seen.has(value)) return;
+		seen.add(value);
+		const obj = value;
+		for (const key of [
+			"code",
+			"error_code",
+			"errorCode",
+			"errCode"
+		]) {
+			const candidate = obj[key];
+			const code = (typeof candidate === "number" && Number.isFinite(candidate) ? String(candidate) : typeof candidate === "string" ? candidate.trim() : void 0)?.slice(0, 100);
+			if (!code || code === "0" || code === String(status) && !Object.hasOwn(modelBusinessErrors, code)) continue;
+			if (depth >= codeDepth) {
+				upstreamCode = code;
+				codeDepth = depth;
+			}
+		}
+		const seconds = obj.retryAfterSeconds;
+		if (typeof seconds === "number" && Number.isFinite(seconds * 1e3) && seconds > 0) delayMs = Math.max(delayMs ?? 0, seconds * 1e3);
+		for (const key of [
+			"message",
+			"body",
+			"details",
+			"error",
+			"cause",
+			"data",
+			"qoderApiError",
+			"providerError"
+		]) visit(obj[key], depth + 1);
+	}
+	visit(raw, 0);
+	return {
+		upstreamCode,
+		detail,
+		textCode,
+		delayMs
+	};
+}
+/** Model business semantics precede HTTP status; other transport capabilities keep their own protocols. */
+function qoderModelError(message, response) {
+	const details = modelErrorDetails(response.cause, response.status);
+	const known = details.upstreamCode === void 0 ? void 0 : Object.hasOwn(modelBusinessErrors, details.upstreamCode) ? modelBusinessErrors[details.upstreamCode] : void 0;
+	const fallback = qoderHttpError(message, response);
+	let code = fallback.code;
+	let summary = details.detail ? `${message}: ${details.detail}` : message;
+	if (details.upstreamCode !== void 0) {
+		code = known?.code ?? "PROVIDER_ERROR";
+		summary = `${known?.message ?? summary} (Qoder code ${details.upstreamCode}).`;
+	} else if (details.textCode === CONTEXT_WINDOW_EXCEEDED_CODE) {
+		code = CONTEXT_WINDOW_EXCEEDED_CODE;
+		summary = "Qoder model context window has been exceeded.";
+	} else if (details.textCode === QUOTA_EXCEEDED_CODE) {
+		code = QUOTA_EXCEEDED_CODE;
+		summary = "Qoder subscriber quota is exhausted.";
+	}
+	const providerRetryAfterMs = Math.max(fallback.failure.providerRetryAfterMs ?? 0, details.delayMs ?? 0) || void 0;
+	const error = new QoderLlmError(summary, code, {
+		status: response.status,
+		...providerRetryAfterMs === void 0 ? {} : { providerRetryAfterMs },
+		...fallback.failure.requestId === void 0 ? {} : { requestId: fallback.failure.requestId },
+		...response.cause === void 0 ? {} : { cause: response.cause }
+	});
+	error.upstreamCode = details.upstreamCode;
+	error.source = response.source;
+	error.httpStatus = response.httpStatus ?? (response.source === "http" ? response.status : void 0);
+	return error;
+}
+function canRefreshModelCredentials(error) {
+	return error.source === "http" && (error.failure.status === 401 || error.failure.status === 403) && error.code === "AUTH" && (error.upstreamCode === void 0 || error.upstreamCode === "105");
+}
 function qoderHttpError(message, response) {
 	const { status } = response;
 	const code = status === 401 || status === 403 ? "AUTH" : status === 408 ? "TIMEOUT" : status === 429 ? "RATE_LIMIT" : status >= 500 && status <= 599 ? "SERVER" : status >= 400 && status <= 499 ? "INVALID_REQUEST" : "PROVIDER_ERROR";
@@ -367,11 +549,16 @@ function retryAfterMs(value, nowMs = Date.now()) {
 }
 //#endregion
 //#region src/qoder/transport/machine-id.ts
-function defaultMachineIdPaths() {
-	return [join(homedir(), ".qoder", ".auth", "machine_id"), join(homedir(), ".dsh", "qoder", "machine_id")];
-}
+/** Match the native CLI's region-specific config directory overrides. */
+function qoderMachineIdPaths(region = "global", env = process.env, home = homedir()) {
+	const prefix = region === "china" ? "QODERCN_" : "QODER_";
+	const cliHome = env[`${prefix}CLI_HOME`] ?? env.GEMINI_CLI_HOME ?? home;
+	const configDir = env[`${prefix}CONFIG_DIR`];
+	return [join(configDir ? resolve(configDir) : join(cliHome, region === "china" ? ".qoder-cn" : ".qoder"), ".auth", "machine_id"), join(home, ".dsh", "qoder", "machine_id")];
+}
+const ephemeralMachineIds = /* @__PURE__ */ new Map();
 /** Read Qoder's machine id or create the DSH-owned fallback. */
-function getMachineId(paths = defaultMachineIdPaths()) {
+function getMachineId(paths = qoderMachineIdPaths()) {
 	for (const path of paths) {
 		if (!existsSync(path)) continue;
 		try {
@@ -379,8 +566,8 @@ function getMachineId(paths = defaultMachineIdPaths()) {
 			if (value) return value;
 		} catch {}
 	}
-	const machineId = crypto.randomUUID();
 	const savePath = paths.at(-1);
+	const machineId = (savePath === void 0 ? void 0 : ephemeralMachineIds.get(savePath)) ?? crypto.randomUUID();
 	if (savePath !== void 0) try {
 		mkdirSync(dirname(savePath), { recursive: true });
 		writeFileSync(savePath, machineId, {
@@ -393,6 +580,7 @@ function getMachineId(paths = defaultMachineIdPaths()) {
 			if (existing) return existing;
 		} catch {}
 	}
+	if (savePath !== void 0) ephemeralMachineIds.set(savePath, machineId);
 	return machineId;
 }
 //#endregion
@@ -419,7 +607,12 @@ function redactString(value) {
 }
 /** Redact credentials and bound arbitrary provider values before logging them. */
 function redactLogValue(value, depth = 0) {
-	if (typeof value === "string") return redactString(value);
+	if (typeof value === "string") {
+		if (depth < maxDepth && value.length <= 16 * 1024 && /^[\s]*[{"]/u.test(value)) try {
+			return redactString(JSON.stringify(redactLogValue(JSON.parse(value), depth + 1)));
+		} catch {}
+		return redactString(value);
+	}
 	if (value === null || typeof value !== "object") return value;
 	if (depth >= maxDepth) return "[TRUNCATED]";
 	if (value instanceof Error) return {
@@ -427,6 +620,10 @@ function redactLogValue(value, depth = 0) {
 		message: redactString(value.message),
 		..."code" in value ? { code: redactLogValue(value.code, depth + 1) } : {},
 		..."cause" in value ? { cause: redactLogValue(value.cause, depth + 1) } : {},
+		..."upstreamCode" in value ? { upstreamCode: redactLogValue(value.upstreamCode, depth + 1) } : {},
+		..."source" in value ? { source: value.source } : {},
+		..."httpStatus" in value ? { httpStatus: value.httpStatus } : {},
+		..."failure" in value ? { failure: redactLogValue(value.failure, depth + 1) } : {},
 		...value instanceof AggregateError ? { errors: redactLogValue(value.errors, depth + 1) } : {}
 	};
 	if (Array.isArray(value)) return value.slice(0, maxEntries).map((item) => redactLogValue(item, depth + 1));
@@ -468,12 +665,14 @@ MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDA8iMH5c02LilrsERw9t6Pv5Nc
 6HRkPJ7S236FZz73In/KVuLnwI8JJ2CbuJap8kvheCCZpmAWpb/cPx/3Vr/J6I17
 XcW+ML9FoCI6AOvOzwIDAQAB
 -----END PUBLIC KEY-----`;
-const qoderIdeVersion = "1.1.60";
+const qoderIdeVersion = "1.1.65";
 const defaultUserAgent = `qoder/${qoderIdeVersion}`;
 const qoderDataPolicy = "disagree";
 const qoderLoginVersion = "v2";
-const qoderMachineOs = process.platform === "win32" ? process.arch === "arm64" ? "aarch64_windows" : "x86_64_windows" : process.arch === "arm64" ? "aarch64_linux" : "x86_64_linux";
 const qoderMachineTypeMagic = "5";
+function qoderMachineOs(platform = process.platform, arch = process.arch) {
+	return `${arch === "arm64" ? "aarch64" : arch === "x64" ? "x86_64" : arch}_${platform}`;
+}
 function computeSigPath(urlStr) {
 	let sigPath = new URL(urlStr).pathname;
 	if (sigPath.startsWith("/algo")) sigPath = sigPath.substring(5);
@@ -499,9 +698,9 @@ function buildAuthHeaders(body, requestURL, creds) {
 	const userInfo = {
 		uid: creds.userID,
 		security_oauth_token: creds.authToken,
-		name: creds.name || "",
-		aid: "",
-		email: creds.email || ""
+		...creds.organizationId === void 0 ? {} : { organization_id: creds.organizationId },
+		...creds.organizationTags === void 0 ? {} : { organization_tags: creds.organizationTags },
+		...creds.dataPolicyAgreed === void 0 ? {} : { data_policy_agreed: creds.dataPolicyAgreed }
 	};
 	const infoB64 = aesEncryptCBCBase64(JSON.stringify(userInfo), aesKey);
 	const cosyKey = rsaEncryptBase64(aesKey);
@@ -517,9 +716,9 @@ function buildAuthHeaders(body, requestURL, creds) {
 	const sigPath = computeSigPath(requestURL);
 	const sigInput = `${payloadB64}\n${cosyKey}\n${timestamp}\n${body ? Buffer.isBuffer(body) ? body.toString("utf8") : body : ""}\n${sigPath}`;
 	const sig = crypto.createHash("md5").update(sigInput).digest("hex");
-	const bodyHash = crypto.createHash("md5").update(body || "").digest("hex");
-	const bodyLen = body ? (Buffer.isBuffer(body) ? body.length : Buffer.from(body).length).toString() : "0";
 	const machineID = creds.machineID || getMachineId();
+	const isModelRequest = sigPath === "/api/v2/service/pro/sse/agent_chat_generation";
+	const machineHostname = hostname().replace(/[^\x20-\x7e]/gu, "").trim();
 	return {
 		Authorization: `Bearer COSY.${payloadB64}.${sig}`,
 		"Cosy-Key": cosyKey,
@@ -529,17 +728,17 @@ function buildAuthHeaders(body, requestURL, creds) {
 		"Cosy-Machineid": machineID,
 		"Cosy-Machinetoken": machineID,
 		"Cosy-Machinetype": qoderMachineTypeMagic,
-		"Cosy-Machineos": qoderMachineOs,
+		"Cosy-Machineos": qoderMachineOs(),
+		...isModelRequest && machineHostname ? { "Cosy-MachineHostname": machineHostname } : {},
 		"Cosy-Clienttype": "5",
-		"Cosy-Clientip": "127.0.0.1",
-		"Cosy-Bodyhash": bodyHash,
-		"Cosy-Bodylength": bodyLen,
-		"Cosy-Sigpath": sigPath,
-		"Cosy-Data-Policy": qoderDataPolicy,
-		"Cosy-Organization-Id": "",
-		"Cosy-Organization-Tags": "",
-		"Login-Version": qoderLoginVersion,
-		"X-Request-Id": crypto.randomUUID()
+		"Cosy-Business-Product": "cli",
+		"Cosy-Business-Type": "agent",
+		"Cosy-Scene": "assistant",
+		...isModelRequest ? {} : { "Cosy-Clientip": machineID },
+		"Cosy-Data-Policy": creds.dataPolicyAgreed === true ? "agree" : qoderDataPolicy,
+		...creds.organizationId ? { "Cosy-Organization-Id": creds.organizationId } : {},
+		...creds.organizationTags?.length ? { "Cosy-Organization-Tags": creds.organizationTags.join(",") } : {},
+		"Login-Version": qoderLoginVersion
 	};
 }
 const defaultResponseHeaderTimeoutMs = 6e4;
@@ -666,15 +865,12 @@ async function openApiJsonRequest(fetchImpl, options) {
 		const headers = {
 			accept: "application/json",
 			"user-agent": options.userAgent ?? defaultUserAgent,
-			"cosy-version": "1.0.1",
+			"cosy-version": qoderIdeVersion,
+			"cosy-machineos": qoderMachineOs(),
 			"cosy-clienttype": "5",
 			...options.headers
 		};
 		if (options.token) headers.authorization = `Bearer ${options.token}`;
-		if (options.machineId) {
-			headers["Cosy-MachineToken"] = options.machineId;
-			headers["Cosy-MachineType"] = "host";
-		}
 		let bodyText;
 		if (options.body !== void 0) {
 			headers["content-type"] = "application/json";
@@ -718,16 +914,28 @@ async function openApiJsonRequest(fetchImpl, options) {
 const expiryBufferMs = 300 * 1e3;
 const defaultExpiryMs = 1440 * 60 * 1e3;
 const defaultAuthTimeoutMs = 15e3;
+const defaultOrganizationTagsTimeoutMs = 3e3;
+/** Match qodercli's seconds/milliseconds compatibility, preferring absolute expiry. */
+function jobTokenExpiry(data, now = Date.now()) {
+	const absolute = data.expires_at ?? data.expiresAt ?? data.expire_time ?? data.expireTime;
+	if (absolute !== void 0) {
+		const parsed = typeof absolute === "string" ? Date.parse(absolute) : absolute > 0xe8d4a51000 ? absolute : absolute * 1e3;
+		if (Number.isFinite(parsed)) return parsed;
+	}
+	const relative = data.expires_in;
+	if (typeof relative === "number" && Number.isFinite(relative) && relative > 0) return now + (relative > 86400 ? relative : relative * 1e3);
+	return now + defaultExpiryMs;
+}
 function abortedError() {
 	return new QoderLlmError("Qoder authentication was aborted.", "ABORTED");
 }
 async function waitForFlight(promise, signal) {
 	if (signal === void 0) return promise;
-	if (signal.aborted) throw abortedError();
 	return new Promise((resolve, reject) => {
 		const onAbort = () => reject(abortedError());
 		signal.addEventListener("abort", onAbort, { once: true });
 		promise.then(resolve, reject).finally(() => signal.removeEventListener("abort", onAbort));
+		if (signal.aborted) onAbort();
 	});
 }
 var QoderAuthService = class {
@@ -735,14 +943,16 @@ var QoderAuthService = class {
 	inFlight = /* @__PURE__ */ new Map();
 	fetchImpl;
 	timeoutMs;
+	organizationTagsTimeoutMs;
 	resolveMachineId;
 	region;
 	logger;
 	constructor(options = {}) {
 		this.fetchImpl = options.fetch ?? globalThis.fetch;
 		this.timeoutMs = options.timeoutMs ?? defaultAuthTimeoutMs;
-		this.resolveMachineId = options.resolveMachineId ?? getMachineId;
+		this.organizationTagsTimeoutMs = options.organizationTagsTimeoutMs ?? defaultOrganizationTagsTimeoutMs;
 		this.region = options.region ?? "global";
+		this.resolveMachineId = options.resolveMachineId ?? (() => getMachineId(qoderMachineIdPaths(this.region)));
 		this.logger = options.logger;
 	}
 	clear(pat) {
@@ -763,7 +973,7 @@ var QoderAuthService = class {
 			created.waiters = 0;
 			created.settled = false;
 			created.timeout = setTimeout(() => controller.abort("authentication timeout"), this.timeoutMs);
-			created.promise = this.exchangeAndResolve(pat, controller.signal).finally(() => {
+			created.promise = this.exchangeAndResolve(pat, controller.signal, () => clearTimeout(created.timeout)).finally(() => {
 				created.settled = true;
 				clearTimeout(created.timeout);
 				if (this.inFlight.get(cacheKey) === created) this.inFlight.delete(cacheKey);
@@ -782,32 +992,45 @@ var QoderAuthService = class {
 			}
 		}
 	}
-	async exchangeAndResolve(pat, signal) {
-		let jobToken;
-		let expiresAt = Date.now() + defaultExpiryMs;
+	async exchangeAndResolve(pat, signal, onAuthenticated) {
+		const machineID = this.resolveMachineId().trim();
 		const data = await openApiJsonRequest(this.fetchImpl, {
 			url: getQoderExchangeUrl(this.region),
-			body: { personal_token: pat },
+			body: {
+				personal_token: pat,
+				...machineID && machineID !== "unknown" ? { machine_id: machineID } : {}
+			},
 			signal,
 			timeoutMs: this.timeoutMs,
 			logger: this.logger,
 			operation: "Auth",
 			logCategory: "auth.exchange"
 		});
-		if (!data.token) throw new QoderLlmError("Qoder PAT exchange returned no job token.", "AUTH");
-		jobToken = data.token;
-		if (data.expires_at) {
-			const parsed = Date.parse(data.expires_at);
-			if (!Number.isNaN(parsed)) expiresAt = parsed;
-		} else if (typeof data.expires_in === "number" && data.expires_in > 0) expiresAt = Date.now() + data.expires_in;
+		const jobToken = [
+			data.token,
+			data.device_token,
+			data.access_token
+		].find((value) => typeof value === "string" && value.length > 0);
+		if (!jobToken) throw new QoderLlmError("Qoder PAT exchange returned no job token.", "AUTH");
+		const expiresAt = jobTokenExpiry(data);
 		const userInfo = await retryMetadataRead(signal, () => this.fetchUserInfo(jobToken, signal));
+		if (signal.aborted) throw abortedError();
+		onAuthenticated();
 		const creds = {
 			userID: userInfo.userID,
 			authToken: jobToken,
 			name: userInfo.name || "Qoder User",
 			email: userInfo.email,
-			machineID: this.resolveMachineId()
+			machineID,
+			...userInfo.organizationId === void 0 ? {} : { organizationId: userInfo.organizationId },
+			...userInfo.organizationTags === void 0 ? {} : { organizationTags: userInfo.organizationTags },
+			...userInfo.dataPolicyAgreed === void 0 ? {} : { dataPolicyAgreed: userInfo.dataPolicyAgreed }
 		};
+		if (creds.organizationId && creds.organizationTags === void 0) {
+			const tags = await this.fetchOrganizationTags(jobToken, creds.organizationId, signal);
+			if (tags !== void 0) creds.organizationTags = tags;
+		}
+		if (signal.aborted) throw abortedError();
 		const cacheKey = `${this.region}:${opaqueCredentialKey(pat)}`;
 		this.cache.set(cacheKey, {
 			creds,
@@ -825,13 +1048,49 @@ var QoderAuthService = class {
 			operation: "UserInfo",
 			logCategory: "auth.user-info"
 		});
-		if (!info.id) throw new QoderLlmError("Qoder identity lookup returned no user id.", "AUTH");
+		const userID = [
+			info.id,
+			info.user_id,
+			info.uid
+		].find((value) => typeof value === "string" && value.length > 0);
+		const organizationId = [
+			info.orgId,
+			info.organization_id,
+			info.organizationId,
+			info.organization?.org_id,
+			info.organization?.orgId,
+			info.organization?.id
+		].find((value) => typeof value === "string" && value.length > 0);
+		if (!userID) throw new QoderLlmError("Qoder identity lookup returned no user id.", "AUTH");
+		const organizationTags = Array.isArray(info.organization_tags) ? info.organization_tags.filter((tag) => typeof tag === "string") : void 0;
 		return {
-			userID: info.id,
+			userID,
 			email: info.email ?? "",
-			name: info.name ?? info.username ?? ""
+			name: info.name ?? info.username ?? "",
+			...organizationId ? { organizationId } : {},
+			...organizationTags === void 0 ? {} : { organizationTags },
+			...typeof info.data_policy_agreed === "boolean" ? { dataPolicyAgreed: info.data_policy_agreed } : {}
 		};
 	}
+	async fetchOrganizationTags(jobToken, organizationId, signal) {
+		const timeout = AbortSignal.timeout(this.organizationTagsTimeoutMs);
+		const lookupSignal = AbortSignal.any([signal, timeout]);
+		try {
+			const { tags } = await retryMetadataRead(lookupSignal, () => openApiJsonRequest(this.fetchImpl, {
+				url: `${resolveQoderEndpoints(this.region).openApiUrl}/api/v1/organizations/${encodeURIComponent(organizationId)}/tags`,
+				token: jobToken,
+				signal: lookupSignal,
+				timeoutMs: this.organizationTagsTimeoutMs,
+				logger: this.logger,
+				operation: "OrganizationTags"
+			}));
+			return Array.isArray(tags) ? tags.filter((tag) => typeof tag === "string") : [];
+		} catch (error) {
+			if (signal.aborted) throw error;
+			this.logger?.warn?.("[Qoder Auth] Organization tags unavailable; retaining subscriber organization.");
+			return;
+		}
+	}
 };
 //#endregion
 //#region src/qoder/transport/catalog-reader.ts
@@ -885,14 +1144,19 @@ async function fetchQoderModels(credentials, options = {}) {
 function unsupported(message) {
 	return new QoderLlmError(message, "UNSUPPORTED_CONTENT");
 }
-function toolResultText(block) {
-	let text = "";
-	for (const nested of block.content) {
-		if (nested.type === "image") continue;
-		if (nested.type !== "text") throw unsupported(`Qoder tool results support text only; received nested ${String(nested.type)} content.`);
-		text += nested.text;
-	}
-	return text;
+/** Keep multimodal tool results attached to their call. */
+async function translateToolResultContent(blocks, context) {
+	const supportedBlocks = blocks.map((block) => {
+		if (block.type === "text" || block.type === "image") return block;
+		throw unsupported(`Qoder tool results support text and images only; received ${String(block.type)} content.`);
+	});
+	const images = supportedBlocks.filter((block) => block.type === "image");
+	if (images.length === 0) return { content: supportedBlocks.map((block) => block.type === "text" ? block.text : "").join("") };
+	if (context.attachments !== void 0) enforceImageLimits(images, context.attachments);
+	return { content: await Promise.all(supportedBlocks.map((block) => block.type === "image" ? resolveImagePart(block, context) : {
+		type: "text",
+		text: block.text
+	})) };
 }
 /** Reject a batch that exceeds the deployment image policy before any upload work starts. */
 function enforceImageLimits(images, attachments) {
@@ -985,23 +1249,21 @@ async function validateAndTranslateMessages(messages, systemPrompt, attachments,
 				output.push({
 					role: "tool",
 					tool_call_id: callId,
-					content: toolResultText(result)
+					...await translateToolResultContent(result.content, context)
 				});
-				const images = result.content.filter((block) => block.type === "image");
-				if (images.length > 0) {
-					if (attachments !== void 0) enforceImageLimits(images, attachments);
-					output.push({
-						role: "user",
-						content: [{
-							type: "text",
-							text: `[${images.length} image${images.length === 1 ? "" : "s"} returned by the previous tool call]`
-						}, ...await Promise.all(images.map((image) => resolveImagePart(image, context)))]
-					});
-				}
 			}
 			if (nonToolBlocks.length === 0) continue;
 		}
 		const contentBlocks = toolResults.length > 0 ? nonToolBlocks : message.content;
+		if (message.role === "tool") {
+			const callId = consumeToolCallId(message, void 0, lastAssistantToolCallIds, output.length);
+			output.push({
+				role: "tool",
+				tool_call_id: callId,
+				...await translateToolResultContent(contentBlocks, context)
+			});
+			continue;
+		}
 		let text = "";
 		let reasoningText = "";
 		const userContent = [];
@@ -1009,7 +1271,6 @@ async function validateAndTranslateMessages(messages, systemPrompt, attachments,
 		let hasImage = false;
 		const toolCalls = [];
 		for (const block of contentBlocks) {
-			if (message.role === "tool" && block.type !== "text" && block.type !== "image") throw unsupported(`Qoder tool results support text and images only; received ${block.type} content.`);
 			if (block.type === "text") {
 				text += block.text;
 				if (message.role === "user" || toolResults.length > 0) userContent.push({
@@ -1019,7 +1280,7 @@ async function validateAndTranslateMessages(messages, systemPrompt, attachments,
 				continue;
 			}
 			if (block.type === "image") {
-				if (message.role !== "user" && message.role !== "tool" && toolResults.length === 0) throw unsupported("Qoder image content is valid only in user messages.");
+				if (message.role !== "user" && toolResults.length === 0) throw unsupported("Qoder image content is valid only in user messages.");
 				hasImage = true;
 				pendingImages.push({
 					slot: userContent.length,
@@ -1056,25 +1317,6 @@ async function validateAndTranslateMessages(messages, systemPrompt, attachments,
 			});
 			continue;
 		}
-		if (message.role === "tool") {
-			const callId = consumeToolCallId(message, void 0, lastAssistantToolCallIds, output.length);
-			output.push({
-				role: "tool",
-				tool_call_id: callId,
-				content: text
-			});
-			if (pendingImages.length > 0) {
-				if (attachments !== void 0) enforceImageLimits(pendingImages.map((pending) => pending.block), attachments);
-				output.push({
-					role: "user",
-					content: [{
-						type: "text",
-						text: `[${pendingImages.length} image${pendingImages.length === 1 ? "" : "s"} returned by the previous tool call]`
-					}, ...await Promise.all(pendingImages.map((pending) => resolveImagePart(pending.block, context)))]
-				});
-			}
-			continue;
-		}
 		if (pendingImages.length > 0) {
 			if (attachments !== void 0) enforceImageLimits(pendingImages.map((pending) => pending.block), attachments);
 			await Promise.all(pendingImages.map(async (pending) => {
@@ -1152,10 +1394,10 @@ const injectedContextOpenings = [
 */
 const hostNotificationTemplate = /^(?:Agent|Background subagent) \S{3,} (?:sent a message:|finished\b)/;
 /**
-* Text this transport synthesizes while translating a turn's own tool results.
+* Compatibility with image markers synthesized by older transport versions.
 *
-* A tool result carrying images becomes a user-role message, so it must be
-* recognized as part of the open record rather than as new subscriber input.
+* Current tool images stay in tool-role messages. Historical user-role markers
+* still belong to the open record rather than to new subscriber input.
 */
 const syntheticMarkerTemplate = /^\[\d+ images? returned by the previous tool call\]/;
 /** Wire text of one user message, used for injection classification and text extraction. */
@@ -1230,7 +1472,8 @@ var QoderTurnTracker = class {
 			requestSetId: `qoder-request-${crypto.randomUUID()}`,
 			chatRecordId: requestId,
 			businessId: crypto.randomUUID(),
-			beginAt: now
+			beginAt: now,
+			businessStage: "start"
 		};
 		if (kind === "auxiliary") {
 			if (this.sessions.has(sessionId)) this.sessions.get(sessionId).lastTouchedAt = now;
@@ -1238,7 +1481,8 @@ var QoderTurnTracker = class {
 				requestSetId: `qoder-request-${crypto.randomUUID()}`,
 				chatRecordId: requestId,
 				businessId: crypto.randomUUID(),
-				beginAt: now
+				beginAt: now,
+				businessStage: "start"
 			};
 		}
 		let state = this.sessions.get(sessionId);
@@ -1286,12 +1530,15 @@ var QoderTurnTracker = class {
 			if (current === void 0) state.claimed.delete(fingerprint);
 			else if (current.count < claimed) state.claimed.set(fingerprint, current.count);
 		}
+		let businessStage = "processing";
 		if (opening !== void 0 && unclaimed > 0 || modelChanged) {
+			businessStage = "start";
 			state.turnCount += 1;
 			state.currentTurnId = turnIdFor(sessionId, state.turnCount, opening ?? state.currentModel ?? "");
 			state.currentBusinessId = crypto.randomUUID();
 			state.turnOpenedAt = now;
 		} else if (state.currentTurnId === "") {
+			businessStage = "start";
 			state.turnCount += 1;
 			state.currentTurnId = turnIdFor(sessionId, state.turnCount, state.currentModel ?? "");
 			state.currentBusinessId = crypto.randomUUID();
@@ -1301,7 +1548,8 @@ var QoderTurnTracker = class {
 			requestSetId: state.currentTurnId,
 			chatRecordId: requestId,
 			businessId: state.currentBusinessId,
-			beginAt: state.turnOpenedAt
+			beginAt: state.turnOpenedAt,
+			businessStage
 		};
 	}
 	/**
@@ -1461,7 +1709,10 @@ async function buildQoderRequestBody(options, userId, translatedMessages, model,
 		chat_prompt: "",
 		image_urls: null,
 		aliyun_user_type: "",
-		system: "",
+		system: messages.filter((message) => message.role === "system").flatMap((message) => typeof message.content === "string" && message.content.length > 0 ? [{
+			type: "text",
+			text: message.content
+		}] : []),
 		messages,
 		tools,
 		parameters: {
@@ -1492,9 +1743,9 @@ async function buildQoderRequestBody(options, userId, translatedMessages, model,
 		},
 		business: {
 			product: "cli",
-			version: "1.0.60",
+			version: qoderIdeVersion,
 			type: "agent",
-			stage: "start",
+			stage: identity.businessStage,
 			id: identity.businessId,
 			name: lastUserText.substring(0, 30),
 			begin_at: identity.beginAt
@@ -2029,7 +2280,7 @@ var QoderUsageReader = class {
 		const [usage, plan, status] = await Promise.all([
 			retryMetadataRead(signal, () => this.fetchUsage(creds.authToken, signal)),
 			this.safeFetchPlan(creds.authToken, signal),
-			this.safeFetchStatus(creds.authToken, creds.machineID, signal)
+			this.safeFetchStatus(creds.authToken, signal)
 		]);
 		const accountInfo = {
 			profile,
@@ -2055,6 +2306,11 @@ var QoderUsageReader = class {
 	* `dedicatedResourcePackages`: those entries carry the campaign identifiers
 	* that the normalized list deliberately discards, and this payload crosses
 	* the seam into the browser.
+	*
+	* `addOnQuota` is the pool a plan holds separately from its own subscription
+	* quota. A plan whose subscription quota is zero — Free in particular —
+	* reports its whole balance there, so dropping the bucket left the card with
+	* nothing to render.
 	*/
 	async fetchUsage(jobToken, signal) {
 		const data = await openApiJsonRequest(this.fetchImpl, {
@@ -2072,6 +2328,7 @@ var QoderUsageReader = class {
 		return {
 			userQuota: normalizeQuota(data.userQuota),
 			orgResourcePackage: normalizeQuota(data.orgResourcePackage),
+			addOnQuota: normalizeQuota(data.add_on_quota ?? data.addOnQuota),
 			...dedicatedResourcePackages !== void 0 ? { dedicatedResourcePackages } : {},
 			totalUsagePercentage: typeof data.totalUsagePercentage === "number" ? data.totalUsagePercentage : void 0,
 			isQuotaExceeded: typeof data.isQuotaExceeded === "boolean" ? data.isQuotaExceeded : false,
@@ -2099,11 +2356,10 @@ var QoderUsageReader = class {
 			return;
 		}
 	}
-	async fetchStatus(jobToken, machineId, signal) {
+	async fetchStatus(jobToken, signal) {
 		return normalizeStatus(await openApiJsonRequest(this.fetchImpl, {
 			url: getQoderUserStatusUrl(this.region),
 			token: jobToken,
-			machineId,
 			signal,
 			timeoutMs: this.timeoutMs,
 			logger: this.logger,
@@ -2111,9 +2367,9 @@ var QoderUsageReader = class {
 			logCategory: "account.status"
 		}));
 	}
-	async safeFetchStatus(jobToken, machineId, signal) {
+	async safeFetchStatus(jobToken, signal) {
 		try {
-			return await this.fetchStatus(jobToken, machineId, signal);
+			return await this.fetchStatus(jobToken, signal);
 		} catch (error) {
 			if (signal?.aborted) throw error;
 			this.logger?.warn?.("[Qoder Status] Failed to load user status (degraded)", error instanceof Error ? error.message : error);
@@ -2133,23 +2389,27 @@ var QoderUsageReader = class {
 */
 const qoderCustomAlphabet = "_doRTgHZBKcGVjlvpC,@aFSx#DPuNJme&i*MzLOEn)sUrthbf%Y^w.(kIQyXqWA!";
 const qoderStdAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-function qoderEncodeBody(plaintext) {
+const qoderEncodeTable = /* @__PURE__ */ new Uint8Array(128);
+for (let i = 0; i < 64; i++) qoderEncodeTable[qoderStdAlphabet.charCodeAt(i)] = qoderCustomAlphabet.charCodeAt(i);
+qoderEncodeTable["=".charCodeAt(0)] = "$".charCodeAt(0);
+/** Encode directly into wire bytes without building per-character string ropes. */
+function qoderEncodeBodyBytes(plaintext) {
 	const std = Buffer.isBuffer(plaintext) ? plaintext.toString("base64") : Buffer.from(plaintext).toString("base64");
 	const n = std.length;
 	const a = Math.floor(n / 3);
-	const rearranged = std.slice(n - a) + std.slice(a, n - a) + std.slice(0, a);
-	let out = "";
-	for (let i = 0; i < n; i++) {
-		const c = rearranged[i];
-		if (c === "=") out += "$";
-		else {
-			const idx = qoderStdAlphabet.indexOf(c);
-			if (idx >= 0) out += qoderCustomAlphabet[idx];
-			else out += c;
-		}
-	}
+	const out = Buffer.allocUnsafe(n);
+	let offset = 0;
+	const writeRange = (start, end) => {
+		for (let i = start; i < end; i++) out[offset++] = qoderEncodeTable[std.charCodeAt(i)];
+	};
+	writeRange(n - a, n);
+	writeRange(a, n - a);
+	writeRange(0, a);
 	return out;
 }
+function qoderEncodeBody(plaintext) {
+	return qoderEncodeBodyBytes(plaintext).toString("latin1");
+}
 //#endregion
 //#region src/qoder/transport/search.ts
 /**
@@ -2320,163 +2580,6 @@ var QoderSearchClient = class {
 	}
 };
 //#endregion
-//#region src/qoder/transport/wire/thinking.ts
-const thinkingTags = [{
-	open: "<thinking>",
-	close: "</thinking>"
-}, {
-	open: "<think>",
-	close: "</think>"
-}];
-const allTags = thinkingTags.flatMap((tag) => [tag.open, tag.close]);
-function trailingPrefixLength(text, candidates) {
-	let best = 0;
-	for (const candidate of candidates) {
-		const limit = Math.min(text.length, candidate.length - 1);
-		for (let length = limit; length > best; length--) if (text.endsWith(candidate.slice(0, length))) {
-			best = length;
-			break;
-		}
-	}
-	return best;
-}
-function earliestTag(text, kind) {
-	let found;
-	for (const tag of thinkingTags) {
-		const position = text.indexOf(tag[kind]);
-		if (position !== -1 && (found === void 0 || position < found.position)) found = {
-			position,
-			tag
-		};
-	}
-	return found;
-}
-function trimSeparator(text) {
-	if (text.startsWith("\n\n")) return text.slice(2);
-	if (text.startsWith("\n")) return text.slice(1);
-	return text;
-}
-var NativeReasoningStripper = class {
-	buffer = "";
-	push(chunk) {
-		this.buffer += chunk;
-		let output = "";
-		while (this.buffer) {
-			let firstPosition = -1;
-			let firstTag = "";
-			for (const tag of allTags) {
-				const position = this.buffer.indexOf(tag);
-				if (position !== -1 && (firstPosition === -1 || position < firstPosition)) {
-					firstPosition = position;
-					firstTag = tag;
-				}
-			}
-			if (firstPosition !== -1) {
-				output += this.buffer.slice(0, firstPosition);
-				this.buffer = this.buffer.slice(firstPosition + firstTag.length);
-				continue;
-			}
-			const held = trailingPrefixLength(this.buffer, allTags);
-			output += this.buffer.slice(0, this.buffer.length - held);
-			this.buffer = this.buffer.slice(this.buffer.length - held);
-			break;
-		}
-		return output;
-	}
-	finish() {
-		const output = allTags.some((tag) => tag.startsWith(this.buffer)) ? "" : this.buffer;
-		this.buffer = "";
-		return output;
-	}
-};
-var QoderThinkingParser = class {
-	buffer = "";
-	mode = "text";
-	closingTag = thinkingTags[0].close;
-	native = new NativeReasoningStripper();
-	pushReasoning(chunk) {
-		const text = this.native.push(chunk);
-		return text ? [{
-			type: "reasoning",
-			text
-		}] : [];
-	}
-	pushContent(chunk) {
-		const output = [];
-		const pendingReasoning = this.native.finish();
-		if (pendingReasoning) output.push({
-			type: "reasoning",
-			text: pendingReasoning
-		});
-		this.buffer += chunk;
-		while (this.buffer) {
-			if (this.mode === "reasoning") {
-				const closeAt = this.buffer.indexOf(this.closingTag);
-				if (closeAt !== -1) {
-					if (closeAt > 0) output.push({
-						type: "reasoning",
-						text: this.buffer.slice(0, closeAt)
-					});
-					this.buffer = trimSeparator(this.buffer.slice(closeAt + this.closingTag.length));
-					this.mode = "text";
-					continue;
-				}
-				const held = trailingPrefixLength(this.buffer, [this.closingTag]);
-				const safeLength = this.buffer.length - held;
-				if (safeLength > 0) output.push({
-					type: "reasoning",
-					text: this.buffer.slice(0, safeLength)
-				});
-				this.buffer = this.buffer.slice(safeLength);
-				break;
-			}
-			const opener = earliestTag(this.buffer, "open");
-			const closer = earliestTag(this.buffer, "close");
-			if (opener !== void 0 && (closer === void 0 || opener.position < closer.position)) {
-				if (opener.position > 0) output.push({
-					type: "text",
-					text: this.buffer.slice(0, opener.position)
-				});
-				this.buffer = this.buffer.slice(opener.position + opener.tag.open.length);
-				this.closingTag = opener.tag.close;
-				this.mode = "reasoning";
-				continue;
-			}
-			if (closer !== void 0) {
-				if (closer.position > 0) output.push({
-					type: "text",
-					text: this.buffer.slice(0, closer.position)
-				});
-				this.buffer = trimSeparator(this.buffer.slice(closer.position + closer.tag.close.length));
-				continue;
-			}
-			const held = trailingPrefixLength(this.buffer, allTags);
-			const safeLength = this.buffer.length - held;
-			if (safeLength > 0) output.push({
-				type: "text",
-				text: this.buffer.slice(0, safeLength)
-			});
-			this.buffer = this.buffer.slice(safeLength);
-			break;
-		}
-		return output;
-	}
-	finish() {
-		const output = [];
-		const pendingReasoning = this.native.finish();
-		if (pendingReasoning) output.push({
-			type: "reasoning",
-			text: pendingReasoning
-		});
-		if (this.buffer) output.push({
-			type: this.mode,
-			text: this.buffer
-		});
-		this.buffer = "";
-		return output;
-	}
-};
-//#endregion
 //#region src/qoder/transport/wire/sse.ts
 /** Decode Qoder's outer SSE envelope and inner model chunks. */
 const doneMarker = "[DONE]";
@@ -2484,31 +2587,7 @@ const defaultMaxSseBufferChars = 2 * 1024 * 1024;
 function malformed(message) {
 	return new QoderLlmError(message, "MALFORMED_RESPONSE");
 }
-function extractErrorDetail(envelope) {
-	const raw = envelope.body ?? envelope.message;
-	if (!raw) return void 0;
-	if (typeof raw !== "string") return JSON.stringify(raw);
-	const trimmed = raw.trim();
-	try {
-		const parsed = JSON.parse(trimmed);
-		if (parsed && typeof parsed === "object") {
-			let detailMsg;
-			if (typeof parsed.details === "string") try {
-				const inner = JSON.parse(parsed.details);
-				if (typeof inner?.error?.message === "string") detailMsg = inner.error.message.trim();
-				else if (typeof inner?.message === "string") detailMsg = inner.message.trim();
-			} catch {}
-			const msg = typeof parsed.message === "string" ? parsed.message.trim() : void 0;
-			const code = typeof parsed.code === "string" ? parsed.code.trim() : void 0;
-			const err = typeof parsed.error === "string" ? parsed.error.trim() : void 0;
-			const text = detailMsg || msg || err;
-			if (code && text) return `${code}: ${text}`;
-			return text || code || trimmed;
-		}
-	} catch {}
-	return trimmed;
-}
-function parseEnvelope(rawData) {
+function parseEnvelope(rawData, options) {
 	let value;
 	try {
 		value = JSON.parse(rawData);
@@ -2519,13 +2598,13 @@ function parseEnvelope(rawData) {
 	const envelope = value;
 	if (envelope.statusCodeValue !== void 0 && typeof envelope.statusCodeValue !== "number") throw malformed("Qoder SSE envelope has an invalid status code.");
 	if (envelope.statusCodeValue !== void 0 && (!Number.isInteger(envelope.statusCodeValue) || envelope.statusCodeValue < 100 || envelope.statusCodeValue > 599)) throw malformed("Qoder SSE envelope has an invalid status code.");
-	if (envelope.statusCodeValue !== void 0 && envelope.statusCodeValue !== 200) {
-		const detail = extractErrorDetail(envelope);
-		throw qoderHttpError(detail ? `Qoder service returned upstream error status ${envelope.statusCodeValue}: ${detail}` : `Qoder service returned upstream error status ${envelope.statusCodeValue}.`, {
-			status: envelope.statusCodeValue,
-			cause: envelope.body
-		});
-	}
+	if (envelope.statusCodeValue !== void 0 && envelope.statusCodeValue !== 200) throw qoderModelError(`Qoder service returned upstream error status ${envelope.statusCodeValue}`, {
+		status: envelope.statusCodeValue,
+		cause: envelope.body ?? envelope.message,
+		source: "sse",
+		headers: options.headers,
+		httpStatus: options.httpStatus
+	});
 	if (envelope.body !== void 0 && typeof envelope.body !== "string") throw malformed("Qoder SSE envelope has an invalid model body.");
 	return envelope;
 }
@@ -2572,7 +2651,6 @@ function carriesStreamDelta(delta) {
 async function* parseQoderSse(stream, options = {}) {
 	const reader = stream.getReader();
 	const decoder = new TextDecoder();
-	const thinkingParser = new QoderThinkingParser();
 	const toolCalls = /* @__PURE__ */ new Map();
 	let buffer = "";
 	let sourceEnded = false;
@@ -2676,7 +2754,7 @@ async function* parseQoderSse(stream, options = {}) {
 					sawDone = true;
 					break;
 				}
-				const envelope = parseEnvelope(rawData);
+				const envelope = parseEnvelope(rawData, options);
 				const body = typeof envelope.body === "string" ? envelope.body.trim() : "";
 				if (!body) continue;
 				if (body === doneMarker) {
@@ -2693,8 +2771,14 @@ async function* parseQoderSse(stream, options = {}) {
 					} else if (carriesStreamDelta(choice.delta)) sawFinishReason = false;
 					const delta = choice.delta;
 					if (!delta) continue;
-					if (typeof delta.reasoning_content === "string" && delta.reasoning_content) for (const segment of thinkingParser.pushReasoning(delta.reasoning_content)) for (const chunk of appendSegment(segment)) yield chunk;
-					if (typeof delta.content === "string" && delta.content) for (const segment of thinkingParser.pushContent(delta.content)) for (const chunk of appendSegment(segment)) yield chunk;
+					if (typeof delta.reasoning_content === "string" && delta.reasoning_content) for (const chunk of appendSegment({
+						type: "reasoning",
+						text: delta.reasoning_content
+					})) yield chunk;
+					if (typeof delta.content === "string" && delta.content) for (const chunk of appendSegment({
+						type: "text",
+						text: delta.content
+					})) yield chunk;
 					if (delta.tool_calls !== void 0) {
 						if (!Array.isArray(delta.tool_calls)) throw malformed("Qoder tool-call delta is not an array.");
 						for (const rawCall of delta.tool_calls) {
@@ -2761,7 +2845,6 @@ async function* parseQoderSse(stream, options = {}) {
 		reader.releaseLock();
 	}
 	if (!sawDone && !sawFinishReason) throw new QoderLlmError("SSE stream ended prematurely without [DONE].", "TRANSPORT");
-	for (const segment of thinkingParser.finish()) for (const chunk of appendSegment(segment)) yield chunk;
 	for (const chunk of closeTextual()) yield chunk;
 	for (const [, state] of [...toolCalls.entries()].sort(([left], [right]) => left - right)) {
 		if (!state.id || !state.name) throw malformed("Qoder completed an unidentifiable tool call.");
@@ -2821,8 +2904,8 @@ function aborted$1(message) {
 }
 async function* streamQoderChat(options, model, credentials, messages, dependencies) {
 	const request = await buildQoderRequestBody(options, credentials.userID, messages, model);
-	const encodedBody = qoderEncodeBody(JSON.stringify(request));
-	const encodedBytes = Buffer.from(encodedBody, "utf8");
+	request.session_type = dependencies.region === "china" ? "qoderclicn" : "qodercli";
+	const encodedBytes = qoderEncodeBodyBytes(JSON.stringify(request));
 	const chatUrl = getQoderChatUrl(dependencies.region);
 	const requestController = new AbortController();
 	let headerTimedOut = false;
@@ -2834,7 +2917,7 @@ async function* streamQoderChat(options, model, credentials, messages, dependenc
 	let lastActivityAt = startedAt;
 	const onCallerAbort = () => requestController.abort(options.signal?.reason);
 	options.signal?.addEventListener("abort", onCallerAbort, { once: true });
-	const headerTimer = setTimeout(() => {
+	let headerTimer = setTimeout(() => {
 		headerTimedOut = true;
 		requestController.abort("response header timeout");
 	}, dependencies.responseHeaderTimeoutMs);
@@ -2857,58 +2940,72 @@ async function* streamQoderChat(options, model, credentials, messages, dependenc
 			contextTier: markedTiers.length === 1 ? markedTiers[0][0] : null,
 			context_length: request.parameters.context_length ?? null
 		}));
-		const response = await dependencies.fetch(chatUrl, {
-			method: "POST",
-			headers: {
-				"content-type": "application/json",
-				"accept": "text/event-stream",
-				"cache-control": "no-cache",
-				"accept-encoding": "identity",
-				"x-model-key": options.model || "cmodel",
-				"x-model-source": model?.source || "system",
-				...attributionHeaders(),
-				...buildAuthHeaders(encodedBytes, chatUrl, credentials)
-			},
-			body: encodedBytes,
-			signal: requestController.signal
-		});
-		clearTimeout(headerTimer);
-		reqId = qoderRequestId(response.headers);
-		dependencies.logger?.debug?.("[Qoder Stream] Response headers received", {
-			region: dependencies.region,
-			status: response.status,
-			durationMs: Math.round(performance.now() - startedAt),
-			...reqId === void 0 ? {} : { requestId: reqId }
-		});
-		resetIdleTimer();
-		if (!response.ok) {
+		let response;
+		let activeCredentials = credentials;
+		for (let attempt = 0; attempt < 2; attempt++) {
+			if (options.signal?.aborted) throw aborted$1("Request was aborted.");
+			if (attempt > 0) headerTimer = setTimeout(() => {
+				headerTimedOut = true;
+				requestController.abort("response header timeout");
+			}, dependencies.responseHeaderTimeoutMs);
+			response = await dependencies.fetch(chatUrl, {
+				method: "POST",
+				headers: {
+					"content-type": "application/json",
+					"accept": "text/event-stream",
+					"cache-control": "no-cache",
+					"connection": "keep-alive",
+					"accept-encoding": "identity",
+					"x-model-key": options.model || "cmodel",
+					"x-model-source": model?.source || "system",
+					...attributionHeaders(),
+					...buildAuthHeaders(encodedBytes, chatUrl, activeCredentials)
+				},
+				body: encodedBytes,
+				signal: requestController.signal
+			});
+			clearTimeout(headerTimer);
+			reqId = qoderRequestId(response.headers);
+			dependencies.logger?.debug?.("[Qoder Stream] Response headers received", {
+				region: dependencies.region,
+				status: response.status,
+				attempt: attempt + 1,
+				durationMs: Math.round(performance.now() - startedAt),
+				...reqId === void 0 ? {} : { requestId: reqId }
+			});
+			resetIdleTimer();
+			if (response.ok) break;
 			let bodyText = "";
 			try {
-				bodyText = (await response.text()).trim();
-			} catch {}
-			let detail = "";
-			if (bodyText) try {
-				const parsed = JSON.parse(bodyText);
-				const msg = typeof parsed.message === "string" && parsed.message.trim() ? parsed.message.trim() : void 0;
-				const code = typeof parsed.code === "string" && parsed.code.trim() ? parsed.code.trim() : void 0;
-				if (code && msg) detail = `: ${code}: ${msg}`;
-				else if (msg) detail = `: ${msg}`;
-				else detail = `: ${bodyText.slice(0, 300)}`;
-			} catch {
-				detail = `: ${bodyText.slice(0, 300)}`;
+				bodyText = (await readLimitedText(response, defaultMaxErrorBytes, "Qoder model error response")).trim();
+			} catch (error) {
+				if (requestController.signal.aborted) throw error;
 			}
-			throw qoderHttpError(`Qoder upstream service returned HTTP ${response.status}${detail}.`, {
+			const failure = qoderModelError(`Qoder upstream service returned HTTP ${response.status}`, {
 				status: response.status,
 				headers: response.headers,
-				cause: bodyText || void 0
+				cause: bodyText || void 0,
+				source: "http"
 			});
+			if (attempt === 0 && dependencies.refreshCredentials && canRefreshModelCredentials(failure)) {
+				if (idleTimer !== void 0) clearTimeout(idleTimer);
+				activeCredentials = await dependencies.refreshCredentials(activeCredentials, options.signal);
+				if (activeCredentials.userID !== credentials.userID) throw new QoderLlmError("Qoder subscriber identity changed during authentication recovery.", "AUTH");
+				continue;
+			}
+			throw failure;
 		}
+		if (!response) throw new QoderLlmError("Qoder response is missing.", "EMPTY_RESPONSE");
 		if (!response.body) throw new QoderLlmError("Qoder response contains no readable body stream.", "EMPTY_RESPONSE");
 		let firstChunkDurationMs;
 		let tokenUsage;
 		let finishReason;
 		const streamStartedAt = performance.now();
-		for await (const chunk of parseQoderSse(response.body, { onActivity: resetIdleTimer })) {
+		for await (const chunk of parseQoderSse(response.body, {
+			onActivity: resetIdleTimer,
+			headers: response.headers,
+			httpStatus: response.status
+		})) {
 			chunkCount++;
 			if (firstChunkDurationMs === void 0) {
 				firstChunkDurationMs = Math.round(performance.now() - startedAt);
@@ -3095,7 +3192,13 @@ var DefaultQoderTransport = class {
 			logger: this.logger,
 			region: this.region,
 			responseHeaderTimeoutMs: this.responseHeaderTimeoutMs,
-			streamIdleTimeoutMs: this.streamIdleTimeoutMs
+			streamIdleTimeoutMs: this.streamIdleTimeoutMs,
+			refreshCredentials: async (rejected, signal) => {
+				const current = await this.auth.getCredentials(pat, signal);
+				if (current.authToken !== rejected.authToken) return current;
+				this.auth.clear(pat);
+				return this.auth.getCredentials(pat, signal);
+			}
 		});
 	}
 };
@@ -3165,6 +3268,149 @@ function modelsFor(config, region) {
 	return resolveModels(config.modelsByRegion?.[region]);
 }
 //#endregion
+//#region src/dsh/catalog-lifecycle.ts
+/** Region-scoped Qoder model discovery, effective catalogs, and advisory persistence. */
+var QoderCatalogLifecycle = class {
+	options;
+	catalogs = {
+		global: {
+			models: [],
+			generation: 0,
+			expiresAt: 0,
+			dirty: false,
+			retryRequested: false
+		},
+		china: {
+			models: [],
+			generation: 0,
+			expiresAt: 0,
+			dirty: false,
+			retryRequested: false
+		}
+	};
+	settings;
+	disposed = false;
+	activeTransport;
+	activeRegion;
+	constructor(options) {
+		this.options = options;
+	}
+	/** Observe every transport replacement, including switching away and back. */
+	observeTransport() {
+		const transport = this.options.resolveTransport();
+		const region = this.options.region();
+		if (transport === this.activeTransport && region === this.activeRegion) return;
+		if (this.activeRegion !== void 0) {
+			const previous = this.catalogs[this.activeRegion];
+			previous.generation++;
+			previous.inflight = void 0;
+		}
+		this.activeTransport = transport;
+		this.activeRegion = region;
+		const state = this.catalogs[region];
+		state.generation++;
+		state.expiresAt = 0;
+		state.inflight = void 0;
+	}
+	models() {
+		this.observeTransport();
+		const region = this.options.region();
+		return mergeQoderDiscoveryMetadata(this.options.configuredModels(region), this.catalogs[region].models);
+	}
+	/** Automatic reads join the newest discovery and never wait for settings writes. */
+	async refresh() {
+		while (!this.disposed) {
+			this.observeTransport();
+			const region = this.options.region();
+			const state = this.catalogs[region];
+			const transport = this.activeTransport;
+			const pending = state.inflight ?? (Date.now() >= state.expiresAt ? this.discover() : void 0);
+			await pending?.catch(() => {});
+			this.observeTransport();
+			if (this.activeTransport !== transport || this.activeRegion !== region) continue;
+			if (state.inflight && state.inflight !== pending) continue;
+			return;
+		}
+	}
+	/** Explicit discovery supersedes older work as soon as it starts, even if it fails. */
+	discover(signal, requestTransport) {
+		if (this.disposed || signal?.aborted) return Promise.reject(new QoderLlmError("Qoder model discovery was aborted.", "ABORTED"));
+		this.observeTransport();
+		const region = this.options.region();
+		const state = this.catalogs[region];
+		const transport = this.activeTransport;
+		const generation = ++state.generation;
+		const pending = Promise.resolve().then(() => (requestTransport ?? transport).discoverModels(signal)).then((models) => {
+			this.observeTransport();
+			if (!this.disposed && this.activeTransport === transport && this.activeRegion === region && state.generation === generation) {
+				state.models = models.map(cloneCatalogModel);
+				state.expiresAt = Date.now() + 300 * 1e3;
+				state.dirty = true;
+				this.schedulePersistence(region);
+				try {
+					Promise.resolve(this.options.onDiscovered?.(transport, state.models)).catch(() => {});
+				} catch {}
+			}
+			return models;
+		}).finally(() => {
+			if (state.inflight === pending) state.inflight = void 0;
+		});
+		state.inflight = pending;
+		return pending;
+	}
+	bindSettings(settings) {
+		this.settings = settings;
+		this.retryPersistence();
+	}
+	/** Called by settings changes/reattachment; no timer retries or fallback writes. */
+	retryPersistence() {
+		for (const region of ["global", "china"]) {
+			const state = this.catalogs[region];
+			if (state.models.length === 0) continue;
+			state.dirty = true;
+			this.schedulePersistence(region);
+		}
+	}
+	dispose() {
+		this.disposed = true;
+		this.settings = void 0;
+		for (const state of Object.values(this.catalogs)) state.generation++;
+	}
+	schedulePersistence(region) {
+		const state = this.catalogs[region];
+		const settings = this.settings;
+		if (this.disposed || !settings || !state.dirty) return;
+		if (state.writing) {
+			state.retryRequested = true;
+			return;
+		}
+		state.retryRequested = false;
+		const writing = Promise.resolve().then(() => this.persist(region, settings)).catch((error) => {
+			this.options.onPersistenceError?.(error);
+		}).finally(() => {
+			if (state.writing === writing) state.writing = void 0;
+			if (this.settings !== settings || state.retryRequested) this.schedulePersistence(region);
+		});
+		state.writing = writing;
+	}
+	async persist(region, settings) {
+		const state = this.catalogs[region];
+		while (!this.disposed && this.settings === settings && state.dirty) {
+			const snapshot = settings.read(region);
+			if (!snapshot) return;
+			const enriched = modelsFor(Config({ modelsByRegion: { [region]: mergeQoderDiscoveryMetadata(snapshot.models, state.models) } }), region);
+			state.dirty = false;
+			if (hasSameQoderDiscoveryMetadata(snapshot.models, enriched)) continue;
+			try {
+				await settings.write(region, enriched, snapshot.revision);
+			} catch (error) {
+				state.dirty = true;
+				if (!(error instanceof SettingsConflictError)) throw error;
+			}
+		}
+	}
+};
+//#endregion
 //#region src/dsh/provider.ts
 /** DSH model provider route, matching the plugin package name. */
 const QODER_PROVIDER_ID = "dsh-provider-qoder";
@@ -3186,12 +3432,12 @@ var QoderAdapter = class extends LlmAdapter {
 	catalogModels;
 	providerId;
 	providerName;
-	onModelsDiscovered;
-	discoveries = /* @__PURE__ */ new WeakMap();
+	catalog;
 	historyRegion;
 	historyRegionChanged = false;
 	region;
 	sessionTiers = /* @__PURE__ */ new Map();
+	tierListeners = /* @__PURE__ */ new Set();
 	sessions;
 	agents;
 	constructor(options) {
@@ -3200,8 +3446,13 @@ var QoderAdapter = class extends LlmAdapter {
 		this.catalogModels = options.models && options.models.length > 0 ? options.models : defaultModels;
 		this.providerId = options.providerId ?? "dsh-provider-qoder";
 		this.providerName = options.providerName ?? "Qoder";
-		this.onModelsDiscovered = options.onModelsDiscovered;
 		this.region = options.region ?? (() => "global");
+		this.catalog = options.catalog ?? new QoderCatalogLifecycle({
+			resolveTransport: this.resolveTransport,
+			region: this.region,
+			configuredModels: () => this.catalogModels,
+			onDiscovered: options.onModelsDiscovered
+		});
 		this.historyRegion = this.region();
 		this.sessions = options.sessions;
 		this.agents = options.agents;
@@ -3214,6 +3465,31 @@ var QoderAdapter = class extends LlmAdapter {
 			sessionId,
 			modelId
 		]), tierKey);
+		for (const listener of this.tierListeners) try {
+			listener({
+				region,
+				sessionId,
+				modelId
+			});
+		} catch {}
+	}
+	subscribeSessionTiers(listener) {
+		this.tierListeners.add(listener);
+		return () => {
+			this.tierListeners.delete(listener);
+		};
+	}
+	readSessionTier(scope) {
+		const { region, sessionId, modelId } = scope;
+		if (region !== this.region() || !sessionId || this.sessions && !this.sessions.get(sessionId)) throw new QoderLlmError("Invalid session context tier scope.", "INVALID_REQUEST");
+		const model = this.resolveEffectiveModelForSession(modelId, sessionId);
+		const tier = model && resolveContextTier(model, model.contextTier);
+		if (!tier) throw new QoderLlmError("Model has no context tiers.", "INVALID_REQUEST");
+		return {
+			...scope,
+			tierKey: tier.key,
+			tokenCount: tier.tokenCount
+		};
 	}
 	getSessionTier(sessionId, modelId) {
 		return this.sessionTiers.get(JSON.stringify([
@@ -3233,11 +3509,7 @@ var QoderAdapter = class extends LlmAdapter {
 		const base = this.effectiveModels().find((candidate) => candidate.id === modelId);
 		if (base === void 0) return void 0;
 		if (sessionId) {
-			const manualTierKey = this.sessionTiers.get(JSON.stringify([
-				this.region(),
-				sessionId,
-				modelId
-			]));
+			const manualTierKey = this.getSessionTier(sessionId, modelId);
 			const reqCtx = this.sessions?.get(sessionId)?.requestContext?.();
 			const tier = resolveContextTier(base, manualTierKey, !this.historyRegionChanged && reqCtx?.provider === this.providerId && reqCtx.model === modelId ? reqCtx.contextWindow : void 0);
 			if (tier) return {
@@ -3254,53 +3526,17 @@ var QoderAdapter = class extends LlmAdapter {
 			name: this.providerName
 		};
 	}
-	/** Refresh advertised metadata on catalog reads, sharing a five-minute transport-local cache. */
 	async listModels(provider) {
-		const transport = this.resolveTransport();
-		let cached = this.discoveries.get(transport);
-		if (cached === void 0) {
-			cached = { expiresAt: 0 };
-			this.discoveries.set(transport, cached);
-		}
-		const entry = cached;
-		if (entry.inflight === void 0 && Date.now() >= entry.expiresAt) entry.inflight = Promise.resolve().then(() => transport.discoverModels()).then((models) => {
-			if (this.discoveries.get(transport) !== entry || this.resolveTransport() !== transport) return;
-			entry.models = models;
-			entry.expiresAt = Date.now() + 300 * 1e3;
-			this.publishDiscoveredModels(transport, models);
-		}).catch(() => {}).finally(() => {
-			entry.inflight = void 0;
-		});
-		await entry.inflight;
-		if (this.resolveTransport() !== transport) return this.listModels(provider);
+		await this.catalog.refresh();
 		return this.effectiveModels().map((model) => modelInfo(provider, model));
 	}
-	/**
-	* Announce one accepted discovery without joining the catalog read.
-	*
-	* Persisting metadata can queue behind unrelated settings writes, so awaiting
-	* it here would stall every `listModels` call on settings storage.
-	*/
-	publishDiscoveredModels(transport, models) {
-		try {
-			const pending = this.onModelsDiscovered?.(transport, models);
-			if (pending !== void 0 && pending !== null && typeof pending.catch === "function") pending.catch(() => {});
-		} catch {}
-	}
 	effectiveModels() {
-		return mergeQoderDiscoveryMetadata(this.catalogModels, this.discoveries.get(this.resolveTransport())?.models ?? []);
+		return this.catalog.models();
 	}
 	replaceModels(models) {
 		this.observeRegion();
 		this.catalogModels = models;
 	}
-	/** Publish an explicit discovery without letting older in-flight reads overwrite it. */
-	updateDiscoveredModels(transport, models) {
-		this.discoveries.set(transport, {
-			models,
-			expiresAt: Date.now() + 300 * 1e3
-		});
-	}
 	resolveModel(provider, modelId, signal) {
 		if (signal?.aborted) return Promise.reject(new QoderLlmError("Qoder model resolution was aborted.", "ABORTED"));
 		const sessionId = this.agents?.currentInitiator()?.session?.id;
@@ -3360,17 +3596,23 @@ var QoderAdapter = class extends LlmAdapter {
 * @module dsh-provider-qoder/dsh/search-provider
 */
 const QODER_SEARCH_PROVIDER_ID = "qoder";
+function initiatingModelProvider(ctx) {
+	const agent = (ctx.get("agents") ?? ctx.agents)?.currentInitiator?.();
+	const defaultModelService = ctx.get("agentDefaultModel");
+	return agent?.options?.provider ?? defaultModelService?.get?.()?.provider;
+}
+function shouldUseQoderSearch(mode, provider) {
+	return mode === "always" || mode === "auto" && provider === "dsh-provider-qoder";
+}
 var QoderSearchProvider = class {
 	id = QODER_SEARCH_PROVIDER_ID;
 	ctx;
 	resolveTransport;
-	searchClient;
 	getWebSearchMode;
 	fallbackProvider;
 	constructor(options) {
 		this.ctx = options.ctx;
 		this.resolveTransport = options.resolveTransport;
-		this.searchClient = options.searchClient;
 		this.getWebSearchMode = options.getWebSearchMode;
 		this.fallbackProvider = options.fallbackProvider;
 	}
@@ -3380,13 +3622,15 @@ var QoderSearchProvider = class {
 	async search(request, signal) {
 		const mode = this.getWebSearchMode();
 		if (mode === "disabled") throw new WebError("Qoder web search is disabled in settings.", "WEB_PROVIDER_UNAVAILABLE");
-		const agent = (this.ctx.get("agents") ?? this.ctx.agents)?.currentInitiator?.();
-		const defaultModelService = this.ctx.get("agentDefaultModel");
-		const providerRoute = agent?.options?.provider ?? defaultModelService?.get?.()?.provider;
-		if (mode === "always" || providerRoute === "dsh-provider-qoder") {
-			if (this.resolveTransport !== void 0) return this.resolveTransport().searchWeb(request, signal);
-			if (this.searchClient !== void 0) return this.searchClient.search(request, signal);
-			throw new WebError("No Qoder transport configured for web search.", "WEB_PROVIDER_ERROR");
+		const providerRoute = initiatingModelProvider(this.ctx);
+		if (shouldUseQoderSearch(mode, providerRoute)) {
+			const result = await this.resolveTransport().searchWeb(request, signal);
+			if (request.maxResults === void 0 || result.sources.length <= request.maxResults) return result;
+			return {
+				...result,
+				sources: result.sources.slice(0, request.maxResults),
+				truncated: true
+			};
 		}
 		const fallback = this.resolveFallback();
 		if (fallback && fallback.available()) return fallback.search(request, signal);
@@ -3451,7 +3695,9 @@ const qoderRpcApiPath = `/api/qoder-subscription`;
 const qoderRpcEndpoints = [
 	"account",
 	"models",
-	"sessionTier"
+	"sessionTier",
+	"readSessionTier",
+	"sessionTierEvents"
 ];
 /** Absolute Fetch-route path of one endpoint. */
 function qoderRpcPath(endpoint) {
@@ -3474,16 +3720,18 @@ function isQoderRpcEndpoint(value) {
 * @returns disposer removing every registered route.
 * @throws when Connection exposes no exact Fetch registry.
 */
-function registerQoderRpc(ctx, handler) {
+function registerQoderRpc(ctx, handler, subscribeTiers) {
 	const registry = ctx.connection?.fetch;
 	if (typeof registry?.register !== "function") throw new Error("provider-qoder: connection exposes no exact Fetch route registry");
+	const streams = /* @__PURE__ */ new Set();
 	const disposers = qoderRpcEndpoints.map((endpoint) => registry.register({
 		path: qoderRpcPath(endpoint),
 		methods: ["POST"],
 		requestBody: "buffered",
-		fetch: (request) => handleQoderRpcRequest(endpoint, handler, request)
+		fetch: (request) => endpoint === "sessionTierEvents" && subscribeTiers ? Promise.resolve(sessionTierEvents(request, subscribeTiers, streams)) : handleQoderRpcRequest(endpoint, handler, request)
 	}));
 	return () => {
+		for (const close of streams) close();
 		for (const dispose of disposers) dispose();
 	};
 }
@@ -3523,6 +3771,43 @@ async function handleQoderRpcRequest(endpoint, handler, request) {
 		return new Response(`handler failure: ${String(error)}`, { status: 500 });
 	}
 }
+/** Authenticated change stream; reconnecting clients reread on the initial ready item. */
+function sessionTierEvents(request, subscribe, streams) {
+	let close = () => {};
+	const encoder = new TextEncoder();
+	const body = new ReadableStream({
+		start(controller) {
+			let ended = false;
+			let unsubscribe = () => {};
+			const send = (value) => {
+				if (!ended) controller.enqueue(encoder.encode(JSON.stringify(value) + "\n"));
+			};
+			close = () => {
+				if (ended) return;
+				ended = true;
+				unsubscribe();
+				request.signal.removeEventListener("abort", close);
+				streams.delete(close);
+				try {
+					controller.close();
+				} catch {}
+			};
+			unsubscribe = subscribe((scope) => send(scope));
+			streams.add(close);
+			request.signal.addEventListener("abort", close, { once: true });
+			if (request.signal.aborted) close();
+			else send({ ready: true });
+		},
+		cancel() {
+			close();
+		}
+	});
+	return new Response(body, { headers: {
+		"content-type": "application/x-ndjson",
+		"cache-control": "no-store",
+		"x-accel-buffering": "no"
+	} });
+}
 //#endregion
 //#region src/dsh/plugin.ts
 const name = "provider-qoder";
@@ -3554,6 +3839,26 @@ function publicError(code, message, details = { issues: [] }) {
 		}
 	};
 }
+async function executeRpc(operation, task, signal, logger) {
+	try {
+		return {
+			ok: true,
+			value: await task()
+		};
+	} catch (error) {
+		if (signal.aborted || error instanceof QoderLlmError && error.code === "ABORTED") {
+			logger?.debug?.(`[Qoder RPC] ${operation} was aborted`);
+			return publicError("ABORTED", "Request aborted");
+		}
+		let code = "INTERNAL";
+		if (error instanceof QoderLlmError) if (error.code === "MISSING_CREDENTIAL" || error.code === "NO_CREDENTIALS") code = "NO_CREDENTIALS";
+		else if (error.code === "AUTH") code = "UNAUTHENTICATED";
+		else if (error.code === "TIMEOUT") code = "TIMEOUT";
+		else code = "UPSTREAM_ERROR";
+		logger?.error?.(`[Qoder RPC] Failed to ${operation}`, logError(error));
+		return publicError(code, error instanceof Error ? error.message : `Failed to ${operation}`);
+	}
+}
 function apply(ctx, input = {}) {
 	const config = readConfig(input);
 	const logger = ctx.logger;
@@ -3566,11 +3871,6 @@ function apply(ctx, input = {}) {
 		webSearchMode: config.webSearchMode ?? "auto"
 	};
 	let current = () => baseConfig;
-	let persistDiscoveredModels = async (_region) => {};
-	const discoveredCatalogs = {
-		global: [],
-		china: []
-	};
 	const createTransport = (region, streamIdleTimeoutMs, responseHeaderTimeoutMs, preserveThinking, resolvePat = () => resolveManagedQoderPat(ctx.credentials)) => createQoderTransport({
 		region,
 		resolvePat,
@@ -3585,7 +3885,7 @@ function apply(ctx, input = {}) {
 		const region = value.region ?? "global";
 		return {
 			region,
-			models: mergeQoderDiscoveryMetadata(modelsFor(value, region), discoveredCatalogs[region]),
+			models: modelsFor(value, region),
 			streamIdleTimeoutMs: value.streamIdleTimeoutMs ?? 3e5,
 			responseHeaderTimeoutMs: value.responseHeaderTimeoutMs ?? 6e4,
 			preserveThinking: value.preserveThinking ?? true,
@@ -3600,23 +3900,22 @@ function apply(ctx, input = {}) {
 		responseHeaderTimeoutMs: initial.responseHeaderTimeoutMs,
 		preserveThinking: initial.preserveThinking
 	};
+	const catalog = new QoderCatalogLifecycle({
+		resolveTransport: () => activeTransport,
+		region: () => activeTransportConfig.region,
+		configuredModels: (region) => modelsFor(current(), region),
+		onDiscovered: () => registration.replace([providerQoder]),
+		onPersistenceError: (error) => logger?.error?.("[Qoder Settings] Failed to synchronize model catalog", logError(error))
+	});
+	ctx.effect(() => () => catalog.dispose(), "provider-qoder: catalog lifecycle");
 	const adapter = new QoderAdapter({
 		resolveTransport: () => activeTransport,
-		models: initial.models,
+		catalog,
 		region: () => activeTransportConfig.region,
 		providerId: providerQoder,
 		providerName: "Qoder",
 		sessions: ctx.get("sessions"),
-		agents: ctx.get("agents"),
-		onModelsDiscovered: (transport, models) => {
-			if (transport !== activeTransport || ctx.fiber.state === fiberUnloading || ctx.fiber.state === fiberDisposed) return;
-			const region = activeTransportConfig.region;
-			discoveredCatalogs[region] = models;
-			refreshAdapter();
-			persistDiscoveredModels(region).catch((error) => {
-				logger?.error?.("[Qoder Settings] Failed to synchronize model catalog", logError(error));
-			});
-		}
+		agents: ctx.get("agents")
 	});
 	const registration = ctx.llm.registerAdapter([providerQoder], adapter);
 	const refreshAdapter = () => {
@@ -3630,6 +3929,7 @@ function apply(ctx, input = {}) {
 				preserveThinking: next.preserveThinking
 			};
 		}
+		catalog.observeTransport();
 		adapter.replaceModels(next.models);
 		registration.replace([providerQoder]);
 	};
@@ -3640,52 +3940,35 @@ function apply(ctx, input = {}) {
 			modelsFor(value, "china");
 		} });
 		current = () => scope.get();
-		let bindingActive = true;
-		const persistCatalog = async (region) => {
-			while (bindingActive && ctx.fiber.state !== fiberUnloading && ctx.fiber.state !== fiberDisposed) {
-				if (!settingsCtx.settings.writable || discoveredCatalogs[region].length === 0) return;
+		catalog.bindSettings({
+			read: (region) => {
+				if (!settingsCtx.settings.writable) return void 0;
 				const snapshot = settingsCtx.settings.describe().find((section) => section.ns === namespace);
-				if (snapshot === void 0) return;
-				const selected = modelsFor(snapshot.value, region);
-				const enriched = modelsFor(Config({ modelsByRegion: { [region]: mergeQoderDiscoveryMetadata(selected, discoveredCatalogs[region]) } }), region);
-				if (hasSameQoderDiscoveryMetadata(selected, enriched)) return;
-				try {
-					await settingsCtx.settings.update(namespace, { modelsByRegion: { [region]: enriched } }, snapshot.revision);
-					return;
-				} catch (error) {
-					if (!(error instanceof SettingsConflictError)) throw error;
-				}
-			}
-		};
-		persistDiscoveredModels = persistCatalog;
+				return snapshot === void 0 ? void 0 : {
+					models: modelsFor(snapshot.value, region),
+					revision: snapshot.revision
+				};
+			},
+			write: (region, models, revision) => settingsCtx.settings.update(namespace, { modelsByRegion: { [region]: models } }, revision)
+		});
 		refreshAdapter();
-		scope.watch(async () => {
-			if (!bindingActive || ctx.fiber.state === fiberUnloading || ctx.fiber.state === fiberDisposed) return;
+		scope.watch(() => {
+			if (ctx.fiber.state === fiberUnloading || ctx.fiber.state === fiberDisposed) return;
 			refreshAdapter();
-			await persistCatalog(scope.get().region ?? "global");
+			catalog.retryPersistence();
 		});
-		for (const region of ["global", "china"]) {
-			if (discoveredCatalogs[region].length === 0) continue;
-			persistCatalog(region).catch((error) => logger?.error?.("[Qoder Settings] Failed to synchronize model catalog", logError(error)));
-		}
 		settingsCtx.effect(() => () => {
-			bindingActive = false;
+			catalog.bindSettings(void 0);
 			if (ctx.fiber.state === fiberUnloading || ctx.fiber.state === fiberDisposed) return;
-			persistDiscoveredModels = async () => {};
 			current = () => baseConfig;
 			refreshAdapter();
 		});
 	});
 	const discoverModels = async (signal, suppliedPat) => {
 		const snapshot = resolveConfig();
-		const snapshotTransport = activeTransport;
 		const normalizedPat = suppliedPat?.trim();
-		const models = await (normalizedPat ? createTransport(snapshot.region, snapshot.streamIdleTimeoutMs, snapshot.responseHeaderTimeoutMs, snapshot.preserveThinking, () => Promise.resolve(normalizedPat)) : snapshotTransport).discoverModels(signal);
-		adapter.updateDiscoveredModels(snapshotTransport, models);
-		discoveredCatalogs[snapshot.region] = models;
-		refreshAdapter();
-		await persistDiscoveredModels(snapshot.region);
-		return models;
+		const transport = normalizedPat ? createTransport(snapshot.region, snapshot.streamIdleTimeoutMs, snapshot.responseHeaderTimeoutMs, snapshot.preserveThinking, () => Promise.resolve(normalizedPat)) : activeTransport;
+		return catalog.discover(signal, transport);
 	};
 	ctx.llm.registerModelDiscovery(settingsNamespace, async (request, signal) => {
 		if (request.provider !== void 0 && request.provider !== providerQoder) throw new QoderLlmError(`Qoder discovery does not own provider "${request.provider}".`, "INVALID_PROVIDER");
@@ -3699,35 +3982,19 @@ function apply(ctx, input = {}) {
 	const handler = async (endpoint, payload, signal) => {
 		if (!isQoderRpcEndpoint(endpoint)) return publicError("UNKNOWN_ENDPOINT", `Unknown endpoint: ${endpoint}`);
 		if (signal.aborted) return publicError("ABORTED", "Request aborted");
-		const executeRpc = async (operation, task) => {
-			try {
-				return {
-					ok: true,
-					value: await task()
-				};
-			} catch (error) {
-				if (signal.aborted || error instanceof QoderLlmError && error.code === "ABORTED") {
-					logger?.debug?.(`[Qoder RPC] ${operation} was aborted`);
-					return publicError("ABORTED", "Request aborted");
-				}
-				let code = "INTERNAL";
-				if (error instanceof QoderLlmError) if (error.code === "MISSING_CREDENTIAL" || error.code === "NO_CREDENTIALS") code = "NO_CREDENTIALS";
-				else if (error.code === "AUTH") code = "UNAUTHENTICATED";
-				else if (error.code === "TIMEOUT") code = "TIMEOUT";
-				else code = "UPSTREAM_ERROR";
-				logger?.error?.(`[Qoder RPC] Failed to ${operation}`, logError(error));
-				return publicError(code, error instanceof Error ? error.message : `Failed to ${operation}`);
-			}
-		};
-		if (endpoint === "models") return await executeRpc("discover Qoder models", () => discoverModels(signal));
-		if (endpoint === "sessionTier") {
+		if (endpoint === "models") return await executeRpc("discover Qoder models", () => discoverModels(signal), signal, logger);
+		if (endpoint === "sessionTier" || endpoint === "readSessionTier") {
 			const data = payload;
-			if (typeof data?.sessionId === "string" && typeof data?.modelId === "string" && typeof data?.tierKey === "string" && (data.region === "global" || data.region === "china")) {
+			if (typeof data?.sessionId === "string" && typeof data?.modelId === "string" && (endpoint === "readSessionTier" || typeof data?.tierKey === "string") && (data.region === "global" || data.region === "china")) {
 				const { sessionId, modelId, tierKey, region } = data;
-				return await executeRpc("select session context tier", async () => {
-					adapter.setSessionTier(sessionId, modelId, tierKey, region);
-					return { success: true };
-				});
+				return await executeRpc(endpoint === "sessionTier" ? "select session context tier" : "read session context tier", async () => {
+					if (endpoint === "sessionTier") adapter.setSessionTier(sessionId, modelId, tierKey, region);
+					return adapter.readSessionTier({
+						sessionId,
+						modelId,
+						region
+					});
+				}, signal, logger);
 			}
 			return publicError("INTERNAL", "Invalid sessionTier payload");
 		}
@@ -3736,12 +4003,12 @@ function apply(ctx, input = {}) {
 		const outcome = await executeRpc("load Qoder account", () => activeTransport.readAccount({
 			force,
 			signal
-		}));
+		}), signal, logger);
 		if (outcome.ok) logger?.debug?.("[Qoder RPC] Subscriber account resolved");
 		return outcome;
 	};
 	try {
-		ctx.effect(() => registerQoderRpc(ctx, handler), "provider-qoder: settings RPC routes");
+		ctx.effect(() => registerQoderRpc(ctx, handler, (listener) => adapter.subscribeSessionTiers(listener)), "provider-qoder: settings RPC routes");
 	} catch (error) {
 		logger?.error?.("[Qoder RPC] Failed to register the settings RPC routes", logError(error));
 	}
@@ -3753,19 +4020,15 @@ function apply(ctx, input = {}) {
 		});
 		webCtx.web.registerSearchProvider(searchProvider);
 		if (typeof webCtx.web.search === "function") {
-			const originalSearch = webCtx.web.search.bind(webCtx.web);
+			const originalSearch = webCtx.web.search;
 			webCtx.effect(() => {
-				webCtx.web.search = async (request, signal) => {
-					const mode = resolveConfig().webSearchMode ?? "auto";
-					if (mode === "disabled") return originalSearch(request, signal);
-					const agent = (ctx.get("agents") ?? ctx.agents)?.currentInitiator?.();
-					const defaultModelService = ctx.get("agentDefaultModel");
-					const isQoderActive = (agent?.options?.provider ?? defaultModelService?.get?.()?.provider) === providerQoder;
-					if (mode === "always" || isQoderActive) return searchProvider.search(request, signal);
-					return originalSearch(request, signal);
+				const routedSearch = async (request, signal) => {
+					if (shouldUseQoderSearch(resolveConfig().webSearchMode ?? "auto", initiatingModelProvider(ctx))) return searchProvider.search(request, signal);
+					return originalSearch.call(webCtx.web, request, signal);
 				};
+				webCtx.web.search = routedSearch;
 				return () => {
-					webCtx.web.search = originalSearch;
+					if (webCtx.web.search === routedSearch) webCtx.web.search = originalSearch;
 				};
 			}, "provider-qoder: transparent web search router");
 		}