dsh-provider-qoder 0.3.2 → 0.4.0

package/README.md

@@ -25,8 +25,7 @@ This project is a community adapter plugin and is not affiliated with Qoder or D
 
 You will need a running DSH Web environment, an active Qoder subscription, and a PAT matching the selected service region. The DSH profile running the plugin must provide a managed credentials service; when configuring via the settings page, the credential storage must also be writable.
 
-This package's dependency ranges are DSH packages `>=0.1.2-rc.1 <0.2`, Cordis `>=4.0.2 <5`, and React `^18.2.0`. The settings UI also depends on the host providing remote credential endpoints and settings slots—please use a DSH version equipped with these interfaces; the ranges above do not imply that every version has been tested.
-
+This package supports DSH `>=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0`, Cordis `>=4.0.4 <5`, and React `^18.2.0`.
 ### Install from npm
 
 Run in your terminal:

package/README_CN.md

@@ -27,7 +27,7 @@
 
 你需要可运行的 DSH Web 环境、可用的 Qoder 订阅，以及与所选服务区域匹配的 PAT。运行插件的 DSH profile 必须提供托管凭据服务；通过设置页面配置时，凭据存储还需可写。
 
-本包的依赖范围为 DSH 相关包 `>=0.1.2-rc.1 <0.2`、Cordis `>=4.0.2 <5` 和 React `^18.2.0`。设置界面还依赖宿主提供凭据远程接口和设置插槽，请使用具备这些接口的 DSH 版本；上述范围不代表每个版本都经过实测。
+本包支持 DSH `>=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0`、Cordis `>=4.0.4 <5` 和 React `^18.2.0`。
 
 ### 从 npm 安装
 

package/lib/client.js

@@ -781,7 +781,7 @@ window.__ModuleLoader__.load({
 			const region = selectedRegion ?? (section.region === "china" ? "china" : "global");
 			const scoped = section.modelsByRegion?.[region];
 			if (Array.isArray(scoped)) return scoped;
-			return region === (section.region === "china" ? "china" : "global") && Array.isArray(section.models) ? section.models : defaultModels.map((model) => ({ ...model }));
+			return defaultModels.map((model) => ({ ...model }));
 		}
 		function regionOf(value) {
 			if (typeof value !== "object" || value === null) return "global";
@@ -1166,24 +1166,15 @@ window.__ModuleLoader__.load({
 			"slots",
 			"locale",
 			"remote",
-			"remote.credentials"
+			"remote.credentials",
+			"configForms"
 		];
 		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");
+			mount(ctx, ctx.configForms.get(settingsNamespace));
 		}
 		function mount(ctx, modelScope) {
 			ctx.effect(() => ctx.locale.register(localeNamespace, {

package/lib/index.d.ts

@@ -43,8 +43,6 @@ type QoderWebSearchMode = 'auto' | 'always' | 'disabled';
 interface Config {
   region?: QoderRegion;
   modelsByRegion?: QoderModelsByRegion;
-  /** @deprecated Migrated to modelsByRegion for the selected region. */
-  models?: QoderCatalogModel[];
   streamIdleTimeoutMs?: number;
   responseHeaderTimeoutMs?: number;
   preserveThinking?: boolean;

package/lib/index.js

@@ -830,8 +830,7 @@ async function resolveImagePart(block, context) {
 		const target = {
 			width: Math.max(1, Math.floor(width * scale)),
 			height: Math.max(1, Math.floor(height * scale)),
-			maxBytes: limits.maxImageBytes,
-			maxPixels: limits.maxImagePixels
+			maxBytes: limits.maxImageBytes
 		};
 		image = await attachments.readImageRequest(block.attachment, target, signal);
 	} catch (error) {
@@ -3000,7 +2999,7 @@ function createQoderTransport(options) {
 }
 //#endregion
 //#region src/dsh/config.ts
-/** DSH configuration schema and region-scoped model catalog migration rules. */
+/** DSH configuration schema and region-scoped model catalog selection. */
 const catalogModel = z.object({
 	id: z.string().required(),
 	name: z.string().required(),
@@ -3028,7 +3027,6 @@ const modelsByRegionSchema = z.dict(z.array(catalogModel));
 const Config = z.object({
 	region: z.union(["global", "china"]).default("global"),
 	modelsByRegion: modelsByRegionSchema.default({}),
-	models: z.array(catalogModel),
 	streamIdleTimeoutMs: z.number().step(1).min(1).default(defaultStreamIdleTimeoutMs),
 	responseHeaderTimeoutMs: z.number().step(1).min(1).default(defaultResponseHeaderTimeoutMs),
 	preserveThinking: z.boolean().default(true),
@@ -3053,11 +3051,8 @@ function resolveModels(models) {
 		return { ...model };
 	});
 }
-function modelsFor(config, region, legacyModelsRegion = config.region ?? "global") {
-	const scoped = config.modelsByRegion?.[region];
-	if (scoped !== void 0) return resolveModels(scoped);
-	if (legacyModelsRegion === region && config.models !== void 0 && config.models.length > 0) return resolveModels(config.models);
-	return resolveModels(defaultModels);
+function modelsFor(config, region) {
+	return resolveModels(config.modelsByRegion?.[region]);
 }
 //#endregion
 //#region src/dsh/provider.ts
@@ -3245,14 +3240,6 @@ async function resolveManagedQoderPat(credentials) {
 //#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());
@@ -3265,10 +3252,9 @@ function bindQoderSettings(owner, ctx, input, options) {
 		namespace,
 		scope: {
 			get,
-			update: (patch) => settings.update(namespace, patch),
+			update: (patch) => ctx.settings.update(namespace, patch),
 			watch: (listener) => {
-				const on = owner.on.bind(owner);
-				return ctx.effect(() => on("loader/volatile-update", () => {
+				return ctx.effect(() => owner.on("loader/volatile-update", () => {
 					Promise.resolve().then(listener).catch((error) => ctx.emit("internal/error", error));
 				}));
 			}
@@ -3313,7 +3299,7 @@ function registerQoderRpc(ctx, handler) {
 		fetch: (request) => handleQoderRpcRequest(endpoint, handler, request)
 	}));
 	return () => {
-		for (const dispose of disposers) if (typeof dispose === "function") dispose();
+		for (const dispose of disposers) dispose();
 	};
 }
 /**
@@ -3386,19 +3372,15 @@ function publicError(code, message, details = { issues: [] }) {
 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;
 	const baseConfig = {
-		region: initialRegion,
+		region: config.region ?? "global",
 		modelsByRegion: { ...config.modelsByRegion },
-		...hasConfiguredModels ? { models: resolveModels(config.models) } : {},
 		streamIdleTimeoutMs: config.streamIdleTimeoutMs ?? 3e5,
 		responseHeaderTimeoutMs: config.responseHeaderTimeoutMs ?? 6e4,
 		preserveThinking: config.preserveThinking ?? true,
 		webSearchMode: config.webSearchMode ?? "auto"
 	};
 	let current = () => baseConfig;
-	let legacyModelsRegion = initialRegion;
 	let persistDiscoveredModels = async (_region) => {};
 	const discoveredCatalogs = {
 		global: [],
@@ -3418,7 +3400,7 @@ function apply(ctx, input = {}) {
 		const region = value.region ?? "global";
 		return {
 			region,
-			models: mergeQoderDiscoveryMetadata(modelsFor(value, region, legacyModelsRegion), discoveredCatalogs[region]),
+			models: mergeQoderDiscoveryMetadata(modelsFor(value, region), discoveredCatalogs[region]),
 			streamIdleTimeoutMs: value.streamIdleTimeoutMs ?? 3e5,
 			responseHeaderTimeoutMs: value.responseHeaderTimeoutMs ?? 6e4,
 			preserveThinking: value.preserveThinking ?? true,
@@ -3464,15 +3446,11 @@ function apply(ctx, input = {}) {
 		registration.replace([providerQoder]);
 	};
 	ctx.inject(["settings"], (settingsCtx) => {
-		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}"`);
-				modelsFor(value, "global", legacyModelsRegion);
-				modelsFor(value, "china", legacyModelsRegion);
-			}
-		});
-		legacyModelsRegion = scope.get().region ?? initialRegion;
+		const { scope, namespace } = bindQoderSettings(ctx, settingsCtx, input, { 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}"`);
+			modelsFor(value, "global");
+			modelsFor(value, "china");
+		} });
 		current = () => scope.get();
 		let bindingActive = true;
 		const persistCatalog = async (region) => {
@@ -3480,7 +3458,7 @@ function apply(ctx, input = {}) {
 				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 selected = modelsFor(snapshot.value, region);
 				const enriched = modelsFor(Config({ modelsByRegion: { [region]: mergeQoderDiscoveryMetadata(selected, discoveredCatalogs[region]) } }), region);
 				if (hasSameQoderDiscoveryMetadata(selected, enriched)) return;
 				try {
@@ -3493,9 +3471,6 @@ function apply(ctx, input = {}) {
 		};
 		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: { [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();

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.2",
+  "version": "0.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -65,43 +65,42 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/cordis": ">=4.0.2 <5",
-    "@deepseek-ai/dsh-api-remotes": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-attachment": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-client-connection": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-client-locale": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-credentials": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-invariants": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-llm": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-settings": ">=0.1.2-rc.1 <0.2",
-    "@deepseek-ai/dsh-web": ">=0.1.2-rc.1 <0.2",
+    "@deepseek-ai/cordis": ">=4.0.4 <5",
+    "@deepseek-ai/dsh-api-remotes": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-attachment": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-client-connection": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-client-locale": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-credentials": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-invariants": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-llm": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-settings": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-web": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "3.18.3"
+    "@deepseek-ai/schemastery": "3.18.4"
   },
   "devDependencies": {
-    "@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",
+    "@deepseek-ai/cordis": "4.0.4",
+    "@deepseek-ai/cordis-plugin-loader": "1.0.5",
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-api-remotes": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-app-boot": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-brand": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-config-editor": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-web": "0.1.7-rc.2",
     "@types/node": "24.3.0",
     "@types/react": "18.3.1",
     "lightningcss": "^1.33.0",