dsh-cloudq 0.1.0 → 0.1.1

package/README.md

@@ -35,7 +35,7 @@ dsh plugin --profile web remove dsh-cloudq
 
 ## 凭证配置
 
-设置卡片支持 CloudQ OAuth 流程，也支持手动配置腾讯云 `SecretId` 和 `SecretKey`。
+设置卡片支持配置腾讯云 `SecretId` 和 `SecretKey` 凭证。
 
 - 凭证保存在本机 `~/.tencent-cloudq/credential.json`，文件权限仅允许当前用户访问。
 - 敏感凭证通过标准输入传递给 Python 辅助脚本，不会放入命令行参数。

package/lib/client.js

@@ -100,6 +100,11 @@ window.__ModuleLoader__.load({
   background: var(--dsw-alias-bg-layer-3, #fff);
   color: var(--dsw-alias-label-primary, #17191c);
 }
+.dsh-cloudq-settings-card *,
+.dsh-cloudq-settings-card *::before,
+.dsh-cloudq-settings-card *::after {
+  box-sizing: border-box;
+}
 .dsh-cloudq-settings-card__summary {
   padding: 15px 16px;
 }
@@ -215,10 +220,11 @@ window.__ModuleLoader__.load({
   flex-wrap: wrap;
 }
 .dsh-cloudq-settings-card__actions--stacked {
-  flex-direction: column-reverse;
+  flex-direction: column;
+  align-items: stretch;
 }
 .dsh-cloudq-settings-card__actions--stacked button {
-  width: 100%;
+  align-self: flex-end;
 }
 .dsh-cloudq-settings-card__btn {
   display: inline-flex;
@@ -1906,7 +1912,7 @@ display: none;
 				panelBody.textContent = "";
 				const err = document.createElement("div");
 				err.className = "dsh-cloudq-panel__error";
-				err.textContent = `用量加载失败：${error.message}`;
+				err.textContent = cloudqPanelErrorText(error, "用量加载失败");
 				panelBody.appendChild(err);
 			});
 		}
@@ -2009,7 +2015,7 @@ display: none;
 				list.textContent = "";
 				const err = document.createElement("div");
 				err.className = "dsh-cloudq-panel__error";
-				err.textContent = `灵感加载失败：${error instanceof Error ? error.message : "未知错误"}`;
+				err.textContent = cloudqPanelErrorText(error, "灵感加载失败");
 				list.appendChild(err);
 			});
 		}
@@ -2152,7 +2158,7 @@ display: none;
 				panelBody.textContent = "";
 				const err = document.createElement("div");
 				err.className = "dsh-cloudq-panel__error";
-				err.textContent = `制品加载失败：${error instanceof Error ? error.message : "未知错误"}`;
+				err.textContent = cloudqPanelErrorText(error, "制品加载失败");
 				panelBody.appendChild(err);
 			});
 		}
@@ -2433,7 +2439,7 @@ display: none;
 						summary.textContent = "加载失败";
 						const err = document.createElement("div");
 						err.className = "dsh-cloudq-panel__error";
-						err.textContent = `架构图加载失败：${error instanceof Error ? error.message : "未知错误"}`;
+						err.textContent = cloudqPanelErrorText(error, "架构图加载失败");
 						grid.appendChild(err);
 					});
 				};
@@ -2452,7 +2458,7 @@ display: none;
 				panelBody.textContent = "";
 				const err = document.createElement("div");
 				err.className = "dsh-cloudq-panel__error";
-				err.textContent = `架构目录加载失败：${error instanceof Error ? error.message : "未知错误"}`;
+				err.textContent = cloudqPanelErrorText(error, "架构目录加载失败");
 				panelBody.appendChild(err);
 			});
 		}
@@ -2732,8 +2738,6 @@ display: none;
 			};
 		}
 		const API_CREDENTIAL = "/api/dsh-cloudq/credential";
-		const API_LOGIN_URL = "/api/dsh-cloudq/login/url";
-		const API_LOGIN_SAVE = "/api/dsh-cloudq/login/save";
 		const API_LOGOUT = "/api/dsh-cloudq/logout";
 		const API_CREDENTIAL_TEST = "/api/dsh-cloudq/credential/test";
 		const API_CREDENTIAL_SAVE = "/api/dsh-cloudq/credential/save";
@@ -2744,6 +2748,14 @@ display: none;
 				this.code = code;
 			}
 		};
+		/**
+		* Panel-facing error text. A missing credential gets an actionable pointer to
+		* the settings card instead of a raw load failure message.
+		*/
+		function cloudqPanelErrorText(error, prefix) {
+			if (error instanceof CloudQApiError && error.code === "NeedAuth") return "尚未配置 AK/SK，请前往「设置 → 插件 → CloudQ」完成配置后重试。";
+			return `${prefix}：${error instanceof Error ? error.message : "未知错误"}`;
+		}
 		async function cloudqRequest(url, init, timeoutMs = 2e4) {
 			const controller = new AbortController();
 			const timeout = window.setTimeout(() => controller.abort(), timeoutMs);
@@ -2788,9 +2800,8 @@ display: none;
 			const [loading, setLoading] = react.useState(true);
 			const [busy, setBusy] = react.useState();
 			const [status, setStatus] = react.useState();
-			const [authorizeUrl, setAuthorizeUrl] = react.useState("");
-			const [code, setCode] = react.useState("");
 			const [feedback, setFeedback] = react.useState();
+			const [validated, setValidated] = react.useState(false);
 			const [secretId, setSecretId] = react.useState("");
 			const [secretKey, setSecretKey] = react.useState("");
 			const refresh = react.useCallback(async () => {
@@ -2810,61 +2821,13 @@ display: none;
 			react.useEffect(() => {
 				refresh();
 			}, [refresh]);
-			const handleGetAuthorizeUrl = async () => {
-				setBusy("url");
-				setFeedback(void 0);
-				try {
-					const response = await cloudqRequest(API_LOGIN_URL, { method: "POST" });
-					setAuthorizeUrl(response.authorize_url);
-					if (response.authorize_url) window.open(response.authorize_url, "_blank", "noopener");
-				} catch (error) {
-					setFeedback({
-						kind: "error",
-						text: error.message
-					});
-				} finally {
-					setBusy(void 0);
-				}
-			};
-			const handleSaveCode = async () => {
-				const trimmed = code.trim();
-				if (!trimmed) {
-					setFeedback({
-						kind: "error",
-						text: "请先在浏览器中完成授权，然后粘贴授权码。"
-					});
-					return;
-				}
-				setBusy("save");
-				setFeedback(void 0);
-				try {
-					const response = await cloudqRequest(API_LOGIN_SAVE, {
-						method: "POST",
-						body: JSON.stringify({ code: trimmed })
-					});
-					setStatus(response.status);
-					setCode("");
-					setFeedback({
-						kind: "success",
-						text: "登录成功，凭证已保存。"
-					});
-				} catch (error) {
-					setFeedback({
-						kind: "error",
-						text: error.message
-					});
-				} finally {
-					setBusy(void 0);
-				}
-			};
 			const handleLogout = async () => {
 				setBusy("logout");
 				setFeedback(void 0);
 				try {
 					await cloudqRequest(API_LOGOUT, { method: "POST" });
 					setStatus({ logged_in: false });
-					setAuthorizeUrl("");
-					setCode("");
+					setValidated(false);
 					setFeedback({
 						kind: "success",
 						text: "已退出登录。"
@@ -2903,26 +2866,27 @@ display: none;
 						setSecretId("");
 						setSecretKey("");
 					}
+					setValidated(true);
 					setFeedback({
 						kind: "success",
 						text: successText
 					});
 				} catch (error) {
+					setValidated(false);
+					const invalid = error instanceof CloudQApiError && error.code !== "network-error" && error.code !== "invalid-response";
 					setFeedback({
 						kind: "error",
-						text: error.message
+						text: invalid ? "AKSK 无效，请检查后重新配置。" : error.message
 					});
 				} finally {
 					setBusy(void 0);
 				}
 			};
-			const handleTestConnection = () => submitAccessKey(API_CREDENTIAL_TEST, "test", "连接成功，该密钥可用于 CloudQ。");
-			const handleSaveAccessKey = () => submitAccessKey(API_CREDENTIAL_SAVE, "save-ak", "配置已保存，密钥已安全存放在 DSH Host 端。");
+			const handleTestConnection = () => submitAccessKey(API_CREDENTIAL_TEST, "test", "连接成功，AKSK 有效。");
+			const handleSaveAccessKey = () => submitAccessKey(API_CREDENTIAL_SAVE, "save-ak", "配置已保存，AKSK 有效。");
 			const loggedIn = status?.logged_in === true;
-			const expired = status?.expired === true;
-			const badgeClass = expired ? "dsh-cloudq-settings-card__badge dsh-cloudq-settings-card__badge--warn" : loggedIn ? "dsh-cloudq-settings-card__badge dsh-cloudq-settings-card__badge--ok" : "dsh-cloudq-settings-card__badge dsh-cloudq-settings-card__badge--off";
-			const badgeText = expired ? "凭证已过期" : loggedIn ? "已登录" : "未登录";
-			const summarySubtitle = loggedIn ? "腾讯云 CloudQ 凭证已激活，可直接使用 CloudQ 模式。" : "用于在 CloudQ 模式下调用腾讯云 SSE API 与 CLI 工具。";
+			const akskValid = validated || loggedIn;
+			const summarySubtitle = akskValid ? "腾讯云 CloudQ 凭证已激活，可直接使用 CloudQ 模式。" : "用于在 CloudQ 模式下调用腾讯云 SSE API 与 CLI 工具。";
 			const disabled = loading || busy !== void 0;
 			return react_jsx_runtime.jsx("section", {
 				className: "dsh-cloudq-settings-card",
@@ -2938,9 +2902,9 @@ display: none;
 							children: [react_jsx_runtime.jsx("strong", { children: "CloudQ" }), react_jsx_runtime.jsx("small", { children: summarySubtitle })]
 						}), react_jsx_runtime.jsx("span", {
 							className: "dsh-cloudq-settings-card__summary-right",
-							children: [react_jsx_runtime.jsx("span", {
-								className: badgeClass,
-								children: [react_jsx_runtime.jsx("span", { className: "dsh-cloudq-settings-card__badge-dot" }), badgeText]
+							children: [akskValid && react_jsx_runtime.jsx("span", {
+								className: "dsh-cloudq-settings-card__badge dsh-cloudq-settings-card__badge--ok",
+								children: [react_jsx_runtime.jsx("span", { className: "dsh-cloudq-settings-card__badge-dot" }), "AKSK有效"]
 							}), react_jsx_runtime.jsx("span", {
 								className: `dsh-cloudq-settings-card__chevron${expanded ? " is-open" : ""}`,
 								children: "▾"
@@ -2952,20 +2916,10 @@ display: none;
 					children: [
 						loading ? react_jsx_runtime.jsx("div", {
 							className: "dsh-cloudq-settings-card__hint",
-							children: "正在检查 CloudQ 登录状态…"
+							children: "正在检查凭证状态…"
 						}) : react_jsx_runtime.jsx("div", {
 							className: "dsh-cloudq-settings-card__rows",
 							children: [
-								react_jsx_runtime.jsx("div", {
-									className: "dsh-cloudq-settings-card__row",
-									children: [react_jsx_runtime.jsx("span", {
-										className: "dsh-cloudq-settings-card__row-key",
-										children: "状态"
-									}), react_jsx_runtime.jsx("span", {
-										className: "dsh-cloudq-settings-card__row-val",
-										children: badgeText
-									})]
-								}),
 								status?.credential_file ? react_jsx_runtime.jsx("div", {
 									className: "dsh-cloudq-settings-card__row",
 									children: [react_jsx_runtime.jsx("span", {
@@ -3023,35 +2977,6 @@ display: none;
 							children: feedback.text
 						}) : null,
 						!loggedIn && react_jsx_runtime.jsx("div", { children: [
-							react_jsx_runtime.jsx("div", {
-								className: "dsh-cloudq-settings-card__actions",
-								children: [react_jsx_runtime.jsx("button", {
-									type: "button",
-									className: "dsh-cloudq-settings-card__btn dsh-cloudq-settings-card__btn--primary",
-									disabled,
-									onClick: handleGetAuthorizeUrl,
-									children: busy === "url" ? "获取中…" : "获取授权链接"
-								})]
-							}),
-							authorizeUrl && react_jsx_runtime.jsx("div", {
-								className: "dsh-cloudq-settings-card__hint",
-								children: "已在新标签页打开授权页。授权完成后，请将页面显示的授权码粘贴到下方："
-							}),
-							react_jsx_runtime.jsx("div", {
-								className: "dsh-cloudq-settings-card__actions dsh-cloudq-settings-card__actions--stacked",
-								children: [react_jsx_runtime.jsx("input", {
-									className: "dsh-cloudq-settings-card__input",
-									placeholder: "粘贴授权码",
-									value: code,
-									onChange: (event) => setCode(event.target.value)
-								}), react_jsx_runtime.jsx("button", {
-									type: "button",
-									className: "dsh-cloudq-settings-card__btn",
-									disabled,
-									onClick: handleSaveCode,
-									children: busy === "save" ? "登录中…" : "完成登录"
-								})]
-							}),
 							react_jsx_runtime.jsx("div", {
 								className: "dsh-cloudq-settings-card__field",
 								children: [

package/lib/index.js

@@ -392,9 +392,9 @@ function runScript$1(scriptsDirectory, scriptName, args, { timeoutMs = 3e4, json
 * and referenced through a directory `resourceBase`, so every `{baseDir}`
 * placeholder in the body resolves against the installed package directory.
 *
-* It also exposes a small credential-management API (status / authorize-url /
-* save-code / logout) that the client half renders in the settings panel, so
-* the CloudQ login flow no longer requires touching a terminal.
+* It also exposes a small credential-management API (status / AK-SK test &
+* save / logout) that the client half renders in the settings panel, so the
+* CloudQ credential flow no longer requires touching a terminal.
 *
 * @module dsh-cloudq
 */
@@ -420,8 +420,13 @@ function renderedSkillContent() {
 	return rawSkillContent().replace(/\{baseDir\}/g, baseDir);
 }
 /** Run one helper from the bundled CloudQ skill. */
-function runScript(scriptName, args, options) {
-	return runScript$1(resolve(skillDirectory(), "scripts"), scriptName, args, options);
+async function runScript(scriptName, args, options) {
+	try {
+		return await runScript$1(resolve(skillDirectory(), "scripts"), scriptName, args, options);
+	} catch (error) {
+		if (error instanceof HttpError && error.code === "NeedAuth") throw new HttpError(401, "NeedAuth", "尚未配置 AK/SK，请前往「设置 → 插件 → CloudQ」完成配置。");
+		throw error;
+	}
 }
 /** Remove host filesystem details before returning credential state to the browser. */
 function publicCredentialStatus(status) {
@@ -434,15 +439,6 @@ function publicCredentialStatus(status) {
 async function credentialStatus() {
 	return publicCredentialStatus(await runScript("login.py", ["--status"]));
 }
-function authorizeUrl() {
-	return runScript("login.py", ["--authorize-url"]);
-}
-async function saveAuthCode(code) {
-	return publicCredentialStatus(await runScript("login.py", ["--save", "--stdin"], {
-		stdin: JSON.stringify({ code }),
-		sensitiveValues: [code]
-	}));
-}
 function logout() {
 	return runScript("logout.py", [], { jsonOnly: false });
 }
@@ -616,23 +612,29 @@ const inject = [
 	"sessionQuery"
 ];
 function apply(ctx) {
-	ctx.effect(() => ctx.settings.register(SETTINGS_NAMESPACE, Config, { base: {} }), "dsh-cloudq: settings namespace");
-	ctx.effect(() => ctx.settings.register(PLUGIN_MANAGER_NAMESPACE, Config, { base: {} }), "dsh-cloudq: plugin-manager settings namespace");
-	ctx.effect(() => ctx.skills.register({
-		name: "cloudq",
-		description: "用户咨询腾讯云产品资源、AWS、阿里云等多云资源时，查看智能顾问架构图、架构目录、架构详情、架构评估结果、绘制架构图、开通智能顾问时、AI智能巡检、AI容量监测、AI混沌演练、AI云诊断、主动预警、架构健康度、云运维问答、云资源查询、云成本优化、安全合规、云资源盘点、闲置资源检查、云产品最佳实践等AIOps、ChatOps、CloudOps操作时使用。",
-		whenToUse: "用户要求进入 CloudQ 模式、使用 CloudQ、咨询云上架构/资源/成本/巡检/诊断等多云或腾讯云运维问题，或点击输入栏 CloudQ 按钮时使用；也适用于架构图查看/评估、AI 巡检、容量监测、混沌演练、云诊断等场景。",
-		source: "bundled",
-		resourceBase: {
-			kind: "directory",
-			path: skillDirectory()
-		},
-		content: renderedSkillContent(),
-		invocation: {
-			modelInvocable: true,
-			userInvocable: true
-		}
-	}), "dsh-cloudq: CloudQ skill");
+	ctx.effect(() => {
+		ctx.settings.register(SETTINGS_NAMESPACE, Config, { base: {} });
+	}, "dsh-cloudq: settings namespace");
+	ctx.effect(() => {
+		ctx.settings.register(PLUGIN_MANAGER_NAMESPACE, Config, { base: {} });
+	}, "dsh-cloudq: plugin-manager settings namespace");
+	ctx.effect(() => {
+		ctx.skills.register({
+			name: "cloudq",
+			description: "用户咨询腾讯云产品资源、AWS、阿里云等多云资源时，查看智能顾问架构图、架构目录、架构详情、架构评估结果、绘制架构图、开通智能顾问时、AI智能巡检、AI容量监测、AI混沌演练、AI云诊断、主动预警、架构健康度、云运维问答、云资源查询、云成本优化、安全合规、云资源盘点、闲置资源检查、云产品最佳实践等AIOps、ChatOps、CloudOps操作时使用。",
+			whenToUse: "用户要求进入 CloudQ 模式、使用 CloudQ、咨询云上架构/资源/成本/巡检/诊断等多云或腾讯云运维问题，或点击输入栏 CloudQ 按钮时使用；也适用于架构图查看/评估、AI 巡检、容量监测、混沌演练、云诊断等场景。",
+			source: "bundled",
+			resourceBase: {
+				kind: "directory",
+				path: skillDirectory()
+			},
+			content: renderedSkillContent(),
+			invocation: {
+				modelInvocable: true,
+				userInvocable: true
+			}
+		});
+	}, "dsh-cloudq: CloudQ skill");
 	ctx.effect(() => {
 		const disposers = [];
 		disposers.push(ctx.webServer.register({
@@ -650,41 +652,6 @@ function apply(ctx) {
 				}
 			}
 		}));
-		disposers.push(ctx.webServer.register({
-			kind: "exact",
-			path: "/api/dsh-cloudq/login/url",
-			handler: async (request, response) => {
-				try {
-					assertSafeRequest(request, "POST");
-					const result = await authorizeUrl();
-					sendJson(response, 200, {
-						ok: true,
-						authorize_url: result.authorize_url,
-						state: result.state
-					});
-				} catch (error) {
-					sendError(response, error);
-				}
-			}
-		}));
-		disposers.push(ctx.webServer.register({
-			kind: "exact",
-			path: "/api/dsh-cloudq/login/save",
-			handler: async (request, response) => {
-				try {
-					assertSafeRequest(request, "POST");
-					const body = await readJsonBody(request);
-					const code = typeof body?.code === "string" ? body.code.trim() : "";
-					if (!code) throw new HttpError(400, "missing-code", "缺少授权码。");
-					sendJson(response, 200, {
-						ok: true,
-						status: await saveAuthCode(code)
-					});
-				} catch (error) {
-					sendError(response, error);
-				}
-			}
-		}));
 		disposers.push(ctx.webServer.register({
 			kind: "exact",
 			path: "/api/dsh-cloudq/logout",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cloudq",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "CloudQ integration for DeepSeek Harness with secure credential, workspace, and plugin-management surfaces",
   "license": "MIT",
   "type": "module",

package/skills/cloudq/scripts/login.py

@@ -139,7 +139,7 @@ def cmd_status() -> int:
     if cred_data is None:
         print(_json_ok({
             "logged_in": False,
-            "message": "未找到 OAuth 凭证",
+            "message": "未找到凭证",
         }))
         return 0