@michengai/dsh-codex-ui 0.2.57 → 0.2.59

package/dist/client.js

@@ -3417,8 +3417,6 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 			});
 		}
 		CodexSidebar.displayName = "michengai-codex-ui";
-		//#endregion
-		//#region src/dependencies.ts
 		const MANAGED_DEPENDENCIES = [
 			{
 				id: "suite",

package/dist/index.mjs

@@ -4,10 +4,19 @@ import { homedir } from "node:os";
 import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 //#region src/dependencies.ts
+const SUITE_PACKAGE = "@michengai/dsh-codex-suite";
+const SUITE_MEMBER_PACKAGES = [
+	"@michengai/dsh-codex-ui",
+	"@michengai/dsh-agency-agents",
+	"@michengai/dsh-skills-manager",
+	"@michengai/dsh-archive-manager",
+	"@michengai/dsh-im-connect",
+	"@michengai/dsh-automation"
+];
 const MANAGED_DEPENDENCIES = [
 	{
 		id: "suite",
-		packageName: "@michengai/dsh-codex-suite"
+		packageName: SUITE_PACKAGE
 	},
 	{
 		id: "ui",
@@ -47,6 +56,28 @@ function profileDirectory() {
 	if (process.env.DSH_PROFILE_DIR !== void 0) return process.env.DSH_PROFILE_DIR;
 	return resolve(homedir(), ".dsh", "profiles", "web");
 }
+async function declaredPluginNames() {
+	try {
+		const manifest = JSON.parse(await readFile(resolve(profileDirectory(), "package.json"), "utf8"));
+		return Object.keys({
+			...manifest.devDependencies,
+			...manifest.dependencies
+		});
+	} catch (error) {
+		if (error.code === "ENOENT") return [];
+		throw error;
+	}
+}
+/** 安装套件前卸掉已单独安装的子插件，避免两套 patch 重复注册同一 id。 */
+function pluginsToRemoveBeforeInstall(declared, installing) {
+	if (installing !== "@michengai/dsh-codex-suite") return [];
+	return SUITE_MEMBER_PACKAGES.filter((name) => declared.includes(name));
+}
+/** 已装套件时，子插件的安装/更新改走套件，避免再写入一份 bundle。 */
+function resolveDshPluginTarget(installing, declared) {
+	if (installing !== "@michengai/dsh-codex-suite" && SUITE_MEMBER_PACKAGES.includes(installing) && declared.includes("@michengai/dsh-codex-suite")) return SUITE_PACKAGE;
+	return installing;
+}
 async function installedPackageVersion(packageName) {
 	try {
 		const manifest = JSON.parse(await readFile(resolve(profileDirectory(), "node_modules", ...packageName.split("/"), "package.json"), "utf8"));
@@ -222,14 +253,20 @@ async function installDependencyLocked(id) {
 	if (dependency === void 0) throw new Error("不支持安装该依赖。");
 	const latestVersion = await npmLatestVersion(dependency.packageName);
 	if (latestVersion === void 0) throw new Error("无法获取 npm 最新版本，请检查网络或 npm registry 后重试。");
-	await ensureLatestReleaseAllowed(dependency.packageName, latestVersion);
+	const declared = await declaredPluginNames();
+	const target = resolveDshPluginTarget(dependency.packageName, declared);
+	const targetVersion = target === dependency.packageName ? latestVersion : await npmLatestVersion(target);
+	if (targetVersion === void 0) throw new Error("无法获取 npm 最新版本，请检查网络或 npm registry 后重试。");
+	const remove = pluginsToRemoveBeforeInstall(declared, target);
+	if (remove.length > 0) await runDshPlugin(["remove", ...remove]);
+	await ensureLatestReleaseAllowed(target, targetVersion);
 	await runDshPlugin([
 		"add",
-		`${dependency.packageName}@${latestVersion}`,
+		`${target}@${targetVersion}`,
 		"--registry=https://registry.npmjs.org/"
 	]);
-	const installed = await installedPackageVersion(dependency.packageName);
-	if (installed !== latestVersion) throw new Error(`已请求 ${dependency.packageName}@${latestVersion}，但当前仍是 ${installed ?? "未安装"}。请先停止 DSH Web 后再更新。`);
+	const installed = await installedPackageVersion(target);
+	if (installed !== targetVersion) throw new Error(`已请求 ${target}@${targetVersion}，但当前仍是 ${installed ?? "未安装"}。请先停止 DSH Web 后再更新。`);
 	return dependencyStatuses();
 }
 //#endregion

package/package.json

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