dsh-config-manager 0.1.60 → 0.1.62

package/README.md

@@ -40,7 +40,7 @@ DSH is your AI assistant workbench — it holds your settings: model configs, pl
 
 ### Backup DeepSeek Harness configuration
 
-Create a portable backup of your DSH settings, model providers, plugins, MCP servers, skills, agent presets, profiles and workspace — one ZIP file, no secret values included by default.
+Create a portable backup of your DSH settings, model providers, plugins, MCP servers, skills, agent presets and workspace — one ZIP file, no secret values included by default. (DSH's own profiles — `$DSH_HOME/profiles/<name>`, i.e. which plugin stack to boot — are machine-local and are not migrated; the **Profiles** page can list/create/rename/delete them and record which one the next launch should use.)
 
 ### Restore DeepSeek Harness on another machine
 
@@ -52,7 +52,7 @@ Move your complete DeepSeek Harness setup without manually reinstalling plugins,
 
 ### Sync DSH configuration across machines
 
-Keep portable configuration synchronized between machines through a private Git repository or WebDAV — secrets never sync.
+Keep portable configuration synchronized between machines through a private Git repository or WebDAV — secrets do not sync by default (the payload is run through the SecretScanner); check "Export secrets" with an encryption password and `~/.dsh/.credentials.yaml` travels as scrypt + AES-256-GCM ciphertext inside the encrypted snapshot, so another machine can restore the credentials while the remote (Git host / WebDAV provider) only ever sees ciphertext.
 
 ### Schedule automatic full backups
 
@@ -76,10 +76,10 @@ Browse the built-in official market for ready-made configurations (model provide
 | 🔒 | **Secret safety** | API Keys are not exported by default — non-encrypted imports ask you to re-enter; encrypted backups restore them with the password |
 | ↩️ | **Automatic rollback** | Failed import restores everything automatically |
 | 📸 | **Snapshot restore** | Undo an import: whole-file restore + uninstall added plugins (CLI & GUI) |
-| 🔄 | **Remote Sync** | Push/pull portable config via **Git private repo or WebDAV** (secrets never sync) |
+| 🔄 | **Remote Sync** | Push/pull portable config via **Git private repo or WebDAV** (secrets do not sync by default; encrypted snapshots can optionally carry encrypted credentials) |
 | ⏰ | **Scheduled backups** | Full backup on a fixed cadence (6h / 12h / 24h / 7d) — set-and-forget, secrets never included |
-| 🛒 | **Config Marketplace** | Browse & one-click install community configs — supply-chain warnings + per-section approval |
-| 🗂️ | **Profiles** | Save multiple setups (Work / Personal) and switch anytime — preview + auto-backup + rollback |
+| 🛒 | **Config Marketplace** | Browse & one-click install community configs — supply-chain warnings + per-item content selection (change summary + in-place high-risk flags) |
+| 🗂️ | **Profiles (DSH profiles)** | Manage `$DSH_HOME/profiles/<name>` directly: list / create from a shipped template / rename / hard delete / record which profile the next launch should use |
 | 🌐 | **Bilingual UI** | Interface, reports and error details follow the DSH app language (中文 / English) |
 | 🤖 | **Agent tools** | Backup / snapshot / restore / sync right from an agent session |
 
@@ -248,6 +248,7 @@ Push / pull your portable config between machines through **either of two channe
 - **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".
 - **Push preview before uploading** — the Push button first shows a read-only preview of what will be sent (sections + per-section counts + changed-vs-baseline markers, first-baseline notice) and only writes the remote after you confirm.
+- **Secrets do not sync by default**: every section goes through the `SecretScanner` (sensitive field values stripped) and the credential section is structurally excluded. With "Export secrets" checked and an encryption password set, `~/.dsh/.credentials.yaml` travels as scrypt + AES-256-GCM ciphertext in a **separate credentials payload** of the encrypted snapshot (never inside any section); the receiving side decrypts it into per-ref "credential migration" items that are written back to the local credential store (`credentials.set`) only after you confirm. The encryption/decryption password is kept in a dedicated local DSH credential slot (`~/.dsh/.credentials.yaml`): it is remembered once "Encrypt backup" is checked (leave the fields empty to reuse it) and cleared when you uncheck it or press "Delete saved password" — never written to sync files, responses, logs or the exported backup, and never sent back to the browser. The decryption password is only ever used when the pulled snapshot is actually encrypted. **Auto sync never carries credentials** (it has no password and skips encrypted snapshots).
 
 ### 🛒 Configuration Marketplace
 
@@ -256,18 +257,27 @@ Browse and install ready-made configurations (model providers, plugins, MCP serv
 - **Built-in official market** — read-only, bound to the official public repo (official badge shown, not editable); first open auto-refreshes, manual refresh also available
 - **Search & filter** — keyword search (matches name / description / author / **categories**), category filter, **section filter** (items already downloaded list their sections; others are excluded with a hint), source filter (Official / Community), sorting (recently updated / most starred / name A–Z), and a ⭐ badge showing the **source repo's** star count (queried anonymously, no token involved)
 - **Impact preview** — the detail view shows "what installing this will change" (items updated / identical / conflicts / secrets to re-enter / DSH restart needed) before you approve anything
-- **Supply-chain warnings always shown** — source repo URL, "not officially reviewed", download time; **per-section approval** — high-risk sections (sessions / arbitrary files) are banned from listing outright, and every remaining section must be explicitly approved before the import is confirmed
+- **Supply-chain warnings always shown** — source repo URL, "not officially reviewed", download time; **per-item content selection** — the selection step lists what each item will change and flags high-risk sections in place (selected by default; unchecking excludes them from the import and the snapshot); high-risk content (sessions / arbitrary files) is still banned from listing outright
 - **Install reuses the safe import pipeline** — analyze → preview → auto-backup → apply → rollback; nothing is written before you confirm
 - **"My Configs"** — sign in with GitHub (device flow), upload a config to **your own public repo** in one click, and an **auto listing PR** is opened against the official market repo; manage your listings (status badges: not listed / PR pending / listed), update in one click, install back locally, or delist (auto de-listing PR)
 
-### 🗂️ Profiles
+### 🗂️ Profiles (= DSH's own profiles)
 
-Save multiple configurations (Work / Personal) and switch anytime; switching includes preview + auto-backup + rollback.
+A "profile" here is DSH's own profile (`$DSH_HOME/profiles/<name>`) — one **plugin stack (bundles) + dependencies + patch layer**,
+launched with `dsh --profile <name>`. This page reads and writes that directory directly instead of keeping its own config snapshots:
 
-- **Save current config** — pick a name and store the current DSH configuration (settings / providers / plugins / skills / agent presets…; no secrets, file sections embedded)
-- **Switch with safety** — preview first (zero writes) → confirm → automatic snapshot → staged apply; any failure rolls back fully
-- **Manage** — rename / delete (confirmed) / import an exported profile.json
-- Library is an independent tab: Settings → "Backup & Migration" → **Profiles**
+| Action | What it does |
+|---|---|
+| List / details | Bundle layers, dependencies, patch entries and size, patchReload, node_modules, mtime; details show the raw `package.json` and `cordis.patch.yml` (redacted before display) |
+| Create | Writes the standard three files under `$DSH_HOME/profiles/<name>` (equivalent to the shipped `initProfile`); starting templates: base / web / headless / sdk / sdk-minimal / acp |
+| Rename | Directory move + fixes the manifest name field; the running profile is refused |
+| Delete | **Hard-deletes the whole directory** (including node_modules); deleting the running profile needs an extra checkbox |
+| Next launch | Only records which profile to use next and shows the `dsh --profile <name>` restart command |
+
+> DSH **cannot switch profiles while running** (the profile comes from the launch flag and bundle layers resolve at boot),
+> so this page never touches processes — it records your choice and asks you to restart.
+> Third-party plugins must be installed into that profile separately (`dsh plugin --profile <name> add <pkg>`).
+> The tab lives at Settings → "Backup & Migration" → **Profiles**.
 
 ### 📸 Snapshot restore (undo an import)
 
@@ -488,6 +498,9 @@ No. A checksum mismatch rejects the import outright (protects against corruption
 **Q: Will re-importing duplicate things?**
 No. Items are deduplicated by stable IDs (plugin ID / MCP name / skill name…); existing items are skipped.
 
+**Q: Why is the console quiet after `dsh web` — how do I get the plugin logs back?**
+By design. Routine progress logs (mount banner, scheduler skips, export/backup completion) are emitted at `info`, and the shipped default level is `warn` — so only warnings and errors reach the terminal. Set `DSH_CONFIG_MANAGER_LOG_LEVEL=info` (or `debug`) before starting DSH to bring the verbose lines back.
+
 **Q: Does importing an encrypted backup require the password?**
 Yes. The import wizard asks for the export-time encryption password and verifies it before the import can proceed; the password is never saved — memory only. A wrong or missing password blocks the import (credentials are restored from the backup instead of being re-entered when the password is correct).
 

package/README.zh-CN.md

@@ -10,10 +10,12 @@ DSH Config Manager 是一个 DeepSeek Harness 配置备份与迁移插件：一
 - MCP Servers
 - Skills
 - Agent Presets
-- Profiles（配置档案）
 - Workspace / AGENTS.md
 
-把当前 DeepSeek Harness 环境导出为可移植备份，在另一台电脑上一键恢复；也支持通过 Git / WebDAV 跨机同步（密钥永不参与同步）；还能通过内置**配置市场**浏览、一键安装社区分享的现成配置。
+> DSH 的 profile（`$DSH_HOME/profiles/<name>`）本身**不随备份迁移**（它是「用哪套插件组合启动」的机器本地选择）；
+> 本插件的「档案」页可以列表 / 新建 / 重命名 / 删除它们，并记录「下次启动用哪个」。
+
+把当前 DeepSeek Harness 环境导出为可移植备份，在另一台电脑上一键恢复；也支持通过 Git / WebDAV 跨机同步（密钥默认不同步，勾选「导出密钥」并加密后可随加密快照迁移）；还能通过内置**配置市场**浏览、一键安装社区分享的现成配置。
 
 [English](README.md) · [简体中文](README.zh-CN.md)
 
@@ -52,7 +54,7 @@ DSH 是你的 AI 助手工作台，里面存着你的各种设置：模型配置
 
 ### 在多台电脑间同步 DSH 配置
 
-通过私有 Git 仓库或 WebDAV 在多台电脑间保持可移植配置同步——密钥永不参与同步。
+通过私有 Git 仓库或 WebDAV 在多台电脑间保持可移植配置同步——密钥默认不参与同步（同步载荷会被 SecretScanner 剥离）；勾选「导出密钥」并设置加密密码后，`~/.dsh/.credentials.yaml` 会以 scrypt + AES-256-GCM 密文随加密快照上行，换机后可随同步写回本机凭据，远端（Git 仓库 / WebDAV 服务商）全程只见密文。
 
 ### 定时自动全量备份
 
@@ -76,10 +78,10 @@ DSH 是你的 AI 助手工作台，里面存着你的各种设置：模型配置
 | 🔒 | **密钥安全** | API Key 默认不导出；非加密导入后提醒重新填写，加密备份用密码解锁恢复 |
 | ↩️ | **自动回滚** | 导入失败自动恢复原样，不会弄坏现有配置 |
 | 📸 | **快照恢复** | 撤销一次导入：整文件还原 + 卸载新增插件（CLI 与 GUI 均支持） |
-| 🔄 | **远程同步** | 通过 **Git 私有仓库或 WebDAV** 推送 / 拉取可移植配置（密钥永不参与同步） |
+| 🔄 | **远程同步** | 通过 **Git 私有仓库或 WebDAV** 推送 / 拉取可移植配置（密钥默认不参与同步；加密快照可选携带密文凭据） |
 | ⏰ | **定时全量备份** | 按固定周期（6h / 12h / 24h / 7d）自动全量备份，一劳永逸，密钥永不包含 |
-| 🛒 | **配置市场** | 浏览并一键安装社区分享的配置——供应链警示 + 逐分区批准 |
-| 🗂️ | **配置档案 Profiles** | 保存多套配置（工作 / 个人），随时切换 |
+| 🛒 | **配置市场** | 浏览并一键安装社区分享的配置——供应链警示 + 逐项内容选择（可就地看到改动与高风险分区） |
+| 🗂️ | **档案 Profiles（DSH profile）** | 直接管理 `$DSH_HOME/profiles/<name>`：列表 / 新建（官方模板）/ 重命名 / 物理删除 / 记录「下次启动用哪个」 |
 | 🧩 | **本地插件随备份迁移** | `link:` / `file:` 安装的本地开发插件会被打包进备份，换机不再丢失 |
 | 🗄️ | **保留策略可配（GFS 分层）** | 「最近 N 份 + 每月留 1 份 + 每年留 1 份」，默认值等价旧行为 |
 | 🤖 | **Agent 工具** | Agent 会话内直接备份 / 快照 / 恢复 / 同步 |
@@ -243,6 +245,7 @@ dsh plugin --profile web add dsh-config-manager@latest
 - **切换通道重新开始**：Git 与 WebDAV 的快照 / 共同祖先**互不共享**。切换通道后，同步从新远端的空基线重新开始——请先推送一个新快照。
 - **WebDAV 认证**采用 HTTP Basic：`username` 存配置、可在界面回显；`password` 则实时从 DSH credentials 槽位 `DSH_CONFIG_MANAGER_SYNC_WEBDAV_PASSWORD` 读取——绝不出现于任何同步文件或日志。
 - **插件自动安装**：拉取差异时，备份里新增的插件会在确认导入时**自动安装**，无需在差异列表里逐项手动勾选；只有**版本冲突**的插件仍需要你决定「保留当前 / 采用备份」。
+- **密钥默认不同步**：同步载荷逐分区过 `SecretScanner`（敏感字段值剥离），凭据分区结构性排除。勾选「导出密钥」并设置加密密码后，`~/.dsh/.credentials.yaml` 以 scrypt + AES-256-GCM 密文作为**独立凭据载荷**随加密快照上行（不放进任何分区）；拉取侧解密后生成逐条「凭据迁移」项，你确认采纳才写回本机凭据（`credentials.set`）。加密/解密密码保存在本机 DSH 凭据库（`~/.dsh/.credentials.yaml` 的独立槽位）：勾选「加密备份」后自动记住（输入框留空即沿用），取消勾选或点「删除已保存密码」即清除 —— 密码绝不写入同步文件、响应、日志或导出备份，也绝不回传浏览器；解密密码只在拉取的快照确实加密时才会被使用。**自动同步恒不含凭据**（无密码可用，遇到加密快照会跳过）。
 
 ### 🛒 配置市场（Marketplace）
 
@@ -250,13 +253,25 @@ dsh plugin --profile web add dsh-config-manager@latest
 
 - **内置官方市场**——只读、绑定官方公开仓库（官方徽章，不可编辑）；首次打开自动刷新，也支持手动拉取最新
 - **搜索与筛选**——关键词搜索、类别过滤、来源筛选（官方 / 个人）、排序（最近更新 / ⭐ 最多 / 名称 A–Z），并显示**来源仓库**的 ⭐ star 数（匿名查询，不触碰任何 token）
-- **供应链警示恒展示**——来源仓库 URL +「未经官方审核」+ 下载时间；**逐分区批准**——高风险分区（历史会话 / 任意文件）直接禁止上架，其余分区确认导入前须逐项显式勾选
+- **供应链警示恒展示**——来源仓库 URL +「未经官方审核」+ 下载时间；**逐项内容选择**——选择页列出每个单元「本次将改动什么」并就地标出高风险分区（默认勾选，取消勾选即不导入、也不进快照）；历史会话 / 任意文件类高风险内容仍直接禁止上架
 - **安装复用安全导入管道**——分析 → 预览 → 自动备份 → 执行 → 回滚；确认前零写入
 - **「我的配置」**——GitHub 登录（device flow）后一键上传到**你自己的公开仓库**，并自动向官方市场仓库提交**收录 PR**；管理已上传条目（收录状态徽章：未收录 / PR 待审核 / 已收录）、一键更新、装回本地、删除（自动下架 PR）
 
-### 🗂️ 配置档案（Profiles）
+### 🗂️ 档案（Profiles = DSH 自带 profile）
+
+「档案」就是 DSH 自己的 profile（`$DSH_HOME/profiles/<name>`）——一套**插件组合（bundles）+ 依赖 + patch 层**，
+用 `dsh --profile <name>` 启动。本页直接读写这个目录，不再自建一套「配置快照」：
+
+| 动作 | 说明 |
+|---|---|
+| 列表 / 详情 | bundles 层、依赖、patch 条目与体积、patchReload、node_modules、更新时间；详情可看 `package.json` 与 `cordis.patch.yml` 原文（展示前脱敏） |
+| 新建 | 在 `$DSH_HOME/profiles/<name>` 写标准三件套（与官方 `initProfile` 等价）；可选起步模板 base / web / headless / sdk / sdk-minimal / acp |
+| 重命名 | 目录级移动 + 同步修正 `package.json` 的 name；当前运行中的档案拒绝重命名 |
+| 删除 | **物理删除整个目录**（含 node_modules）；当前运行中的档案需额外勾选确认 |
+| 下次启动 | 只写「下次启动用哪个」标记 + 给出 `dsh --profile <name>` 重启命令 |
 
-保存多套配置（如「工作」「个人」），随时切换；切换同样带预览 + 自动备份 + 回滚。
+> DSH **无法在运行中切换 profile**（profile 由启动参数决定，bundle 层在启动时解析），因此本页不做进程操作，
+> 只记录选择并提示你手动重启。第三方插件需要在该档案里单独安装（`dsh plugin --profile <name> add <pkg>`）。
 
 ### 📸 快照恢复（撤销一次导入）
 
@@ -424,6 +439,9 @@ dsh-config-manager backup --sections skills,self          # 收窄范围
 **Q：加密备份导入时需要密码吗？**
 需要。导入向导会要求输入导出时设置的加密密码并验证通过后才能继续执行；密码仅存于内存、绝不保存。密码错误或缺失都会阻止导入（密码正确时凭据直接从备份解密恢复，无需重新填写）。
 
+**Q：`dsh web` 启动后控制台为什么安静了？想恢复日志怎么办？**
+这是刻意的。常规进度日志（挂载横幅、调度器跳过、导出/备份完成）是 `info` 级别，而插件出厂默认级别为 `warn`——所以控制台只剩警告与错误。启动 DSH 前设 `DSH_CONFIG_MANAGER_LOG_LEVEL=info`（或 `debug`）即可恢复逐条输出。
+
 ---
 
 ## 📋 已知限制（用户须知）

package/lib/adapters/file-collection.d.ts

@@ -1,6 +1,6 @@
 import type { MsgFunc } from '../core/messages.ts';
 import type { FilesSection, SectionId } from '../schema/types.ts';
-import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, Portability, ValidationResult } from '../core/types.ts';
+import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, ExportUnit, HostContext, ImportContext, PlanItem, Portability, ValidationResult } from '../core/types.ts';
 export declare abstract class FileCollectionAdapter implements ConfigAdapter<FilesSection> {
     abstract readonly id: SectionId;
     abstract readonly displayName: string;
@@ -8,7 +8,36 @@ export declare abstract class FileCollectionAdapter implements ConfigAdapter<Fil
     abstract readonly portability: Portability;
     /** 相对 homeDir 的基准目录（与 core/backup.ts FILE_BASES 一致） */
     abstract readonly baseDir: string;
-    export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<FilesSection>>;
+    /**
+     * 最小可拆单元的 id（相对 baseDir 的路径）。
+     *
+     * 缺省 = **首个路径段** —— 目录 bundle 整体成一个单元，这是技能/会话/预设的正确粒度
+     * （拆开即失效）。平铺文件即自身。pluginFiles / self 覆写为「整条相对路径」：
+     * 它们的白名单文件彼此独立，不构成 bundle。
+     */
+    protected unitIdOf(relativePath: string): string;
+    /** 清单里的路径 → 相对 baseDir 的路径（baseDir 为空表示整目录即根）。 */
+    protected relPathOf(rel: string): string;
+    /**
+     * 条目级选择（Phase 1）：只导出白名单命中的单元。
+     *
+     * 过滤发生在 readFile **之前** —— 未勾选的文件不读盘，大分区（sessions）取消勾选后
+     * 导出耗时应显著下降。allow === undefined（键缺省）= 全量，与改造前完全一致。
+     */
+    /**
+     * 单元级预筛选钩子（缺省 null = 不筛选）。
+     *
+     * 子类可据 `options` 与清单计算「允许导出的单元」子集（如 sessions 的「最新 N 个」，
+     * 见 core/session-select.ts）；`keep: null` = 本次不施加单元级筛选（但仍可带告警）。
+     * 在 readFile **之前**执行：未入选的文件不读盘。
+     */
+    protected restrictUnits(_ctx: HostContext, _rels: readonly string[], _options: ExportOptions): Promise<{
+        keep: Set<string> | null;
+        warnings: string[];
+    } | null>;
+    export(ctx: HostContext, options: ExportOptions): Promise<ExportSection<FilesSection>>;
+    /** 单元清单（零 I/O：直接由 export 产物归并）。 */
+    listUnits(section: ExportSection<FilesSection>): ExportUnit[];
     analyzeImport(data: FilesSection, ctx: ImportContext): Promise<PlanItem[]>;
     applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;
     validate(data: FilesSection, msg?: MsgFunc): Promise<ValidationResult>;

package/lib/adapters/file-collection.js

@@ -12,10 +12,45 @@ import { sha256Hex } from '../utils/hashing.js';
 import { isReservedInternalRel, normalizePath } from '../utils/paths.js';
 import { msgOf, zhMsg } from '../core/messages.js';
 import { linkWarnings, listFilesDetailed } from './link-report.js';
+import { defaultUnitId, unitAllowed, unitsFromFiles } from './units.js';
 export class FileCollectionAdapter {
-    async export(ctx, _options) {
+    /**
+     * 最小可拆单元的 id（相对 baseDir 的路径）。
+     *
+     * 缺省 = **首个路径段** —— 目录 bundle 整体成一个单元，这是技能/会话/预设的正确粒度
+     * （拆开即失效）。平铺文件即自身。pluginFiles / self 覆写为「整条相对路径」：
+     * 它们的白名单文件彼此独立，不构成 bundle。
+     */
+    unitIdOf(relativePath) {
+        return defaultUnitId(relativePath);
+    }
+    /** 清单里的路径 → 相对 baseDir 的路径（baseDir 为空表示整目录即根）。 */
+    relPathOf(rel) {
+        if (this.baseDir === '')
+            return rel;
+        const prefix = this.baseDir.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        return rel.replace(new RegExp('^' + prefix + '[\\\\/]'), '');
+    }
+    /**
+     * 条目级选择（Phase 1）：只导出白名单命中的单元。
+     *
+     * 过滤发生在 readFile **之前** —— 未勾选的文件不读盘，大分区（sessions）取消勾选后
+     * 导出耗时应显著下降。allow === undefined（键缺省）= 全量，与改造前完全一致。
+     */
+    /**
+     * 单元级预筛选钩子（缺省 null = 不筛选）。
+     *
+     * 子类可据 `options` 与清单计算「允许导出的单元」子集（如 sessions 的「最新 N 个」，
+     * 见 core/session-select.ts）；`keep: null` = 本次不施加单元级筛选（但仍可带告警）。
+     * 在 readFile **之前**执行：未入选的文件不读盘。
+     */
+    async restrictUnits(_ctx, _rels, _options) {
+        return null;
+    }
+    async export(ctx, options) {
         const files = [];
         const warnings = [];
+        const allow = options.includeItems?.[this.id];
         // issue #37：用「跟随 junction/符号链接」的遍历，并把跟随/跳过的链接写进告警——
         // 此前链接目录及其全部内容被静默排除，备份仍报成功。
         let listing = { paths: [], skippedLinks: [], followedLinks: 0, unreadableDirs: [] };
@@ -26,9 +61,19 @@ export class FileCollectionAdapter {
             // 目录不存在视为空
         }
         const rels = listing.paths;
+        // 单元级预筛选（issue #39 Feature 1：sessions 的「最新 N 个」）
+        const restricted = await this.restrictUnits(ctx, rels, options);
+        if (restricted !== null)
+            warnings.push(...restricted.warnings);
+        const keep = restricted?.keep ?? null;
         for (const rel of rels) {
+            const relPath = this.relPathOf(rel);
+            const unitId = this.unitIdOf(relPath);
+            if (keep !== null && !keep.has(unitId))
+                continue;
+            if (!unitAllowed(allow, `${this.id}:${unitId}`))
+                continue;
             const data = await ctx.fs.readFile(rel);
-            const relPath = this.baseDir === '' ? rel : rel.replace(new RegExp(`^${escapeRegExp(this.baseDir)}[\\/]`), '');
             files.push({ relativePath: relPath, data, contentHash: sha256Hex(data) });
         }
         if (rels.length === 0)
@@ -41,17 +86,24 @@ export class FileCollectionAdapter {
             warnings,
         };
     }
+    /** 单元清单（零 I/O：直接由 export 产物归并）。 */
+    listUnits(section) {
+        return unitsFromFiles(this.id, section.data.files, (rel) => this.unitIdOf(rel));
+    }
     async analyzeImport(data, ctx) {
         const msg = ctx.msg;
         const items = [];
         for (const file of data.files) {
             const id = `${this.id}:${file.relativePath}`;
+            // Phase 2：声明最小可拆单元（与 listUnits 同一套 unitIdOf 规则）。
+            // 计划项是逐文件的，但选择器要按「一个技能 bundle / 一次会话」勾选，两端因此对齐。
+            const unitId = `${this.id}:${this.unitIdOf(file.relativePath)}`;
             // F23 修复：不可信 import 不得写内部 control-plane namespace。
             // 检查 baseDir+ref 解析后的 homeDir 相对路径（self 适配器 baseDir='dsh-config-manager' 是主投毒向量）。
             const resolvedRel = normalizePath(path.join(this.baseDir, file.relativePath));
             if (isReservedInternalRel(resolvedRel)) {
                 items.push({
-                    id, kind: 'Error', adapter: this.id,
+                    id, unitId, kind: 'Error', adapter: this.id,
                     description: msg('adapter.fileReserved', { path: file.relativePath }), severity: 'error',
                 });
                 continue;
@@ -65,17 +117,17 @@ export class FileCollectionAdapter {
             }
             if (current === null) {
                 items.push({
-                    id, kind: 'Create', adapter: this.id,
+                    id, unitId, kind: 'Create', adapter: this.id,
                     description: msg('adapter.fileCreate', { type: this.displayName, path: file.relativePath }), severity: 'info',
                     target: { adapter: this.id, ref: file.relativePath },
                 });
             }
             else if (sha256Hex(current) === file.contentHash) {
-                items.push({ id, kind: 'Skip', adapter: this.id, description: msg('adapter.fileSame', { path: file.relativePath }), severity: 'info' });
+                items.push({ id, unitId, kind: 'Skip', adapter: this.id, description: msg('adapter.fileSame', { path: file.relativePath }), severity: 'info' });
             }
             else {
                 items.push({
-                    id, kind: 'Conflict', adapter: this.id,
+                    id, unitId, kind: 'Conflict', adapter: this.id,
                     description: msg('adapter.fileDiff', { path: file.relativePath }), severity: 'warning',
                     target: { adapter: this.id, ref: file.relativePath },
                 });
@@ -121,7 +173,4 @@ export class FileCollectionAdapter {
         return { valid: issues.filter((i) => i.severity === 'error').length === 0, issues };
     }
 }
-function escapeRegExp(s) {
-    return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
 //# sourceMappingURL=file-collection.js.map

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

@@ -1,6 +1,6 @@
 import type { MsgFunc } from '../core/messages.ts';
 import type { FilesSection } from '../schema/types.ts';
-import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
+import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, ExportUnit, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
 export declare const DEFAULT_PLUGIN_FILE_WHITELIST: readonly string[];
 export declare class PluginFilesAdapter implements ConfigAdapter<FilesSection> {
     readonly id: 'pluginFiles';
@@ -11,7 +11,9 @@ export declare class PluginFilesAdapter implements ConfigAdapter<FilesSection> {
     /** 约定配置目录（相对 ~/.dsh 根，如 'plugin-config'）；递归收集其下所有文件。undefined = 不收集。 */
     private readonly collectDir?;
     constructor(whitelist?: string[], collectDir?: string);
-    export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<FilesSection>>;
+    export(ctx: HostContext, options: ExportOptions): Promise<ExportSection<FilesSection>>;
+    /** 单元清单（零 I/O）：逐文件单元，id 与导入侧 `pluginFiles:<relPath>` 一致。 */
+    listUnits(section: ExportSection<FilesSection>): ExportUnit[];
     analyzeImport(data: FilesSection, ctx: ImportContext): Promise<PlanItem[]>;
     applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;
     validate(data: FilesSection, msg?: MsgFunc): Promise<ValidationResult>;

package/lib/adapters/plugin-files.js

@@ -10,6 +10,7 @@ import { sha256Hex } from '../utils/hashing.js';
 import { msgOf, zhMsg } from '../core/messages.js';
 import { linkWarnings, listFilesDetailed } from './link-report.js';
 import { isPathSafe, isReservedInternalRel } from '../utils/paths.js';
+import { unitAllowed, unitsFromFiles } from './units.js';
 export const DEFAULT_PLUGIN_FILE_WHITELIST = ['dsh-ssh.json', 'pet.json'];
 export class PluginFilesAdapter {
     id = 'pluginFiles';
@@ -26,11 +27,16 @@ export class PluginFilesAdapter {
         }
         this.collectDir = collectDir === '' ? undefined : collectDir;
     }
-    async export(ctx, _options) {
+    async export(ctx, options) {
         const files = [];
         const seen = new Set();
+        // Phase 1 条目级选择：**逐文件单元** —— 每个插件配置文件彼此独立，
+        // 不像技能/会话那样构成 bundle（collectDir 下每个文件可单独带走）。
+        const allow = options.includeItems?.[this.id];
         // 1) 白名单固定文件（不存在则跳过，dsh-ssh.json 等为按需创建）
         for (const rel of this.whitelist) {
+            if (!unitAllowed(allow, `${this.id}:${rel}`))
+                continue;
             try {
                 const data = await ctx.fs.readFile(rel);
                 files.push({ relativePath: rel, data, contentHash: sha256Hex(data) });
@@ -54,6 +60,8 @@ export class PluginFilesAdapter {
             for (const rel of rels) {
                 if (seen.has(rel))
                     continue;
+                if (!unitAllowed(allow, `${this.id}:${rel}`))
+                    continue;
                 try {
                     const data = await ctx.fs.readFile(rel);
                     files.push({ relativePath: rel, data, contentHash: sha256Hex(data) });
@@ -70,6 +78,10 @@ export class PluginFilesAdapter {
             warnings: linkWarnings(msgOf(ctx), this.displayName, listing),
         };
     }
+    /** 单元清单（零 I/O）：逐文件单元，id 与导入侧 `pluginFiles:<relPath>` 一致。 */
+    listUnits(section) {
+        return unitsFromFiles(this.id, section.data.files, (rel) => rel);
+    }
     async analyzeImport(data, ctx) {
         const msg = ctx.msg;
         const items = [];

package/lib/adapters/plugins.d.ts

@@ -1,7 +1,7 @@
 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';
+import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, ExportUnit, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
 export declare const USER_PATCH_FILE = "cordis.patch.yml";
 /**
  * 本地源插件打包钩子（由宿主注入，见 src/index.ts createAdapters）。
@@ -28,7 +28,16 @@ export declare class PluginsAdapter implements ConfigAdapter<PluginsSection> {
     /** T1：本地源（link:/file:）插件打包钩子；未注入 = 不打包（保持改造前行为） */
     private readonly localPack;
     constructor(selfName?: string, localPack?: LocalPluginPackHook);
-    export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<PluginsSection>>;
+    export(ctx: HostContext, options: ExportOptions): Promise<ExportSection<PluginsSection>>;
+    /**
+     * 单元清单（Phase 1；零 I/O：直接由 export 产物派生）。
+     *
+     * 单元 = 插件包 / cordis 补丁行 / pnpm-workspace.yaml / 单个 patch 文件。
+     * 后两者构成**原子组**：patchedDependencies 的声明与 patches/** 文件必须同进同出
+     * （issue #35 —— 只搬声明会让目标机 pnpm 拒绝一切 add），故互相写进 lockedWith，
+     * 由选择模型保证勾选/取消同步。
+     */
+    listUnits(section: ExportSection<PluginsSection>): ExportUnit[];
     /**
      * 导入后目标机**可能**存在的 patch 文件集合（相对 profile 目录）——issue #35。
      * = 备份携带的 patchFiles ∪ 目标机本来就有的文件。只用于判定「声明能否被满足」，

package/lib/adapters/plugins.js

@@ -119,7 +119,7 @@ export class PluginsAdapter {
         this.selfName = selfName;
         this.localPack = localPack;
     }
-    async export(ctx, _options) {
+    async export(ctx, options) {
         const plugins = [];
         const warnings = [];
         try {
@@ -228,25 +228,97 @@ export class PluginsAdapter {
                 warnings.push(msgOf(ctx)('adapter.localPackFailed', { reason: err instanceof Error ? err.message : String(err) }));
             }
         }
+        // Phase 1 条目级选择：只保留白名单命中的单元。键缺省 = 全量（与改造前逐字节一致）；
+        // 空数组由 Exporter 在选定阶段整分区剔除，不会走到这里。
+        const allow = options.includeItems?.[this.id];
+        let keptPlugins = effectivePlugins;
+        let keptPatch = patch;
+        let keptWorkspace = pnpmWorkspace;
+        let keptPatchFiles = patchFiles;
+        let keptTarballs = localTarballs;
+        if (allow !== undefined) {
+            // 原子组（D5 / issue #35）：pnpm-workspace.yaml ↔ patch 文件必须同进同出 ——
+            // 声明在而文件不在会让目标机 pnpm 拒绝一切 add；文件在而声明不在则补丁静默失效。
+            // 这里用 every（全或无）做纵深防御：即使 UI 的 lockedWith 没生效也不会产出半套。
+            const wsId = 'plugins:pnpm-workspace';
+            const pfIds = (patchFiles ?? []).map((pf) => `plugins:patch:${normalizePath(pf.relativePath)}`);
+            const groupKept = [wsId, ...pfIds].every((id) => allow.includes(id));
+            keptWorkspace = groupKept ? pnpmWorkspace : null;
+            keptPatchFiles = groupKept ? patchFiles : undefined;
+            keptPlugins = effectivePlugins.filter((pl) => allow.includes(`plugin:${pl.name}`));
+            keptPatch = patch.filter((pl) => allow.includes(`patch:${pl.lineId}`));
+            // tarball 只跟随存活的插件（本地源插件的打包产物不得被孤立带走）
+            const alive = new Set(keptPlugins.map((pl) => pl.name));
+            keptTarballs = localTarballs?.filter((t) => alive.has(t.packageName));
+        }
         return {
             sectionId: 'plugins',
             data: {
                 version: 1,
-                plugins: effectivePlugins,
-                patch,
-                pnpmWorkspace,
-                ...(localTarballs !== undefined ? { localTarballs } : {}),
-                ...(patchFiles !== undefined ? { patchFiles } : {}),
+                plugins: keptPlugins,
+                patch: keptPatch,
+                pnpmWorkspace: keptWorkspace,
+                ...(keptTarballs !== undefined ? { localTarballs: keptTarballs } : {}),
+                ...(keptPatchFiles !== undefined ? { patchFiles: keptPatchFiles } : {}),
             },
             counts: {
-                plugins: effectivePlugins.length,
-                patchLines: patch.length,
-                ...(localTarballs !== undefined ? { localTarballs: localTarballs.length } : {}),
-                ...(patchFiles !== undefined ? { patchFiles: patchFiles.length } : {}),
+                plugins: keptPlugins.length,
+                patchLines: keptPatch.length,
+                ...(keptTarballs !== undefined ? { localTarballs: keptTarballs.length } : {}),
+                ...(keptPatchFiles !== undefined ? { patchFiles: keptPatchFiles.length } : {}),
             },
             warnings,
         };
     }
+    /**
+     * 单元清单（Phase 1；零 I/O：直接由 export 产物派生）。
+     *
+     * 单元 = 插件包 / cordis 补丁行 / pnpm-workspace.yaml / 单个 patch 文件。
+     * 后两者构成**原子组**：patchedDependencies 的声明与 patches/** 文件必须同进同出
+     * （issue #35 —— 只搬声明会让目标机 pnpm 拒绝一切 add），故互相写进 lockedWith，
+     * 由选择模型保证勾选/取消同步。
+     */
+    listUnits(section) {
+        const data = section.data;
+        const wsId = 'plugins:pnpm-workspace';
+        const patchFileIds = (data.patchFiles ?? []).map((pf) => `plugins:patch:${normalizePath(pf.relativePath)}`);
+        const group = [wsId, ...patchFileIds];
+        const units = [];
+        for (const pl of data.plugins) {
+            const tarball = (data.localTarballs ?? []).find((t) => t.packageName === pl.name);
+            units.push({
+                id: `plugin:${pl.name}`,
+                label: pl.name,
+                detail: pl.version,
+                // base64 长度 → 原始字节数（仅用于展示体积，不求精确）
+                sizeBytes: tarball !== undefined ? Math.floor((tarball.base64.length * 3) / 4) : 0,
+                ...(tarball !== undefined ? { fileCount: 1 } : {}),
+            });
+        }
+        for (const line of data.patch) {
+            // 由 mcp / prompts adapter 管理的行不属本分区（applyItem 同样跳过），列出来只会误导用户
+            if (isManagedElsewhere(line.raw))
+                continue;
+            units.push({ id: `patch:${line.lineId}`, label: line.lineId, sizeBytes: 0 });
+        }
+        if (data.pnpmWorkspace !== undefined && data.pnpmWorkspace !== null && data.pnpmWorkspace !== '') {
+            units.push({
+                id: wsId,
+                label: 'pnpm-workspace.yaml',
+                sizeBytes: data.pnpmWorkspace.length,
+                ...(group.length > 1 ? { lockedWith: group } : {}),
+            });
+        }
+        for (const pf of data.patchFiles ?? []) {
+            units.push({
+                id: `plugins:patch:${normalizePath(pf.relativePath)}`,
+                label: pf.relativePath,
+                sizeBytes: Math.floor((pf.base64.length * 3) / 4),
+                ...(group.length > 1 ? { lockedWith: group } : {}),
+            });
+        }
+        return units;
+    }
     /**
      * 导入后目标机**可能**存在的 patch 文件集合（相对 profile 目录）——issue #35。
      * = 备份携带的 patchFiles ∪ 目标机本来就有的文件。只用于判定「声明能否被满足」，

package/lib/adapters/self.d.ts

@@ -13,5 +13,8 @@ export declare class SelfAdapter extends FileCollectionAdapter {
     constructor(baseDir?: string);
     /** 白名单收集：只导出配置类文件（存在才收），不递归（排除快照/历史/缓存/临时产物）。
      *  relativePath 产出相对 baseDir 的路径（与 analyzeImport/applyItem 的 path.join(baseDir, ref) 匹配）。 */
-    export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<FilesSection>>;
+    /** self 的白名单文件彼此独立（同步配置 / 市场配置 / UI 偏好…），不构成 bundle
+     *  → 覆写为「逐文件单元」，用户可以只带走其中几项。 */
+    protected unitIdOf(relativePath: string): string;
+    export(ctx: HostContext, options: ExportOptions): Promise<ExportSection<FilesSection>>;
 }

package/lib/adapters/self.js

@@ -25,6 +25,7 @@ import path from 'node:path';
 import { msgOf } from '../core/messages.js';
 import { sha256Hex } from '../utils/hashing.js';
 import { FileCollectionAdapter } from './file-collection.js';
+import { unitAllowed } from './units.js';
 /** self 分区白名单文件（相对 baseDir，即 $DSH_HOME/dsh-config-manager/）。 */
 export const SELF_CONFIG_FILES = [
     'sync/sync-config.json',
@@ -50,10 +51,18 @@ export class SelfAdapter extends FileCollectionAdapter {
     }
     /** 白名单收集：只导出配置类文件（存在才收），不递归（排除快照/历史/缓存/临时产物）。
      *  relativePath 产出相对 baseDir 的路径（与 analyzeImport/applyItem 的 path.join(baseDir, ref) 匹配）。 */
-    async export(ctx, _options) {
+    /** self 的白名单文件彼此独立（同步配置 / 市场配置 / UI 偏好…），不构成 bundle
+     *  → 覆写为「逐文件单元」，用户可以只带走其中几项。 */
+    unitIdOf(relativePath) {
+        return relativePath;
+    }
+    async export(ctx, options) {
         const files = [];
         const warnings = [];
+        const allow = options.includeItems?.[this.id];
         for (const rel of SELF_CONFIG_FILES) {
+            if (!unitAllowed(allow, `${this.id}:${this.unitIdOf(rel)}`))
+                continue;
             // ctx.fs.readFile 语义 = 相对 homeDir 的完整路径 → 拼接 baseDir；产出仍为相对 baseDir
             const data = await ctx.fs.readFile(path.join(this.baseDir, rel)).catch(() => null);
             if (data === null)