dsh-codearts 0.4.0 → 0.4.1

package/DEV.md

@@ -40,6 +40,35 @@ pnpm run hmr:off       # 关掉，回到 base 默认（只监听 profile 配置
 
 改完这个 patch 通常不用重启：profile 的 patch 文件本身也在 HMR 的监听范围内（profile 里 `patchReload: live`），条目会重新加载。若发现没生效，重启一次 DSH 即可，之后就一直有效。
 
+> ⚠️ **开了模块监听就别用插件管理器/npm 升级本插件。** 宿主为热重载监视着
+> `node_modules/dsh-codearts`，目录被占用后 pnpm 替换版本时会失败：
+>
+> ```
+> [ERR_PNPM_EPERM] [importPackage ...\node_modules\dsh-codearts]
+> EPERM: operation not permitted, rename
+>   '...\dsh-codearts_tmp_20976_1' -> '...\dsh-codearts'
+> ```
+>
+> 更麻烦的是失败后**插件管理器会回滚**：把 `dsh-codearts` 从 profile 的
+> `dependencies` 和 `bundles` 里一起删掉，表现为「插件列表里它没了」。升级前的正确顺序是
+> `pnpm run hmr:off` → 升级 → （要接着开发再）`pnpm run hmr:on`。
+>
+> 这条只影响**跑过 `hmr:on` 的开发机**：该覆盖行写在 profile 的
+> `cordis.patch.yml` 里，插件包自带的 patch 只有 `insert: llm-codearts`，
+> 普通用户从 dshmarket 直接升级不会碰到。DSH base 的 desktop bundle 里默认是
+> **不监视模块**的（原文，`app.asar` 内 base 的 patch）：
+>
+> ```yaml
+>     # Profile configuration reloads by default; module roots are opt-in.
+>     - id: hmr
+>       name: '@deepseek-ai/dsh-hmr'
+>       disabled: !!js "!ctx.get('profileContext')"
+>       config:
+>         root: []
+> ```
+>
+> 即 `root` 默认空表 —— 没人去开它，就没有句柄占用 `node_modules/dsh-codearts`。
+
 ## 日常循环
 
 ```sh

package/lib/bin.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { C as codeartsAccountsPath, b as isBenefitModel, n as codeartsUsagePath, r as discoverModels, t as CodeArtsUsageTracker, u as fetchCallerIdentity, v as FALLBACK_CODEARTS_MODELS, x as CodeArtsAccountStore } from "./usage-3W88T_H1.mjs";
+import { C as codeartsAccountsPath, b as isBenefitModel, n as codeartsUsagePath, r as discoverModels, t as CodeArtsUsageTracker, u as fetchCallerIdentity, v as FALLBACK_CODEARTS_MODELS, x as CodeArtsAccountStore } from "./usage-D6EeUWiQ.mjs";
 import { existsSync, statSync } from "node:fs";
 //#region src/version.ts
-const CODEARTS_VERSION = "0.3.0";
+const CODEARTS_VERSION = "0.4.1";
 //#endregion
 //#region src/bin.ts
 /**

package/lib/client/index.d.cts

@@ -67,10 +67,8 @@ interface CodeArtsSettingsKey {
   creditsUnavailable: string;
   creditsDock: string;
   creditsDockTitle: string;
-  claimButton: string;
-  claiming: string;
-  claimSuccess: string;
-  claimFailed: string;
+  signInButton: string;
+  signInHint: string;
   [key: string]: string;
 }
 //#endregion

package/lib/client/index.js

@@ -18,32 +18,32 @@ if (typeof document !== "undefined" && document.querySelector("style[data-plugin
 	document.head.appendChild(tag);
 }
 var CodeArtsPluginCard_module_css_default = {
-	"choices": "DZPfya_choices",
-	"actions": "DZPfya_actions",
+	"manual": "DZPfya_manual",
+	"area": "DZPfya_area",
+	"error": "DZPfya_error",
 	"choiceRow": "DZPfya_choiceRow",
+	"fieldLabel": "DZPfya_fieldLabel",
+	"desc": "DZPfya_desc",
+	"card": "DZPfya_card",
+	"field": "DZPfya_field",
 	"header": "DZPfya_header",
+	"link": "DZPfya_link",
 	"manualSummary": "DZPfya_manualSummary",
-	"field": "DZPfya_field",
+	"section": "DZPfya_section",
+	"sectionLabel": "DZPfya_sectionLabel",
+	"headText": "DZPfya_headText",
+	"statusLine": "DZPfya_statusLine",
 	"meta": "DZPfya_meta",
-	"link": "DZPfya_link",
-	"area": "DZPfya_area",
 	"headActions": "DZPfya_headActions",
-	"hint": "DZPfya_hint",
-	"statusLine": "DZPfya_statusLine",
-	"check": "DZPfya_check",
-	"manual": "DZPfya_manual",
-	"desc": "DZPfya_desc",
-	"fieldLabel": "DZPfya_fieldLabel",
 	"body": "DZPfya_body",
-	"section": "DZPfya_section",
-	"card": "DZPfya_card",
-	"name": "DZPfya_name",
 	"sectionHead": "DZPfya_sectionHead",
-	"sectionLabel": "DZPfya_sectionLabel",
+	"name": "DZPfya_name",
+	"actions": "DZPfya_actions",
+	"danger": "DZPfya_danger",
 	"count": "DZPfya_count",
-	"headText": "DZPfya_headText",
-	"error": "DZPfya_error",
-	"danger": "DZPfya_danger"
+	"hint": "DZPfya_hint",
+	"choices": "DZPfya_choices",
+	"check": "DZPfya_check"
 };
 //#endregion
 //#region src/client/CodeArtsPluginCard.tsx
@@ -84,47 +84,31 @@ function formatCredits(value) {
 	return Number.isFinite(value) ? new Intl.NumberFormat().format(Math.round(value)) : "0";
 }
 /**
+* 签到领积分的入口页。
+*
+* 官方 CodeArts Agent 客户端里，用户菜单的「活动福利（签到领 1000 积分）」点击后
+* **不发任何接口请求**，只是用系统浏览器打开这个页面（SnapChat 的 isActivity 分支 →
+* `jumpToBrowser(INIT_CONFIG.personalUsageSettings, isOutSideOpen: true)`，URL 来自
+* `vscode-codebot/product.json`）。也就是说积分的签到动作只在那一页上完成，AK/SK
+* 网关那套（benefit/claim、statistics/plugin）里没有任何发积分的接口 —— 详见
+* src/upstream.ts 的 claimBenefit：它开通的是「限时福利免费模型」渠道，不是积分。
+*/
+const CODEARTS_SIGN_IN_URL = "https://codearts.huaweicloud.com/portal/settings/personal-usage";
+/** 打开签到页；带 locale 参数，与官方客户端的拼法一致。 */
+function openSignInPage() {
+	if (typeof window === "undefined") return;
+	const locale = (typeof navigator === "undefined" ? "" : navigator.language ?? "").toLowerCase().startsWith("en") ? "en-us" : "zh-cn";
+	window.open(`${CODEARTS_SIGN_IN_URL}?locale=${locale}`, "_blank", "noopener");
+}
+/**
 * 积分区块。
 *
 * 2026-10 从官方 CodeArts Agent 客户端挖出积分接口并实测通过（见 src/credits.ts），
 * 所以这里能直接显示账号总额度 —— 与下面的「本机用量」互补：一个是账号级、一个是
 * 本机级。拉不到时显示原因（creditsError），不静默吞掉。
 */
-function CreditsSection({ credits, error, t, onClaimed }) {
-	const [claimState, setClaimState] = (0, react.useState)(() => {
-		try {
-			const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-			if (typeof localStorage !== "undefined" && localStorage.getItem("codearts-claim-date") === today) return "success";
-		} catch {}
-		return "idle";
-	});
-	const [claimMessage, setClaimMessage] = (0, react.useState)("");
+function CreditsSection({ credits, error, t }) {
 	if (credits === void 0 && error === void 0) return null;
-	const handleClaim = async () => {
-		setClaimState("loading");
-		try {
-			const res = await fetch("/api/codearts/claim", {
-				method: "POST",
-				headers: { Accept: "application/json" },
-				credentials: "same-origin"
-			});
-			const data = await res.json().catch(() => void 0);
-			if (res.ok && data?.ok === true) {
-				setClaimState("success");
-				try {
-					const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-					if (typeof localStorage !== "undefined") localStorage.setItem("codearts-claim-date", today);
-				} catch {}
-				onClaimed?.();
-			} else {
-				setClaimState("error");
-				setClaimMessage(data?.message ?? `HTTP ${res.status}`);
-			}
-		} catch (err) {
-			setClaimState("error");
-			setClaimMessage(err instanceof Error ? err.message : String(err));
-		}
-	};
 	const c = credits?.credits;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: CodeArtsPluginCard_module_css_default.section,
@@ -142,12 +126,11 @@ function CreditsSection({ credits, error, t, onClaimed }) {
 							remain: formatCredits(c.total.remain),
 							total: formatCredits(c.total.total)
 						})
-					}), onClaimed !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 						variant: "outline",
 						size: "sm",
-						disabled: claimState === "loading" || claimState === "success",
-						onClick: () => void handleClaim(),
-						children: claimState === "loading" ? t("claiming") : claimState === "success" ? t("claimSuccess") : t("claimButton")
+						onClick: () => openSignInPage(),
+						children: t("signInButton")
 					})]
 				})]
 			}),
@@ -155,9 +138,9 @@ function CreditsSection({ credits, error, t, onClaimed }) {
 				className: CodeArtsPluginCard_module_css_default.hint,
 				children: t("creditsUnavailable", { message: error })
 			}),
-			claimState === "error" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				className: CodeArtsPluginCard_module_css_default.hint,
-				children: t("claimFailed", { message: claimMessage })
+				children: t("signInHint")
 			}),
 			c !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -780,8 +763,7 @@ function CodeArtsPluginCard({ t }) {
 				signedIn && (status?.credits !== void 0 || status?.creditsError !== void 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CreditsSection, {
 					credits: status?.credits,
 					error: status?.creditsError,
-					t,
-					onClaimed: () => void refresh()
+					t
 				}),
 				status?.usage !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(UsageSection, {
 					usage: status.usage,
@@ -948,10 +930,8 @@ const zh = {
 	creditsUnavailable: "积分不可用：{message}",
 	creditsDock: "积分 {remain}",
 	creditsDockTitle: "CodeArts 剩余积分 {remain} / {total}",
-	claimButton: "领取积分",
-	claiming: "领取中…",
-	claimSuccess: "已领取",
-	claimFailed: "领取失败：{message}"
+	signInButton: "去签到领积分",
+	signInHint: "积分由 CodeArts 官网活动页发放，签到要在官网页面完成（和官方客户端同一入口）。"
 };
 const en = {
 	tabLabel: "CodeArts",
@@ -1020,10 +1000,8 @@ const en = {
 	creditsUnavailable: "Credits unavailable: {message}",
 	creditsDock: "Credits {remain}",
 	creditsDockTitle: "CodeArts credits left {remain} / {total}",
-	claimButton: "Claim credits",
-	claiming: "Claiming…",
-	claimSuccess: "Claimed",
-	claimFailed: "Claim failed: {message}"
+	signInButton: "Check in for credits",
+	signInHint: "Credits are issued on the CodeArts portal; check-in happens on that page (same entry as the official client)."
 };
 //#endregion
 //#region src/client/index.tsx

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { C as codeartsAccountsPath, S as CodeArtsCredentialStore, T as startLogin, _ as CodeArtsCatalog, a as SNAP_HOST, b as isBenefitModel, c as claimBenefit, d as fetchModels, f as isConcurrencyCap, g as signedGet, h as prepareChatBody, i as refreshCatalog, l as degradeTokenCeiling, m as maxTokensCeilingFor, n as codeartsUsagePath, o as canonicalModel, p as isParamInvalidFrame, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as fetchCallerIdentity, v as FALLBACK_CODEARTS_MODELS, w as codeartsAuthPath, x as CodeArtsAccountStore, y as filterEnabledModels } from "./usage-3W88T_H1.mjs";
+import { C as codeartsAccountsPath, S as CodeArtsCredentialStore, T as startLogin, _ as CodeArtsCatalog, a as SNAP_HOST, b as isBenefitModel, c as claimBenefit, d as fetchModels, f as isConcurrencyCap, g as signedGet, h as prepareChatBody, i as refreshCatalog, l as degradeTokenCeiling, m as maxTokensCeilingFor, n as codeartsUsagePath, o as canonicalModel, p as isParamInvalidFrame, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as fetchCallerIdentity, v as FALLBACK_CODEARTS_MODELS, w as codeartsAuthPath, x as CodeArtsAccountStore, y as filterEnabledModels } from "./usage-D6EeUWiQ.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import { createServer } from "node:http";
@@ -999,7 +999,7 @@ const CODEARTS_LOGIN_PATH = "/api/codearts/login";
 const CODEARTS_LOGIN_STATUS_PATH = "/api/codearts/login/status";
 /** 删除某个账号：DELETE /api/codearts/accounts?id=<accountId> */
 const CODEARTS_ACCOUNTS_PATH = "/api/codearts/accounts";
-/** POST /api/codearts/claim — 手动领取限时福利（签到领积分，幂等）。 */
+/** POST /api/codearts/claim — 开通「限时福利」免费模型渠道（幂等）；**不发积分**。 */
 const CODEARTS_CLAIM_PATH = "/api/codearts/claim";
 /**
 * 由完整目录 + 已存 enabled 计算 selection。
@@ -1333,7 +1333,7 @@ function accountsHandler(deps) {
 		}
 	};
 }
-/** POST /api/codearts/claim — 手动领取限时福利（签到领积分，幂等）。 */
+/** POST /api/codearts/claim — 开通「限时福利」免费模型渠道（幂等）；**不发积分**。 */
 function claimHandler(deps) {
 	return async (req, res) => {
 		if (req.method !== "POST") {
@@ -1655,7 +1655,6 @@ function apply(ctx, rawConfig) {
 					const resolved = await store.resolve(id);
 					if (resolved === void 0) continue;
 					await claimBenefit(resolved, AbortSignal.timeout(1e4));
-					credits.invalidate();
 					return { ok: true };
 				}
 				return {

package/lib/{usage-3W88T_H1.mjs → usage-D6EeUWiQ.mjs}

@@ -1883,9 +1883,14 @@ async function fetchModels(credential, signal) {
 	};
 }
 /**
-* 领取限时福利（幂等：已领取返回成功）。官方客户端打开模型菜单即调用。
-* 不领取时福利模型调用必报 InferHub.4004.200 benefit not found。
+* 开通「限时福利」（免费模型）渠道，幂等：已开通就原样返回。官方客户端打开模型菜单
+* 即调用（GET），用户点「领取」时也调（POST）——两种方法实测都返回 200/0000。
+* 不开通时福利模型调用必报 InferHub.4004.200 benefit not found。
 * 需要 AK/SK 签名（凭证要带 accessKeyId/secretAccessKey）。
+*
+* **它不发积分。** 返回体只是一条渠道开通记录（channel / create_time / update_time，
+* 幂等所以时间戳是旧的），账号积分由套餐决定（见 credits.ts），领取动作在官网签到页。
+* 别把它当「领取积分」用 —— 早先卡片这么用，结果就是「点了显示已领取、积分没变」。
 */
 async function claimBenefit(credential, abort) {
 	if (!credential.accessKeyId || !credential.secretAccessKey) return;
@@ -1908,13 +1913,13 @@ async function claimBenefit(credential, abort) {
 	const resp = await fetch(req, { signal: abort });
 	const raw = await resp.text().catch(() => "");
 	if (!resp.ok) throw new Error(`claim benefit failed: ${resp.status} ${raw.slice(0, 200)}`);
+	let json;
 	try {
-		const json = JSON.parse(raw);
-		if (json.error_code && json.error_code !== "0000") throw new Error(`claim benefit rejected: ${json.error_code} ${json.error_msg ?? ""}`);
-	} catch (e) {
-		if (e instanceof SyntaxError) return;
-		throw e;
+		json = JSON.parse(raw);
+	} catch {
+		throw new Error(`claim benefit: unexpected non-JSON response: ${raw.slice(0, 200)}`);
 	}
+	if (json.error_code !== "0000") throw new Error(`claim benefit rejected: ${json.error_code ?? "(no error_code)"} ${json.error_msg ?? ""}`.trim());
 }
 //#endregion
 //#region src/discovery.ts

package/package.json

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