@michengai/dsh-codex-ui 0.2.60 → 0.2.61

package/dist/client.js

@@ -1194,7 +1194,7 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 .dcu-wb-project-head:hover,.dcu-wb-project-head.dcu-wb-menu-open,.dcu-wb-session:hover,.dcu-wb-session.dcu-wb-selected,.dcu-wb-session.dcu-wb-menu-open{background:var(--dcu-sidebar-hover)}.dcu-wb-project-head+.dcu-wb-session,.dcu-wb-project-head+.dcu-wb-nochat{margin-top:4px}.dcu-wb-session+.dcu-wb-session{margin-top:2px}
 .dcu-wb-project-head[draggable=true],.dcu-wb-session[draggable=true]{cursor:grab}
 .dcu-wb-project-head[draggable=true]:active,.dcu-wb-session[draggable=true]:active{cursor:grabbing}
-.dcu-wb-section,.dcu-wb-section:focus,.dcu-wb-section:focus-visible,.dcu-wb-project-head:focus,.dcu-wb-session:focus{outline:0}.dcu-wb-pin-end{position:relative;height:8px}.dcu-wb-project-head.dcu-wb-drop::before,.dcu-wb-session.dcu-wb-drop::before,.dcu-wb-pin-end.dcu-wb-drop::before,.dcu-wb-section[data-pin-over=true] .dcu-wb-section-head::after{content:"";position:absolute;left:8px;right:8px;top:-4px;height:8px;pointer-events:none;background:radial-gradient(circle at 4px 50%,var(--dsw-alias-state-business-primary) 3.25px,transparent 3.45px),linear-gradient(var(--dsw-alias-state-business-primary),var(--dsw-alias-state-business-primary)) 10px 50%/calc(100% - 10px) 2px no-repeat}.dcu-wb-project-head.dcu-wb-drop-after::before,.dcu-wb-session.dcu-wb-drop-after::before{top:auto;bottom:-4px}.dcu-wb-dragging{opacity:.28}.dcu-wb-drag-ghost{position:fixed;top:-120px;left:-240px;z-index:10040;max-width:220px;height:32px;padding:0 10px;border:1px solid var(--dcu-sidebar-border);border-radius:8px;background:var(--dcu-sidebar-hover);color:var(--dcu-sidebar-primary);font:13px/32px var(--dcu-font,inherit);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;pointer-events:none}
+.dcu-wb-section,.dcu-wb-section:focus,.dcu-wb-section:focus-visible,.dcu-wb-project-head:focus,.dcu-wb-session:focus{outline:0}.dcu-wb-pin-end,.dcu-wb-pin-start{position:relative;height:8px}.dcu-wb-project-head.dcu-wb-drop::before,.dcu-wb-session.dcu-wb-drop::before,.dcu-wb-pin-end.dcu-wb-drop::before,.dcu-wb-pin-start.dcu-wb-drop::before{content:"";position:absolute;left:8px;right:8px;top:-4px;height:8px;pointer-events:none;background:radial-gradient(circle at 4px 50%,var(--dsw-alias-state-business-primary) 3.25px,transparent 3.45px),linear-gradient(var(--dsw-alias-state-business-primary),var(--dsw-alias-state-business-primary)) 10px 50%/calc(100% - 10px) 2px no-repeat}.dcu-wb-project-head.dcu-wb-drop-after::before,.dcu-wb-session.dcu-wb-drop-after::before{top:auto;bottom:-4px}.dcu-wb-dragging{opacity:.28}.dcu-wb-drag-ghost{position:fixed;top:-120px;left:-240px;z-index:10040;max-width:220px;height:32px;padding:0 10px;border:1px solid var(--dcu-sidebar-border);border-radius:8px;background:var(--dcu-sidebar-hover);color:var(--dcu-sidebar-primary);font:13px/32px var(--dcu-font,inherit);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;pointer-events:none}
 .dcu-wb-folder{display:grid;place-items:center;flex:none;width:16px;height:20px;color:var(--dcu-sidebar-icon)}.dcu-wb-brand{display:block;width:16px;height:16px}
 .dcu-wb-project-current .dcu-wb-folder{color:var(--dsw-alias-state-business-primary)}
 .dcu-wb-project-title,.dcu-wb-session-title{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:14px;line-height:20px}
@@ -1917,7 +1917,6 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 								className: "dcu-wb-section",
 								"aria-label": t("workspace.pinned"),
-								"data-pin-over": pinDragActive && pinSlot === "header",
 								onDragOver: (event) => {
 									if (!pinDragActive && !isSidebarItemDrag(event.dataTransfer)) return;
 									event.preventDefault();
@@ -1976,7 +1975,19 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 									className: "dcu-wb-section-body",
 									"data-open": sectionOpen("pinned"),
 									children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
-										pinSectionSessions.length === 0 && pinnedGroups.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										(pinDragActive || pinSlot === "header") && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+											className: `dcu-wb-pin-start${pinSlot === "header" ? " dcu-wb-drop" : ""}`,
+											onDragOver: (event) => {
+												if (!pinDragActive && !isSidebarItemDrag(event.dataTransfer)) return;
+												event.preventDefault();
+												event.stopPropagation();
+												event.dataTransfer.dropEffect = "move";
+												setPinSlot("header");
+												setWorkspaceDropId(void 0);
+												setWorkspaceDropAfter(false);
+											}
+										}),
+										pinSectionSessions.length === 0 && pinnedGroups.length === 0 && pinSlot !== "header" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 											className: "dcu-wb-empty",
 											children: t("workspace.pinnedEmpty")
 										}),
@@ -3722,6 +3733,10 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 		//#endregion
 		//#region src/dependencies.ts
 		const MANAGED_DEPENDENCIES = [
+			{
+				id: "dsh",
+				packageName: "@deepseek-ai/dsh"
+			},
 			{
 				id: "ui",
 				packageName: "@michengai/dsh-codex-ui"
@@ -3769,31 +3784,48 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 			const [installing, setInstalling] = (0, react.useState)();
 			const [message, setMessage] = (0, react.useState)();
 			const alive = (0, react.useRef)(true);
+			const root = (0, react.useRef)(null);
+			const stateRef = (0, react.useRef)("loading");
+			const requestId = (0, react.useRef)(0);
+			stateRef.current = state;
 			(0, react.useEffect)(() => () => {
 				alive.current = false;
 			}, []);
 			const load = (0, react.useCallback)(async (signal) => {
-				setState("loading");
+				const currentRequest = ++requestId.current;
+				if (stateRef.current !== "ready") setState("loading");
 				try {
 					const response = await fetch(endpoint, {
 						cache: "no-store",
 						signal
 					});
 					const payload = await response.json();
-					if (signal?.aborted) return;
+					if (signal?.aborted || currentRequest !== requestId.current) return;
 					if (!response.ok || !Array.isArray(payload.dependencies) || !payload.dependencies.every(isDependencyStatus)) throw new Error();
 					setDependencies(payload.dependencies);
 					setState("ready");
 				} catch (error) {
-					if (signal?.aborted || error instanceof DOMException && error.name === "AbortError") return;
-					setState("failed");
+					if (signal?.aborted || error instanceof DOMException && error.name === "AbortError" || currentRequest !== requestId.current) return;
+					if (stateRef.current !== "ready") setState("failed");
 				}
 			}, []);
 			(0, react.useEffect)(() => {
+				const node = root.current;
 				const controller = new AbortController();
-				load(controller.signal);
+				const refresh = () => {
+					load(controller.signal);
+				};
+				refresh();
+				if (node === null || typeof IntersectionObserver === "undefined") return () => {
+					controller.abort();
+				};
+				const observer = new IntersectionObserver((entries) => {
+					if (entries.some((entry) => entry.isIntersecting)) refresh();
+				}, { threshold: .2 });
+				observer.observe(node);
 				return () => {
 					controller.abort();
+					observer.disconnect();
 				};
 			}, [load]);
 			const install = async (id) => {
@@ -3822,6 +3854,7 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 			};
 			const title = (id) => t(`about.dependency.${id}`);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+				ref: root,
 				className: "dcu-about",
 				"aria-label": t("about.nav"),
 				children: [

package/dist/index.mjs

@@ -14,6 +14,10 @@ const SUITE_MEMBER_PACKAGES = [
 	"@michengai/dsh-automation"
 ];
 const MANAGED_DEPENDENCIES = [
+	{
+		id: "dsh",
+		packageName: "@deepseek-ai/dsh"
+	},
 	{
 		id: "ui",
 		packageName: "@michengai/dsh-codex-ui"
@@ -57,10 +61,10 @@ function profileDirectory() {
 async function declaredPluginNames() {
 	try {
 		const manifest = JSON.parse(await readFile(resolve(profileDirectory(), "package.json"), "utf8"));
-		return Object.keys({
+		return [.../* @__PURE__ */ new Set([...Object.keys({
 			...manifest.devDependencies,
 			...manifest.dependencies
-		});
+		}), ...manifest.dsh?.profile?.bundles ?? []])];
 	} catch (error) {
 		if (error.code === "ENOENT") return [];
 		throw error;
@@ -76,31 +80,41 @@ function pluginsToRemoveBeforeInstall(declared, installing) {
 function resolveDshPluginTarget(installing, _declared = []) {
 	return installing;
 }
+function isOfficialRuntimePackage(packageName) {
+	return packageName === "@deepseek-ai/dsh" || packageName.startsWith("@deepseek-ai/dsh-");
+}
+function packageLookupRoots(packageName) {
+	if (isOfficialRuntimePackage(packageName) && process.env.DSH_RUNTIME_DIR !== void 0 && process.env.DSH_RUNTIME_DIR !== "") return [process.env.DSH_RUNTIME_DIR, profileDirectory()];
+	return [profileDirectory()];
+}
 async function installedPackageVersion(packageName) {
-	try {
-		const manifest = JSON.parse(await readFile(resolve(profileDirectory(), "node_modules", ...packageName.split("/"), "package.json"), "utf8"));
-		return typeof manifest.version === "string" ? manifest.version : void 0;
+	for (const root of packageLookupRoots(packageName)) try {
+		const manifest = JSON.parse(await readFile(resolve(root, "node_modules", ...packageName.split("/"), "package.json"), "utf8"));
+		if (typeof manifest.version === "string" && manifest.version !== "") return manifest.version;
 	} catch (error) {
-		if (error.code === "ENOENT") return void 0;
-		throw error;
+		if (error.code !== "ENOENT") throw error;
 	}
 }
-/** 以 node_modules 实际版本为准；套件嵌套安装没有写进顶层 dependencies，也算已安装。 */
+/** 磁盘有包且仍在 profile 声明里，才算已安装。卸载后残留的 node_modules 不算。 */
 function isManagedPackageInstalled(input) {
-	return input.installedVersion !== void 0 && input.installedVersion !== "";
+	return input.declared && input.installedVersion !== void 0 && input.installedVersion !== "";
 }
 /** npm latest 查询缓存有效期：避免每次打开“关于”页都打 7 个 registry 请求。 */
 const LATEST_CACHE_TTL_MS = 3e5;
 const latestCache = /* @__PURE__ */ new Map();
-async function npmLatestVersion(packageName) {
-	const hit = latestCache.get(packageName);
+function cacheKey(packageName, tag) {
+	return packageName + "@" + tag;
+}
+async function npmTaggedVersion(packageName, tag) {
+	const key = cacheKey(packageName, tag);
+	const hit = latestCache.get(key);
 	if (hit !== void 0 && Date.now() - hit.at < LATEST_CACHE_TTL_MS) return hit.version;
 	try {
-		const response = await fetch(`https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`, { signal: AbortSignal.timeout(5e3) });
+		const response = await fetch(`https://registry.npmjs.org/${encodeURIComponent(packageName)}/${tag}`, { signal: AbortSignal.timeout(5e3) });
 		if (!response.ok) return void 0;
 		const manifest = await response.json();
 		if (typeof manifest.version !== "string") return void 0;
-		latestCache.set(packageName, {
+		latestCache.set(key, {
 			version: manifest.version,
 			at: Date.now()
 		});
@@ -109,6 +123,10 @@ async function npmLatestVersion(packageName) {
 		return;
 	}
 }
+async function npmLatestVersion(packageName) {
+	if (isOfficialRuntimePackage(packageName)) return await npmTaggedVersion(packageName, "next") ?? await npmTaggedVersion(packageName, "latest");
+	return npmTaggedVersion(packageName, "latest");
+}
 function escapeRegExp(value) {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -154,17 +172,29 @@ function versionParts(version) {
 		Number(match[3])
 	];
 }
+function prereleaseRank(version) {
+	const match = /-rc\.(\d+)/i.exec(version);
+	return match === null ? Number.POSITIVE_INFINITY : Number(match[1]);
+}
 function newerVersion(installed, latest) {
 	const current = versionParts(installed);
 	const candidate = versionParts(latest);
 	if (current === void 0 || candidate === void 0) return false;
-	return candidate[0] > current[0] || candidate[0] === current[0] && candidate[1] > current[1] || candidate[0] === current[0] && candidate[1] === current[1] && candidate[2] > current[2];
+	if (candidate[0] !== current[0]) return candidate[0] > current[0];
+	if (candidate[1] !== current[1]) return candidate[1] > current[1];
+	if (candidate[2] !== current[2]) return candidate[2] > current[2];
+	return prereleaseRank(latest) > prereleaseRank(installed);
 }
 /** 返回 Web profile 中固定管理插件的实际安装版本与 npm latest 状态。 */
 async function dependencyStatuses() {
+	const declaredNames = await declaredPluginNames();
 	return Promise.all(MANAGED_DEPENDENCIES.map(async (dependency) => {
 		const version = await installedPackageVersion(dependency.packageName);
-		if (!isManagedPackageInstalled({ installedVersion: version })) return {
+		const declared = isOfficialRuntimePackage(dependency.packageName) || declaredNames.includes(dependency.packageName);
+		if (version === void 0 || !isManagedPackageInstalled({
+			installedVersion: version,
+			declared
+		})) return {
 			...dependency,
 			installed: false,
 			updateAvailable: false
@@ -303,7 +333,7 @@ async function installDependencyLocked(id) {
 	const remove = pluginsToRemoveBeforeInstall(declared, target);
 	if (remove.length > 0) await runDshPlugin(["remove", ...remove]);
 	await ensureLatestReleaseAllowed(target, targetVersion);
-	await recordDeclaredVersion(target, targetVersion);
+	if (!isOfficialRuntimePackage(target)) await recordDeclaredVersion(target, targetVersion);
 	await recordPendingUpdate(target, targetVersion);
 	if (requestDesktopHotUpdate()) return dependencyStatuses();
 	try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-codex-ui",
-  "version": "0.2.60",
+  "version": "0.2.61",
   "description": "以 Codex 风格重构 DSH Web 侧栏的独立客户端插件",
   "license": "Apache-2.0",
   "publishConfig": {