dsh-config-manager 0.1.30 → 0.1.32

package/README.md

@@ -193,6 +193,7 @@ Push / pull your portable config between machines through **either of two channe
 - **Same snapshot retention for both channels**: only the newest **10** snapshots are kept on the remote (`MAX_REMOTE_SNAPSHOTS=10`); older ones are deleted automatically.
 - **Switching channels starts fresh**: Git and WebDAV do **not** share snapshots or a common ancestor. When you switch transport, sync begins again from the new remote's empty baseline — push a fresh snapshot first.
 - **WebDAV auth** uses HTTP Basic: the `username` is stored in the config and may be echoed back into the UI, while the `password` is read live from the DSH credentials slot `DSH_CONFIG_MANAGER_SYNC_WEBDAV_PASSWORD` — it never appears in any sync file or log.
+- **Plugins auto-install**: when pulling diffs, plugins that are new in the backup are **installed automatically** on confirm — no manual per-item ticking in the diff list. Only **version-conflict** plugins still ask you to pick "Keep Current / Use Imported".
 
 ### 🗂️ Profiles
 

package/README.zh-CN.md

@@ -192,6 +192,7 @@ dsh plugin --profile web add dsh-config-manager@latest --config.auto-install-pee
 - **两通道保留策略一致**：远端只保留最新 **10** 个快照（`MAX_REMOTE_SNAPSHOTS=10`），更旧的自动删除。
 - **切换通道重新开始**：Git 与 WebDAV 的快照 / 共同祖先**互不共享**。切换通道后，同步从新远端的空基线重新开始——请先推送一个新快照。
 - **WebDAV 认证**采用 HTTP Basic：`username` 存配置、可在界面回显；`password` 则实时从 DSH credentials 槽位 `DSH_CONFIG_MANAGER_SYNC_WEBDAV_PASSWORD` 读取——绝不出现于任何同步文件或日志。
+- **插件自动安装**：拉取差异时，备份里新增的插件会在确认导入时**自动安装**，无需在差异列表里逐项手动勾选；只有**版本冲突**的插件仍需要你决定「保留当前 / 采用备份」。
 
 ### 🗂️ 配置档案（Profiles）
 

package/lib/adapters/index.d.ts

@@ -17,6 +17,8 @@ export interface AdapterRegistryOptions {
     credentialsRefs?: CredentialRefsProvider;
     /** pluginFiles 白名单（相对 ~/.dsh 根；缺省 dsh-ssh.json + pet.json） */
     pluginFiles?: string[];
+    /** pluginFiles 约定的配置目录（相对 ~/.dsh 根），递归收集其下所有插件配置文件 */
+    pluginFilesDir?: string;
     /** 是否包含 sessions 分区（默认关，研究报告 §4.9） */
     includeSessions?: boolean;
     /** 插件自身包名：导出 plugins 分区时不列自己（避免自引用；缺省 dsh-config-manager） */

package/lib/adapters/index.js

@@ -26,7 +26,7 @@ export function createAdapters(options = {}) {
         new AgentInstructionsAdapter(),
         new WorkspacesAdapter(),
         new CredentialsAdapter({ namespaces, refs: options.credentialsRefs }),
-        new PluginFilesAdapter(options.pluginFiles),
+        new PluginFilesAdapter(options.pluginFiles, options.pluginFilesDir),
     ];
     if (options.includeSessions)
         adapters.push(new SessionsAdapter());

package/lib/adapters/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/adapters/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAA0B,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAA+B,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAehD,+EAA+E;AAC/E,MAAM,UAAU,cAAc,CAAC,UAAkC,EAAE;IACjE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAoB;QAChC,IAAI,eAAe,CAAC,UAAU,CAAC;QAC/B,IAAI,SAAS,CAAC,UAAU,CAAC;QACzB,IAAI,gBAAgB,EAAE;QACtB,IAAI,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC;QAC1C,IAAI,UAAU,EAAE;QAChB,IAAI,cAAc,EAAE;QACpB,IAAI,aAAa,EAAE;QACnB,IAAI,mBAAmB,EAAE;QACzB,IAAI,wBAAwB,EAAE;QAC9B,IAAI,iBAAiB,EAAE;QACvB,IAAI,kBAAkB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC;QACrE,IAAI,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC;KAC5C,CAAC;IACF,IAAI,OAAO,CAAC,eAAe;QAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;IAClE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAKD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,2BAA2B,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAwD,MAAM,gBAAgB,CAAC;AACrI,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAA8C,MAAM,UAAU,CAAC;AACxH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAqD,MAAM,cAAc,CAAC;AACvJ,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/adapters/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAA0B,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAA+B,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAiBhD,+EAA+E;AAC/E,MAAM,UAAU,cAAc,CAAC,UAAkC,EAAE;IACjE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAoB;QAChC,IAAI,eAAe,CAAC,UAAU,CAAC;QAC/B,IAAI,SAAS,CAAC,UAAU,CAAC;QACzB,IAAI,gBAAgB,EAAE;QACtB,IAAI,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC;QAC1C,IAAI,UAAU,EAAE;QAChB,IAAI,cAAc,EAAE;QACpB,IAAI,aAAa,EAAE;QACnB,IAAI,mBAAmB,EAAE;QACzB,IAAI,wBAAwB,EAAE;QAC9B,IAAI,iBAAiB,EAAE;QACvB,IAAI,kBAAkB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC;QACrE,IAAI,kBAAkB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC;KACpE,CAAC;IACF,IAAI,OAAO,CAAC,eAAe;QAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;IAClE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAKD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,2BAA2B,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAwD,MAAM,gBAAgB,CAAC;AACrI,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAA8C,MAAM,UAAU,CAAC;AACxH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAqD,MAAM,cAAc,CAAC;AACvJ,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC"}

package/lib/adapters/plugin-files.d.ts

@@ -8,7 +8,9 @@ export declare class PluginFilesAdapter implements ConfigAdapter<FilesSection> {
     readonly defaultIncluded = false;
     readonly portability: "deviceSpecific";
     private readonly whitelist;
-    constructor(whitelist?: string[]);
+    /** 约定配置目录（相对 ~/.dsh 根，如 'plugin-config'）；递归收集其下所有文件。undefined = 不收集。 */
+    private readonly collectDir?;
+    constructor(whitelist?: string[], collectDir?: string);
     export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<FilesSection>>;
     analyzeImport(data: FilesSection, ctx: ImportContext): Promise<PlanItem[]>;
     applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;

package/lib/adapters/plugin-files.js

@@ -1,10 +1,14 @@
 /**
  * pluginFiles 分区 adapter（可选，设计 §3.3/§1.2）：
- * 数据源 = 插件自有配置文件白名单（dsh-ssh.json、pet.json 等，相对 ~/.dsh 根）。
- * 白名单机制避免扫描整个主目录；默认关闭（defaultIncluded=false，用户显式勾选才导出）。
+ * 数据源 = 插件自有配置文件（相对 ~/.dsh 根）：
+ *   1. 白名单固定文件（dsh-ssh.json、pet.json 等，避免扫描整个主目录）；
+ *   2. 约定的插件配置目录（collectDir，如 plugin-config/）递归收集其下所有文件。
+ * relativePath 一律是「相对 ~/.dsh 根」的完整路径（与白名单文件一致），
+ * 导入时按同一相对路径写回原位置。默认关闭（defaultIncluded=false，用户显式勾选才导出）。
  */
 import { sha256Hex } from "../utils/hashing.js";
 import { zhMsg } from "../core/messages.js";
+import { isPathSafe } from "../utils/paths.js";
 export const DEFAULT_PLUGIN_FILE_WHITELIST = ['dsh-ssh.json', 'pet.json'];
 export class PluginFilesAdapter {
     id = 'pluginFiles';
@@ -12,18 +16,48 @@ export class PluginFilesAdapter {
     defaultIncluded = false;
     portability = 'deviceSpecific';
     whitelist;
-    constructor(whitelist = [...DEFAULT_PLUGIN_FILE_WHITELIST]) {
+    /** 约定配置目录（相对 ~/.dsh 根，如 'plugin-config'）；递归收集其下所有文件。undefined = 不收集。 */
+    collectDir;
+    constructor(whitelist = [...DEFAULT_PLUGIN_FILE_WHITELIST], collectDir) {
         this.whitelist = whitelist;
+        if (collectDir !== undefined && collectDir !== '' && !isPathSafe(collectDir)) {
+            throw new Error(`pluginFiles collectDir 非法（须为相对 ~/.dsh 根的安全路径）: ${collectDir}`);
+        }
+        this.collectDir = collectDir === '' ? undefined : collectDir;
     }
     async export(ctx, _options) {
         const files = [];
+        const seen = new Set();
+        // 1) 白名单固定文件（不存在则跳过，dsh-ssh.json 等为按需创建）
         for (const rel of this.whitelist) {
             try {
                 const data = await ctx.fs.readFile(rel);
                 files.push({ relativePath: rel, data, contentHash: sha256Hex(data) });
+                seen.add(rel);
             }
             catch {
-                // 白名单文件不存在则跳过（dsh-ssh.json 等为按需创建）
+                /* 白名单文件不存在则跳过 */
+            }
+        }
+        // 2) 约定配置目录递归收集（相对 ~/.dsh 根的完整路径；与白名单文件去重）
+        if (this.collectDir !== undefined) {
+            let rels = [];
+            try {
+                rels = await ctx.fs.listRecursive(this.collectDir);
+            }
+            catch {
+                // 目录不存在视为空
+            }
+            for (const rel of rels) {
+                if (seen.has(rel))
+                    continue;
+                try {
+                    const data = await ctx.fs.readFile(rel);
+                    files.push({ relativePath: rel, data, contentHash: sha256Hex(data) });
+                }
+                catch {
+                    continue;
+                }
             }
         }
         return {

package/lib/adapters/plugin-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-files.js","sourceRoot":"","sources":["../../src/adapters/plugin-files.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAQ5C,MAAM,CAAC,MAAM,6BAA6B,GAAsB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAE7F,MAAM,OAAO,kBAAkB;IACpB,EAAE,GAAG,aAAsB,CAAC;IAC5B,WAAW,GAAG,cAAc,CAAC;IAC7B,eAAe,GAAG,KAAK,CAAC;IACxB,WAAW,GAAG,gBAAyB,CAAC;IAChC,SAAS,CAAW;IAErC,YAAY,YAAsB,CAAC,GAAG,6BAA6B,CAAC;QAClE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAgB,EAAE,QAAuB;QACpD,MAAM,KAAK,GAA0B,EAAE,CAAC;QACxC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACxC,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACxE,CAAC;YAAC,MAAM,CAAC;gBACP,mCAAmC;YACrC,CAAC;QACH,CAAC;QACD,OAAO;YACL,SAAS,EAAE,aAAa;YACxB,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE;YAC3B,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE;YAC/B,QAAQ,EAAE,EAAE;SACb,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAkB,EAAE,GAAkB;QACxD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QACpB,MAAM,KAAK,GAAe,EAAE,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,EAAE,GAAG,cAAc,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7C,IAAI,OAAO,GAAsB,IAAI,CAAC;YACtC,IAAI,CAAC;gBACH,OAAO,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,KAAK,CAAC,IAAI,CAAC;oBACT,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa;oBAC1C,WAAW,EAAE,GAAG,CAAC,0BAA0B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM;oBAC3F,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC3D,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnD,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAChJ,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC;oBACT,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa;oBAC5C,WAAW,EAAE,GAAG,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS;oBACtF,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC3D,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAc,EAAE,GAAkB;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;QAC7B,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,CAAC;QAC7E,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAA6B,CAAC;QACzE,MAAM,IAAI,GAAG,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QACtF,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAkB,EAAE,MAAe,KAAK;QACrD,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QAC3I,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACjI,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAClH,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACtF,CAAC;CACF"}
+{"version":3,"file":"plugin-files.js","sourceRoot":"","sources":["../../src/adapters/plugin-files.ts"],"names":[],"mappings":"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"}

package/lib/client.d.ts

@@ -544,6 +544,8 @@ interface UploadResponse {
   zipPath: string;
   name: string;
   sizeBytes: number;
+  /** zip=普通备份；encrypted=整体加密备份容器（需先 decryptArchive 解锁才能按 ZIP 解析） */
+  containerType: 'zip' | 'encrypted';
 }
 /** decrypt-verify 端点响应：校验加密备份密码是否可解开 secrets.enc（零写入） */
 interface DecryptVerifyResponse {
@@ -604,6 +606,10 @@ declare class ConfigManagerApi {
   createImportPlan(zipPath: string, decisions: ImportDecisions): Promise<ImportPlan>;
   /** 验证加密备份的解密密码（只读零写入）：成功返回将恢复的凭据数；密码错误抛 ConfigManagerApiError */
   verifyDecrypt(zipPath: string, password: string): Promise<DecryptVerifyResponse>;
+  /** ImportPort.decryptArchive：解锁整体加密备份容器 → 返回可被 analyze/plan/execute 引用的明文 ZIP 路径 */
+  decryptArchive(zipPath: string, password: string): Promise<{
+    zipPath: string;
+  }>;
   /** ImportPort.executeImportPlan：快照→分阶段 apply→validate→commit/rollback */
   executeImportPlan(zipPath: string, plan: ImportPlan, opts: {
     confirm: boolean;
@@ -645,7 +651,8 @@ interface SyncPullReport {
   ok: boolean;
   snapshotId: string;
   changes: PullChange[];
-  /** 是否存在需要人工决策的项（Conflict / MissingSecret / MissingDependency / Install / 路径问题） */
+  /** 是否存在需要人工决策的项（Conflict / MissingSecret / MissingDependency / 路径问题）。
+   * 插件 Install 不算 —— 插件安装随同步自动采用（product requirement）。 */
   needsReview: boolean;
   message?: string;
 }
@@ -653,15 +660,6 @@ interface SyncPullReport {
 //#region src/client/sync/sync-api.d.ts
 /** 远程同步通道类型：git（默认）或 webdav */
 type SyncTransportType = 'git' | 'webdav';
-/** WebDAV 通道配置（仅请求体携带；password 为 secret，只存在于请求体，Host 写入 credentials 后值不回传） */
-interface WebDavRequestPayload {
-  /** WebDAV 远端根地址（https://…），快照存于 {url}/snapshots/ 下 */
-  url?: string;
-  /** HTTP Basic 用户名（非敏感） */
-  username?: string;
-  /** HTTP Basic 密码（secret：仅请求体，绝不持久化到同步文件/日志/URL） */
-  password?: string;
-}
 /** GET /sync/status 响应：配置/凭据/上次同步的只读事实（无任何 secret 值） */
 interface SyncStatusResponse {
   ok: boolean;
@@ -669,7 +667,6 @@ interface SyncStatusResponse {
   configured: boolean;
   /** git 通道：上次使用的仓库地址（不含 token，可回显） */
   repoUrl?: string;
-  gitBin?: string;
   /** git 通道：DSH credentials 中是否已存在 token（describe 只报状态，值永不返回） */
   credentialConfigured: boolean;
   credentialWritable: boolean;
@@ -683,28 +680,54 @@ interface SyncStatusResponse {
     type: string;
     ref: string;
   };
+  /** 可同步分区目录（「高级/自定义导出」勾选列表；host adapters 唯一事实源，只含 portable） */
+  syncSections?: SyncSectionInfo[];
+  /** 当前分区选择（默认/高级模式 + 勾选分区；UI 回填用，自动同步与手动 push 共用） */
+  syncSelection?: SyncSelectionPayload;
   /** 自动同步当前状态（供 UI 顶部开关回填；§3.9） */
   autosync?: AutosyncStatusResponse;
 }
+/** 同步分区选择（POST /sync/selection 请求体 + status.syncSelection 响应；持久化于 Host）。 */
+interface SyncSelectionPayload {
+  mode: 'default' | 'advanced';
+  /** 高级模式勾选分区；default 模式可为空数组 */
+  sections: SectionId[];
+}
 /** webdav 通道状态字段（无任何 secret 值；password 只报 passwordConfigured 布尔） */
 interface WebDavStatusResponse {
   /** 上次使用的服务器地址（可回显；不含 userinfo） */
   url?: string;
-  /** 是否已填过用户名（布尔；便于 UI 提示。username 值由 Host 不回传） */
+  /** 上次使用的用户名（非敏感，可回显；供表单回填） */
+  username?: string;
+  /** 是否已填过用户名（布尔；便于 UI 提示徽章） */
   usernameConfigured: boolean;
   /** DSH credentials 中是否已存在密码（值永不返回） */
   passwordConfigured: boolean;
 }
+/** 可同步分区条目（status.syncSections 项）。只含 portable —— 与 SyncEngine 同步通道一致。 */
+interface SyncSectionInfo {
+  id: SectionId;
+  /** 展示名（host adapter displayName） */
+  displayName: string;
+  portability: 'portable' | 'deviceSpecific' | 'platformSpecific';
+  defaultIncluded: boolean;
+}
 /** push 请求体（token 可选：非空则 Host 先写入 DSH credentials 再使用）。
- *  git 通道携带 repoUrl/gitBin/token；webdav 通道携带 webdav.url/username/password。 */
+ *  扁平形状与 Host parseSyncBody 一致：git 携带 repoUrl/token；
+ *  webdav 携带 url/username/password（顶层，不嵌套 webdav 对象）。
+ *  git 可执行文件固定使用系统 PATH 中的 git，不再接受自定义路径。
+ *  sections 可选（高级/自定义导出模式）：只推送勾选分区；缺省 = 默认模式全部推荐分区。 */
 interface SyncPushPayload {
   /** 通道类型；缺省 'git' */
   transport?: SyncTransportType;
   repoUrl?: string;
-  gitBin?: string;
   token?: string;
-  /** webdav 通道配置（transport='webdav' 时使用） */
-  webdav?: WebDavRequestPayload;
+  /** webdav 通道字段（transport='webdav' 时使用；扁平顶层） */
+  url?: string;
+  username?: string;
+  password?: string;
+  /** 仅同步指定分区（缺省 = 全部 portable 推荐分区；即「默认/快速导出」vs「高级/自定义导出」） */
+  sections?: SectionId[];
 }
 /** pull 请求体（strategy 缺省 merge：冲突保留待决策；snapshotId 缺省 = 最新） */
 interface SyncPullPayload extends SyncPushPayload {
@@ -922,6 +945,9 @@ declare class SyncApi {
   autosyncStatus(): Promise<AutosyncStatusResponse>;
   /** 自动同步配置更新（POST /sync/autosync）。 */
   autosyncUpdate(payload: AutosyncUpdatePayload): Promise<AutosyncStatusResponse>;
+  /** 保存同步分区选择（POST /sync/selection）：模式 + 勾选分区持久化到 Host。
+   *  自动同步调度器与手动 push 共用此配置（刷新/重启后仍然生效）。 */
+  saveSelection(payload: SyncSelectionPayload): Promise<SyncSelectionPayload>;
   /** 一键回滚：按 restoreId 调用 backup→rollback */
   rollback(payload: {
     restoreId: string;
@@ -1086,12 +1112,15 @@ declare const zh$2: {
   readonly 'export.mode.quickHint': "一键导出推荐分区（可迁移、不含设备专属数据），适合常规备份。";
   readonly 'export.mode.custom': "自定义导出";
   readonly 'export.mode.customHint': "按分组逐项勾选要导出的分区。";
-  readonly 'export.includeSecrets': "包含真实密钥（加密备份）";
-  readonly 'export.includeSecretsHint': "勾选后导出将包含密钥，并以密码加密（AES-256-GCM）。密码仅用于本次加密，不会写入备份或任何配置文件。";
+  readonly 'export.security': "安全选项";
+  readonly 'export.encrypt': "加密备份";
+  readonly 'export.encryptHint': "用密码加密整个备份文件（AES-256-GCM）。密码仅用于本次加密，不会写入备份或任何配置文件；导入时必须输入该密码才能解锁。";
   readonly 'export.password': "备份加密密码";
   readonly 'export.passwordConfirm': "确认密码";
   readonly 'export.passwordMismatch': "两次输入的密码不一致";
-  readonly 'export.passwordRequired': "包含密钥时必须设置加密密码";
+  readonly 'export.passwordRequired': "加密备份必须设置密码";
+  readonly 'export.includeSecrets': "导出密钥";
+  readonly 'export.includeSecretsHint': "把真实密钥（凭据值）写入备份。密钥必须以加密形式保存：勾选时会自动选中「加密备份」；取消「加密备份」会同时取消「导出密钥」。";
   readonly 'export.run': "开始导出";
   readonly 'export.running': "正在导出…";
   readonly 'export.download': "下载备份文件";
@@ -1133,6 +1162,11 @@ declare const zh$2: {
   readonly 'import.decrypt.badge': "加密备份";
   readonly 'import.decrypt.title': "解密备份";
   readonly 'import.decrypt.hint': "此备份包含加密的凭据，必须输入导出时设置的加密密码才能解锁并继续导入。";
+  readonly 'import.decryptArchive.title': "解锁加密备份";
+  readonly 'import.decryptArchive.hint': "此备份已整体加密（整个文件被密码保护）。输入导出时设置的密码才能解密并继续导入；密码仅本次使用，绝不落盘。";
+  readonly 'import.decryptArchive.passwordPlaceholder': "输入备份加密密码";
+  readonly 'import.decryptArchive.unlock': "解锁并继续";
+  readonly 'import.decryptArchive.unlocking': "解锁中…";
   readonly 'import.decrypt.passwordPlaceholder': "输入备份加密密码";
   readonly 'import.decrypt.verify': "验证密码";
   readonly 'import.decrypt.verifying': "验证中…";
@@ -1207,8 +1241,6 @@ declare const zh$1: {
   readonly 'config.tokenHint': "将安全写入 DSH credentials（引用名 {ref}），不会写入同步文件或日志。留空表示沿用已保存的凭据。";
   readonly 'config.tokenSaved': "凭据已配置";
   readonly 'config.tokenPlaceholder': "ghp_…（可选）";
-  readonly 'config.gitBin': "git 可执行文件（可选）";
-  readonly 'config.gitBinHint': "缺省使用 PATH 中的 git。";
   readonly 'channel.title': "同步通道";
   readonly 'channel.hint': "选择远程同步通道：Git 私有仓库或 WebDAV 服务器。";
   readonly 'channel.git': "Git 私有仓库";
@@ -1222,6 +1254,7 @@ declare const zh$1: {
   readonly 'webdav.passwordHint': "将安全写入 DSH credentials（引用名 {ref}），不会写入同步文件或日志。留空表示沿用已保存的凭据。";
   readonly 'webdav.passwordSaved': "凭据已配置";
   readonly 'webdav.passwordPlaceholder': "密码（可选）";
+  readonly 'webdav.presetHint': "选择常见 WebDAV 服务器可快速填入地址；含 <占位符> 的模板请替换为你的真实服务器/用户名。";
   readonly 'github.title': "GitHub 登录";
   readonly 'github.description': "通过 GitHub OAuth 设备码流程授权：无需手动输入 token，在浏览器中确认授权后，token 自动写入 DSH credentials。";
   readonly 'github.login': "使用 GitHub 登录";
@@ -1278,11 +1311,24 @@ declare const zh$1: {
   readonly 'syncflow.rollingBack': "正在回滚…";
   readonly 'syncflow.rollbackDone': "已回滚到应用前";
   readonly 'syncflow.needsRestart': "部分改动需要重启 DSH 后生效";
+  readonly 'mode.title': "同步模式";
+  readonly 'mode.hint': "选择推送时导出哪些分区：默认 = 推荐分区一键推送（快速导出）；高级 = 自定义勾选（自定义导出）。";
+  readonly 'mode.default': "默认（快速导出）";
+  readonly 'mode.defaultHint': "一键推送全部推荐分区（settings、providers、plugins、prompts、skills 等），无需配置。";
+  readonly 'mode.advanced': "高级（自定义导出）";
+  readonly 'mode.advancedHint': "手动勾选要推送的分区（等同导出备份的自定义导出）；仅可移植分区可参与同步。";
+  readonly 'mode.sectionsTitle': "同步分区";
+  readonly 'mode.sectionsHint': "仅可移植分区可同步：设备相关（插件文件、凭据状态、会话）与平台相关（MCP、工作区）分区不参与远程同步。";
+  readonly 'mode.atLeastOne': "请至少勾选一个同步分区";
+  readonly 'mode.defaultCount': "将同步 {n} 个推荐分区";
+  readonly 'mode.sectionPortable': "可移植";
+  readonly 'mode.sectionRecommended': "推荐";
+  readonly 'mode.persistHint': "模式与分区选择已保存到本机：自动同步和手动推送都会使用此配置（重启后仍生效）。";
   readonly 'autosync.title': "自动同步";
-  readonly 'autosync.description': "开启后，DSH 将按固定间隔自动执行双向同步（拉取合并 + 上传）；DSH 启动时还会触发一次「自动下载合并（不上传）」以保持本地为最新。仅在无冲突且无需人工干预时才自动写入。";
+  readonly 'autosync.description': "开启后，DSH 在后台保持配置一致：本地配置有改动时自动上传，检测到远端有新快照时才自动拉取合并；定时器仅作兜底轮询，无变化不重复动作。仅在无冲突且无需人工干预时才自动写入本地。";
   readonly 'autosync.enable': "启用自动同步";
-  readonly 'autosync.interval': "同步间隔";
-  readonly 'autosync.intervalHint': "DSH 启动时自动下载合并不上传。";
+  readonly 'autosync.interval': "兜底轮询间隔";
+  readonly 'autosync.intervalHint': "间隔到点 / DSH 启动时检查远端是否有新快照，有才拉取合并（不上传本地）；本地配置改动会触发上传。";
   readonly 'autosync.interval5m': "5 分钟";
   readonly 'autosync.interval15m': "15 分钟";
   readonly 'autosync.interval30m': "30 分钟";