@sunshaobei/dsh-mcp-manager 3.0.8 → 3.0.9

package/lib/index.js

@@ -69,8 +69,11 @@ function mcpManagerHome() {
 function mcpManagerFile(fileName) {
   return join3(mcpManagerHome(), fileName);
 }
+function legacyGlobalConfigFile() {
+  return join3(dshHome(), ".dsh", EFFECTIVE_CONFIG_FILE_NAME);
+}
 function configFile() {
-  return join3(dshHome(), EFFECTIVE_CONFIG_FILE_NAME);
+  return mcpManagerFile(EFFECTIVE_CONFIG_FILE_NAME);
 }
 function userStatePath() {
   return mcpManagerFile(USER_STATE_FILE_NAME);
@@ -93,9 +96,12 @@ function sourcePrefsPath() {
 function versionFile() {
   return mcpManagerFile(VERSION_FILE_NAME);
 }
-function projectConfigFile(projectRoot) {
+function legacyProjectEffectiveConfigFile(projectRoot) {
   return join3(projectRoot, PROJECT_CONFIG_DIR_NAME, EFFECTIVE_CONFIG_FILE_NAME);
 }
+function projectConfigFile(projectRoot) {
+  return join3(projectRoot, PROJECT_CONFIG_DIR_NAME, PACKAGE_DIR, EFFECTIVE_CONFIG_FILE_NAME);
+}
 function legacyProjectConfigFile(projectRoot) {
   return join3(projectRoot, PROJECT_CONFIG_DIR_NAME, PACKAGE_DIR, PROJECT_CONFIG_FILE_NAME);
 }
@@ -103,7 +109,9 @@ function legacyFile(fileName) {
   return join3(dshHome(), fileName);
 }
 function isProjectConfigFile(path) {
-  return basename(path) === EFFECTIVE_CONFIG_FILE_NAME && basename(dirname(path)) === PROJECT_CONFIG_DIR_NAME;
+  const parent = basename(dirname(path));
+  return basename(path) === EFFECTIVE_CONFIG_FILE_NAME && // 旧布局：父目录即 .dsh；包分区布局：父目录是 .dsh/dsh-mcp-manager。
+  (parent === PROJECT_CONFIG_DIR_NAME || parent === PACKAGE_DIR);
 }
 function fileMode(file) {
   const entry = FILE_MODES.find((candidate) => candidate.matches(file));
@@ -146,6 +154,7 @@ var init_paths2 = __esm({
     };
     FILE_MODES = [
       { matches: (path) => path === configFile(), mode: 384 },
+      { matches: (path) => path === legacyGlobalConfigFile(), mode: 384 },
       { matches: (path) => path === userStatePath(), mode: 420 },
       { matches: (path) => dirname(path) === catalogDir(), mode: 420 },
       { matches: (path) => path === catalogSummaryFile(), mode: 420 },
@@ -381,6 +390,7 @@ __export(interface_exports, {
   OFFICIAL_MCP_CLIENT_LOG_NAME: () => OFFICIAL_MCP_CLIENT_LOG_NAME,
   OFFICIAL_MCP_CLIENT_SPECIFIER: () => OFFICIAL_MCP_CLIENT_SPECIFIER,
   OFFICIAL_SERVER_NAME_PATTERN: () => OFFICIAL_SERVER_NAME_PATTERN,
+  PACKAGE_DIR: () => PACKAGE_DIR,
   PACKAGE_DIR_MODE: () => PACKAGE_DIR_MODE,
   SERVER_NAME_PATTERN: () => SERVER_NAME_PATTERN,
   STATS_FILE_NAME: () => STATS_FILE_NAME,
@@ -396,7 +406,9 @@ __export(interface_exports, {
   ensureDir: () => ensureDir,
   fileMode: () => fileMode,
   legacyFile: () => legacyFile,
+  legacyGlobalConfigFile: () => legacyGlobalConfigFile,
   legacyProjectConfigFile: () => legacyProjectConfigFile,
+  legacyProjectEffectiveConfigFile: () => legacyProjectEffectiveConfigFile,
   mcpManagerHome: () => mcpManagerHome,
   projectConfigFile: () => projectConfigFile,
   publicToolName: () => publicToolName,
@@ -517,8 +529,9 @@ function sourcePath(id, projectRoot) {
     return join4(homedir2(), ".dsh", "mcp.json");
   if (projectRoot === void 0 || projectRoot === "")
     return null;
-  const dir = id === "project-agents" ? ".agents" : ".dsh";
-  return join4(projectRoot, dir, "mcp.json");
+  if (id === "project-agents")
+    return join4(projectRoot, ".agents", "mcp.json");
+  return join4(projectRoot, ".dsh", PACKAGE_DIR, "mcp.json");
 }
 function readSourceFile(path) {
   return existsSync(path) ? readFileSync(path, "utf8") : null;
@@ -575,6 +588,7 @@ var init_sources = __esm({
   "lib/server/config/sources.js"() {
     "use strict";
     init_import();
+    init_interface();
     SOURCE_IDS = [
       "global-dsh",
       "global-agents",
@@ -9237,6 +9251,22 @@ function archive(source) {
     throw new Error(`dsh-mcp-manager: 旧存储文件改名失败：${source}`, { cause });
   }
 }
+async function relocateEffectiveConfigs(deps) {
+  if (deps.storePath !== "")
+    return;
+  const legacy = legacyGlobalConfigFile();
+  if (!existsSync10(legacy))
+    return;
+  const target = configFile();
+  const seededEmpty = existsSync10(target) && readFileSync4(target, "utf8") === EMPTY_CONFIG;
+  if (existsSync10(target) && !seededEmpty) {
+    warnIfDowngraded(legacy, target, deps);
+    archive(legacy);
+    return;
+  }
+  await writeFileAtomic(target, readSource(legacy));
+  archive(legacy);
+}
 
 // lib/server/upgrade/impl/steps/index.js
 var STEPS = [
@@ -9248,7 +9278,9 @@ var STEPS = [
   // 0.2.7 → 0.2.8 为空步（dsh 0.2.0-rc.2 适配 + 导出面收窄，均不落盘）：run 指共享空函数。
   { fromVersion: "0.2.7", targetVersion: "0.2.8", run: tickUpgradeVersion },
   // 0.2.8 → 0.2.9 为空步（本版无 MCP 管理器 home 级存储形态变化）：run 指共享空函数。
-  { fromVersion: "0.2.8", targetVersion: "0.2.9", run: tickUpgradeVersion }
+  { fromVersion: "0.2.8", targetVersion: "0.2.9", run: tickUpgradeVersion },
+  // 0.2.9 → 0.2.10：生效配置 .config 归位进包分区目录（全局 + 项目级 JIT）。
+  { fromVersion: "0.2.9", targetVersion: "0.2.10", run: relocateEffectiveConfigs }
 ];
 
 // lib/server/upgrade/impl/version/index.js
@@ -9286,12 +9318,13 @@ var upgradeRunner = createUpgradeRunner("dsh-mcp-manager", runUpgradeChain2);
 // lib/server/upgrade/impl/steps/project-layout.js
 init_interface();
 function settleProjectConfig(root, logger) {
-  return settleOne(legacyProjectConfigFile(root), projectConfigFile(root), null, {
+  const deps = {
     logger,
     // settle 路径只用 logger：`storePath` 传空串——takenOver 是 LAYOUT 层的概念，
     // 与项目级无关。
     storePath: ""
-  });
+  };
+  return settleOne(legacyProjectConfigFile(root), projectConfigFile(root), null, deps).then(() => settleOne(legacyProjectEffectiveConfigFile(root), projectConfigFile(root), null, deps));
 }
 function withSettledProjectConfig(root, logger, useSettled) {
   return settleProjectConfig(root, logger).then(() => useSettled(projectConfigFile(root)));

package/lib/server/config/sources.d.ts

@@ -3,7 +3,7 @@
  *
  * 四个声明来源，默认全部读取：
  *   - 全局：~/.agents/mcp.json 与 ~/.dsh/mcp.json
- *   - 项目：<项目根>/.agents/mcp.json 与 <项目根>/.dsh/mcp.json
+ *   - 项目：<项目根>/.agents/mcp.json 与 <项目根>/.dsh/dsh-mcp-manager/mcp.json
  *
  * 同名互斥原则：同一个服务器名在多个来源出现时，**只允许一个生效**——
  * 生效者进入对应 scope 的 store 并连接；落选者不落盘（若其 scope store

package/lib/server/shared/interface.d.ts

@@ -11,4 +11,4 @@ export type { DomainSpec } from "./compose.js";
 export type { AgentFace, AttachmentsPort, EventsPort, ExposePort, HostContextPort, HostFaces, LoaderPort, LogRecord, LoggerPort, LogsPort, ModelAttachmentRef, ModelContentBlock, ModelInfoPort, MountedPlugin, OfficialPluginModule, PromptPort, RegisterPort, SaveImageInput, ToolsPort, } from "./host-faces.js";
 export { CONNECT_TIMEOUT_MS, DEFAULT_ANNOUNCE_CATALOG, DEFAULT_CATALOG_MAX_ENTRIES, DEFAULT_TOOL_CALL_TIMEOUT_MS, DISCOVERY_TIMEOUT_MS, LIST_DEFAULT_TOOLS_PER_SERVER, OFFICIAL_MCP_CLIENT_LOG_NAME, OFFICIAL_MCP_CLIENT_SPECIFIER, OFFICIAL_SERVER_NAME_PATTERN, SERVER_NAME_PATTERN, } from "./constants.js";
 export { publicToolName } from "./tool-names.js";
-export { CATALOG_DIR_NAME, CATALOG_SUMMARY_FILE_NAME, CONFIG_FILE_NAME, LEGACY_LAYOUT, PACKAGE_DIR_MODE, STATS_FILE_NAME, USER_STATE_FILE_NAME, VERSION_FILE_NAME, catalogDir, catalogFile, catalogSummaryFile, configFile, directoryMode, fileMode, legacyFile, legacyProjectConfigFile, mcpManagerHome, projectConfigFile, statsFile, userStatePath, sourcePrefsPath, versionFile, } from "./paths.js";
+export { CATALOG_DIR_NAME, CATALOG_SUMMARY_FILE_NAME, CONFIG_FILE_NAME, LEGACY_LAYOUT, PACKAGE_DIR_MODE, STATS_FILE_NAME, USER_STATE_FILE_NAME, VERSION_FILE_NAME, catalogDir, catalogFile, catalogSummaryFile, configFile, directoryMode, fileMode, legacyFile, PACKAGE_DIR, legacyProjectConfigFile, legacyProjectEffectiveConfigFile, legacyGlobalConfigFile, mcpManagerHome, projectConfigFile, statsFile, userStatePath, sourcePrefsPath, versionFile, } from "./paths.js";

package/lib/server/shared/paths.d.ts

@@ -1,3 +1,5 @@
+/** 本插件在 DSH home 下的私有目录：按 npm 包名分区，不与其它插件争用根目录。 */
+export declare const PACKAGE_DIR = "dsh-mcp-manager";
 /** 私有目录权限：同机其它用户不得列举本插件的落盘面（与 mcp.json 的 0o600 同族）。 */
 export declare const PACKAGE_DIR_MODE = 448;
 /** 目标布局的文件名（迁移契约）。 */
@@ -22,7 +24,9 @@ export declare const LEGACY_LAYOUT: {
 };
 /** 本插件私有目录。 */
 export declare function mcpManagerHome(): string;
-/** 全局生效配置：`<DSH_HOME>/.dsh/dsh-mcp-manager.config`（互斥同步唯一写面，
+/** 旧版全局生效配置（迁移**读面**，新代码不得回写）：`<DSH_HOME>/.dsh/dsh-mcp-manager.config`。 */
+export declare function legacyGlobalConfigFile(): string;
+/** 全局生效配置：`<DSH_HOME>/dsh-mcp-manager/dsh-mcp-manager.config`（互斥同步唯一写面，
  * 含 env 引用与凭据字段，0600）。四个声明来源 mcp.json 不会直接被运行面读取。 */
 export declare function configFile(): string;
 /**
@@ -44,7 +48,9 @@ export declare function statsFile(): string;
 export declare function sourcePrefsPath(): string;
 /** 存储版本刻度（升级链走到哪一版，不是插件版本——后者读 package.json）。 */
 export declare function versionFile(): string;
-/** 项目级生效配置：`<项目根>/.dsh/dsh-mcp-manager.config`（互斥同步唯一写面）。 */
+/** 旧版项目级生效配置（迁移**读面**，新代码不得回写）：`<项目根>/.dsh/dsh-mcp-manager.config`。 */
+export declare function legacyProjectEffectiveConfigFile(projectRoot: string): string;
+/** 项目级生效配置：`<项目根>/.dsh/dsh-mcp-manager/dsh-mcp-manager.config`（互斥同步唯一写面）。 */
 export declare function projectConfigFile(projectRoot: string): string;
 /**
  * 旧目录形态（迁移**读面**，新代码不得回写）：`<项目根>/.dsh/dsh-mcp-manager/mcp.json`。

package/lib/server/upgrade/impl/steps/storage-layout.d.ts

@@ -15,3 +15,12 @@ export declare function migrateStorageLayout(deps: UpgradeDeps): Promise<void>;
  * 项目级 just-in-time 迁移（`./project-layout.ts`）复用本函数：同文件内的 `settleOne` 即同一语义。
  */
 export declare function settleOne(source: string, target: string, initial: string | null, deps: UpgradeDeps): Promise<void>;
+/**
+ * 0.2.9 → 0.2.10：生效配置 .config 归位进包分区目录——
+ * 全局 `<DSH_HOME>/.dsh/dsh-mcp-manager.config` → `<DSH_HOME>/dsh-mcp-manager/`。
+ *
+ * 不能直接复用 `settleOne`：0.2.5 的迁移可能已在目标落过**版本化空形占位**——那不是用户数据。
+ * 目标是空占位而源在场时，以源为准覆盖；目标已有真实内容才走「归档源、保目标」的常规语义。
+ * 用户接管 store（`storePath` 非空）时整项不动。
+ */
+export declare function relocateEffectiveConfigs(deps: UpgradeDeps): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sunshaobei/dsh-mcp-manager",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "description": "Manage MCP servers (stdio / streamable-http) for dsh web; tools are reached only through four middleware tools. DSH MCP 管理器：Web 侧边栏「MCP」入口，面板按状态分级展示 MCP 服务器（运行中/连接中/已配置/失败），支持快速接入（stdio / streamable-http 表单）与粘贴 mcpServers JSON 导入。已连接服务器的工具一律经中间层工具（ws_mcp_search / ws_mcp_detail / ws_mcp_call / ws_mcp_list）访问：宿主注册名 mcp__<id>__<tool> 是内部标识（id 按 (工作空间, 服务器名) 分配、不可由服务器名推导），不对模型可见，禁止直呼。",
   "type": "module",
   "main": "lib/index.js",