dsh-cloudq 0.1.9 → 0.2.0

package/lib/client.js

@@ -1014,7 +1014,9 @@ body.dsh-cloudq-mode-active [class*=composerHero] [class*=root][class*=hero] {
 }
 .dsh-cloudq-convo-chip {
   position: fixed;
-  top: 20px;
+  /* Below the conversation header divider (header bottom ≈76px) so the chip
+     never overlaps the Session log affordance in the title row. */
+  top: 88px;
   right: 16px;
   display: inline-flex;
   align-items: center;
@@ -1605,12 +1607,24 @@ body.dsh-cloudq-mode-active [class*=composerHero] [class*=root][class*=hero] {
 }
 .dsh-cloudq-artifact__download {
   justify-self: end;
+  padding: 0;
+  border: 0;
+  background: none;
   color: var(--dsw-alias-state-business-primary, #006eff);
+  font: inherit;
   text-decoration: none;
+  cursor: pointer;
 }
 .dsh-cloudq-artifact__download:hover {
   text-decoration: underline;
 }
+.dsh-cloudq-artifact__download:disabled {
+  cursor: default;
+  opacity: .6;
+}
+span.dsh-cloudq-artifact__download {
+  cursor: default;
+}
 /* architecture library */
 .dsh-cloudq-arch__toolbar {
   position: relative;
@@ -2036,12 +2050,10 @@ display: none;
 		let panelBody = null;
 		let panelView = "usage";
 		let panelExpanded = false;
-		let inspirationCache = null;
 		let inspirationCategory = 0;
-		let artifactCache = null;
-		let artifactTotal = 0;
-		let architectureDirectoriesCache = null;
-		let architectureFirstFolderId = null;
+		const artifactCollapsedSessions = /* @__PURE__ */ new Set();
+		let artifactRefreshTimer = 0;
+		let artifactRetryTimer = 0;
 		let architectureRequestSeq = 0;
 		let architecturePickerCleanup = null;
 		function renderUsageView() {
@@ -2345,17 +2357,12 @@ display: none;
 					list.appendChild(card);
 				}
 			};
-			if (inspirationCache) {
-				paint(inspirationCache);
-				return;
-			}
 			const hint = document.createElement("div");
 			hint.className = "dsh-cloudq-panel__hint";
 			hint.textContent = "正在加载灵感…";
 			list.appendChild(hint);
 			requireCloudqCredential().then(() => cloudqRequest(API_INSPIRATIONS)).then((data) => {
-				inspirationCache = Array.isArray(data.inspirations) ? data.inspirations : [];
-				paint(inspirationCache);
+				paint(Array.isArray(data.inspirations) ? data.inspirations : []);
 			}).catch((error) => {
 				if (!panelExpanded) return;
 				list.textContent = "";
@@ -2365,140 +2372,181 @@ display: none;
 				list.appendChild(err);
 			});
 		}
-		function renderArtifactView({ force = false } = {}) {
+		/**
+		* Refresh the artifact list in the background after a CloudQ conversation
+		* turn completes. Never shows the loading hint: the visible list stays
+		* untouched and is repainted synchronously once fresh data arrives. The
+		* delayed retry covers artifacts archived with a lag.
+		*/
+		function scheduleArtifactSilentRefresh() {
+			window.clearTimeout(artifactRefreshTimer);
+			window.clearTimeout(artifactRetryTimer);
+			const run = () => {
+				cloudqRequest(API_ARTIFACTS).then((data) => {
+					if (panelView !== "artifact" || !panelExpanded) return;
+					paintArtifactList(Array.isArray(data?.sessions) ? data.sessions : [], Number(data?.total) || 0);
+				}).catch(() => {});
+			};
+			artifactRefreshTimer = window.setTimeout(run, 3e3);
+			artifactRetryTimer = window.setTimeout(run, 15e3);
+		}
+		function paintArtifactList(sessions, total) {
+			if (panelView !== "artifact" || !panelExpanded) return;
 			panelBody.textContent = "";
-			const paint = (sessions, total) => {
-				if (panelView !== "artifact" || !panelExpanded) return;
-				panelBody.textContent = "";
-				const safeSessions = Array.isArray(sessions) ? sessions : [];
-				const artifactCount = safeSessions.reduce((sum, session) => {
-					return sum + (Array.isArray(session?.Artifacts) ? session.Artifacts : []).length;
-				}, 0);
-				const toolbar = document.createElement("div");
-				toolbar.className = "dsh-cloudq-artifact__toolbar";
-				const summary = document.createElement("span");
-				summary.textContent = `共 ${Number(total) || safeSessions.length} 组会话，${artifactCount} 个制品`;
-				const refresh = document.createElement("button");
-				refresh.type = "button";
-				refresh.className = "dsh-cloudq-artifact__refresh";
-				refresh.dataset.testid = "cloudq-artifact-refresh-btn";
-				refresh.textContent = "刷新";
-				refresh.addEventListener("click", () => {
-					artifactCache = null;
-					artifactTotal = 0;
-					renderArtifactView({ force: true });
-				});
-				toolbar.appendChild(summary);
-				toolbar.appendChild(refresh);
-				panelBody.appendChild(toolbar);
-				if (safeSessions.length === 0) {
-					const empty = document.createElement("div");
-					empty.className = "dsh-cloudq-usage__table__empty";
-					empty.textContent = "暂无制品";
-					panelBody.appendChild(empty);
-					return;
-				}
-				const list = document.createElement("div");
-				list.className = "dsh-cloudq-artifact__list";
-				const columns = document.createElement("div");
-				columns.className = "dsh-cloudq-artifact__columns";
-				for (const label of [
-					"报告名称",
-					"用户名称",
-					"生成时间",
-					"操作"
-				]) {
-					const cell = document.createElement("span");
-					cell.textContent = label;
-					columns.appendChild(cell);
-				}
-				list.appendChild(columns);
-				for (const session of safeSessions) {
-					const artifacts = Array.isArray(session?.Artifacts) ? session.Artifacts : [];
-					const group = document.createElement("section");
-					group.className = "dsh-cloudq-artifact__session";
-					const sessionHead = document.createElement("button");
-					sessionHead.type = "button";
-					sessionHead.className = "dsh-cloudq-artifact__session-head";
-					sessionHead.dataset.testid = `cloudq-artifact-session-${session?.SessionID ?? "unknown"}`;
-					sessionHead.setAttribute("aria-expanded", "true");
-					const chevron = document.createElement("span");
-					chevron.className = "dsh-cloudq-artifact__chevron";
-					chevron.textContent = "▼";
-					const title = document.createElement("span");
-					title.className = "dsh-cloudq-artifact__session-title";
-					title.textContent = session?.SessionTitle || "未命名会话";
-					title.title = title.textContent;
-					const latestTime = artifacts.reduce((latest, artifact) => {
-						const time = String(artifact?.ArchiveTime ?? "");
-						return time > latest ? time : latest;
-					}, "");
-					const meta = document.createElement("span");
-					meta.className = "dsh-cloudq-artifact__session-meta";
-					meta.textContent = `${artifacts.length} 个制品${latestTime ? ` · 最近 ${latestTime.slice(0, 10)}` : ""}`;
-					sessionHead.appendChild(chevron);
-					sessionHead.appendChild(title);
-					sessionHead.appendChild(meta);
-					const files = document.createElement("div");
-					files.className = "dsh-cloudq-artifact__files";
-					for (const artifact of artifacts) {
-						const row = document.createElement("div");
-						row.className = "dsh-cloudq-artifact__file";
-						const main = document.createElement("div");
-						main.className = "dsh-cloudq-artifact__file-main";
-						const type = document.createElement("span");
-						type.className = "dsh-cloudq-artifact__file-type";
-						type.textContent = artifact?.FileType || "file";
-						const name = document.createElement("span");
-						name.className = "dsh-cloudq-artifact__file-name";
-						name.textContent = artifact?.FileName || "未命名文件";
-						name.title = `${name.textContent} · ${formatFileSize(artifact?.SizeBytes)}`;
-						main.appendChild(type);
-						main.appendChild(name);
-						const owner = document.createElement("span");
-						owner.className = "dsh-cloudq-artifact__owner";
-						owner.textContent = artifact?.UserName || "—";
-						const time = document.createElement("span");
-						time.className = "dsh-cloudq-artifact__time";
-						time.textContent = formatDateTime(artifact?.ArchiveTime);
-						const downloadUrl = safeDownloadUrl(artifact?.DownloadURL);
-						const action = document.createElement(downloadUrl ? "a" : "span");
-						action.className = "dsh-cloudq-artifact__download";
-						action.textContent = downloadUrl ? "下载" : "不可用";
-						if (downloadUrl) {
-							action.href = downloadUrl;
-							action.target = "_blank";
-							action.rel = "noopener noreferrer";
-							action.dataset.testid = `cloudq-artifact-download-${artifact?.ArtifactID ?? "unknown"}`;
-						}
-						row.appendChild(main);
-						row.appendChild(owner);
-						row.appendChild(time);
-						row.appendChild(action);
-						files.appendChild(row);
+			const safeSessions = Array.isArray(sessions) ? sessions : [];
+			const artifactCount = safeSessions.reduce((sum, session) => {
+				return sum + (Array.isArray(session?.Artifacts) ? session.Artifacts : []).length;
+			}, 0);
+			const toolbar = document.createElement("div");
+			toolbar.className = "dsh-cloudq-artifact__toolbar";
+			const summary = document.createElement("span");
+			summary.textContent = `共 ${Number(total) || safeSessions.length} 组会话，${artifactCount} 个制品`;
+			const refresh = document.createElement("button");
+			refresh.type = "button";
+			refresh.className = "dsh-cloudq-artifact__refresh";
+			refresh.dataset.testid = "cloudq-artifact-refresh-btn";
+			refresh.textContent = "刷新";
+			refresh.addEventListener("click", () => renderArtifactView());
+			toolbar.appendChild(summary);
+			toolbar.appendChild(refresh);
+			panelBody.appendChild(toolbar);
+			if (safeSessions.length === 0) {
+				const empty = document.createElement("div");
+				empty.className = "dsh-cloudq-usage__table__empty";
+				empty.textContent = "暂无制品";
+				panelBody.appendChild(empty);
+				return;
+			}
+			const list = document.createElement("div");
+			list.className = "dsh-cloudq-artifact__list";
+			const columns = document.createElement("div");
+			columns.className = "dsh-cloudq-artifact__columns";
+			for (const label of [
+				"报告名称",
+				"用户名称",
+				"生成时间",
+				"操作"
+			]) {
+				const cell = document.createElement("span");
+				cell.textContent = label;
+				columns.appendChild(cell);
+			}
+			list.appendChild(columns);
+			for (const session of safeSessions) {
+				const artifacts = Array.isArray(session?.Artifacts) ? session.Artifacts : [];
+				const sessionKey = String(session?.SessionID ?? "");
+				const group = document.createElement("section");
+				group.className = "dsh-cloudq-artifact__session";
+				const startCollapsed = sessionKey !== "" && artifactCollapsedSessions.has(sessionKey);
+				if (startCollapsed) group.classList.add("is-collapsed");
+				const sessionHead = document.createElement("button");
+				sessionHead.type = "button";
+				sessionHead.className = "dsh-cloudq-artifact__session-head";
+				sessionHead.dataset.testid = `cloudq-artifact-session-${session?.SessionID ?? "unknown"}`;
+				sessionHead.setAttribute("aria-expanded", String(!startCollapsed));
+				const chevron = document.createElement("span");
+				chevron.className = "dsh-cloudq-artifact__chevron";
+				chevron.textContent = "▼";
+				const title = document.createElement("span");
+				title.className = "dsh-cloudq-artifact__session-title";
+				title.textContent = session?.SessionTitle || "未命名会话";
+				title.title = title.textContent;
+				const latestTime = artifacts.reduce((latest, artifact) => {
+					const time = String(artifact?.ArchiveTime ?? "");
+					return time > latest ? time : latest;
+				}, "");
+				const meta = document.createElement("span");
+				meta.className = "dsh-cloudq-artifact__session-meta";
+				meta.textContent = `${artifacts.length} 个制品${latestTime ? ` · 最近 ${latestTime.slice(0, 10)}` : ""}`;
+				sessionHead.appendChild(chevron);
+				sessionHead.appendChild(title);
+				sessionHead.appendChild(meta);
+				const files = document.createElement("div");
+				files.className = "dsh-cloudq-artifact__files";
+				for (const artifact of artifacts) {
+					const row = document.createElement("div");
+					row.className = "dsh-cloudq-artifact__file";
+					const main = document.createElement("div");
+					main.className = "dsh-cloudq-artifact__file-main";
+					const type = document.createElement("span");
+					type.className = "dsh-cloudq-artifact__file-type";
+					type.textContent = artifact?.FileType || "file";
+					const name = document.createElement("span");
+					name.className = "dsh-cloudq-artifact__file-name";
+					name.textContent = artifact?.FileName || "未命名文件";
+					name.title = `${name.textContent} · ${formatFileSize(artifact?.SizeBytes)}`;
+					main.appendChild(type);
+					main.appendChild(name);
+					const owner = document.createElement("span");
+					owner.className = "dsh-cloudq-artifact__owner";
+					owner.textContent = artifact?.UserName || "—";
+					const time = document.createElement("span");
+					time.className = "dsh-cloudq-artifact__time";
+					time.textContent = formatDateTime(artifact?.ArchiveTime);
+					const downloadUrl = safeDownloadUrl(artifact?.DownloadURL);
+					const fileName = artifact?.FileName || "未命名文件";
+					const action = document.createElement(downloadUrl ? "button" : "span");
+					action.className = "dsh-cloudq-artifact__download";
+					action.textContent = downloadUrl ? "下载" : "不可用";
+					if (downloadUrl) {
+						action.type = "button";
+						action.dataset.testid = `cloudq-artifact-download-${artifact?.ArtifactID ?? "unknown"}`;
+						action.addEventListener("click", () => {
+							if (action.disabled) return;
+							action.disabled = true;
+							action.textContent = "下载中…";
+							const restore = () => {
+								action.disabled = false;
+								action.textContent = "下载";
+							};
+							fetch(downloadUrl).then((res) => {
+								if (!res.ok) throw new Error(`download failed: ${res.status}`);
+								return res.blob();
+							}).then((blob) => {
+								const objectUrl = URL.createObjectURL(blob);
+								const link = document.createElement("a");
+								link.href = objectUrl;
+								link.download = fileName;
+								link.rel = "noopener noreferrer";
+								link.click();
+								window.setTimeout(() => URL.revokeObjectURL(objectUrl), 1e4);
+							}).catch(() => {
+								const link = document.createElement("a");
+								link.href = downloadUrl;
+								link.download = fileName;
+								link.rel = "noopener noreferrer";
+								link.click();
+							}).finally(restore);
+						});
 					}
-					sessionHead.addEventListener("click", () => {
-						const collapsed = group.classList.toggle("is-collapsed");
-						sessionHead.setAttribute("aria-expanded", String(!collapsed));
-					});
-					group.appendChild(sessionHead);
-					group.appendChild(files);
-					list.appendChild(group);
+					row.appendChild(main);
+					row.appendChild(owner);
+					row.appendChild(time);
+					row.appendChild(action);
+					files.appendChild(row);
 				}
-				panelBody.appendChild(list);
-			};
-			if (artifactCache !== null && !force) {
-				paint(artifactCache, artifactTotal);
-				return;
+				sessionHead.addEventListener("click", () => {
+					const collapsed = group.classList.toggle("is-collapsed");
+					sessionHead.setAttribute("aria-expanded", String(!collapsed));
+					if (sessionKey) {
+						if (collapsed) artifactCollapsedSessions.add(sessionKey);
+						else artifactCollapsedSessions.delete(sessionKey);
+					}
+				});
+				group.appendChild(sessionHead);
+				group.appendChild(files);
+				list.appendChild(group);
 			}
+			panelBody.appendChild(list);
+		}
+		function renderArtifactView() {
+			panelBody.textContent = "";
 			const hint = document.createElement("div");
 			hint.className = "dsh-cloudq-panel__hint";
 			hint.textContent = "正在加载制品…";
 			panelBody.appendChild(hint);
 			requireCloudqCredential().then(() => cloudqRequest(API_ARTIFACTS)).then((data) => {
-				artifactCache = Array.isArray(data?.sessions) ? data.sessions : [];
-				artifactTotal = Number(data?.total) || artifactCache.length;
-				paint(artifactCache, artifactTotal);
+				paintArtifactList(Array.isArray(data?.sessions) ? data.sessions : [], Number(data?.total) || 0);
 			}).catch((error) => {
 				if (panelView !== "artifact" || !panelExpanded) return;
 				panelBody.textContent = "";
@@ -2733,14 +2781,16 @@ display: none;
 						}
 						for (const architecture of architectures) {
 							const imageUrl = safeDownloadUrl(architecture?.SvgURL);
-							const card = document.createElement(imageUrl ? "a" : "article");
+							const archId = typeof architecture?.ArchId === "string" ? architecture.ArchId.trim() : "";
+							const consoleUrl = archId ? `https://console.cloud.tencent.com/advisor?archId=${encodeURIComponent(archId)}` : "";
+							const card = document.createElement(consoleUrl ? "a" : "article");
 							card.className = "dsh-cloudq-arch__card";
 							card.dataset.testid = `cloudq-architecture-card-${architecture?.ArchId ?? "unknown"}`;
-							if (imageUrl) {
-								card.href = imageUrl;
+							if (consoleUrl) {
+								card.href = consoleUrl;
 								card.target = "_blank";
 								card.rel = "noopener noreferrer";
-								card.setAttribute("aria-label", `查看架构图：${architecture?.ArchName || "未命名系统"}`);
+								card.setAttribute("aria-label", `打开架构图：${architecture?.ArchName || "未命名系统"}`);
 							}
 							const preview = document.createElement("div");
 							preview.className = "dsh-cloudq-arch__preview";
@@ -2759,7 +2809,7 @@ display: none;
 								image.addEventListener("load", () => placeholder.remove());
 								image.addEventListener("error", () => {
 									image.remove();
-									placeholder.textContent = "预览加载失败，点击可打开原图";
+									placeholder.textContent = consoleUrl ? "预览加载失败，点击打开架构图" : "预览加载失败";
 								});
 								preview.appendChild(image);
 							}
@@ -2791,14 +2841,8 @@ display: none;
 				};
 				loadArchitectures(selectedFolderId);
 			};
-			if (architectureDirectoriesCache !== null) {
-				paintDirectories(architectureDirectoriesCache, architectureFirstFolderId);
-				return;
-			}
 			requireCloudqCredential().then(() => cloudqRequest(API_ARCH_DIRECTORIES)).then((data) => {
-				architectureDirectoriesCache = Array.isArray(data?.folders) ? data.folders : [];
-				architectureFirstFolderId = Number(data?.firstFolderId) || null;
-				paintDirectories(architectureDirectoriesCache, architectureFirstFolderId);
+				paintDirectories(Array.isArray(data?.folders) ? data.folders : [], Number(data?.firstFolderId) || null);
 			}).catch((error) => {
 				if (panelView !== "architecture" || !panelExpanded || viewRequest !== architectureRequestSeq) return;
 				panelBody.textContent = "";
@@ -3073,12 +3117,7 @@ display: none;
 					panelEl = null;
 					panelBody = null;
 				}
-				inspirationCache = null;
 				inspirationCategory = 0;
-				artifactCache = null;
-				artifactTotal = 0;
-				architectureDirectoriesCache = null;
-				architectureFirstFolderId = null;
 				architectureRequestSeq += 1;
 				panelView = "usage";
 			};
@@ -3644,6 +3683,19 @@ display: none;
 					window.removeEventListener("storage", onStorage);
 				};
 			}, "dsh-cloudq: reconcile durable session identities");
+			ctx.effect(() => {
+				const list = ctx?.sessions?.list;
+				if (!list?.subscribe || !list?.getSnapshot) return void 0;
+				const prevRunning = /* @__PURE__ */ new Map();
+				return list.subscribe(() => {
+					const byId = list.getSnapshot()?.byId ?? {};
+					for (const [id, summary] of Object.entries(byId)) {
+						const running = summary?.running === true;
+						if (prevRunning.get(id) === true && !running && cloudqSessions.has(id)) scheduleArtifactSilentRefresh();
+						prevRunning.set(id, running);
+					}
+				});
+			}, "dsh-cloudq: refresh artifacts on turn completion");
 			ctx.effect(() => {
 				const markIfCloudqClaim = () => {
 					const textarea = document.querySelector("textarea[class*=input]");

package/package.json

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

package/skills/cloudq/scripts/create_role.py

@@ -104,7 +104,7 @@ def find_available_role_name() -> tuple:
 
 
 def save_config(account_uin: str, role_arn: str, role_id: str = "",
-                auto_created: bool = True):
+                auto_created: bool = True, role_name: str = ""):
     """保存配置到文件"""
     CONFIG_DIR.mkdir(parents=True, exist_ok=True)
 
@@ -114,15 +114,25 @@ def save_config(account_uin: str, role_arn: str, role_id: str = "",
         except OSError:
             pass
 
+    # 保留 DSH 插件写入的免密开关偏好，避免重建角色时被重置。
+    existing = {}
+    if CONFIG_FILE.exists():
+        try:
+            existing = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
+        except (json.JSONDecodeError, IOError):
+            existing = {}
+
     config = {
         "accountUin": account_uin,
-        "roleName": ROLE_NAME,
+        "roleName": role_name or ROLE_NAME,
         "roleArn": role_arn,
         "roleId": role_id,
         "configuredAt": datetime.now(timezone.utc).isoformat(),
         "autoCreated": auto_created,
         "version": "1.0",
     }
+    if isinstance(existing.get("enabled"), bool):
+        config["enabled"] = existing["enabled"]
 
     CONFIG_FILE.write_text(
         json.dumps(config, indent=2, ensure_ascii=False),
@@ -153,6 +163,21 @@ def main():
     secret_id = os.environ.get("TENCENTCLOUD_SECRET_ID", "")
     secret_key = os.environ.get("TENCENTCLOUD_SECRET_KEY", "")
 
+    # 环境变量缺失时回退到凭证文件（与 login_url.py 一致），
+    # 使 DSH 插件等宿主可直接调用而无需注入环境变量。
+    if not secret_id or not secret_key:
+        try:
+            from credential_manager import get_credential
+            cred = get_credential()
+            secret_id = cred["secretId"]
+            secret_key = cred["secretKey"]
+            if cred.get("token"):
+                os.environ["TENCENTCLOUD_TOKEN"] = cred["token"]
+        except ImportError:
+            pass
+        except Exception:
+            pass
+
     if not secret_id or not secret_key:
         print(output_json(output_error(
             "MissingCredentials",
@@ -210,7 +235,7 @@ def main():
                     attach_warnings.append(f"策略 {policy_name} 关联失败: {err_msg}")
                     print(f"WARNING: {attach_warnings[-1]}", file=sys.stderr)
 
-        save_config(account_uin, role_arn, role_id, auto_created=False)
+        save_config(account_uin, role_arn, role_id, auto_created=False, role_name=target_role)
         result = output_success(role_arn, account_uin, role_id)
         result["data"]["roleName"] = target_role
         if attach_warnings:
@@ -266,7 +291,7 @@ def main():
 
     # ============== 6. 保存配置 ==============
     role_arn = f"qcs::cam::uin/{account_uin}:roleName/{target_role}"
-    save_config(account_uin, role_arn, role_id, auto_created=True)
+    save_config(account_uin, role_arn, role_id, auto_created=True, role_name=target_role)
 
     # ============== 7. 输出结果 ==============
     result = output_success(role_arn, account_uin, role_id)