dsh-provider-qoder 0.3.0 → 0.3.2

package/README.md

@@ -1,18 +1,22 @@
-# DSH Qoder Subscription Plugin
+# dsh-provider-qoder
+
+[![npm version](https://img.shields.io/npm/v/dsh-provider-qoder.svg?color=blue)](https://www.npmjs.com/package/dsh-provider-qoder)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
+[![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
 
 English | [简体中文](./README_CN.md)
 
-`dsh-provider-qoder` integrates your Qoder subscription into DeepSeek Harness (DSH), supporting text and image input, streaming text, reasoning content, and tool calls across Global and China Qoder services.
+Use your Qoder subscription in DeepSeek Harness (DSH), supporting multimodality, web search, and tool calls across Global and China Qoder services.
 
 The plugin handles authentication and model communication, while tool execution, workspace operations, and permission management are handled by DSH.
-This project is a community adapter plugin.
+This project is a community adapter plugin and is not affiliated with Qoder or DeepSeek.
 
 ## Features
 
 - Configure subscription access via Qoder Personal Access Token (PAT).
 - Supports both Global (`global`) and China (`china`) services.
 - Discovers available models for your account, allows selecting enabled models, and displays pricing multipliers and reasoning effort options when reported by the service.
-- Supports streaming responses, reasoning content, multimodality, search, tool calls, and multi-turn interactions.
+- Supports multimodality, search, and tool calls.
 - View account information, quota, and reset dates in Settings.
 
 ## Installation
@@ -53,62 +57,25 @@ Select the region matching your account, enter your Qoder PAT into the input box
 
 Fetching models uses the **saved PAT and service region**. If you switch accounts or regions, you need to fetch models again. The initial model catalog is only a candidate reference; actual available models are subject to account query results. Model multipliers, reasoning effort options, and image-input capability are provided by Qoder and may not be available for all models.
 
-The model picker refreshes Qoder metadata for enabled models when opened, with a five-minute cache after a successful fetch.
-
-### 3. View Account & Quota
-
-Open **Settings → Qoder** to view account and quota details.
-
-## FAQ
-
-### The plugin fails to start, or credentials cannot be saved
-
-Ensure you have restarted the profile where the plugin was installed, and that the profile provides the DSH managed credentials service. If prompted that the storage is not writable, a writable credential store needs to be configured on the host side. The plugin does not read PATs from environment variables.
-
-### PAT is saved, but model fetching or requests fail
-
-Verify that the PAT is valid and matches the saved service region. If modified, save first before fetching models. The save action itself does not validate the token. If your account quota is exhausted, you will need to resolve your subscription quota first.
-
-### Models remain unavailable after switching regions
-
-Global and China model catalogs are stored separately. Switching regions does not automatically update your PAT or refetch that region's models; after saving the matching PAT, fetch and save the models for the selected region.
-
-### Are requests automatically retried?
-
-Model-generation retries are managed by DSH. To enable them, the running profile should include `@deepseek-ai/dsh-llm-retry`. The plugin reports empty responses, rate limits, server errors, timeouts, and transport errors using DSH's default retry policy; authentication, invalid requests, cancellations, quota issues, and protocol formatting errors are not retried by default. The Qoder transport may independently retry an idempotent model-catalog, subscriber-profile, or quota read once, but never retries a model-generation POST internally.
-
-## Install from Source & Development
+The model picker refreshes Qoder metadata for enabled models when opened, with a five-minute cache after a successful fetch. When settings are writable, refreshed multipliers and capabilities are also synchronized to the saved catalog shown in **Custom Settings**, without enabling additional models. Failed refreshes retain the last known metadata.
 
-Run in an environment with Git, Node.js, and pnpm installed. Node.js must support the `--experimental-strip-types` and `--test-isolation=none` flags used by the project's test scripts.
+<p align="center">
+  <img src="./assets/credentials-settings.png" alt="Qoder credentials and model configuration" width="680" />
+</p>
 
-```sh
-git clone https://github.com/mo-n/dsh-provider-qoder.git
-cd dsh-provider-qoder
-pnpm install --frozen-lockfile
-pnpm run build
-```
-
-Install the built repository directory into your DSH profile. The path below is a placeholder example; replace it with the actual absolute path:
-
-```sh
-dsh plugin --profile web add /absolute/path/to/dsh-provider-qoder
-```
-
-After restarting the profile, follow the configuration steps above. If running the CLI within a DSH source workspace, you can use `pnpm dsh` from that workspace.
-
-For development, run watch mode in the plugin directory:
+### 3. View Account & Quota
 
-```sh
-pnpm run dev
-```
+Open **Settings → Qoder** to view account and quota details, and configure the web search policy as needed:
 
-Before committing changes, run:
+<p align="center">
+  <img src="./assets/account-quota.png" alt="Qoder account quota and search settings" width="650" />
+</p>
 
-```sh
-pnpm run check
-```
+## Upcoming Features
 
-This command runs non-UI mocked tests, builds the ESM package and type declarations, checks build artifacts, and previews the package tarball without sending real Qoder model requests or publishing npm packages.
+- [ ] Context window tier switching
+- [ ] Request rate-limiting queue mechanism
+- [ ] Connect with Qoder's Protobuf protocol
 
 ## References
 

package/README_CN.md

@@ -1,18 +1,24 @@
-# DSH Qoder 订阅插件
+# dsh-provider-qoder
+
+[![npm version](https://img.shields.io/npm/v/dsh-provider-qoder.svg?color=blue)](https://www.npmjs.com/package/dsh-provider-qoder)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
+[![DSH Plugin](https://img.shields.io/badge/DSH-Plugin-6f42c1.svg)](https://github.com/mo-n/dsh-provider-qoder)
+[![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
+
 
 [English](./README.md) | 简体中文
 
-`dsh-provider-qoder` 将你的 Qoder 订阅接入 DeepSeek Harness（DSH），支持文本与图片输入、流式文本、推理内容和工具调用，可选择国际版或中国区 Qoder 服务。
+在 DeepSeek Harness（DSH） 中使用 Qoder 订阅，支持多模态、联网搜索和工具调用，可选择国际版或中国区 Qoder 服务。
 
 插件负责认证和模型通信，工具执行、工作区操作及权限管理由 DSH 负责。
-本项目是社区适配插件。
+本项目是社区适配插件，与 Qoder、DeepSeek 官方均无关联。
 
 ## 功能
 
 - 通过 Qoder Personal Access Token（PAT，个人访问令牌）配置订阅访问。
 - 支持国际版（`global`）和中国区（`china`）服务。
 - 获取账号可用模型，选择启用的模型，并在服务返回相关信息时显示价格倍率和推理强度选项。
-- 支持流式回答、推理内容、多模态、搜索、工具调用及多轮交互。
+- 支持多模态、搜索以及工具调用。
 - 在设置中查看账号信息、额度和重置时间。
 
 ## 安装
@@ -53,62 +59,25 @@ dsh plugin --profile web add dsh-provider-qoder
 
 获取模型使用的是**已保存的 PAT 和服务区域**。更换账号或区域后，需要重新获取模型。初始模型目录仅供候选参考，实际可用模型以账号查询结果为准。模型倍率、推理强度选项及图片输入能力由 Qoder 提供，并非所有模型都有这些信息。
 
-展开模型选择器时会自动刷新已启用 Qoder 模型的元数据，成功获取后缓存 5 分钟。
-
-### 3. 查看账号与额度
-
-打开 **设置 → Qoder** 查看账号和额度。
-
-## 常见问题
-
-### 插件无法启动，或凭据无法保存
-
-确认已重启安装插件的 profile，且该 profile 提供 DSH 托管凭据服务。如果提示存储不可写，需要在宿主侧配置可写的凭据存储。插件不会从环境变量读取 PAT。
-
-### 已保存 PAT，但获取模型或请求失败
-
-确认 PAT 有效且与已保存的服务区域匹配。修改后先保存，再获取模型。保存操作本身不会验证令牌。若账号额度已用尽，需先处理订阅额度问题。
-
-### 切换区域后，模型仍不可用
-
-Global 与 China 的模型目录会分别保存。切换区域不会自动替换 PAT，也不会自动重新获取该区域的模型；请先保存匹配区域的 PAT，再获取并保存所选区域的模型。
-
-### 请求是否会自动重试？
-
-模型生成重试由 DSH 管理。需要启用时，运行中的 profile 应包含 `@deepseek-ai/dsh-llm-retry`。插件使用 DSH 默认重试策略报告空响应、限流、服务端、超时和传输错误；认证、无效请求、取消、额度及协议格式错误默认不重试。Qoder transport 可以独立重试一次幂等的模型目录、订阅者资料或配额读取，但绝不会在内部重试模型生成 POST。
+展开模型选择器时会自动刷新已启用 Qoder 模型的元数据，成功获取后缓存 5 分钟。设置可写时，更新后的倍率和能力信息也会同步到**自定义设置**显示的已保存目录，不会自动启用其他模型。刷新失败时保留最近一次成功获取的信息。
 
-## 从源码安装与开发
+<p align="center">
+  <img src="./assets/credentials-settings.png" alt="Qoder 凭据与模型配置" width="680" />
+</p>
 
-在已安装 Git、Node.js 和 pnpm 的环境中执行。Node.js 需支持项目测试脚本使用的 `--experimental-strip-types` 和 `--test-isolation=none` 参数。
-
-```sh
-git clone https://github.com/mo-n/dsh-provider-qoder.git
-cd dsh-provider-qoder
-pnpm install --frozen-lockfile
-pnpm run build
-```
-
-将构建后的仓库目录安装到 DSH profile。以下路径为占位示例，请替换为实际绝对路径：
-
-```sh
-dsh plugin --profile web add /absolute/path/to/dsh-provider-qoder
-```
-
-重启 profile 后，按前文完成配置。若在 DSH 源码工作区中运行 CLI，可使用该工作区的 `pnpm dsh` 命令。
+### 3. 查看账号与额度
 
-开发时，在插件目录运行监听构建：
+打开 **设置 → Qoder** 查看账号额度，并可按需切换联网搜索策略：
 
-```sh
-pnpm run dev
-```
+<p align="center">
+  <img src="./assets/account-quota.png" alt="Qoder 账号额度与搜索设置" width="650" />
+</p>
 
-提交修改前运行：
-
-```sh
-pnpm run check
-```
 
-该命令运行模拟网络的非 UI 测试、构建 ESM 包与类型声明、检查构建产物并预览打包内容，不会发起真实 Qoder 模型请求或发布 npm 包。
+## 后续计划功能
+- [ ] 支持上下文窗口（Context Window）档位切换
+- [ ] 请求限流排队机制
+- [ ] 接入 Qoder 的 Protobuf 协议
 
 ## 参考项目
 

package/cordis.patch.yml

@@ -1,6 +1,6 @@
 # Adds only the Qoder provider plugin. Model selection remains user-owned.
 - insert:
-    - id: qoder-subscription
+    - id: provider-qoder
       name: 'dsh-provider-qoder'
 
 - id: web

package/lib/client.js

@@ -1166,21 +1166,32 @@ window.__ModuleLoader__.load({
 			"slots",
 			"locale",
 			"remote",
-			"remote.credentials",
-			"settingsScope"
+			"remote.credentials"
 		];
 		const fill = (text, values) => {
 			if (!values) return text;
 			return Object.entries(values).reduce((next, [key, value]) => next.replace(new RegExp(`\\{${key}\\}`, "g"), String(value)), text);
 		};
 		function apply(ctx) {
+			const configForms = ctx.get?.("configForms");
+			if (configForms) {
+				mount(ctx, configForms.get(settingsNamespace));
+				return;
+			}
+			const settingsScope = ctx.get?.("settingsScope");
+			if (settingsScope) {
+				mount(ctx, settingsScope.bind({ namespace: settingsNamespace }));
+				return;
+			}
+			console.warn("[provider-qoder] Neither configForms nor settingsScope available; settings panel will not mount");
+		}
+		function mount(ctx, modelScope) {
 			ctx.effect(() => ctx.locale.register(localeNamespace, {
 				zh,
 				en
 			}), "provider-qoder: credential copy");
 			const credentials = ctx.remote.credentials;
 			const rpc = createQoderRpcCaller();
-			const modelScope = ctx.settingsScope.bind({ namespace: settingsNamespace });
 			const operations = {
 				describe: async () => {
 					try {
@@ -1210,27 +1221,24 @@ window.__ModuleLoader__.load({
 				storeModels: async (region, models) => {
 					try {
 						const current = modelScope.getSnapshot().value;
-						await modelScope.set("modelsByRegion", {
+						return await modelScope.set("modelsByRegion", {
 							...current?.modelsByRegion,
 							[region]: models
-						});
-						return true;
+						}) !== false;
 					} catch {
 						return false;
 					}
 				},
 				storeRegion: async (region) => {
 					try {
-						await modelScope.set("region", region);
-						return true;
+						return await modelScope.set("region", region) !== false;
 					} catch {
 						return false;
 					}
 				},
 				storeWebSearchMode: async (mode) => {
 					try {
-						await modelScope.set("webSearchMode", mode);
-						return true;
+						return await modelScope.set("webSearchMode", mode) !== false;
 					} catch {
 						return false;
 					}

package/lib/index.d.ts

@@ -51,11 +51,14 @@ interface Config {
   webSearchMode?: QoderWebSearchMode;
 }
 declare const Config: z<Config>;
+type PluginConfig = Config;
+declare const PluginConfig: z<NoInfer<Config>, NoInfer<Config>, "volatile">;
+type LiveConfig = ReturnType<typeof PluginConfig>;
 //#endregion
 //#region src/dsh/plugin.d.ts
 declare const name = "provider-qoder";
 declare const inject: string[];
-declare function apply(ctx: Context, config?: Config): void;
+declare function apply(ctx: Context, input?: Config | LiveConfig): void;
 //#endregion
 //#region src/qoder/account.d.ts
 /** Browser-safe Qoder subscriber account and quota types. */
@@ -225,4 +228,4 @@ declare class QoderSearchProvider implements WebSearchProvider {
   private resolveFallback;
 }
 //#endregion
-export { Config, QODER_SEARCH_PROVIDER_ID, type QoderAccountInfo, type QoderCatalogModel, type QoderModelsByRegion, type QoderRegion, QoderSearchClient, type QoderSearchClientOptions, QoderSearchProvider, type QoderSearchProviderOptions, type QoderWebSearchMode, apply, getQoderWebSearchUrl, inject, name, qoderWebSearchPath };
+export { PluginConfig as Config, QODER_SEARCH_PROVIDER_ID, type QoderAccountInfo, type QoderCatalogModel, type QoderModelsByRegion, type QoderRegion, QoderSearchClient, type QoderSearchClientOptions, QoderSearchProvider, type QoderSearchProviderOptions, type QoderWebSearchMode, apply, getQoderWebSearchUrl, inject, name, qoderWebSearchPath };

package/lib/index.js

@@ -5,6 +5,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { WebError } from "@deepseek-ai/dsh-web";
+import { SettingsConflictError } from "@deepseek-ai/dsh-settings";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 //#region src/qoder/catalog.ts
 const discoveredMetadataKeys = [
@@ -261,7 +262,8 @@ function qoderHttpError(message, response) {
 	return new QoderLlmError(message, code, {
 		status,
 		...providerRetryAfterMs === void 0 ? {} : { providerRetryAfterMs },
-		...requestId === void 0 ? {} : { requestId }
+		...requestId === void 0 ? {} : { requestId },
+		...response.cause === void 0 ? {} : { cause: response.cause }
 	});
 }
 function qoderRequestId(headers) {
@@ -383,7 +385,7 @@ MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDA8iMH5c02LilrsERw9t6Pv5Nc
 6HRkPJ7S236FZz73In/KVuLnwI8JJ2CbuJap8kvheCCZpmAWpb/cPx/3Vr/J6I17
 XcW+ML9FoCI6AOvOzwIDAQAB
 -----END PUBLIC KEY-----`;
-const qoderIdeVersion = "1.1.47";
+const qoderIdeVersion = "1.1.60";
 const defaultUserAgent = `qoder/${qoderIdeVersion}`;
 const qoderDataPolicy = "disagree";
 const qoderLoginVersion = "v2";
@@ -809,35 +811,6 @@ function toolResultText(block) {
 	}
 	return text;
 }
-/**
-* Check message shapes without performing any provider I/O.
-*
-* Callers run this before resolving credentials so an invalid request never
-* consumes a Qoder subscription.
-*/
-function validateMessageShapes(messages) {
-	for (const message of messages) {
-		const toolResults = message.content.filter((block) => block.type === "tool-result");
-		if (toolResults.length > 0) {
-			if (message.role !== "user" || toolResults.length !== message.content.length) throw unsupported("Qoder tool-result messages cannot contain sibling content or use a non-user role.");
-			for (const result of toolResults) toolResultText(result);
-			continue;
-		}
-		for (const block of message.content) {
-			if (block.type === "text") continue;
-			if (block.type === "image") {
-				if (message.role !== "user") throw unsupported("Qoder image content is valid only in user messages.");
-				continue;
-			}
-			if (block.type === "tool-call") {
-				if (message.role !== "assistant") throw unsupported("Qoder tool calls are valid only in assistant messages.");
-				continue;
-			}
-			if (block.type === "reasoning") continue;
-			throw unsupported(`Qoder transport encountered unsupported block type: ${String(block.type)}`);
-		}
-	}
-}
 /** Reject a batch that exceeds the deployment image policy before any upload work starts. */
 function enforceImageLimits(images, attachments) {
 	const limits = attachments.imageLimits;
@@ -852,10 +825,15 @@ async function resolveImagePart(block, context) {
 	let image;
 	try {
 		const limits = attachments.imageLimits;
-		image = await attachments.readImageRequest(block.attachment, {
-			maxPixels: limits.maxImagePixels,
-			maxBytes: limits.maxImageBytes
-		}, signal);
+		const { width, height } = block.attachment;
+		const scale = Math.min(1, Math.sqrt(limits.maxImagePixels / (width * height)), limits.maxImageDimension / width, limits.maxImageDimension / height);
+		const target = {
+			width: Math.max(1, Math.floor(width * scale)),
+			height: Math.max(1, Math.floor(height * scale)),
+			maxBytes: limits.maxImageBytes,
+			maxPixels: limits.maxImagePixels
+		};
+		image = await attachments.readImageRequest(block.attachment, target, signal);
 	} catch (error) {
 		if (signal?.aborted) throw new QoderLlmError("Qoder image preparation was aborted.", "ABORTED", { cause: error });
 		if (error instanceof QoderLlmError) throw error;
@@ -880,8 +858,29 @@ function translateTools(tools) {
 		}
 	}));
 }
+/** Read a named property from an untyped object, returning it only if present. */
+function prop(obj, key) {
+	return obj !== null && obj !== void 0 && typeof obj === "object" ? obj[key] : void 0;
+}
+/** Coerce a candidate value to a non-empty string tool call id, or `undefined`. */
+function asCallId(value) {
+	if (typeof value !== "string") return void 0;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : void 0;
+}
+function extractToolCallId(message, result) {
+	return asCallId(prop(result, "toolCallId")) ?? asCallId(prop(message, "toolCallId")) ?? asCallId(prop(message, "tool_call_id")) ?? asCallId(prop(message.source, "kind") === "tool" ? prop(message.source, "callId") : void 0);
+}
+function consumeToolCallId(message, result, pendingIds, fallbackIndex) {
+	const explicit = extractToolCallId(message, result);
+	if (explicit !== void 0) {
+		const idx = pendingIds.indexOf(explicit);
+		if (idx !== -1) pendingIds.splice(idx, 1);
+		return explicit;
+	}
+	return pendingIds.shift() ?? `call_unknown_${fallbackIndex}`;
+}
 async function validateAndTranslateMessages(messages, systemPrompt, attachments, signal, pipeline) {
-	validateMessageShapes(messages);
 	const context = {
 		attachments,
 		signal,
@@ -890,18 +889,20 @@ async function validateAndTranslateMessages(messages, systemPrompt, attachments,
 	};
 	const preserveThinking = pipeline?.preserveThinking ?? true;
 	const output = [];
+	let lastAssistantToolCallIds = [];
 	if (typeof systemPrompt === "string" && systemPrompt.trim().length > 0) output.push({
 		role: "system",
 		content: systemPrompt
 	});
 	for (const message of messages) {
 		const toolResults = message.content.filter((block) => block.type === "tool-result");
+		const nonToolBlocks = message.content.filter((block) => block.type !== "tool-result");
 		if (toolResults.length > 0) {
-			if (message.role !== "user" || toolResults.length !== message.content.length) throw unsupported("Qoder tool-result messages cannot contain sibling content or use a non-user role.");
 			for (const result of toolResults) {
+				const callId = consumeToolCallId(message, result, lastAssistantToolCallIds, output.length);
 				output.push({
 					role: "tool",
-					tool_call_id: String(result.toolCallId),
+					tool_call_id: callId,
 					content: toolResultText(result)
 				});
 				const images = result.content.filter((block) => block.type === "image");
@@ -916,24 +917,27 @@ async function validateAndTranslateMessages(messages, systemPrompt, attachments,
 					});
 				}
 			}
-			continue;
+			if (nonToolBlocks.length === 0) continue;
 		}
+		const contentBlocks = toolResults.length > 0 ? nonToolBlocks : message.content;
 		let text = "";
 		let reasoningText = "";
 		const userContent = [];
 		const pendingImages = [];
 		let hasImage = false;
 		const toolCalls = [];
-		for (const block of message.content) {
+		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") userContent.push({
+				if (message.role === "user" || toolResults.length > 0) userContent.push({
 					type: "text",
 					text: block.text
 				});
 				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.");
 				hasImage = true;
 				pendingImages.push({
 					slot: userContent.length,
@@ -961,6 +965,7 @@ async function validateAndTranslateMessages(messages, systemPrompt, attachments,
 		if (message.role === "assistant") {
 			const hasReasoning = preserveThinking && reasoningText.length > 0;
 			if (!text && toolCalls.length === 0 && !hasReasoning) continue;
+			if (toolCalls.length > 0) lastAssistantToolCallIds = toolCalls.map((tc) => tc.id);
 			output.push({
 				role: "assistant",
 				content: text || " ",
@@ -969,20 +974,317 @@ 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) => {
 				userContent[pending.slot] = await resolveImagePart(pending.block, context);
 			}));
 		}
+		if (toolResults.length > 0 && !hasImage && text.trim().length === 0) continue;
+		const wireRole = toolResults.length > 0 ? "user" : message.role;
+		const wireToolCallId = wireRole === "tool" ? consumeToolCallId(message, void 0, lastAssistantToolCallIds, output.length) : void 0;
 		output.push({
-			role: message.role,
-			content: hasImage ? userContent.filter((part) => part !== void 0) : text
+			role: wireRole,
+			content: hasImage ? userContent.filter((part) => part !== void 0) : text,
+			...wireToolCallId ? { tool_call_id: wireToolCallId } : {}
 		});
 	}
 	return output;
 }
 //#endregion
+//#region src/qoder/transport/wire/turn-identity.ts
+/**
+* Per-turn Qoder request identity.
+*
+* A DSH turn issues one model request per reasoning step, so a single
+* subscriber prompt becomes dozens of consecutive Qoder requests. Qoder's
+* Credits panel aggregates consumption per agent run — the `business.id` a
+* request reports — so every step of one turn must carry the same run identity
+* while the next subscriber prompt opens a new one.
+*
+* The adapter never sees a turn number, and the host appends messages to a
+* turn's history while it runs — its own context, notifications, delegated
+* agents' messages — so the boundary is derived from the history here. A turn is
+* the multiset of user-role messages it has accounted for: a subscriber message
+* the run has not seen opens the next turn, while host-appended context,
+* transport-synthesized markers, and anything an auxiliary call carries continue
+* the open record.
+*
+* Known limit: text identifies a message because the host's message ids are not
+* part of the wire shape. A subscriber who sends the same words twice with the
+* first copy already gone from history — compaction replaced that span — shares
+* the open record instead of opening a new one. Carrying the host's message
+* identity through translation is the fix, and needs the host to expose it on
+* the request the adapter receives.
+*
+* @module dsh-provider-qoder/qoder/transport/wire/turn-identity
+*/
+const defaultMaxSessions = 64;
+/** A conversation untouched for this long cannot still be mid-turn. */
+const defaultIdleSessionTtlMs = 3600 * 1e3;
+/**
+* Openings of everything the host appends while a turn runs.
+*
+* One subscriber prompt is what the subscriber perceives as one turn, so every
+* message the harness adds around that prompt — its own context, notifications,
+* and delegated agents' messages — must stay inside the same record. Only a
+* message outside this list is treated as a new prompt. The list is
+* evidence-based: every entry was observed in live DSH transcripts, and an
+* offline audit replays real sessions to keep it aligned. An unknown future
+* wrapper therefore opens one extra record instead of merging two turns.
+*/
+const injectedContextOpenings = [
+	"<system-reminder>",
+	"<openviking-context",
+	"<goal_complete>",
+	"Current runtime context. This snapshot supersedes earlier runtime-context",
+	"This is an automatically generated checkpoint condensing",
+	"[model changed:",
+	"background job ",
+	"The approval policy changed"
+];
+/**
+* Host messages that name their sender.
+*
+* A delegated agent's message and a settled background subagent both start with
+* a word a subscriber may legitimately use, so they are matched on the host's
+* own template — the sender's identity then a fixed phrase — instead of on a
+* bare prefix that would swallow real prompts.
+*/
+const hostNotificationTemplate = /^(?:Agent|Background subagent) \S{3,} (?:sent a message:|finished\b)/;
+/**
+* Text this transport synthesizes while translating a turn's own tool results.
+*
+* 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.
+*/
+const syntheticMarkerTemplate = /^\[\d+ images? returned by the previous tool call\]/;
+/** Wire text of one user message, used for injection classification and text extraction. */
+function wireMessageText(message) {
+	const content = message.content;
+	if (typeof content === "string") return content;
+	if (content === null) return "";
+	return content.map((part) => part.type === "text" ? part.text : "").join("");
+}
+/** Classify one user-role wire message. */
+function qoderMessageOrigin(message) {
+	const text = wireMessageText(message).trimStart();
+	if (syntheticMarkerTemplate.test(text)) return "synthetic";
+	if (hostNotificationTemplate.test(text)) return "injected";
+	return injectedContextOpenings.some((opening) => text.startsWith(opening)) ? "injected" : "prompt";
+}
+/** Stable record id of one session turn. */
+function turnIdFor(sessionId, turnCount, anchor) {
+	return crypto.createHash("sha256").update("qoder-turn").update("\0").update(sessionId).update("\0").update(String(turnCount)).update("\0").update(anchor).digest("hex").slice(0, 16);
+}
+/**
+* Fingerprint of one message, used to count how often a turn has seen it.
+*
+* Text identifies a message, never an image URL: a published URL is re-signed as
+* its cache entry expires, so a rotating URL would make the turn's own prompt
+* look like new input and split the record. Image count still separates a
+* message that carries images from one that does not.
+*/
+function messageFingerprint(message) {
+	const hash = crypto.createHash("sha256");
+	hash.update(message.role);
+	hash.update("\0");
+	const content = message.content;
+	if (typeof content === "string") hash.update(content);
+	else if (content !== null) {
+		let images = 0;
+		for (const part of content) if (part.type === "text") {
+			hash.update("\0text\0");
+			hash.update(part.text);
+		} else images += 1;
+		hash.update(`\0images=${images}`);
+	}
+	return hash.digest("hex").slice(0, 16);
+}
+/**
+* Resolves the record identity of the turn one request belongs to.
+*
+* One tracker instance owns its sessions, so tests and transports stay
+* independent. State is created lazily per session and bounded by
+* `maxSessions`.
+*/
+var QoderTurnTracker = class {
+	maxSessions;
+	idleSessionTtlMs;
+	now;
+	sessions = /* @__PURE__ */ new Map();
+	constructor(options = {}) {
+		this.maxSessions = options.maxSessions ?? defaultMaxSessions;
+		this.idleSessionTtlMs = options.idleSessionTtlMs ?? defaultIdleSessionTtlMs;
+		this.now = options.now ?? Date.now;
+	}
+	/**
+	* Resolves the full wire identity for one Qoder request.
+	*
+	* Coordinates `request_set_id`, `chat_record_id`, and `business` metadata so
+	* that requests within one subscriber turn share a single agent run and
+	* consumption record.
+	*/
+	resolveTurnIdentity(sessionId, messages, kind = "conversation", requestId = crypto.randomUUID(), modelKey) {
+		const now = this.now();
+		if (sessionId === void 0 || sessionId.length === 0) return {
+			requestSetId: `qoder-request-${crypto.randomUUID()}`,
+			chatRecordId: requestId,
+			businessId: crypto.randomUUID(),
+			beginAt: now
+		};
+		if (kind === "auxiliary") {
+			if (this.sessions.has(sessionId)) this.sessions.get(sessionId).lastTouchedAt = now;
+			return {
+				requestSetId: `qoder-request-${crypto.randomUUID()}`,
+				chatRecordId: requestId,
+				businessId: crypto.randomUUID(),
+				beginAt: now
+			};
+		}
+		let state = this.sessions.get(sessionId);
+		if (state === void 0) {
+			state = {
+				claimed: /* @__PURE__ */ new Map(),
+				currentTurnId: "",
+				currentBusinessId: "",
+				turnOpenedAt: 0,
+				lastTouchedAt: now,
+				turnCount: 0,
+				currentModel: modelKey
+			};
+			this.claimSession(sessionId, state);
+		} else {
+			state.lastTouchedAt = now;
+			this.sessions.delete(sessionId);
+			this.sessions.set(sessionId, state);
+		}
+		const modelChanged = state.currentModel !== void 0 && modelKey !== void 0 && state.currentModel !== modelKey;
+		if (modelKey !== void 0) state.currentModel = modelKey;
+		const present = /* @__PURE__ */ new Map();
+		for (const message of messages) {
+			if (message.role !== "user") continue;
+			const fingerprint = messageFingerprint(message);
+			const entry = present.get(fingerprint);
+			if (entry === void 0) present.set(fingerprint, {
+				count: 1,
+				host: qoderMessageOrigin(message)
+			});
+			else entry.count += 1;
+		}
+		let opening;
+		let unclaimed = 0;
+		for (const [fingerprint, entry] of present) {
+			const claimed = state.claimed.get(fingerprint) ?? 0;
+			if (entry.count <= claimed) continue;
+			state.claimed.set(fingerprint, entry.count);
+			if (entry.host === "injected" || entry.host === "synthetic") continue;
+			unclaimed += entry.count - claimed;
+			opening = fingerprint;
+		}
+		for (const [fingerprint, claimed] of state.claimed) {
+			const current = present.get(fingerprint);
+			if (current === void 0) state.claimed.delete(fingerprint);
+			else if (current.count < claimed) state.claimed.set(fingerprint, current.count);
+		}
+		if (opening !== void 0 && unclaimed > 0 || modelChanged) {
+			state.turnCount += 1;
+			state.currentTurnId = turnIdFor(sessionId, state.turnCount, opening ?? state.currentModel ?? "");
+			state.currentBusinessId = crypto.randomUUID();
+			state.turnOpenedAt = now;
+		} else if (state.currentTurnId === "") {
+			state.turnCount += 1;
+			state.currentTurnId = turnIdFor(sessionId, state.turnCount, state.currentModel ?? "");
+			state.currentBusinessId = crypto.randomUUID();
+			state.turnOpenedAt = now;
+		}
+		return {
+			requestSetId: state.currentTurnId,
+			chatRecordId: requestId,
+			businessId: state.currentBusinessId,
+			beginAt: state.turnOpenedAt
+		};
+	}
+	/**
+	* Record id shared by every step of `sessionId`'s current turn.
+	*
+	* `null` means the request carries no session identity, so no conversation
+	* identity can be derived and the caller must fall back to a per-request id.
+	*/
+	resolveTurnRecordId(sessionId, messages, kind = "conversation") {
+		if (sessionId === void 0 || sessionId.length === 0) return null;
+		return this.resolveTurnIdentity(sessionId, messages, kind).requestSetId;
+	}
+	/**
+	* Agent-run identity the Qoder service reports consumption against.
+	*
+	* The official client stamps one `business.id` per agent run and keeps it for
+	* every request that run makes, which is what makes one subscriber turn one
+	* consumption record. A request outside any conversation still gets its own.
+	*/
+	resolveBusinessId(sessionId, messages, kind = "conversation") {
+		const identity = this.resolveTurnIdentity(sessionId, messages, kind);
+		return {
+			businessId: identity.businessId,
+			beginAt: identity.beginAt
+		};
+	}
+	/** Forget one session, e.g. when its transport is disposed. */
+	forget(sessionId) {
+		this.sessions.delete(sessionId);
+	}
+	/** Forget every session. */
+	clear() {
+		this.sessions.clear();
+	}
+	claimSession(sessionId, state) {
+		this.sessions.set(sessionId, state);
+		this.evict();
+	}
+	/**
+	* Keep the recorded sessions bounded.
+	*
+	* A conversation untouched for longer than the idle TTL cannot still be
+	* running a turn, so it is dropped first and dropping it cannot split a
+	* record. Sessions are ordered by last touch, which makes that idle set the
+	* prefix of the map, so in practice this deletes from the coldest end; the TTL
+	* only changes the outcome if the clock moves backwards. Once every recorded
+	* conversation is more recent than the TTL, the ceiling drops the coldest one,
+	* which can split the turn that conversation was running.
+	*/
+	evict() {
+		const idleBefore = this.now() - this.idleSessionTtlMs;
+		for (const [id, state] of this.sessions) {
+			if (this.sessions.size <= this.maxSessions) return;
+			if (state.lastTouchedAt <= idleBefore) this.sessions.delete(id);
+		}
+		while (this.sessions.size > this.maxSessions) {
+			const oldest = this.sessions.keys().next();
+			if (oldest.done === true) return;
+			this.sessions.delete(oldest.value);
+		}
+	}
+};
+//#endregion
 //#region src/qoder/transport/wire/serialize.ts
 /** Build the minimum qodercli request envelope for a validated DSH request. */
 function stableHash(prefix, ...inputs) {
@@ -994,18 +1296,25 @@ function stableHash(prefix, ...inputs) {
 	}
 	return hash.digest("hex").slice(0, 16);
 }
-function stableChatRecordId(model, messages, tools, maxTokens) {
-	const hash = crypto.createHash("sha256");
-	hash.update("qoder-record");
-	hash.update("\0");
-	hash.update(model);
-	hash.update("\0");
-	hash.update(JSON.stringify(messages));
-	hash.update("\0");
-	hash.update(JSON.stringify(tools));
-	hash.update("\0");
-	hash.update(`mt=${maxTokens}`);
-	return hash.digest("hex").slice(0, 16);
+/**
+* Turn identity shared by every request the process serves.
+*
+* Qoder's Credits panel aggregates consumption per agent run — the
+* `business.id` a request reports — so every step of one turn must carry the
+* same run identity while the next subscriber prompt opens a new one. The
+* tracker owns that boundary.
+*/
+const qoderTurnTracker = new QoderTurnTracker();
+/**
+* Whether this request serves the subscriber's turn or the host's bookkeeping.
+*
+* The host marks an auxiliary call through `GenerateOptions.purpose`, and those
+* calls carry a message list of their own under the same session identity. They
+* must never move the open turn's boundary, or one subscriber prompt would
+* report two consumption records.
+*/
+function callKind(options) {
+	return options.purpose === void 0 ? "conversation" : "auxiliary";
 }
 /**
 * Reject an unusable request before any credential resolution or provider I/O.
@@ -1020,7 +1329,6 @@ function validateQoderRequestShape(options, model) {
 		if (!model?.reasoningEfforts?.some((candidate) => candidate.id === effort)) throw new QoderLlmError(`Qoder model "${options.model}" does not advertise reasoning effort "${effort}".`, "UNSUPPORTED_REASONING_EFFORT");
 	}
 	if (options.messages.some((message) => contentHasImage(message.content)) && model?.supportsImages !== true) throw new QoderLlmError(`Qoder model "${options.model}" does not advertise image input.`, "UNSUPPORTED_CONTENT");
-	validateMessageShapes(options.messages);
 }
 /** Translate a request whose shape has already been validated. */
 function translateQoderMessages(options, attachments, pipeline) {
@@ -1030,7 +1338,7 @@ async function validateQoderRequest(options, model, attachments) {
 	validateQoderRequestShape(options, model);
 	return validateAndTranslateMessages(options.messages, options.system, attachments, options.signal);
 }
-async function buildQoderRequestBody(options, userId, translatedMessages, model, attachments) {
+async function buildQoderRequestBody(options, userId, translatedMessages, model, attachments, tracker) {
 	if (!userId) throw new QoderLlmError("Qoder request identity is missing.", "AUTH");
 	const modelKey = options.model || "cmodel";
 	const messages = translatedMessages ?? await validateQoderRequest(options, model, attachments);
@@ -1045,17 +1353,18 @@ async function buildQoderRequestBody(options, userId, translatedMessages, model,
 	}]));
 	let lastUserText = "";
 	for (let index = messages.length - 1; index >= 0; index--) if (messages[index].role === "user") {
-		const content = messages[index].content;
-		lastUserText = typeof content === "string" ? content : Array.isArray(content) ? content.filter((part) => part.type === "text").map((part) => part.text).join("") : "";
+		lastUserText = wireMessageText(messages[index]);
 		break;
 	}
-	const stablePart = stableHash("qoder-session", userId, modelKey);
+	const stablePart = stableHash("qoder-session", userId);
 	const sessionId = options.sessionId === void 0 ? `${stablePart}-${crypto.randomUUID()}` : `${stablePart}-${String(options.sessionId)}`;
-	const recordId = stableChatRecordId(modelKey, messages, tools, maxTokens);
+	const requestId = crypto.randomUUID();
+	const sessionIdParam = options.sessionId === void 0 ? void 0 : String(options.sessionId);
+	const identity = (tracker ?? qoderTurnTracker).resolveTurnIdentity(sessionIdParam, messages, callKind(options), requestId, modelKey);
 	return {
-		request_id: crypto.randomUUID(),
-		request_set_id: recordId,
-		chat_record_id: recordId,
+		request_id: requestId,
+		request_set_id: identity.requestSetId,
+		chat_record_id: identity.chatRecordId,
 		session_id: sessionId,
 		stream: true,
 		chat_task: "FREE_INPUT",
@@ -1100,12 +1409,12 @@ async function buildQoderRequestBody(options, userId, translatedMessages, model,
 		},
 		business: {
 			product: "cli",
-			version: "1.0.0",
+			version: "1.0.60",
 			type: "agent",
 			stage: "start",
-			id: crypto.randomUUID(),
+			id: identity.businessId,
 			name: lastUserText.substring(0, 30),
-			begin_at: Date.now()
+			begin_at: identity.beginAt
 		}
 	};
 }
@@ -2079,6 +2388,30 @@ const doneMarker = "[DONE]";
 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) {
 	let value;
 	try {
@@ -2090,7 +2423,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) throw qoderHttpError(`Qoder service returned upstream error status ${envelope.statusCodeValue}.`, { status: envelope.statusCodeValue });
+	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.body !== void 0 && typeof envelope.body !== "string") throw malformed("Qoder SSE envelope has an invalid model body.");
 	return envelope;
 }
@@ -2241,7 +2580,8 @@ async function* parseQoderSse(stream, options = {}) {
 					sawDone = true;
 					break;
 				}
-				const body = parseEnvelope(rawData).body?.trim();
+				const envelope = parseEnvelope(rawData);
+				const body = typeof envelope.body === "string" ? envelope.body.trim() : "";
 				if (!body) continue;
 				if (body === doneMarker) {
 					sawDone = true;
@@ -2435,7 +2775,28 @@ async function* streamQoderChat(options, model, credentials, messages, dependenc
 			...reqId === void 0 ? {} : { requestId: reqId }
 		});
 		resetIdleTimer();
-		if (!response.ok) throw qoderHttpError(`Qoder upstream service returned HTTP ${response.status}.`, response);
+		if (!response.ok) {
+			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)}`;
+			}
+			throw qoderHttpError(`Qoder upstream service returned HTTP ${response.status}${detail}.`, {
+				status: response.status,
+				headers: response.headers,
+				cause: bodyText || void 0
+			});
+		}
 		if (!response.body) throw new QoderLlmError("Qoder response contains no readable body stream.", "EMPTY_RESPONSE");
 		let firstChunkDurationMs;
 		let tokenUsage;
@@ -2677,6 +3038,10 @@ const Config = z.object({
 		"disabled"
 	]).default("auto")
 });
+const PluginConfig = Config.volatile();
+function readConfig(value) {
+	return "get" in value ? Config(structuredClone(value.get())) : value;
+}
 function resolveModels(models) {
 	const resolved = models ?? defaultModels;
 	if (resolved.length === 0) throw new Error("provider-qoder: at least one model is required");
@@ -2715,6 +3080,7 @@ var QoderAdapter = class extends LlmAdapter {
 	catalogModels;
 	providerId;
 	providerName;
+	onModelsDiscovered;
 	discoveries = /* @__PURE__ */ new WeakMap();
 	constructor(options) {
 		super();
@@ -2722,6 +3088,7 @@ 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;
 	}
 	providerInfo(provider) {
 		return {
@@ -2739,8 +3106,10 @@ var QoderAdapter = class extends LlmAdapter {
 		}
 		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;
 		});
@@ -2748,6 +3117,18 @@ var QoderAdapter = class extends LlmAdapter {
 		if (this.resolveTransport() !== transport) return this.listModels(provider);
 		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 ?? []);
 	}
@@ -2861,6 +3242,39 @@ async function resolveManagedQoderPat(credentials) {
 	if (hit === void 0 || isEnvironmentCredentialSource(hit.source)) return "";
 	return hit.value.trim();
 }
+//#endregion
+//#region src/dsh/settings.ts
+function bindQoderSettings(owner, ctx, input, options) {
+	const settings = ctx.settings;
+	if (typeof settings.register === "function") {
+		const namespace = "provider-qoder";
+		return {
+			namespace,
+			scope: settings.register(namespace, Config, options)
+		};
+	}
+	const namespace = owner.fiber.entry?.options.id ?? "provider-qoder";
+	const get = () => readConfig(input);
+	options.validate?.(get());
+	ctx.effect(() => owner.on("internal/config", function(_raw, next) {
+		const value = next();
+		if (this === owner.fiber) options.validate?.(Config(value));
+		return value;
+	}));
+	return {
+		namespace,
+		scope: {
+			get,
+			update: (patch) => settings.update(namespace, patch),
+			watch: (listener) => {
+				const on = owner.on.bind(owner);
+				return ctx.effect(() => on("loader/volatile-update", () => {
+					Promise.resolve().then(listener).catch((error) => ctx.emit("internal/error", error));
+				}));
+			}
+		}
+	};
+}
 /**
 * Absolute Fetch-route prefix. Connection mounts its shared, authenticated API
 * channel at `/api`, and every exact Fetch route lives directly below it.
@@ -2969,7 +3383,8 @@ function publicError(code, message, details = { issues: [] }) {
 		}
 	};
 }
-function apply(ctx, config = {}) {
+function apply(ctx, input = {}) {
+	const config = readConfig(input);
 	const logger = ctx.logger;
 	const initialRegion = config.region ?? "global";
 	const hasConfiguredModels = config.models !== void 0 && config.models.length > 0;
@@ -3022,7 +3437,16 @@ function apply(ctx, config = {}) {
 		resolveTransport: () => activeTransport,
 		models: initial.models,
 		providerId: providerQoder,
-		providerName: "Qoder"
+		providerName: "Qoder",
+		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));
+			});
+		}
 	});
 	const registration = ctx.llm.registerAdapter([providerQoder], adapter);
 	const refreshAdapter = () => {
@@ -3040,7 +3464,7 @@ function apply(ctx, config = {}) {
 		registration.replace([providerQoder]);
 	};
 	ctx.inject(["settings"], (settingsCtx) => {
-		const scope = settingsCtx.settings.register(settingsNamespace, Config, {
+		const { scope, namespace } = bindQoderSettings(ctx, settingsCtx, input, {
 			base: baseConfig,
 			validate: (value) => {
 				for (const region of Object.keys(value.modelsByRegion ?? {})) if (region !== "global" && region !== "china") throw new Error(`provider-qoder: unsupported model catalog region "${region}"`);
@@ -3050,34 +3474,39 @@ function apply(ctx, config = {}) {
 		});
 		legacyModelsRegion = scope.get().region ?? initialRegion;
 		current = () => scope.get();
-		persistDiscoveredModels = async (region) => {
-			const value = scope.get();
-			const selected = modelsFor(value, region, legacyModelsRegion);
-			const enriched = mergeQoderDiscoveryMetadata(selected, discoveredCatalogs[region]);
-			if (!hasSameQoderDiscoveryMetadata(selected, enriched)) await scope.update({ modelsByRegion: {
-				...value.modelsByRegion,
-				[region]: enriched
-			} });
+		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;
+				const snapshot = settingsCtx.settings.describe().find((section) => section.ns === namespace);
+				if (snapshot === void 0) return;
+				const selected = modelsFor(snapshot.value, region, legacyModelsRegion);
+				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;
 		refreshAdapter();
 		const loaded = scope.get();
 		const loadedRegion = loaded.region ?? "global";
-		if (loaded.models !== void 0 && loaded.models.length > 0 && loaded.modelsByRegion?.[loadedRegion] === void 0) scope.update({ modelsByRegion: {
-			...loaded.modelsByRegion,
-			[loadedRegion]: resolveModels(loaded.models)
-		} }).catch((error) => logger?.error?.("[Qoder Settings] Failed to migrate model catalog", logError(error)));
-		scope.watch(async (next) => {
-			if (ctx.fiber.state === fiberUnloading || ctx.fiber.state === fiberDisposed) return;
+		if (loaded.models !== void 0 && loaded.models.length > 0 && loaded.modelsByRegion?.[loadedRegion] === void 0) scope.update({ modelsByRegion: { [loadedRegion]: resolveModels(loaded.models) } }).catch((error) => logger?.error?.("[Qoder Settings] Failed to migrate model catalog", logError(error)));
+		scope.watch(async () => {
+			if (!bindingActive || ctx.fiber.state === fiberUnloading || ctx.fiber.state === fiberDisposed) return;
 			refreshAdapter();
-			const region = next.region ?? "global";
-			const selected = modelsFor(next, region, legacyModelsRegion);
-			const enriched = mergeQoderDiscoveryMetadata(selected, discoveredCatalogs[region]);
-			if (!hasSameQoderDiscoveryMetadata(selected, enriched)) await scope.update({ modelsByRegion: {
-				...next.modelsByRegion,
-				[region]: enriched
-			} });
+			await persistCatalog(scope.get().region ?? "global");
 		});
+		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;
 			if (ctx.fiber.state === fiberUnloading || ctx.fiber.state === fiberDisposed) return;
 			persistDiscoveredModels = async () => {};
 			current = () => baseConfig;
@@ -3169,4 +3598,4 @@ function apply(ctx, config = {}) {
 	});
 }
 //#endregion
-export { Config, QODER_SEARCH_PROVIDER_ID, QoderSearchClient, QoderSearchProvider, apply, getQoderWebSearchUrl, inject, name, qoderWebSearchPath };
+export { PluginConfig as Config, QODER_SEARCH_PROVIDER_ID, QoderSearchClient, QoderSearchProvider, apply, getQoderWebSearchUrl, inject, name, qoderWebSearchPath };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-provider-qoder",
   "description": "Global Qoder subscription adapter for the DeepSeek Harness LLM seam",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "publishConfig": {
     "access": "public"
   },
@@ -80,23 +80,28 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "3.18.1"
+    "@deepseek-ai/schemastery": "3.18.3"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-invariants": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-web": "0.1.2-rc.1",
-    "@deepseek-ai/schemastery": "3.18.1",
+    "@deepseek-ai/cordis": "4.0.3",
+    "@deepseek-ai/cordis-plugin-loader": "1.0.4",
+    "@deepseek-ai/dsh-agent": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-api-remotes": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-app-boot": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-attachment": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-brand": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-connection": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-config-editor": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-credentials": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-invariants": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-llm": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-session": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-settings": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-settings-legacy": "npm:@deepseek-ai/dsh-settings@0.1.2-rc.1",
+    "@deepseek-ai/dsh-web": "0.1.7-alpha.1",
     "@types/node": "24.3.0",
     "@types/react": "18.3.1",
     "lightningcss": "^1.33.0",