dsh-codearts 1.1.4 → 1.2.1

package/lib/index.d.mts

@@ -1572,10 +1572,14 @@ declare const name = "llm-codearts";
 declare const inject: string[];
 /** Settings namespace owning the configuration card. */
 declare const CODEARTS_SETTINGS_NS: SettingsNamespace;
-/** Plugin configuration (MVP: just the model allowlist). */
+/** Plugin configuration. */
 interface Config {
   /** Allowlist of CodeArts model ids offered in the model pickers. */
   enabledModels?: string[];
+  /** 对话输入框下方那行「积分 N」是否显示。缺省 = 显示（老配置不改行为）。 */
+  showCreditDock?: boolean;
+  /** 等上游开流时那行「排队第 N 位」是否显示。缺省 = 显示。 */
+  showQueueDock?: boolean;
 }
 declare const Config: z<Config>;
 declare function apply(ctx: Context, rawConfig: Config): void;

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { A as filterEnabledModels, C as rateLimitFrame, D as FALLBACK_CODEARTS_MODELS, E as CodeArtsCatalog, F as MANUAL_ACCOUNT_ID, I as codeartsAccountsPath, L as codeartsAuthPath, M as isBenefitModel, N as CodeArtsAccountStore, O as clearBenefitBlocked, P as CodeArtsCredentialStore, R as startLogin, S as prepareChatBody, T as upstreamErrorMessage, _ as isQueueableRate, a as SNAP_HOST, b as maxTokensCeilingFor, c as claimDailyWelfare, d as fetchCallerIdentity, f as fetchModels, g as isParamInvalidFrame, h as isConcurrencyCap, i as refreshCatalog, j as isBenefitBlocked, k as creditRatioLabel, l as clearQueueStatus, m as fetchWelfareCampaigns, n as codeartsUsagePath, o as canonicalModel, p as fetchQueueStatus, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as degradeTokenCeiling, v as isTpmLimit, w as signedGet, x as pickDailyWelfareCampaign, y as isWelfareClaimedStatus } from "./usage-B0NfG8vZ.mjs";
+import { A as filterEnabledModels, C as rateLimitFrame, D as FALLBACK_CODEARTS_MODELS, E as CodeArtsCatalog, F as MANUAL_ACCOUNT_ID, I as codeartsAccountsPath, L as codeartsAuthPath, M as isBenefitModel, N as CodeArtsAccountStore, O as clearBenefitBlocked, P as CodeArtsCredentialStore, R as startLogin, S as prepareChatBody, T as upstreamErrorMessage, _ as isQueueableRate, a as SNAP_HOST, b as maxTokensCeilingFor, c as claimDailyWelfare, d as fetchCallerIdentity, f as fetchModels, g as isParamInvalidFrame, h as isConcurrencyCap, i as refreshCatalog, j as isBenefitBlocked, k as creditRatioLabel, l as clearQueueStatus, m as fetchWelfareCampaigns, n as codeartsUsagePath, o as canonicalModel, p as fetchQueueStatus, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as degradeTokenCeiling, v as isTpmLimit, w as signedGet, x as pickDailyWelfareCampaign, y as isWelfareClaimedStatus } from "./usage-05PgtUIP.mjs";
 import { i as lazyApi, r as createProvider } from "./models-CgKCibpk.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomBytes, timingSafeEqual } from "node:crypto";
@@ -1404,6 +1404,11 @@ const CODEARTS_CLAIM_PATH = "/api/codearts/claim";
 const CODEARTS_REFRESH_MODELS_PATH = "/api/codearts/refresh-models";
 /** GET /api/codearts/queue — 上游排队位置（只在等开流期间有值，底部积分条旁边展示）。 */
 const CODEARTS_QUEUE_PATH = "/api/codearts/queue";
+/**
+* GET/POST /api/codearts/dock — 对话底部那一行的显隐开关。
+* GET 给当前值与 writable，POST 收 `{credits?, queue?}` 写进 settings。
+*/
+const CODEARTS_DOCK_PATH = "/api/codearts/dock";
 /** 最近出站请求的**形状**摘要（只有 role 名与计数，不含内容），排障用。 */
 const CODEARTS_DEBUG_PATH = "/api/codearts/debug";
 /**
@@ -1422,6 +1427,7 @@ function selectionOf(models, enabled, writable) {
 			benefit: m.benefit,
 			blocked: m.blocked,
 			ratio: m.ratio,
+			supportsImages: m.supportsImages,
 			enabled: restricted ? allowed.has(m.id) : true
 		})),
 		restricted,
@@ -1438,10 +1444,32 @@ function choicesOf(deps) {
 			name: m.name,
 			benefit,
 			blocked: isBenefitBlocked(m.id),
+			...ratio === void 0 ? {} : { ratio },
+			...m.supportsImages === true ? { supportsImages: true } : {}
+		};
+	});
+}
+/**
+* 目录 -> 底栏/卡片用的模型徽章。
+*
+* 倍率在这里就算好（`creditRatioLabel`：福利恒为 `x0.00`），客户端拿到的是可以直接
+* 印出来的字符串 —— 底栏那一行要把它作为独立的一段，所以不能只给带尾巴的名字。
+*/
+function modelBadgesOf(models) {
+	return models.map((m) => {
+		const ratio = creditRatioLabel(m.ratio, isBenefitModel(m.id));
+		return {
+			id: m.id,
+			name: m.name,
 			...ratio === void 0 ? {} : { ratio }
 		};
 	});
 }
+/** 开关的默认值：没有 settings provider（或老配置没这两个键）时保持原有行为 —— 都显示。 */
+const DEFAULT_DOCK_FLAGS = {
+	credits: true,
+	queue: true
+};
 /**
 * 把逐账号的领取结果汇总成一条：HTTP 层只看 ok，卡片看 results 逐号展示。
 * 有一个号失败就算整批 ok=false，但别的号领到的结果照样在 results 里。
@@ -1563,11 +1591,15 @@ function usageOf(deps) {
 *
 * 积分是「锦上添花」：拉不到也绝不能把状态接口本身拖垮，所以失败一律降级成
 * `creditsError` 交给卡片显示原因（超时由注入方在自己的闭包里保证）。
+*
+* `force` 是给对话底部弹层那个「刷新积分」按钮用的：不强制的话它会命中 60 秒缓存，
+* 按钮点了数字不动 —— 那还不如不给这个按钮。
 */
-async function creditsOf(deps) {
-	if (deps.credits === void 0) return {};
+async function creditsOf(deps, force) {
+	const load = force ? deps.refreshCredits ?? deps.credits : deps.credits;
+	if (load === void 0) return {};
 	try {
-		const entries = await deps.credits();
+		const entries = await load();
 		const primary = entries.find((entry) => entry.credits !== void 0) ?? entries[0];
 		return {
 			...primary?.credits === void 0 ? {} : { credits: primary.credits },
@@ -1578,14 +1610,12 @@ async function creditsOf(deps) {
 		return { creditsError: safeMessage(error) };
 	}
 }
-async function buildStatus(deps) {
-	const models = deps.models().map((m) => ({
-		id: m.id,
-		name: m.name
-	}));
+async function buildStatus(deps, force = false) {
+	const models = modelBadgesOf(deps.models());
 	const accounts = await deps.store.list();
 	const cred = await deps.store.current();
 	const usage = usageOf(deps);
+	const dock = deps.dock === void 0 ? {} : { dock: deps.dock() };
 	const piAi = await probePiAiCompat();
 	const compat = piAi === void 0 ? {} : { piAiError: piAi };
 	if (accounts.length === 0 || cred === void 0) return {
@@ -1593,6 +1623,7 @@ async function buildStatus(deps) {
 		models,
 		accounts,
 		usage,
+		...dock,
 		...compat
 	};
 	const usable = accounts.some(accountUsable);
@@ -1601,7 +1632,8 @@ async function buildStatus(deps) {
 		...cred.storedAt === void 0 ? {} : { storedAt: cred.storedAt },
 		models,
 		accounts,
-		usage
+		usage,
+		...dock
 	};
 	if (!usable) return {
 		status: "expired",
@@ -1612,7 +1644,7 @@ async function buildStatus(deps) {
 		status: "signed-in",
 		...identity,
 		...compat,
-		...await creditsOf(deps)
+		...await creditsOf(deps, force)
 	};
 }
 /** GET /api/codearts/status */
@@ -1627,12 +1659,65 @@ function statusHandler(deps) {
 			return;
 		}
 		try {
-			json(res, 200, await buildStatus(deps));
+			json(res, 200, await buildStatus(deps, new URL(req.url ?? "", "http://localhost").searchParams.get("force") === "1"));
 		} catch (error) {
 			json(res, 500, { error: safeMessage(error) });
 		}
 	};
 }
+/**
+* GET/POST /api/codearts/dock — 对话底部那一行的显隐开关读写。
+*
+* 和 enabled-models 同一套规矩：GET 给当前值 + writable，POST 只收布尔、
+* 没接 settings provider 时回 403 让卡片把勾选框置灰。
+*/
+function dockHandler(deps) {
+	return async (req, res) => {
+		if (!loopbackRequest(req)) {
+			json(res, 403, { error: "request-not-trusted" });
+			return;
+		}
+		const current = deps.dock?.() ?? DEFAULT_DOCK_FLAGS;
+		if (req.method === "GET") {
+			json(res, 200, {
+				dock: current,
+				writable: deps.setDock !== void 0
+			});
+			return;
+		}
+		if (req.method === "POST") {
+			if (deps.setDock === void 0) {
+				json(res, 403, { error: "dock-not-writable" });
+				return;
+			}
+			const type = req.headers["content-type"];
+			if (typeof type !== "string" || !type.trim().toLowerCase().startsWith("application/json")) {
+				json(res, 415, { error: "content-type must be application/json" });
+				return;
+			}
+			try {
+				const body = JSON.parse(await readBody(req));
+				const touched = ["credits", "queue"].filter((key) => body[key] !== void 0);
+				if (touched.length === 0 || touched.some((key) => typeof body[key] !== "boolean")) {
+					json(res, 400, { error: "expected {\"credits\"?: boolean, \"queue\"?: boolean}" });
+					return;
+				}
+				if (!await deps.setDock(Object.fromEntries(touched.map((key) => [key, body[key]])))) {
+					json(res, 403, { error: "dock-not-writable" });
+					return;
+				}
+				json(res, 200, {
+					dock: deps.dock?.() ?? DEFAULT_DOCK_FLAGS,
+					writable: true
+				});
+			} catch (error) {
+				json(res, 500, { error: safeMessage(error) });
+			}
+			return;
+		}
+		json(res, 405, { error: "method not allowed" });
+	};
+}
 /** GET /api/codearts/models — currently offered model ids (honours allowlist). */
 function modelsHandler(deps) {
 	return async (req, res) => {
@@ -1644,10 +1729,7 @@ function modelsHandler(deps) {
 			json(res, 403, { error: "request-not-trusted" });
 			return;
 		}
-		json(res, 200, { models: filterEnabledModels(deps.models(), deps.enabledModels?.()).map((m) => ({
-			id: m.id,
-			name: m.name
-		})) });
+		json(res, 200, { models: modelBadgesOf(filterEnabledModels(deps.models(), deps.enabledModels?.())) });
 	};
 }
 /**
@@ -1935,6 +2017,11 @@ function registerCodeArtsStatusRoute(ctx, deps) {
 			path: CODEARTS_QUEUE_PATH,
 			handler: queueHandler(deps)
 		});
+		const disposeDock = ctx.webServer.register({
+			kind: "exact",
+			path: CODEARTS_DOCK_PATH,
+			handler: dockHandler(deps)
+		});
 		const disposeDebug = ctx.webServer.register({
 			kind: "exact",
 			path: CODEARTS_DEBUG_PATH,
@@ -1951,6 +2038,7 @@ function registerCodeArtsStatusRoute(ctx, deps) {
 			disposeClaim();
 			disposeRefresh();
 			disposeQueue();
+			disposeDock();
 			disposeDebug();
 			for (const s of activeLogins.values()) s.close();
 			activeLogins.clear();
@@ -2115,7 +2203,11 @@ function unwrapConfig(value) {
 	for (const [key, field] of Object.entries(value)) out[key] = unwrapVolatileValue(field);
 	return out;
 }
-const Config = z.object({ enabledModels: z.array(z.string()).description("Model ids offered in the model pickers (empty means every model)").volatile() });
+const Config = z.object({
+	enabledModels: z.array(z.string()).description("Model ids offered in the model pickers (empty means every model)").volatile(),
+	showCreditDock: z.boolean().default(true).description("Show the remaining-credits line under the chat input box").volatile(),
+	showQueueDock: z.boolean().default(true).description("Show the upstream queue position under the chat input box").volatile()
+});
 function settingsCompatNamespace(ctx) {
 	return resolveSettingsNamespaceCompat(ctx, ctx.get("settings"), CODEARTS_SETTINGS_NS);
 }
@@ -2187,6 +2279,19 @@ function apply(ctx, rawConfig) {
 		await settings.update(settingsCompatNamespace(ctx), { enabledModels: [...ids] });
 		return true;
 	};
+	const dock = () => ({
+		credits: current().showCreditDock !== false,
+		queue: current().showQueueDock !== false
+	});
+	const setDock = async (patch) => {
+		const settings = ctx.get("settings");
+		if (settings === void 0) return false;
+		await settings.update(settingsCompatNamespace(ctx), {
+			...patch.credits === void 0 ? {} : { showCreditDock: patch.credits },
+			...patch.queue === void 0 ? {} : { showQueueDock: patch.queue }
+		});
+		return true;
+	};
 	/** 手动「刷新模型列表」的预算：三路来源各打一次，比每小时的后台刷新更该给足时间。 */
 	const MANUAL_REFRESH_MS = 6e4;
 	ctx.inject(["webServer"], (webCtx) => registerCodeArtsStatusRoute(webCtx, {
@@ -2200,6 +2305,12 @@ function apply(ctx, rawConfig) {
 		queue: () => queue.snapshot(),
 		recentRequests: () => recentRequestShapes(),
 		credits: (signal) => loadCredits(signal),
+		refreshCredits: (signal) => {
+			credits.invalidate();
+			return loadCredits(signal);
+		},
+		dock,
+		setDock,
 		claim: async (accountId) => {
 			const ids = accountId === void 0 ? await store.ids() : [accountId];
 			if (ids.length === 0) return {
@@ -2281,6 +2392,7 @@ function apply(ctx, rawConfig) {
 		shim.close().catch(() => {});
 	});
 	const CATALOG_REFRESH_MS = 36e5;
+	const CATALOG_EMPTY_RETRY_MS = 6e4;
 	const abort = new AbortController();
 	const discover = async () => {
 		if (stopped) return;
@@ -2295,13 +2407,18 @@ function apply(ctx, rawConfig) {
 			ctx.logger.debug("dsh-codearts: model discovery failed; keeping the current catalog", error);
 		}
 	};
-	ctx.effect(() => {
-		const timer = setInterval(() => void discover(), CATALOG_REFRESH_MS);
-		timer.unref?.();
-		return () => {
-			abort.abort();
-			clearInterval(timer);
-		};
+	let discoveryTimer;
+	/** 自我重排的发现循环：目录为空时加快到每分钟，有货后回到每小时。 */
+	const discoverLoop = async () => {
+		await discover();
+		if (stopped) return;
+		const delay = catalog.current().length === 0 ? CATALOG_EMPTY_RETRY_MS : CATALOG_REFRESH_MS;
+		discoveryTimer = setTimeout(() => void discoverLoop(), delay);
+		discoveryTimer.unref?.();
+	};
+	ctx.effect(() => () => {
+		abort.abort();
+		if (discoveryTimer !== void 0) clearTimeout(discoveryTimer);
 	});
 	const shim = createCodeArtsShim({
 		store,
@@ -2314,7 +2431,7 @@ function apply(ctx, rawConfig) {
 	usage.load().catch(() => {});
 	shim.ready.then(async () => {
 		if (stopped) return;
-		discover();
+		discoverLoop();
 		const incompatible = await probePiAiCompat();
 		if (incompatible !== void 0) ctx.logger.error(`dsh-codearts: ${incompatible}`);
 		const codearts = createCodeArtsAdapter({

package/lib/{usage-B0NfG8vZ.mjs → usage-05PgtUIP.mjs}

@@ -905,6 +905,13 @@ const FALLBACK_CODEARTS_MODELS = [
 		name: "DeepSeek-V4.1-Flash",
 		contextWindow: 131072,
 		maxTokens: 65536,
+		supportsImages: false
+	},
+	{
+		id: "deepseek-v4.1-flash-1017",
+		name: "DeepSeek-V4.1-Flash-1017",
+		contextWindow: 1048576,
+		maxTokens: 65536,
 		supportsImages: true
 	},
 	{

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-codearts",
   "displayName": "DSH CodeArts Connect",
   "description": "把华为云 CodeArts 接入 DeepSeek Harness —— 内置 OAuth2 登录（PKCE + DPoP），登录后即可在 DSH 对话窗口使用 CodeArts 的模型。",
-  "version": "1.1.4",
+  "version": "1.2.1",
   "packageManager": "pnpm@11.24.0",
   "author": "elegant01",
   "keywords": [