dsh-codearts 1.2.10 → 1.2.11

package/lib/{usage-CjPd0Gok.mjs → version-Dq3wXMop.mjs}

@@ -565,7 +565,9 @@ function summarizeAccount(id, cred) {
 		...cred.expiration === void 0 ? {} : { expiration: cred.expiration },
 		...cred.storedAt === void 0 ? {} : { storedAt: cred.storedAt },
 		stale: cred.stale === true,
-		signable: typeof cred.accessKeyId === "string" && cred.accessKeyId !== "" && typeof cred.secretAccessKey === "string" && cred.secretAccessKey !== ""
+		signable: typeof cred.accessKeyId === "string" && cred.accessKeyId !== "" && typeof cred.secretAccessKey === "string" && cred.secretAccessKey !== "",
+		paused: cred.paused === true,
+		pinned: cred.pinned === true
 	};
 }
 /**
@@ -840,6 +842,58 @@ var CodeArtsAccountStore = class {
 		doc.order = doc.order.filter((existing) => existing !== id);
 		await this.persistDoc();
 	}
+	/**
+	* 暂停 / 恢复一个账号。
+	*
+	* 只改标记，不碰凭证：恢复时不需要重新登录。重新装配槽位是因为 AccountSlot
+	* 缓存的 `_cred` 是旧对象，续期回写会把它盖回来 —— 换了对象，续期写到新文档里。
+	*/
+	async setPaused(id, paused) {
+		await this.loaded();
+		const doc = this._doc;
+		const cred = doc.accounts[id];
+		if (cred === void 0) return false;
+		doc.accounts[id] = {
+			...cred,
+			paused
+		};
+		this._slots.get(id)?.invalidate();
+		this._slots.set(id, new AccountSlot(doc.accounts[id], this.persisterFor(id)));
+		await this.persistDoc();
+		return true;
+	}
+	/** 置顶 / 取消置顶：只改变轮转先后，不绕过冷却与并发上限。 */
+	async setPinned(id, pinned) {
+		await this.loaded();
+		const doc = this._doc;
+		const cred = doc.accounts[id];
+		if (cred === void 0) return false;
+		doc.accounts[id] = {
+			...cred,
+			pinned
+		};
+		this._slots.get(id)?.invalidate();
+		this._slots.set(id, new AccountSlot(doc.accounts[id], this.persisterFor(id)));
+		await this.persistDoc();
+		return true;
+	}
+	/** shim 用：参与轮转的账号 id（排除用户暂停的）。 */
+	async dispatchIds() {
+		const paused = new Set(await this.pausedIds());
+		return (await this.ids()).filter((id) => !paused.has(id));
+	}
+	/** 被用户暂停的账号 id（账号池据此保留状态但不派活）。 */
+	async pausedIds() {
+		await this.loaded();
+		const doc = this._doc;
+		return (await this.ids()).filter((id) => doc.accounts[id]?.paused === true);
+	}
+	/** 置顶账号的 id 列表（给账号池排序用）。 */
+	async pinnedIds() {
+		await this.loaded();
+		const doc = this._doc;
+		return (await this.ids()).filter((id) => doc.accounts[id]?.pinned === true);
+	}
 	/** 清空全部账号（整体登出）。 */
 	async clear() {
 		await this.loaded();
@@ -2405,6 +2459,7 @@ async function fetchModels(credential, signal) {
 			return {
 				...model,
 				...thinking === void 0 ? {} : { thinking },
+				contextWindowKnown: model.contextWindow > 0,
 				contextWindow: model.contextWindow > 0 ? model.contextWindow : UNKNOWN_CONTEXT_WINDOW,
 				maxTokens: Math.min(model.maxTokens > 0 ? model.maxTokens : UNKNOWN_MAX_TOKENS, maxTokensCeilingFor(model.id))
 			};
@@ -2742,6 +2797,21 @@ function codeartsUsagePath(home) {
 	const base = home ?? process.env.DSH_HOME ?? join(homedir(), ".dsh");
 	return join(base, ".codearts-usage.json");
 }
+/** 首字延迟分桶的上界（毫秒）；落进最后一档表示「超过 30 秒」。 */
+const TTFT_BUCKETS_MS = [
+	200,
+	500,
+	1e3,
+	2e3,
+	3e3,
+	5e3,
+	8e3,
+	12e3,
+	2e4,
+	3e4
+];
+/** 直方图桶数（含溢出档）。 */
+const TTFT_BUCKET_COUNT = TTFT_BUCKETS_MS.length + 1;
 function emptyTotals() {
 	return {
 		requests: 0,
@@ -2847,6 +2917,22 @@ function normalizeStore(store) {
 	}
 	return out;
 }
+/** 计数表（失败类别 / 账号失败数）补齐：只留正数，空表给 undefined。 */
+function normalizeCounts(raw) {
+	if (typeof raw !== "object" || raw === null) return void 0;
+	const out = {};
+	for (const [key, value] of Object.entries(raw)) {
+		const count = positiveInt(value);
+		if (count > 0) out[key] = count;
+	}
+	return Object.keys(out).length === 0 ? void 0 : out;
+}
+/** 首字延迟直方图补齐到固定桶数；旧账本/脏数组一律按空表。 */
+function normalizeBuckets(raw) {
+	if (!Array.isArray(raw)) return void 0;
+	const out = Array.from({ length: TTFT_BUCKET_COUNT }, (_, index) => positiveInt(raw[index]));
+	return out.some((count) => count > 0) ? out : void 0;
+}
 /**
 * 用量账本。
 *
@@ -2885,17 +2971,19 @@ var CodeArtsUsageTracker = class {
 			if (parsed.version !== 1 || typeof parsed.days !== "object" || parsed.days === null) return;
 			for (const [date, day] of Object.entries(parsed.days)) {
 				if (typeof day !== "object" || day === null) continue;
-				const models = normalizeStore(day.models);
-				const accounts = normalizeStore(day.accounts);
-				const hours = day.hours;
-				this.days.set(date, hours === void 0 ? {
-					models,
-					accounts
-				} : {
-					models,
-					accounts,
-					hours: normalizeStore(hours)
-				});
+				const stored = day;
+				const restored = {
+					models: normalizeStore(stored.models),
+					accounts: normalizeStore(stored.accounts)
+				};
+				if (stored.hours !== void 0) restored.hours = normalizeStore(stored.hours);
+				const failures = normalizeCounts(stored.failures);
+				if (failures !== void 0) restored.failures = failures;
+				const failuresByAccount = normalizeCounts(stored.failuresByAccount);
+				if (failuresByAccount !== void 0) restored.failuresByAccount = failuresByAccount;
+				const ttft = normalizeBuckets(stored.ttft);
+				if (ttft !== void 0) restored.ttft = ttft;
+				this.days.set(date, restored);
 			}
 			this.prune(this.now());
 		} catch {
@@ -2951,6 +3039,42 @@ var CodeArtsUsageTracker = class {
 		return day.hours;
 	}
 	/**
+	* 记一次失败请求。
+	*
+	* 只在「这次请求最终回给用户一个错误」时调用一次 —— 插件内部换号重试不算失败，
+	* 否则一个排队重试就能把失败率刷成好几倍。`kind` 用 shim 的失败出口标识。
+	*/
+	noteFailure(kind, accountId, at = this.now()) {
+		if (kind === "") return;
+		const day = this.day(localDateKey(at));
+		day.failures ??= {};
+		day.failures[kind] = (day.failures[kind] ?? 0) + 1;
+		if (accountId !== void 0 && accountId !== "") {
+			day.failuresByAccount ??= {};
+			day.failuresByAccount[accountId] = (day.failuresByAccount[accountId] ?? 0) + 1;
+		}
+		this.lastAt = at;
+		this.prune(at);
+		this.scheduleSave();
+	}
+	/**
+	* 记一次首字延迟（毫秒），落进直方图。
+	*
+	* 从请求进入 shim 算起，到上游第一帧真的写给 DSH 为止 —— 排队和换号的时间都算进去，
+	* 因为那正是用户盯着转圈等掉的时长。
+	*/
+	noteLatency(ms, at = this.now()) {
+		if (!Number.isFinite(ms) || ms < 0) return;
+		const day = this.day(localDateKey(at));
+		day.ttft ??= new Array(TTFT_BUCKET_COUNT).fill(0);
+		let index = TTFT_BUCKETS_MS.findIndex((limit) => ms <= limit);
+		if (index < 0) index = TTFT_BUCKET_COUNT - 1;
+		day.ttft[index] += 1;
+		this.lastAt = at;
+		this.prune(at);
+		this.scheduleSave();
+	}
+	/**
 	* 丢弃保留期之外的天（按日期键比较即可，YYYY-MM-DD 是字典序）。
 	*
 	* 顺带把两天之前的**小时桶**清掉：逐小时数据只有「今天按小时」在画，留着只是
@@ -2975,6 +3099,10 @@ var CodeArtsUsageTracker = class {
 			if (date >= cutoff) mergeTotals(last30, totals);
 		}
 		const models = today?.models ?? {};
+		const failuresByKind = today?.failures ?? {};
+		const ttft = today?.ttft ?? [];
+		const p50 = percentileOf(ttft, .5);
+		const p95 = percentileOf(ttft, .95);
 		return {
 			today: {
 				...emptyTotals(),
@@ -2982,6 +3110,17 @@ var CodeArtsUsageTracker = class {
 			},
 			allTime,
 			last30,
+			failuresToday: {
+				total: Object.values(failuresByKind).reduce((sum, count) => sum + count, 0),
+				byKind: { ...failuresByKind }
+			},
+			failuresByAccountToday: { ...today?.failuresByAccount ?? {} },
+			latencyToday: {
+				samples: ttft.reduce((sum, count) => sum + count, 0),
+				...p50.value === void 0 ? {} : { p50: p50.value },
+				...p95.value === void 0 ? {} : { p95: p95.value },
+				overflow: p95.overflow
+			},
 			byModelToday: Object.entries(models).map(([id, totals]) => ({
 				id,
 				totals: { ...totals }
@@ -3051,5 +3190,29 @@ function sumOf(store) {
 	for (const totals of Object.values(store)) mergeTotals(out, totals);
 	return out;
 }
+/**
+* 直方图分位。
+*
+* 返回的是「落进的那一档的上界」而不是精确毫秒 —— 界面上显示 `≤200ms` 这种口径，
+* 比伪造一个精确值诚实。落进溢出档时 `value` 缺省、`overflow` 为真。
+*/
+function percentileOf(buckets, ratio) {
+	const total = buckets.reduce((sum, count) => sum + count, 0);
+	if (total === 0) return { overflow: false };
+	const target = Math.ceil(total * ratio);
+	let seen = 0;
+	for (let index = 0; index < buckets.length; index += 1) {
+		seen += buckets[index] ?? 0;
+		if (seen < target) continue;
+		return index < TTFT_BUCKETS_MS.length ? {
+			value: TTFT_BUCKETS_MS[index],
+			overflow: false
+		} : { overflow: true };
+	}
+	return { overflow: true };
+}
+//#endregion
+//#region src/version.ts
+const CODEARTS_VERSION = "1.2.11";
 //#endregion
-export { upstreamErrorMessage as A, modelUnavailableReason as B, isWelfareClaimedStatus as C, prepareChatBody as D, pickDailyWelfareCampaign as E, filterEnabledModels as F, codeartsAuthPath as G, CodeArtsCredentialStore as H, forgetModelUnavailable as I, credentialFromOAuth as K, isBenefitBlocked as L, FALLBACK_CODEARTS_MODELS as M, clearBenefitBlocked as N, rateLimitFrame as O, creditRatioLabel as P, isBenefitModel as R, isTpmLimit as S, modelUnavailableReasonText as T, MANUAL_ACCOUNT_ID as U, CodeArtsAccountStore as V, codeartsAccountsPath as W, isIamTokenError as _, SNAP_HOST as a, isParamInvalidFrame as b, claimDailyWelfare as c, fetchCallerIdentity as d, fetchModels as f, isConcurrencyCap as g, firstFrameError as h, refreshCatalog as i, CodeArtsCatalog as j, signedGet as k, clearQueueStatus as l, fetchWelfareCampaigns as m, codeartsUsagePath as n, canonicalModel as o, fetchQueueStatus as p, startLogin as q, discoverModels as r, chatStream as s, CodeArtsUsageTracker as t, degradeTokenCeiling as u, isModelNotAccessible as v, maxTokensCeilingFor as w, isQueueableRate as x, isNotMultimodal as y, markModelUnavailable as z };
+export { signedGet as A, markModelUnavailable as B, isTpmLimit as C, pickDailyWelfareCampaign as D, modelUnavailableReasonText as E, creditRatioLabel as F, codeartsAccountsPath as G, CodeArtsAccountStore as H, filterEnabledModels as I, startLogin as J, codeartsAuthPath as K, forgetModelUnavailable as L, CodeArtsCatalog as M, FALLBACK_CODEARTS_MODELS as N, prepareChatBody as O, clearBenefitBlocked as P, isBenefitBlocked as R, isQueueableRate as S, maxTokensCeilingFor as T, CodeArtsCredentialStore as U, modelUnavailableReason as V, MANUAL_ACCOUNT_ID as W, isConcurrencyCap as _, refreshCatalog as a, isNotMultimodal as b, chatStream as c, degradeTokenCeiling as d, fetchCallerIdentity as f, firstFrameError as g, fetchWelfareCampaigns as h, discoverModels as i, upstreamErrorMessage as j, rateLimitFrame as k, claimDailyWelfare as l, fetchQueueStatus as m, CodeArtsUsageTracker as n, SNAP_HOST as o, fetchModels as p, credentialFromOAuth as q, codeartsUsagePath as r, canonicalModel as s, CODEARTS_VERSION as t, clearQueueStatus as u, isIamTokenError as v, isWelfareClaimedStatus as w, isParamInvalidFrame as x, isModelNotAccessible as y, isBenefitModel as z };

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.2.10",
+  "version": "1.2.11",
   "packageManager": "pnpm@11.24.0",
   "author": "elegant01",
   "keywords": [