@michengai/dsh-codex-ui 0.2.56 → 0.2.58

package/README.md

@@ -201,8 +201,6 @@ pnpm build
 pnpm test
 ```
 
-## Documentation and license
-
-Start from the [handoff index](docs/00-交接入口/00-阅读导航.md) for project status, architecture, and iteration notes.
+## License
 
 This project is licensed under [Apache License 2.0](LICENSE). Conversation-management workflow is informed by [Semidia/dsh-session-manager](https://github.com/Semidia/dsh-session-manager), but this plugin is implemented independently through public DSH slots and services.

package/README.zh-CN.md

@@ -201,8 +201,6 @@ pnpm build
 pnpm test
 ```
 
-## 文档与许可证
-
-项目状态、技术架构和迭代记录从[文档交接入口](docs/00-交接入口/00-阅读导航.md)开始。
+## 许可证
 
 本项目采用 [Apache License 2.0](LICENSE)。会话管理工作流参考 [Semidia/dsh-session-manager](https://github.com/Semidia/dsh-session-manager)，但本插件独立通过 DSH 公开插槽和服务实现。

package/dist/client.js

@@ -3417,9 +3417,11 @@ 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",
+				packageName: "@michengai/dsh-codex-suite"
+			},
 			{
 				id: "ui",
 				packageName: "@michengai/dsh-codex-ui"
@@ -3780,7 +3782,7 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 			"about.feature.conversation": "保留原生消息、工具调用、输入、权限和模型选择，仅调整容器视觉",
 			"about.feature.navigator": "当前会话提供轮次缩略导航，可快速跳转至每一次用户提问",
 			"about.dependencies": "配套管理插件",
-			"about.dependenciesDescription": "可在此检查并更新本插件，以及专家、技能、归档、IM、定时任务和第三方插件市场；点击安装会从 npm 下载并写入当前 Web profile。",
+			"about.dependenciesDescription": "可先安装 Codex 套件一键装齐配套插件，也可单独检查并更新专家、技能、归档、IM、定时任务和第三方插件市场。",
 			"about.loading": "正在读取依赖安装状态…",
 			"about.statusFailed": "暂时无法读取依赖安装状态。",
 			"about.installed": "已安装",
@@ -3791,6 +3793,7 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 			"about.installing": "安装中",
 			"about.installFailed": "依赖安装失败，请稍后重试。",
 			"about.restartRequired": "依赖安装完成。请重启 DSH Web 服务以加载新插件。",
+			"about.dependency.suite": "Codex 套件",
 			"about.dependency.ui": "Codex UI",
 			"about.dependency.experts": "专家管理",
 			"about.dependency.skills": "技能管理",
@@ -3901,7 +3904,7 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 			"about.feature.conversation": "Keeps native messages, tool calls, composer, permissions, and model selection while refining the container visuals",
 			"about.feature.navigator": "Navigate directly to each user prompt with the current conversation turn navigator",
 			"about.dependencies": "Companion management plugins",
-			"about.dependenciesDescription": "Check and update this plugin here, along with the expert, skill, archive, IM, scheduled-task, and third-party marketplace companions. Installation downloads from npm and writes to the current Web profile.",
+			"about.dependenciesDescription": "Install the Codex suite to get all companion plugins at once, or check and update the expert, skill, archive, IM, scheduled-task, and marketplace plugins individually.",
 			"about.loading": "Loading dependency status…",
 			"about.statusFailed": "Dependency status is temporarily unavailable.",
 			"about.installed": "Installed",
@@ -3912,6 +3915,7 @@ header [data-dcu-title-folder] svg,header [data-dcu-title-more] svg{display:bloc
 			"about.installing": "Installing",
 			"about.installFailed": "Dependency installation failed. Try again later.",
 			"about.restartRequired": "Installation is complete. Restart DSH Web to load the new plugin.",
+			"about.dependency.suite": "Codex suite",
 			"about.dependency.ui": "Codex UI",
 			"about.dependency.experts": "Expert management",
 			"about.dependency.skills": "Skill management",

package/dist/index.mjs

@@ -4,7 +4,20 @@ 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: SUITE_PACKAGE
+	},
 	{
 		id: "ui",
 		packageName: "@michengai/dsh-codex-ui"
@@ -43,14 +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 profileManifest() {
+async function declaredPluginNames() {
 	try {
-		return JSON.parse(await readFile(resolve(profileDirectory(), "package.json"), "utf8"));
+		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 {};
+		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"));
@@ -60,6 +87,10 @@ async function installedPackageVersion(packageName) {
 		throw error;
 	}
 }
+/** 以 node_modules 实际版本为准；套件嵌套安装没有写进顶层 dependencies，也算已安装。 */
+function isManagedPackageInstalled(input) {
+	return input.installedVersion !== void 0 && input.installedVersion !== "";
+}
 /** npm latest 查询缓存有效期：避免每次打开“关于”页都打 7 个 registry 请求。 */
 const LATEST_CACHE_TTL_MS = 3e5;
 const latestCache = /* @__PURE__ */ new Map();
@@ -133,15 +164,9 @@ function newerVersion(installed, latest) {
 }
 /** 返回 Web profile 中固定管理插件的实际安装版本与 npm latest 状态。 */
 async function dependencyStatuses() {
-	const manifest = await profileManifest();
 	return Promise.all(MANAGED_DEPENDENCIES.map(async (dependency) => {
-		if ((manifest.dependencies?.[dependency.packageName] ?? manifest.devDependencies?.[dependency.packageName]) === void 0) return {
-			...dependency,
-			installed: false,
-			updateAvailable: false
-		};
 		const version = await installedPackageVersion(dependency.packageName);
-		if (version === void 0) return {
+		if (!isManagedPackageInstalled({ installedVersion: version })) return {
 			...dependency,
 			installed: false,
 			updateAvailable: false
@@ -228,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.56",
+  "version": "0.2.58",
   "description": "以 Codex 风格重构 DSH Web 侧栏的独立客户端插件",
   "license": "Apache-2.0",
   "publishConfig": {