@logictan/dsh-config-manager 0.1.60 → 0.1.62

package/lib/adapters/credentials.d.ts

@@ -5,7 +5,7 @@
  *
  * 安全不变量：永不导出值（hasValue 恒 false）；导入生成 MissingSecret 清单，
  * 用户补录值经 ctx.secretInputs / decryptedCredentials（仅内存）→ credentials.set()。
- * .credentials.yaml 文件字节交由 m4 加密层处理，本 adapter 不触碰。
+ * .credentials.yaml 文件字节由 Exporter 的文件级 vault 处理，本 adapter 不触碰。
  */
 import type { CredentialsSection } from '../schema/types.ts';
 import type { MsgFunc } from '../core/messages.ts';

package/lib/adapters/index.d.ts

@@ -42,7 +42,7 @@ export type { CredentialRefsProvider } from './credentials.ts';
 export { SettingsAdapter } from './settings.ts';
 export { UiAdapter, isUiNamespace, KNOWN_UI_NAMESPACE_PREFIXES, UI_MIGRATION_NOTES } from './ui.ts';
 export { ProvidersAdapter, DEFAULT_PROVIDER_NAMESPACES, type ProviderExportEntry, type ProviderExportSection } from './providers.ts';
-export { PluginsAdapter, USER_PATCH_FILE } from './plugins.ts';
+export { PluginsAdapter } from './plugins.ts';
 export type { LocalPluginPackHook } from './plugins.ts';
 export { McpAdapter, extractMcpServers, buildMcpPatchLine, type McpExportEntry, type McpExportSection } from './mcp.ts';
 export { PromptsAdapter, extractPrompts, mergePromptIntoLine, buildPromptLine, type PromptExportEntry, type PromptsExportSection } from './prompts.ts';

package/lib/adapters/index.js

@@ -40,7 +40,7 @@ export function createAdapters(options = {}) {
 export { SettingsAdapter } from './settings.js';
 export { UiAdapter, isUiNamespace, KNOWN_UI_NAMESPACE_PREFIXES, UI_MIGRATION_NOTES } from './ui.js';
 export { ProvidersAdapter, DEFAULT_PROVIDER_NAMESPACES } from './providers.js';
-export { PluginsAdapter, USER_PATCH_FILE } from './plugins.js';
+export { PluginsAdapter } from './plugins.js';
 export { McpAdapter, extractMcpServers, buildMcpPatchLine } from './mcp.js';
 export { PromptsAdapter, extractPrompts, mergePromptIntoLine, buildPromptLine } from './prompts.js';
 export { SkillsAdapter } from './skills.js';

package/lib/adapters/mcp.js

@@ -8,7 +8,7 @@
  */
 import { isDeepStrictEqual } from 'node:util';
 import { msgOf, zhMsg } from '../core/messages.js';
-import { USER_PATCH_FILE } from './plugins.js';
+import { HOME_PATCH_FILE } from '../core/patch-layers.js';
 /** 从 patch 行数组中提取 MCP server 条目（以 config.serverName 存在为判定） */
 export function extractMcpServers(lines) {
     const servers = [];
@@ -84,7 +84,7 @@ export class McpAdapter {
         const warnings = [];
         let lines = [];
         try {
-            lines = await ctx.patchFile.readPatchLines(USER_PATCH_FILE);
+            lines = await ctx.patchFile.readPatchLines(HOME_PATCH_FILE);
         }
         catch (err) {
             warnings.push(msgOf(ctx)('adapter.patchReadFailedMCP', { reason: err instanceof Error ? err.message : String(err) }));
@@ -100,7 +100,7 @@ export class McpAdapter {
     async analyzeImport(data, ctx) {
         const msg = ctx.msg;
         const items = [];
-        const targetLines = await ctx.target.patchFile.readPatchLines(USER_PATCH_FILE);
+        const targetLines = await ctx.target.patchFile.readPatchLines(HOME_PATCH_FILE);
         const targetServers = extractMcpServers(targetLines);
         for (const server of data.servers) {
             const id = `mcp:${server.serverName}`;
@@ -149,7 +149,7 @@ export class McpAdapter {
         if (!ref)
             return { ok: false, message: msg('adapter.missingTargetRef') };
         const raw = buildMcpPatchLine(ref, server);
-        await ctx.target.patchFile.applyPatchChanges(USER_PATCH_FILE, [
+        await ctx.target.patchFile.applyPatchChanges(HOME_PATCH_FILE, [
             { lineId: ref, raw, action: item.kind === 'Create' ? 'insert' : 'update' },
         ]);
         return { ok: true, needsRestart: true, message: msg('adapter.mcpWritten', { serverName }) };

package/lib/adapters/plugins.d.ts

@@ -2,7 +2,6 @@ import type { PackLocalPluginsResult } from '../core/local-plugin-pack.ts';
 import type { MsgFunc } from '../core/messages.ts';
 import type { PluginEntry, PluginsSection } from '../schema/types.ts';
 import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
-export declare const USER_PATCH_FILE = "cordis.patch.yml";
 /**
  * 本地源插件打包钩子（由宿主注入，见 src/index.ts createAdapters）。
  * 返回打包结果（含字节与重写后的 spec）；不注入 = 不做本地源打包（保持旧行为）。

package/lib/adapters/plugins.js

@@ -1,9 +1,9 @@
 /**
  * plugins 分区 adapter（设计 §3.3/§8）：
- * 数据源 = ctx.plugins.listInstalled()（插件清单）+ 用户 patch 层（profile cordis.patch.yml）。
+ * 数据源 = ctx.plugins.listInstalled()（插件清单）+ 两个 patch 层（home 与 profile 的 cordis.patch.yml）。
  *
  * 安全不变量：绝不打包插件二进制；导入走 DSH 官方机制（dsh plugin CLI → needsRestart 提示）。
- * patch 行导入（用户自定义行：启用/禁用/插入）写回 cordis.patch.yml，同样 needsRestart。
+ * patch 行导入（用户自定义行：启用/禁用/插入）写回该行自带的层（home 或 profile），同样 needsRestart。
  *
  * T1（本地源插件迁移）：`link:` / `file:` 来源的插件指向本机路径，换机后必然不可达
  * （曾导致插件被静默丢失）。导出时经注入的 `localPack` 执行 `npm pack`，把 tarball 作为
@@ -17,8 +17,8 @@ import { isLocalPluginSpec, isPackedLocalSpec, LOCAL_PLUGIN_DIR } from '../core/
 import { msgOf, zhMsg } from '../core/messages.js';
 import { isPathSafe, normalizePath } from '../utils/paths.js';
 import { PLUGIN_PATCH_REF_PREFIX } from '../core/backup.js';
+import { HOME_PATCH_FILE, PROFILE_PATCH_FILE, patchLayerKey, parsePatchLayerKey } from '../core/patch-layers.js';
 import { parsePnpmPatchedDependencies, sanitizePnpmWorkspacePatches } from './pnpm-workspace.js';
-export const USER_PATCH_FILE = 'cordis.patch.yml';
 /** tarball 字节 → base64（零依赖，避免 Buffer 在浏览器侧类型问题） */
 function bytesToBase64(data) {
     if (typeof Buffer !== 'undefined')
@@ -142,14 +142,18 @@ export class PluginsAdapter {
         catch (err) {
             warnings.push(msgOf(ctx)('adapter.pluginListReadFailed', { reason: err instanceof Error ? err.message : String(err) }));
         }
+        // 两层都读：home 层（全机偏好）与 profile 层（该 profile 专属）。缺 profile 层文件不是故障
+        // （readPatchLines 对不存在的文件返回空数组），只有真读失败才告警。
         const patch = [];
-        try {
-            const lines = await ctx.patchFile.readPatchLines(USER_PATCH_FILE);
-            for (const l of lines)
-                patch.push({ file: USER_PATCH_FILE, lineId: l.lineId, raw: l.raw });
-        }
-        catch (err) {
-            warnings.push(msgOf(ctx)('adapter.patchReadFailed', { reason: err instanceof Error ? err.message : String(err) }));
+        for (const file of [HOME_PATCH_FILE, PROFILE_PATCH_FILE]) {
+            try {
+                const lines = await ctx.patchFile.readPatchLines(file);
+                for (const l of lines)
+                    patch.push({ file, lineId: l.lineId, raw: l.raw });
+            }
+            catch (err) {
+                warnings.push(msgOf(ctx)('adapter.patchReadFailed', { reason: err instanceof Error ? err.message : String(err) }));
+            }
         }
         // pnpm-workspace.yaml（allowBuilds / minimumReleaseAgeExclude 等）：随插件分区迁移，
         // 否则目标 profile 的 pnpm 可能因构建白名单/冷静期拒绝安装插件（§34.17 同款语义）。
@@ -391,17 +395,26 @@ export class PluginsAdapter {
         }
         // 用户 patch 行：lineId 唯一键；存在且同 → Skip；存在不同 → Conflict；不存在 → Create。
         // mcp-client 行与 systemPrompt/planMode 行由 mcp/prompts adapter 管理，此处跳过（避免重复写入覆盖）。
-        const targetLines = await ctx.target.patchFile.readPatchLines(USER_PATCH_FILE);
+        // 逐层读目标端：行自带的 file 决定比对哪一层（只读 home 层会让 profile 层行在目标机
+        // 已有同值时被误判成 Create，也会让目标机 profile 层的不同值判不出 Conflict）。
+        const targetLines = new Map();
+        for (const pl of data.patch) {
+            if (!targetLines.has(pl.file)) {
+                targetLines.set(pl.file, await ctx.target.patchFile.readPatchLines(pl.file));
+            }
+        }
         for (const pl of data.patch) {
             if (isManagedElsewhere(pl.raw))
                 continue;
-            const id = `patch:${pl.lineId}`;
-            const tl = targetLines.find((l) => l.lineId === pl.lineId);
+            // 层限定复合键：两层可存在同名 lineId，裸 lineId 无法指向「哪一层的哪一行」。
+            const ref = patchLayerKey(pl.file, pl.lineId);
+            const id = `patch:${ref}`;
+            const tl = targetLines.get(pl.file)?.find((l) => l.lineId === pl.lineId);
             if (!tl) {
                 items.push({
                     id, kind: 'Create', adapter: 'plugins',
                     description: msg('adapter.patchLineCreate', { lineId: pl.lineId }), severity: 'info',
-                    target: { adapter: 'plugins', ref: pl.lineId },
+                    target: { adapter: 'plugins', ref },
                 });
             }
             else if (isDeepStrictEqual(tl.raw, pl.raw)) {
@@ -411,7 +424,7 @@ export class PluginsAdapter {
                 items.push({
                     id, kind: 'Conflict', adapter: 'plugins',
                     description: msg('adapter.patchLineDiff', { lineId: pl.lineId }), severity: 'warning',
-                    target: { adapter: 'plugins', ref: pl.lineId },
+                    target: { adapter: 'plugins', ref },
                 });
             }
         }
@@ -547,14 +560,17 @@ export class PluginsAdapter {
         const ref = item.target?.ref;
         if (!ref)
             return { ok: false, message: msg('adapter.missingTargetRef') };
+        // 复合键解析出层与 lineId：只按 lineId 查找会命中数组里先出现的 home 层行，
+        // 把 profile 层的行写进 home 层（回滚同理）。
+        const { file, lineId } = parsePatchLayerKey(ref);
         const data = ctx.sections.get('plugins');
-        const pl = data?.patch.find((p) => p.lineId === ref);
+        const pl = data?.patch.find((p) => p.file === file && p.lineId === lineId);
         if (!pl)
             return { ok: false, message: msg('adapter.patchMissing', { ref }) };
-        await ctx.target.patchFile.applyPatchChanges(pl.file, [
-            { lineId: ref, raw: pl.raw, action: item.kind === 'Create' ? 'insert' : 'update' },
+        await ctx.target.patchFile.applyPatchChanges(file, [
+            { lineId, raw: pl.raw, action: item.kind === 'Create' ? 'insert' : 'update' },
         ]);
-        return { ok: true, needsRestart: true, message: msg('adapter.patchWritten', { ref }) };
+        return { ok: true, needsRestart: true, message: msg('adapter.patchWritten', { ref: lineId }) };
     }
     async validate(data, msg = zhMsg) {
         const issues = [];

package/lib/adapters/prompts.js

@@ -11,7 +11,7 @@
  */
 import { isDeepStrictEqual } from 'node:util';
 import { msgOf, zhMsg } from '../core/messages.js';
-import { USER_PATCH_FILE } from './plugins.js';
+import { HOME_PATCH_FILE } from '../core/patch-layers.js';
 /** 从 patch 行 config 中提取 prompt 条目（systemPrompt.persona / planMode.sections[].text） */
 export function extractPrompts(lines) {
     const prompts = [];
@@ -108,7 +108,7 @@ export class PromptsAdapter {
         const warnings = [];
         let lines = [];
         try {
-            lines = await ctx.patchFile.readPatchLines(USER_PATCH_FILE);
+            lines = await ctx.patchFile.readPatchLines(HOME_PATCH_FILE);
         }
         catch (err) {
             warnings.push(msgOf(ctx)('adapter.patchReadFailedPrompts', { reason: err instanceof Error ? err.message : String(err) }));
@@ -124,7 +124,7 @@ export class PromptsAdapter {
     async analyzeImport(data, ctx) {
         const msg = ctx.msg;
         const items = [];
-        const targetLines = await ctx.target.patchFile.readPatchLines(USER_PATCH_FILE);
+        const targetLines = await ctx.target.patchFile.readPatchLines(HOME_PATCH_FILE);
         const targetPrompts = extractPrompts(targetLines);
         for (const p of data.prompts) {
             const id = p.id;
@@ -191,18 +191,18 @@ export class PromptsAdapter {
         // Create：目标无来源行 → 用记录的行名重建 patch 行（insert）
         if (item.kind === 'Create') {
             const raw = buildPromptLine(ref, prompt);
-            await ctx.target.patchFile.applyPatchChanges(USER_PATCH_FILE, [
+            await ctx.target.patchFile.applyPatchChanges(HOME_PATCH_FILE, [
                 { lineId: ref, raw, action: 'insert' },
             ]);
             return { ok: true, needsRestart: true, message: msg('adapter.promptCreated', { name: prompt.name, ref }) };
         }
         // Update / Conflict(useImported)：合并进目标行 config
-        const lines = await ctx.target.patchFile.readPatchLines(USER_PATCH_FILE);
+        const lines = await ctx.target.patchFile.readPatchLines(HOME_PATCH_FILE);
         const line = lines.find((l) => l.lineId === ref);
         if (!line)
             return { ok: false, message: msg('adapter.patchLineMissing', { ref }) };
         const newRaw = mergePromptIntoLine(line.raw, prompt);
-        await ctx.target.patchFile.applyPatchChanges(USER_PATCH_FILE, [
+        await ctx.target.patchFile.applyPatchChanges(HOME_PATCH_FILE, [
             { lineId: ref, raw: newRaw, action: 'update' },
         ]);
         return { ok: true, needsRestart: true, message: msg('adapter.promptWritten', { name: prompt.name, ref }) };

package/lib/adapters/test-helpers.d.ts

@@ -94,6 +94,30 @@ export declare class MemPatch implements PatchFileFacade {
         action: 'insert' | 'update' | 'remove';
     }[]): Promise<void>;
 }
+/**
+ * 分层 patch 门面 mock：patch 行按 `file`（层 token）分桶。
+ * 单层的 `MemPatch` 无法表达「同名 lineId 分布在两层」——而那正是层寻址契约的核心，
+ * 故另立一个按层键控的实现，供 plugins 适配器与快照/回滚的契约测试使用。
+ */
+export declare class MemLayeredPatch implements PatchFileFacade {
+    files: Map<string, Map<string, {
+        lineId: string;
+        raw: unknown;
+    }>>;
+    /** 直接落一行（测试夹具；等价于目标机该层已存在该行）。 */
+    set(file: string, lineId: string, raw: unknown): void;
+    has(file: string, lineId: string): boolean;
+    rawOf(file: string, lineId: string): unknown;
+    readPatchLines(file: string): Promise<{
+        lineId: string;
+        raw: unknown;
+    }[]>;
+    applyPatchChanges(file: string, changes: {
+        lineId: string;
+        raw: unknown;
+        action: 'insert' | 'update' | 'remove';
+    }[]): Promise<void>;
+}
 export declare class MemSnapshotStore implements SnapshotStore {
     snapshots: Map<string, Snapshot>;
     blobs: Map<string, Uint8Array<ArrayBufferLike>>;
@@ -116,6 +140,9 @@ export declare class MockHostContext implements HostContext {
     patchFile: MemPatch;
     fs: MemFs;
     constructor(platform: string, homeDir: string, profile?: string);
+    /** 换成按层键控的 patch 门面（层寻址契约测试用）。
+     *  字段的声明类型仍是单层的 MemPatch，以免既有夹具的 `.lines` 用法失型。 */
+    useLayeredPatch(): MemLayeredPatch;
 }
 export declare function makeContext(platform: string, homeDir: string, profile?: string): MockHostContext;
 /** 构造最小合法 manifest（adapter 单测用；真实 manifest 由 exporter 生成） */

package/lib/adapters/test-helpers.js

@@ -150,6 +150,39 @@ export class MemPatch {
         }
     }
 }
+/**
+ * 分层 patch 门面 mock：patch 行按 `file`（层 token）分桶。
+ * 单层的 `MemPatch` 无法表达「同名 lineId 分布在两层」——而那正是层寻址契约的核心，
+ * 故另立一个按层键控的实现，供 plugins 适配器与快照/回滚的契约测试使用。
+ */
+export class MemLayeredPatch {
+    files = new Map();
+    /** 直接落一行（测试夹具；等价于目标机该层已存在该行）。 */
+    set(file, lineId, raw) {
+        const layer = this.files.get(file) ?? new Map();
+        layer.set(lineId, { lineId, raw });
+        this.files.set(file, layer);
+    }
+    has(file, lineId) {
+        return this.files.get(file)?.has(lineId) ?? false;
+    }
+    rawOf(file, lineId) {
+        return this.files.get(file)?.get(lineId)?.raw;
+    }
+    async readPatchLines(file) {
+        return [...(this.files.get(file)?.values() ?? [])];
+    }
+    async applyPatchChanges(file, changes) {
+        const layer = this.files.get(file) ?? new Map();
+        this.files.set(file, layer);
+        for (const c of changes) {
+            if (c.action === 'remove')
+                layer.delete(c.lineId);
+            else
+                layer.set(c.lineId, { lineId: c.lineId, raw: c.raw });
+        }
+    }
+}
 export class MemSnapshotStore {
     snapshots = new Map();
     blobs = new Map();
@@ -198,6 +231,13 @@ export class MockHostContext {
         this.fs = new MemFs(homeDir);
         this.log = createLogger({ level: 'error', sink: () => { } });
     }
+    /** 换成按层键控的 patch 门面（层寻址契约测试用）。
+     *  字段的声明类型仍是单层的 MemPatch，以免既有夹具的 `.lines` 用法失型。 */
+    useLayeredPatch() {
+        const layered = new MemLayeredPatch();
+        this.patchFile = layered;
+        return layered;
+    }
 }
 export function makeContext(platform, homeDir, profile) {
     return new MockHostContext(platform, homeDir, profile);

package/lib/client.d.ts

@@ -44,11 +44,9 @@ declare const uiZh: {
   readonly 'report.security': '安全：';
   readonly 'report.apiKeysExcluded': 'API 密钥已排除：';
   readonly 'report.containsSecrets': '包含密钥：';
-  readonly 'report.encrypted': '已加密：';
   readonly 'report.redacted': '{count} 个敏感字段已脱敏';
   readonly 'report.file': '文件：';
   readonly 'report.yes': '是';
-  readonly 'report.yesEncrypted': '是（加密）';
   readonly 'report.no': '否';
   readonly 'report.importedRestored': '已导入/恢复';
   readonly 'report.skipped': '跳过';
@@ -160,7 +158,6 @@ declare const uiZh: {
   readonly 'sync.pushOk': '推送成功（快照 {id}）';
   readonly 'sync.pushPreviewHeadline': '将推送 {total} 个分区（{changed} 个有变化）';
   readonly 'sync.pushPreviewHint': '以上为只读预览，不会写入远端。确认后点击「推送」才真正上传。';
-  readonly 'sync.pushPreviewEncrypted': '加密快照：载荷将整体加密，各分区相对基线的变化不可比对。';
   readonly 'sync.pullFailed': '拉取失败';
   readonly 'sync.pullOk': '远端快照 {id} 差异预览：共 {count} 项变更';
   readonly 'sync.pullEmpty': '远端快照与本地一致（无变更）';
@@ -293,19 +290,10 @@ type UiTextKey = keyof typeof uiZh;
 type UiT = (key: UiTextKey, params?: Record<string, string | number>) => string;
 //#endregion
 //#region src/client/api.d.ts
-/** Host 半健康检查响应（plugin 版本 / DSH 版本 / 平台，用于主页横幅与兼容性说明） */
+/** Host 半状态响应：设置页页脚版本行的两个字段（消费方只有 ConfigManagerSection） */
 interface ServiceStatus {
-  ready: boolean;
   pluginVersion: string;
   dshVersion: string;
-  platform: string;
-  arch: string;
-  homeDir?: string;
-  profile?: string;
-  profileManifestReadable?: boolean;
-  installedPluginCount?: number;
-  installedPluginNames?: string[];
-  bundles?: string[];
 }
 /** 携带路由 JSON error 消息的错误类型 */
 declare class ConfigManagerApiError extends Error {