@mars-sea/dsh-commandcode-provider 0.6.1 → 0.7.0

package/lib/client.js

@@ -163,6 +163,8 @@ window.__ModuleLoader__.load({
 			labelDrafts = /* @__PURE__ */ new Map();
 			/** Staged key drafts, by credential reference (blank = keep stored key). */
 			keyDrafts = /* @__PURE__ */ new Map();
+			/** Credential references staged for removal on the next save. */
+			keyClears = /* @__PURE__ */ new Set();
 			saving = false;
 			failed = false;
 			savedCount = 0;
@@ -239,6 +241,7 @@ window.__ModuleLoader__.load({
 						invalid: false,
 						invalidReason: void 0
 					},
+					apiKeyClearStaged: this.keyClears.has(this.credentialRef),
 					apiBase: this.field("apiBase"),
 					workingDir: this.field("workingDir"),
 					defaultWorkingDir: this.defaultWorkingDir,
@@ -297,15 +300,37 @@ window.__ModuleLoader__.load({
 			/** Stage one extra account's key draft (blank keeps the stored key). */
 			editAccountKey(id, text) {
 				this.keyDrafts.set(id, text);
+				this.keyClears.delete(id);
 				this.failed = false;
 				this.publish();
 			}
+			/**
+			* Toggle the staged removal of one account's stored key: the next save
+			* unsets the credential so the account reports unconfigured and falls back
+			* to its other key sources. Only meaningful while a key is actually
+			* stored. `target` is `'default'` (the implicit first account) or an extra
+			* account's credential reference.
+			*/
+			toggleKeyClear(target) {
+				const ref = target === "default" ? this.credentialRef : target;
+				if (this.keyClears.has(ref)) this.keyClears.delete(ref);
+				else {
+					if (this.credentialStates.get(ref)?.configured !== true) return;
+					this.keyDrafts.delete(ref);
+					if (ref === this.credentialRef) this.staged.delete("apiKey");
+					this.keyClears.add(ref);
+				}
+				this.failed = false;
+				this.describeAll();
+				this.publish();
+			}
 			/** Stage one field's draft text. */
 			edit(field, text) {
 				this.staged.set(field, {
 					text,
 					clear: false
 				});
+				if (field === "apiKey") this.keyClears.delete(this.credentialRef);
 				this.failed = false;
 				this.publish();
 			}
@@ -375,6 +400,7 @@ window.__ModuleLoader__.load({
 					const storedLabel = this.storedExtras().find((extra) => extra.ref === ref)?.label;
 					if (storedLabel === void 0 || storedLabel === text.trim()) this.labelDrafts.delete(ref);
 				}
+				for (const ref of [...this.keyClears]) if (this.credentialStates.get(ref)?.configured !== true) this.keyClears.delete(ref);
 			}
 			spec(field) {
 				const spec = this.specs.get(field);
@@ -545,12 +571,13 @@ window.__ModuleLoader__.load({
 					keyText: this.keyDrafts.get(extra.ref) ?? "",
 					configured: this.credentialStates.get(extra.ref)?.configured ?? false,
 					writable: this.credentialStates.get(extra.ref)?.writable ?? true,
-					added: extra.added
+					added: extra.added,
+					clearStaged: this.keyClears.has(extra.ref)
 				}));
 			}
-			/** Whether any account-level staging (add/remove/label/key) exists. */
+			/** Whether any account-level staging (add/remove/label/key/clear) exists. */
 			accountsStaged() {
-				return this.addedAccounts.length > 0 || this.removedRefs.size > 0 || this.labelDrafts.size > 0 || this.keyDrafts.size > 0;
+				return this.addedAccounts.length > 0 || this.removedRefs.size > 0 || this.labelDrafts.size > 0 || this.keyDrafts.size > 0 || this.keyClears.size > 0;
 			}
 			/** Whether the staged account edits differ from the stored section. */
 			accountsDirty() {
@@ -560,6 +587,7 @@ window.__ModuleLoader__.load({
 					if (base !== void 0 && text.trim() !== "" && text !== base) return true;
 				}
 				for (const text of this.keyDrafts.values()) if (text.trim() !== "") return true;
+				for (const ref of this.keyClears) if (this.credentialStates.get(ref)?.configured === true) return true;
 				return false;
 			}
 			/** Reset every account-level staged edit. */
@@ -568,14 +596,26 @@ window.__ModuleLoader__.load({
 				this.removedRefs.clear();
 				this.labelDrafts.clear();
 				this.keyDrafts.clear();
+				this.keyClears.clear();
+			}
+			/** Unset one stored credential, then re-read the Host's credential states. */
+			async unsetKey(ref) {
+				try {
+					if (!(await this.api.credentials.unset({ ref })).result.ok) return false;
+				} catch {
+					return false;
+				}
+				await this.describeAll();
+				return this.credentialStates.get(ref)?.configured !== true;
 			}
 			/** The account-level writes a save performs (empty when nothing staged). */
 			accountPlan() {
 				if (!this.accountsDirty()) return [];
 				const runs = [];
+				for (const ref of this.keyClears) if (this.credentialStates.get(ref)?.configured === true) runs.push(() => this.unsetKey(ref));
 				for (const [ref, text] of this.keyDrafts) {
 					const value = text.trim();
-					if (value !== "" && !this.removedRefs.has(ref)) runs.push(() => this.writeKeyTo(ref, value));
+					if (value !== "" && !this.removedRefs.has(ref) && !this.keyClears.has(ref)) runs.push(() => this.writeKeyTo(ref, value));
 				}
 				runs.push(() => this.writeAccounts());
 				return runs;
@@ -761,6 +801,11 @@ window.__ModuleLoader__.load({
 			const failures = source.failures;
 			if (!Array.isArray(failures) || failures.some((entry) => typeof entry !== "string")) reject("failures");
 			const report = { failures };
+			if (source.blocked !== void 0) {
+				const blocked = source.blocked;
+				if (blocked !== "invalid-key" && blocked !== "service-unavailable" && blocked !== "network") reject("blocked");
+				report.blocked = blocked;
+			}
 			if (source.account !== void 0) {
 				const account = record(source.account, "account");
 				report.account = {
@@ -857,7 +902,7 @@ window.__ModuleLoader__.load({
 		* @module dsh-commandcode-provider/client/version
 		*/
 		/** The published package version (e.g. `'0.6.0'`). */
-		const PLUGIN_VERSION = "0.6.1";
+		const PLUGIN_VERSION = "0.7.0";
 		//#endregion
 		//#region src/client/section.tsx
 		/**
@@ -970,9 +1015,10 @@ window.__ModuleLoader__.load({
 		/**
 		* The API-key control: write-only, reports configured state, never echoes the
 		* key. The input is masked by default with a Show/Hide toggle so a pasted key
-		* can be spot-checked without leaving the field.
+		* can be spot-checked without leaving the field, and a stored key can be
+		* staged for removal (the next save unsets it) when it is bad or unwanted.
 		*/
-		function SecretKeyField({ label, hint, state, disabled, configured, configuredLabel, unconfiguredLabel, showLabel, hideLabel, onEdit }) {
+		function SecretKeyField({ label, hint, state, disabled, configured, configuredLabel, unconfiguredLabel, clearStaged, showLabel, hideLabel, clearLabel, clearStagedLabel, undoClearLabel, onEdit, onToggleClear }) {
 			const [visible, setVisible] = (0, react.useState)(false);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "cc-field",
@@ -985,16 +1031,30 @@ window.__ModuleLoader__.load({
 							children: label
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 							className: "cc-badges",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: configured ? "cc-badge" : "cc-badgeMuted",
-								children: configured ? configuredLabel : unconfiguredLabel
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-								type: "button",
-								className: "cc-reset",
-								disabled,
-								onClick: () => setVisible((value) => !value),
-								children: visible ? hideLabel : showLabel
-							})]
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: configured ? "cc-badge" : "cc-badgeMuted",
+									children: configured ? configuredLabel : unconfiguredLabel
+								}),
+								clearStaged ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "cc-badge cc-badgeWarn",
+									children: clearStagedLabel
+								}) : null,
+								configured ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "cc-reset",
+									disabled,
+									onClick: onToggleClear,
+									children: clearStaged ? undoClearLabel : clearLabel
+								}) : null,
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "cc-reset",
+									disabled,
+									onClick: () => setVisible((value) => !value),
+									children: visible ? hideLabel : showLabel
+								})
+							]
 						})]
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
@@ -1155,6 +1215,17 @@ window.__ModuleLoader__.load({
 						className: "cc-usageHint",
 						children: t("usageUnconfigured")
 					}) : null,
+					report.blocked !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "cc-usageBlocked",
+						role: "alert",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "cc-usageBlockedTitle",
+							children: blockedTitle(report.blocked, t)
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "cc-usageBlockedHint",
+							children: blockedHint(report.blocked, t)
+						})]
+					}) : null,
 					report.usage !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "cc-usageStats",
 						children: [
@@ -1220,13 +1291,13 @@ window.__ModuleLoader__.load({
 								]
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: "cc-usageMetaSpacer" }),
-							report.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							report.failures.length > 0 && report.blocked === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "cc-usagePartial",
 								title: report.failures.join("; "),
 								children: t("usagePartial")
 							}) : null
 						]
-					}) : report.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					}) : report.failures.length > 0 && report.blocked === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "cc-usageMeta",
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: "cc-usageMetaSpacer" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 							className: "cc-usagePartial",
@@ -1237,6 +1308,18 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
+		/** The headline copy for a report whose every endpoint failed the same way. */
+		function blockedTitle(reason, t) {
+			if (reason === "invalid-key") return t("usageKeyInvalid");
+			if (reason === "service-unavailable") return t("usageServiceUnavailable");
+			return t("usageNetworkError");
+		}
+		/** The actionable hint under a blocked report's headline. */
+		function blockedHint(reason, t) {
+			if (reason === "invalid-key") return t("usageKeyInvalidHint");
+			if (reason === "service-unavailable") return t("usageServiceUnavailableHint");
+			return t("usageNetworkHint");
+		}
 		/** The status dot on an account tab: cooling/invalid warn, everything else ok. */
 		function AccountTabDot({ entry }) {
 			const cls = entry.mark === "invalid-credential" ? "cc-tabDot cc-tabDotError" : entry.mark !== "" || entry.cooldownUntil > 0 ? "cc-tabDot cc-tabDotWarn" : "cc-tabDot cc-tabDotOk";
@@ -1353,7 +1436,7 @@ window.__ModuleLoader__.load({
 		* otherwise the only way to undo a mistaken Add would be discarding every
 		* other staged edit.
 		*/
-		function AccountRow({ account, disabled, t, onLabel, onKey, onRemove }) {
+		function AccountRow({ account, disabled, t, onLabel, onKey, onToggleClear, onRemove }) {
 			const locked = !account.writable;
 			const [keyVisible, setKeyVisible] = (0, react.useState)(false);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1376,6 +1459,24 @@ window.__ModuleLoader__.load({
 									className: account.configured ? "cc-badge" : "cc-badgeMuted",
 									children: account.configured ? t("apiKeySet") : t("apiKeyUnset")
 								}),
+								account.clearStaged ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "cc-badge cc-badgeWarn",
+									children: t("usageKeyClearStaged")
+								}) : null,
+								account.configured && !account.clearStaged ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "cc-reset",
+									disabled,
+									onClick: onToggleClear,
+									children: t("usageKeyClear")
+								}) : null,
+								account.clearStaged ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "cc-reset",
+									disabled,
+									onClick: onToggleClear,
+									children: t("usageUndoKeyClear")
+								}) : null,
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									className: "cc-reset",
@@ -1420,7 +1521,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** The multi-account card: the active-account selector + extra accounts in rotation order + add button. */
-		function AccountsCard({ t, state, disabled, onAdd, onRemove, onLabel, onKey, onActive, onActiveReset }) {
+		function AccountsCard({ t, state, disabled, onAdd, onRemove, onLabel, onKey, onToggleClear, onActive, onActiveReset }) {
 			const active = state.activeAccount;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "cc-card",
@@ -1504,6 +1605,7 @@ window.__ModuleLoader__.load({
 						t,
 						onLabel: (text) => onLabel(account.id, text),
 						onKey: (text) => onKey(account.id, text),
+						onToggleClear: () => onToggleClear(account.id),
 						onRemove: () => onRemove(account.id)
 					}, account.id))
 				]
@@ -1567,6 +1669,7 @@ window.__ModuleLoader__.load({
 						onRemove: props.removeAccount,
 						onLabel: props.editAccountLabel,
 						onKey: props.editAccountKey,
+						onToggleClear: (id) => props.toggleKeyClear(id),
 						onActive: (text) => props.edit("activeAccount", text),
 						onActiveReset: () => props.resetField("activeAccount")
 					}),
@@ -1581,9 +1684,14 @@ window.__ModuleLoader__.load({
 								configured: state.apiKeyConfigured,
 								configuredLabel: t("apiKeySet"),
 								unconfiguredLabel: t("apiKeyUnset"),
+								clearStaged: state.apiKeyClearStaged,
 								showLabel: t("show"),
 								hideLabel: t("hide"),
-								onEdit: (text) => props.edit("apiKey", text)
+								clearLabel: t("usageKeyClear"),
+								clearStagedLabel: t("usageKeyClearStaged"),
+								undoClearLabel: t("usageUndoKeyClear"),
+								onEdit: (text) => props.edit("apiKey", text),
+								onToggleClear: () => props.toggleKeyClear("default")
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
 								id: "cc-api-base",
@@ -1745,6 +1853,15 @@ window.__ModuleLoader__.load({
 			usageExceeded: "已超限",
 			usageReset: "重置于",
 			usagePartial: "部分端点数据不可用",
+			usageKeyClear: "清除已存密钥",
+			usageKeyClearStaged: "将清除（保存后生效）",
+			usageUndoKeyClear: "撤销清除",
+			usageKeyInvalid: "API 密钥无效或已过期",
+			usageKeyInvalidHint: "服务端拒绝了全部请求（401）。请检查该账户配置的密钥，或到 commandcode.ai 控制台重新生成。",
+			usageServiceUnavailable: "Command Code 服务暂时不可用",
+			usageServiceUnavailableHint: "服务端返回了错误（5xx），稍后点击刷新重试。",
+			usageNetworkError: "无法连接 Command Code 服务",
+			usageNetworkHint: "所有请求都没有到达服务端。请检查网络连接或 API 地址设置。",
 			usageUpdated: "更新于",
 			usagePeriodEnd: "账期截止",
 			usageActive: "当前使用",
@@ -1818,6 +1935,15 @@ window.__ModuleLoader__.load({
 			usageExceeded: "Exceeded",
 			usageReset: "Resets",
 			usagePartial: "Some endpoint data unavailable",
+			usageKeyClear: "Clear stored key",
+			usageKeyClearStaged: "Will be cleared on save",
+			usageUndoKeyClear: "Undo clear",
+			usageKeyInvalid: "API key invalid or expired",
+			usageKeyInvalidHint: "The server rejects every request (401). Check the key configured for this account, or generate a new one in the commandcode.ai console.",
+			usageServiceUnavailable: "The Command Code service is temporarily unavailable",
+			usageServiceUnavailableHint: "The server returned errors (5xx); try Refresh again later.",
+			usageNetworkError: "Could not reach the Command Code service",
+			usageNetworkHint: "No request reached the server. Check your network connection or the API base setting.",
 			usageUpdated: "Updated",
 			usagePeriodEnd: "Period ends",
 			usageActive: "Active",
@@ -1897,8 +2023,12 @@ window.__ModuleLoader__.load({
 .cc-usageMetaSpacer{flex:1}
 .cc-usageUpdated{color:var(--dsw-alias-label-tertiary);margin:0;font-size:11px;line-height:1.5}
 .cc-usagePartial{color:var(--dsw-alias-label-error);margin:0;font-size:11px;line-height:1.5}
+.cc-usageBlocked{border:1px solid var(--dsw-alias-label-error);border-radius:10px;padding:10px 12px;display:flex;flex-direction:column;gap:4px}
+.cc-usageBlockedTitle{color:var(--dsw-alias-label-error);margin:0;font-size:13px;font-weight:600;line-height:1.5}
+.cc-usageBlockedHint{color:var(--dsw-alias-label-secondary);margin:0;font-size:12px;line-height:1.5}
 .cc-version{margin:4px 0 0;text-align:center;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5}
 .cc-saved{color:var(--dsw-alias-state-success-primary,var(--dsw-alias-label-secondary));margin:0;font-size:12px;font-weight:500;line-height:1.5}
+.cc-badgeWarn{background:var(--dsw-alias-state-warning-secondary,var(--dsw-alias-bg-module-platform));color:var(--dsw-alias-state-warning-primary,var(--dsw-alias-label-secondary))}
 `;
 		/** Inject the page stylesheet once (idempotent per tag). */
 		function injectPageCss() {
@@ -1984,7 +2114,8 @@ window.__ModuleLoader__.load({
 				addAccount: () => controller.addAccount(),
 				removeAccount: (id) => controller.removeAccount(id),
 				editAccountLabel: (id, text) => controller.editAccountLabel(id, text),
-				editAccountKey: (id, text) => controller.editAccountKey(id, text)
+				editAccountKey: (id, text) => controller.editAccountKey(id, text),
+				toggleKeyClear: (id) => controller.toggleKeyClear(id)
 			});
 			ctx.slots.inject("settings.section", () => ctx.slots.register({
 				name: "settings.section",