dsh-config-manager 0.1.69 → 0.1.70

package/README.md

@@ -19,6 +19,7 @@ Backup, restore, export, import, migrate and sync your complete DeepSeek Harness
 - 🔐 Encrypted backups with optional credentials
 - ☁️ **Git / WebDAV** configuration sync
 - 🛒 **Configuration market** — browse & one-click install shared configs
+- 🧳 **Import from other AI agents** — Claude Code, Cursor, Codex, Hermes, Antigravity … config **and chat history**
 - ↩️ Automatic snapshot and rollback before restore
 
 [English](README.md) · [简体中文](README.zh-CN.md)
@@ -46,7 +47,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 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.)
+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** part of the backup; the **Profiles** page manages them instead — list / create / rename / delete, plus launching or stopping an independent instance for one.)
 
 ### Restore DeepSeek Harness on another machine
 
@@ -68,6 +69,10 @@ Turn on scheduled backups (6h / 12h / 24h / 7d — or a **custom weekly weekday
 
 Browse the built-in official market for ready-made configurations (model providers, plugins, MCP servers, skills, agent presets…), preview what would be imported (dry-run), and install with one click — supply-chain warnings are always shown and every section must be explicitly approved before anything is written.
 
+### Import from another AI agent (Claude Code, Cursor, Codex, …)
+
+Your setup — and your chat history — already live in another AI coding agent on this machine? Pick the source and DSH Config Manager **translates it into a standard bundle** (MCP servers, skills, global instructions, conversations and the workspaces they belong to) and hands it to the same review-first import flow: preview → per-item conflict decisions → automatic snapshot → apply → rollback. 30 sources are recognized and 29 of them can migrate **chat history** too. Secret **values** are never read — only the key names, so the import plan can ask you to re-enter them.
+
 ---
 
 ## 🆚 How it differs from the other DSH backup / sync plugins
@@ -77,7 +82,7 @@ Several DSH plugins live in this space and they solve different problems — pic
 | Plugin | Strongest at | Where DSH Config Manager goes further |
 |---|---|---|
 | [xiaoyuyu6420/dsh-backup](https://github.com/xiaoyuyu6420/dsh-backup) | One-command `~/.dsh` snapshots from the CLI, plus session doctor / upgrade snapshots / rescue console | Review-before-write GUI flow (dry-run preview, per-item conflict decisions, automatic rollback), cross-machine path remapping, encrypted credential payload, configuration marketplace |
-| [muyifc/dsh-config-sync](https://github.com/muyifc/dsh-config-sync) | Export / import DSH configuration to a portable, password-encrypted file, callable from tool calls | 13–14 sections incl. plugins / MCP / skills / profiles / workspaces, scheduled backups, Git + WebDAV sync per channel, session migration with path rebase |
+| [muyifc/dsh-config-sync](https://github.com/muyifc/dsh-config-sync) | Export / import DSH configuration to a portable, password-encrypted file, callable from tool calls | 13–14 sections (plugins / MCP / skills / workspaces / session logs …), scheduled backups, Git + WebDAV sync per channel, session migration with path rebase |
 | [dickpy/dsh-cloud-sync](https://github.com/dickpy/dsh-cloud-sync) · [weibaohui/dsh-sync](https://github.com/weibaohui/dsh-sync) | Keeping machines consistent through WebDAV / S3 or a private Git mirror | Sync is one of five capabilities here — alongside export/import, scheduling, marketplace and profile instance launch/stop |
 | `cp -r ~/.dsh` (or Git on the home dir) | Free, zero setup, fine for a purely textual config | No secret handling, no path remapping, no capture of `link:` / `file:` plugin installs, no session-log work, no conflict handling or rollback |
 
@@ -102,10 +107,13 @@ Several DSH plugins live in this space and they solve different problems — pic
 | 🛒 | **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 / **launch this profile (independent instance)** / **stop the instance** (the row button flips between Launch and Stop with the running state) |
 | 🌐 | **Bilingual UI** | Interface, reports and error details follow the DSH app language (中文 / English) |
+| 🧩 | **Local plugin migration** | `link:` / `file:` development plugins are packed into the backup, so switching machines does not lose them |
+| 🗄️ | **Configurable retention (GFS tiers)** | "keep the last N + one per month + one per year" — the defaults are equivalent to the previous behaviour |
 | 🤖 | **Agent tools** | Backup / snapshot / restore / sync right from an agent session |
 | 💾 | **Disk usage report** | The backups page shows how much space the plugin's own artifacts take (backups / snapshots / sync copies / caches / staging) with a three-tier cleanup policy; **one-click cleanup only touches regenerable caches and expired backups** — snapshots and sync data are never removed there |
-| ⬆️ | **Update check** | The About page reads the latest version from npm and, when there is a newer one, hands you a copyable upgrade command (never auto-installs); offline failures are reported honestly and affect nothing else |
+| ⬆️ | **Update check** | The About page reads the latest version from npm (read-only, cached 10 minutes); when there is a newer one it offers a copyable upgrade command **and** a one-click **Update now** that installs exactly that version — DSH must then be restarted, and the plugin never restarts it for you. Offline failures are reported honestly and affect nothing else |
 | 🧭 | **Compatibility explained** | Before importing you see "source DSH version / platform → local" plus **structured reasons** for the score (cross-platform / missing sections / newer source …) instead of a bare "partial" |
+| 🧳 | **Import from other AI agents** | Read Claude Code / Cursor / Codex / Hermes / Antigravity … configuration **and chat history** on this machine, translate it into a standard bundle, then import through the usual preview / conflict / rollback flow |
 
 ---
 
@@ -307,6 +315,17 @@ When the target already has a same-named item, you choose:
 2. Lets you pick new paths
 3. Supports **batch prefix mapping** (`C:\Users\alice\` → `/Users/bob/` in one shot)
 
+### 🧳 Import from other AI agents (config + chat history)
+
+You do not have to rebuild another agent's setup by hand.
+
+- **30 sources recognized** — Claude Code, Hermes, Cursor, Codex, Antigravity, Gemini, OpenCode, Mimocode, ZCode, Grok Build, OpenClaw, Pi, Kimi, Kilocode, Qoder, ChatGPT, WorkBuddy, Qwen, Continue, Cline, Goose, Zed, Crush, TeleAgent, Trae, Vibe, Reasonix, Copilot, and DSH itself (importing from another DSH home — its v3 and v4 logs count as two ids). Sources **not** installed on this machine are still listed (greyed out, not selectable), so "this machine has no such tool" is never mistaken for "the feature is missing".
+- **Translation, not a second import path** — the source is converted into a standard bundle v1 ZIP and handed to the **existing** import wizard: same preview, same per-item conflict decisions, same pre-import snapshot and rollback, same dry-run.
+- **What travels** — MCP servers, skills, global instructions (as `AGENTS.md`), and **chat history together with the workspaces those conversations belong to** (29 sources; conversations are re-encoded into DSH's session-log format and placed by their recorded `cwd`).
+- **What does not** — secret **values** are never read: only the key names are recorded so the plan can ask you to re-enter them. Structures DSH has no equivalent for (Claude Code hooks, slash commands, …) are reported as explicit codes rather than silently dropped.
+- **Honest skips** — a conversation with no recorded `cwd` cannot be placed and is reported as skipped (never guessed into some other project); known lossy items are listed **before** the import runs.
+- **Entry points** — Settings → "Backup & Migration" → Import → **"Import from another agent"**, the ⌘K command, or the CLI: `dcm import --from <source> [--dry-run] [--out <path>]`.
+
 ### 🔒 Secrets
 
 | Scenario | Behavior |
@@ -325,7 +344,7 @@ Push / pull your portable config between machines through **either of two channe
 | **Endpoint** | `repoUrl` | `webdav.url` |
 | **Credentials** | auth token in DSH credentials (`DSH_CONFIG_MANAGER_SYNC_TOKEN`) | `username` stored in the config (echoed in the UI); **password never synced / never logged** — DSH credentials `DSH_CONFIG_MANAGER_SYNC_WEBDAV_PASSWORD` |
 
-- **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.
+- **Remote retention follows your backup schedule**: both channels keep the same policy as local backups — by default the newest **10** snapshots, plus optional "one per month / one per year" tiers — and the snapshot you just pushed is always kept; 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".
@@ -419,22 +438,40 @@ npm install -g dsh-config-manager@latest --omit=peer
 
 > ⚠️ Installing/updating the plugin (`dsh plugin --profile web add ...`) only enables the GUI — it does **not** create the `dsh-config-manager` command. Run the install command above, then any of the commands below.
 
-All commands (also shown by `dsh-config-manager help`):
+All commands (also shown by `dsh-config-manager help`, which groups them by risk; `dsh-config-manager <command> --help` prints one command's options, exit codes and examples):
 
 ```text
-dsh-config-manager help                                        # list all commands & options
+# Rescue console (local web page — the least typing)
+dsh-config-manager web [--port <n>] [--no-open] [--home <dir>]
+                       [--data-root <dir>] [--idle-timeout <min>]
+
+# Inspect (never touches your config)
 dsh-config-manager snapshots [--data-dir <dir>]                # list snapshots (newest first)
-dsh-config-manager restore [--id <id>] [--dry-run]
-                           [--profile <name>] [--settings <path>]
-dsh-config-manager reinstall [--version <v>] [--yes] [--list]
-                             [--wipe-config] [--dry-run]       # one-click reinstall of DSH itself
-dsh-config-manager recover-stale-lock [--data-dir <dir>]       # clear a leftover lock (see below)
-dsh-config-manager verify [--id <file|path>] [--json]         # read-only check of backup ZIPs
-                          [--data-dir <dir>]
-dsh-config-manager backup [--sections <a,b,c>] [--out <path>] # offline file-level backup
+dsh-config-manager verify [<file|path>] [--json]               # read-only check of backup ZIPs
+                           [--data-dir <dir>]
+dsh-config-manager sessions list   [--home <dir>] [--json]     # list local sessions
+dsh-config-manager sessions doctor [--home <dir>] [--json]     # health check + advice
+
+# Backup & migrate (only writes new files)
+dsh-config-manager backup [--sections <a,b,c>] [--out <path>]  # offline file-level backup
                           [--dry-run] [--data-dir <dir>]
-dsh-config-manager sessions repair [--home <dir>] [--fix]     # offline session layout repair
+dsh-config-manager import --from <source> [--dry-run]          # foreign agent config → bundle ZIP
+                           [--out <path>] [--cwd <dir>] [--data-dir <dir>]
+
+# Repair (writes to this machine — preview with --dry-run first)
+dsh-config-manager restore [--id <id>] [--dry-run]             # roll back to a pre-import snapshot
+                           [--data-dir <dir>] [--data-root <dir>]
+                           [--profile <name>] [--settings <path>]
+dsh-config-manager sessions repair [--home <dir>] [--fix]      # offline session layout repair
                                    [--keep <dir>] [--map old=new]...
+dsh-config-manager recover-stale-lock [--data-dir <dir>]       # clear a leftover lock (see below)
+
+# Dangerous (changes your DSH install / may wipe data)
+dsh-config-manager reinstall [--version <v>] [--yes] [--list]
+                             [--wipe-config] [--dry-run] [--data-root <dir>]
+
+# Help
+dsh-config-manager help [command]                              # overview / one command's detail
 ```
 
 **`reinstall` — rescue when DSH is broken.** It reinstalls the `@deepseek-ai/dsh` launcher across platforms (uses the right command per OS: PowerShell on Windows, bash on Unix). By default it reinstalls the launcher + clears global caches; interactively it asks which **dangerous** clean-up items to include (settings / plugins / session data & credentials) — those are **not** selected by default, and any destructive choice requires a second confirmation by typing `YES` before anything runs. Before wiping any `~/.dsh` data it makes an emergency backup at `.reinstall-backup` (the `snapshots/` folder is deliberately never touched).
@@ -489,6 +526,8 @@ dsh-config-manager verify C:/backups/dsh-config.zip   # ...or by path
 
 **Credential files never enter a backup.** `.credentials.*`, `.env`, `*.pem` and friends are excluded by an explicit blacklist, only whitelisted directories are walked (never the whole home directory), and symlinks are skipped rather than followed.
 
+**Offline backup only covers on-disk skills.** Skills that live in the plugin registry (the ones the shell loads from a profile's plugin packages — see issue #71) need the DSH runtime to enumerate, so only the GUI export (or a scheduled backup while DSH is healthy) can include them; the CLI `backup` collects just the files under `$DSH_HOME/skills`. For a complete skills backup, use the GUI export while DSH is healthy.
+
 Structured sections (settings / UI / providers / plugins / MCP / prompts / workspaces) are **not** silently faked: they need the DSH service layer to read and redact, so they are left out and marked `false` in the manifest — the plan printout lists them under “not offline-collectable” so you know exactly what this backup does and does not contain. Use the GUI export when DSH is healthy for a full backup.
 
 ```bash
@@ -500,7 +539,7 @@ dsh-config-manager backup --sections skills,self          # narrow the scope
 
 `--sections` accepts `skills,agentPresets,agentInstructions,self,pluginFiles`. `pluginFiles` is **opt-in** (as in the GUI): it copies third-party plugin files verbatim, and `dsh-ssh.json` holds plaintext host passwords — select it only when you have looked at what is in there.
 
-**A typical rescue flow** when DSH won't start: ① `dsh-config-manager reinstall` to bring the launcher back (plus any clean-up), ② if DSH reports a session-log error (`corrupt session log` / `duplicate JSONL session id`), run `dsh-config-manager sessions repair --fix` first — it repairs the log layout offline, ③ `dsh web` to start DSH again, ③ re-add the plugin from the registry, and ④ pull a snapshot from the remote repo (or run `dsh-config-manager restore`) to bring your config back. The CLI works at every step regardless of DSH's health.
+**A typical rescue flow** when DSH won't start: ① `dsh-config-manager reinstall` to bring the launcher back (plus any clean-up), ② if DSH reports a session-log error (`corrupt session log` / `duplicate JSONL session id`), run `dsh-config-manager sessions repair --fix` — it repairs the log layout offline, ③ `dsh web` to start DSH again, ④ re-add the plugin from the registry, and ⑤ pull a snapshot from the remote repo (or run `dsh-config-manager restore`) to bring your config back. The CLI works at every step regardless of DSH's health.
 
 **`recover-stale-lock` — when every operation suddenly fails.** Before touching your config, the plugin claims a small environment lock (it records who is operating plus a heartbeat) so that two operations can never write your config at the same time. If a `dsh web` process is **force-killed** (Task Manager, `kill -9`), the lock file survives with a dead owner: the next operation is refused, and it stays refused **no matter how often you retry or restart DSH** — because the plugin deliberately never removes a lock on its own (a wrong guess could evict a live operation).
 
@@ -630,7 +669,7 @@ Yes. Dead absolute paths are detected and remapped (batch replacement supported)
 No. A checksum mismatch rejects the import outright (protects against corruption or tampering).
 
 **Q: Will re-importing duplicate things?**
-No. Items are deduplicated by stable IDs (plugin ID / MCP name / skill name…); existing items are skipped.
+No. Items are matched by stable IDs (plugin ID / MCP name / skill name…): identical ones are skipped, and ones that differ from the target surface as **conflicts you decide** (Keep Current / Use Imported) — nothing is overwritten silently.
 
 **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.
@@ -645,9 +684,11 @@ Yes. The import wizard asks for the export-time encryption password and verifies
 1. **Installing / updating plugins or MCP takes effect after restarting DSH**
 2. **Some UI state is not migrated** (e.g. task board data, panel widths — they live in the browser, not in DSH's config files)
 3. **keybindings / workflow configs / commands** — DSH has no such concepts, so nothing is exported for them. Global agent rules are covered by **Agent Instructions** (`~/.dsh/AGENTS.md`, injected into every session); per-project `AGENTS.md`/`CLAUDE.md` belong to each project's repo and are not migrated
-4. **History/session migration is off by default** (v1 copies files only)
+4. **History/session migration is opt-in** — DSH's own sessions are only exported/synced when you explicitly select the `sessions` section (the sync channel additionally needs both sides to allow it); **another agent's chat history is migrated when you pick that source** in the foreign import. Conversation state that DSH's session format has no room for (model reasoning traces, images, compaction checkpoints) is counted and reported, never fabricated
 5. **Encrypted backups**: a lost password means the `secrets.enc` can't be decrypted (by design — keep your password safe)
 6. **Snapshot restore is offline and honest**: entries the offline engine can't restore (settings namespaces / patch lines when the snapshot has no whole-file backup, workspace records stored in DSH storages) are reported as skipped with a pointer to online rollback; credential **values** are never auto-written (manual re-entry hint only); old snapshots without a plugin baseline only get a hint to remove added plugins manually
+7. **Foreign-agent import has two known blanks**: **Copilot has no chat-history import** (its session format could not be verified on this machine, so only its configuration is imported), and Cursor's per-project history is located through Cursor's own folder-slug scheme, which may not resolve for every project. Conversations already imported with an older build should be deleted and re-imported first (a second import of the same id is reported as a **skipped** `session-id-conflict`, not merged)
+8. **Local source plugins (`link:` / `file:`) are packed into the backup**: the export runs `npm pack` on plugins you are developing locally and stores the tarball in the backup; the import unpacks it under `$DSH_HOME/dsh-config-manager/local-plugins/` and installs it as `file:`. Three consequences: ① backup size grows with those plugins (a single plugin over 100 MB is skipped with a warning — publish it to a registry / git first); ② plugin **source code** enters the backup (this does not conflict with "no secrets in backups" — secrets stay excluded, what travels is code); ③ packing needs a working `npm` on this machine; without it the plugin falls back to the previous behaviour (the original spec is kept, and a new machine still needs a manual install)
 
 ## 💬 Feedback
 

package/README.zh-CN.md

@@ -21,7 +21,7 @@ DSH Config Manager 是一个 DeepSeek Harness 配置备份与迁移插件：一
 > DSH 的 profile（`$DSH_HOME/profiles/<name>`）本身**不随备份迁移**（它是「用哪套插件组合启动」的机器本地选择）；
 > 本插件的「档案」页可以列表 / 新建 / 重命名 / 删除它们，也可以**用某个档案另起一个独立实例并随时停止它**（真正可用的切换）。
 
-把当前 DeepSeek Harness 环境导出为可移植备份，在另一台电脑上一键恢复；也支持通过 Git / WebDAV 跨机同步（密钥默认不同步，勾选「导出密钥」并加密后可随加密快照迁移）；还能通过内置**配置市场**浏览、一键安装社区分享的现成配置。
+把当前 DeepSeek Harness 环境导出为可移植备份，在另一台电脑上一键恢复；也支持通过 Git / WebDAV 跨机同步（密钥默认不同步，勾选「导出密钥」并加密后可随加密快照迁移）；还能通过内置**配置市场**浏览、一键安装社区分享的现成配置；并且能**从其它 AI Agent 导入**配置与历史会话（Claude Code / Cursor / Codex / Hermes / Antigravity 等 30 个来源）。
 
 [English](README.md) · [简体中文](README.zh-CN.md)
 
@@ -48,7 +48,7 @@ DSH 是你的 AI 助手工作台，里面存着你的各种设置：模型配置
 
 ### 备份 DeepSeek Harness 配置
 
-把你的 DSH 设置、模型供应商、插件、MCP 服务器、技能、Agent 预设、配置档案与工作区打包成一个便携 ZIP 备份——默认不含任何密钥值。
+把你的 DSH 设置、模型供应商、插件、MCP 服务器、技能、Agent 预设与工作区打包成一个便携 ZIP 备份——默认不含任何密钥值（DSH 档案不随备份迁移，见上方说明）。
 
 ### 在另一台电脑上恢复 DeepSeek Harness
 
@@ -70,6 +70,10 @@ DSH 是你的 AI 助手工作台，里面存着你的各种设置：模型配置
 
 在内置官方市场浏览现成配置（模型 / Provider、插件、MCP、技能、Agent 预设……），先 dry-run 预览再一键安装——供应链警示恒展示，确认导入前每个分区都须显式批准。
 
+### 从其它 AI Agent 导入（Claude Code / Cursor / Codex…）
+
+你在这台机器上已经用过别的 AI 编程 Agent，配置和历史对话都在？选一个来源，本插件会把它**翻译成标准 bundle**（MCP、技能、全局指令、历史会话及其所属工作区），再交给同一条「先审后写」的导入流程：预览 → 逐项冲突决策 → 自动快照 → 应用 → 可回滚。共识别 **30 个来源**，其中 **29 个**可一并迁移**历史会话**。密钥**值**绝不读取，只记下名字供导入计划提示补录。
+
 ---
 
 ## 🆚 与其它备份 / 同步插件的区别
@@ -79,7 +83,7 @@ DSH 生态里这个方向有几个插件，它们解决的问题并不相同—
 | 插件 | 最擅长 | 本插件更进一步的地方 |
 |---|---|---|
 | [xiaoyuyu6420/dsh-backup](https://github.com/xiaoyuyu6420/dsh-backup) | 一条命令从 CLI 给整个 `~/.dsh` 打快照，另有会话体检 / 升级快照 / 救援控制台 | 写盘前可审阅的 GUI 流程（dry-run 预览、冲突逐项决策、失败自动回滚）、跨机路径重映射、加密凭据载荷、配置市场 |
-| [muyifc/dsh-config-sync](https://github.com/muyifc/dsh-config-sync) | 把 DSH 配置导出/导入成可移植的密码加密文件，可被工具调用 | 13–14 个分区（含插件 / MCP / 技能 / 档案 / 工作区）、定时备份、Git + WebDAV 双通道同步、会话跨机迁移与路径重定基 |
+| [muyifc/dsh-config-sync](https://github.com/muyifc/dsh-config-sync) | 把 DSH 配置导出/导入成可移植的密码加密文件，可被工具调用 | 13–14 个分区（插件 / MCP / 技能 / 工作区 / 会话日志 …）、定时备份、Git + WebDAV 双通道同步、会话跨机迁移与路径重定基 |
 | [dickpy/dsh-cloud-sync](https://github.com/dickpy/dsh-cloud-sync) · [weibaohui/dsh-sync](https://github.com/weibaohui/dsh-sync) | 通过 WebDAV / S3 或私有 Git 镜像让多台机器保持一致 | 同步只是本插件五项能力之一——另有导出/导入、定时备份、配置市场与档案实例启停 |
 | `cp -r ~/.dsh`（或给 home 目录挂 Git） | 免费、零配置，纯文本配置够用 | 不处理密钥、不做路径重映射、抓不到 `link:` / `file:` 安装的本地插件、不动会话日志、没有冲突处理与回滚 |
 
@@ -105,10 +109,12 @@ DSH 生态里这个方向有几个插件，它们解决的问题并不相同—
 | 🗂️ | **档案 Profiles（DSH profile）** | 直接管理 `$DSH_HOME/profiles/<name>`：列表 / 新建（官方模板）/ 重命名 / 物理删除 / **启动该档案（独立实例）** / **停止实例**（行内按钮按运行状态在「启动 ↔ 停止」间切换） |
 | 🧩 | **本地插件随备份迁移** | `link:` / `file:` 安装的本地开发插件会被打包进备份，换机不再丢失 |
 | 🗄️ | **保留策略可配（GFS 分层）** | 「最近 N 份 + 每月留 1 份 + 每年留 1 份」，默认值等价旧行为 |
+| 🌐 | **双语界面** | 界面、报告与错误详情跟随 DSH 应用语言（中文 / English） |
 | 🤖 | **Agent 工具** | Agent 会话内直接备份 / 快照 / 恢复 / 同步 |
 | 💾 | **磁盘占用体检** | 备份页逐项列出本插件自身占了多少盘（备份 / 快照 / 同步副本 / 缓存 / 暂存），三档回收策略一目了然；**一键清理只碰可重建缓存与过期备份**，快照与同步数据永不在此删除 |
-| ⬆️ | **版本更新检查** | 「关于」页只读探测 npm 上的最新版本，有新版本时给一条可复制的升级命令（绝不自动安装）；离线失败如实显示，不影响其它功能 |
+| ⬆️ | **版本更新检查** | 「关于」页只读探测 npm 上的最新版本（缓存 10 分钟）；有新版本时既给可复制的升级命令，也提供一键**立即更新**（按该精确版本安装）——之后需重启 DSH 才生效，插件绝不代你重启；离线失败如实显示，不影响其它功能 |
 | 🧭 | **兼容性讲清楚** | 导入前显示「来源 DSH 版本 / 平台 → 本机」，并用**结构化原因**解释评分（跨平台 / 分区缺失 / 版本超前…），而不是只丢一句「部分兼容」 |
+| 🧳 | **从其它 AI Agent 导入** | 读取本机 Claude Code / Cursor / Codex / Hermes / Antigravity 等的配置**与历史会话**，翻译成标准 bundle，再走既有的预览 / 冲突 / 回滚流程导入 |
 
 ---
 
@@ -305,6 +311,17 @@ allowBuilds:
 2. 让你选择新路径
 3. 支持**批量前缀映射**（如 `C:\Users\alice\` → `/Users/bob/` 一键替换所有相关路径）
 
+### 🧳 从其它 AI Agent 导入（配置 + 历史会话）
+
+不必手工重建另一个 Agent 里已经调好的那套配置。
+
+- **识别 30 个来源** —— Claude Code、Hermes、Cursor、Codex、Antigravity、Gemini、OpenCode、Mimocode、ZCode、Grok Build、OpenClaw、Pi、Kimi、Kilocode、Qoder、ChatGPT、WorkBuddy、Qwen、Continue、Cline、Goose、Zed、Crush、TeleAgent、Trae、Vibe、Reasonix、Copilot，以及 DSH 自己（从另一个 DSH home 导入，其 v3 / v4 日志算两个 id）。本机**没装**的来源照样列出来（置灰不可选）——「这台机器没有这个工具」不会被误解成「功能没做」。
+- **是翻译，不是第二套导入通道** —— 来源被转成标准 bundle v1 ZIP，交给**既有**导入向导：同一份预览、同一套逐项冲突决策、同一次导入前快照与回滚、同样的 dry-run。
+- **会带走什么** —— MCP Servers、技能、全局指令（落成 `AGENTS.md`），以及**历史会话连同这些对话所属的工作区**（29 个来源；会话会重新编码成 DSH 的会话日志格式，并按它记录的 `cwd` 归位）。
+- **不会带走什么** —— 密钥**值**一律不读：只记录键名，由导入计划提示补录。DSH 没有对等结构的东西（Claude Code 的 hooks、斜杠命令等）会**报出明确的码**，不会静默丢掉。
+- **如实跳过** —— 没记录 `cwd` 的对话无处归位，会列为跳过（绝不猜进别的项目）；已知的有损项在导入**之前**就摆明。
+- **入口** —— 设置 →「备份与迁移」→ 导入 → **「从其它 agent 导入」**、⌘K 命令，或 CLI：`dcm import --from <来源> [--dry-run] [--out <路径>]`。
+
 ### 🔒 密钥处理
 
 | 场景 | 行为 |
@@ -323,7 +340,7 @@ allowBuilds:
 | **端点** | `repoUrl` | `webdav.url` |
 | **凭据** | 认证 token 存入 DSH credentials（`DSH_CONFIG_MANAGER_SYNC_TOKEN`） | `username` 存配置、可在界面回显；**密码永不同步、永不记日志**——存入 DSH credentials `DSH_CONFIG_MANAGER_SYNC_WEBDAV_PASSWORD` |
 
-- **两通道保留策略一致**：远端只保留最新 **10** 个快照（`MAX_REMOTE_SNAPSHOTS=10`），更旧的自动删除。
+- **远端保留跟本地同一套策略**：两通道都按你的备份计划保留——默认最新 **10** 个快照，可另设「每月 1 份 / 每年 1 份」分层；刚推上去的那份恒保留，更旧的自动删除。
 - **切换通道重新开始**：Git 与 WebDAV 的快照 / 共同祖先**互不共享**。切换通道后，同步从新远端的空基线重新开始——请先推送一个新快照。
 - **WebDAV 认证**采用 HTTP Basic：`username` 存配置、可在界面回显；`password` 则实时从 DSH credentials 槽位 `DSH_CONFIG_MANAGER_SYNC_WEBDAV_PASSWORD` 读取——绝不出现于任何同步文件或日志。
 - **插件自动安装**：拉取差异时，备份里新增的插件会在确认导入时**自动安装**，无需在差异列表里逐项手动勾选；只有**版本冲突**的插件仍需要你决定「保留当前 / 采用备份」。
@@ -465,6 +482,8 @@ dsh-config-manager verify C:/backups/dsh-config.zip   # 或按路径
 
 **凭据文件永不进入备份。** `.credentials.*`、`.env`、`*.pem` 等由显式黑名单排除；只遍历白名单目录（绝不对整个主目录递归）；symlink 一律跳过而非跟随。
 
+**离线备份只覆盖磁盘上的技能。** 插件注册表里的技能（外壳从 profile 的插件包里加载的那些，见 issue #71）需要 DSH 运行时才能列举，因此**只有 GUI 导出（或 DSH 健康时的定时备份）能带上它们**；CLI `backup` 只收 `$DSH_HOME/skills` 目录下的文件——想要完整的技能备份，请在 DSH 健康时用 GUI 导出。
+
 结构化分区（设置 / UI / providers / 插件 / MCP / prompts / workspaces）**不会**被偷偷伪造：它们需要 DSH 服务层读值并脱敏，因此一律不写入、在 manifest 里标记为 `false`——计划输出会把它们列在「离线不可收集」下，让你清楚这份备份到底有什么、没有什么。DSH 健康时想要完整备份，请用 GUI 导出。
 
 ```bash
@@ -477,7 +496,7 @@ dsh-config-manager backup --sections skills,self          # 收窄范围
 `--sections` 可选值为 `skills,agentPresets,agentInstructions,self,pluginFiles`。其中 `pluginFiles` 与 GUI 侧一致属**默认关闭**：它原样复制第三方插件自有文件，而 `dsh-ssh.json` 里是明文主机密码——确认过内容之后再选它。
 
 
-**典型救急流程**（DSH 起不来时）：① `dsh-config-manager reinstall` 先把启动器重装回来（必要时顺带清理），② `dsh web` 重新启动 DSH，③ 从仓库装回插件，④ 从远程仓库拉取快照（或执行 `dsh-config-manager restore`）把配置恢复回来。整个流程中 CLI 全程可用，与 DSH 是否健康无关。
+**典型救急流程**（DSH 起不来时）：① `dsh-config-manager reinstall` 先把启动器重装回来（必要时顺带清理），② 若 DSH 报会话日志错误（`corrupt session log` / `duplicate JSONL session id`），先跑 `dsh-config-manager sessions repair --fix` 把日志目录离线归位，③ `dsh web` 重新启动 DSH，④ 从仓库装回插件，⑤ 从远程仓库拉取快照（或执行 `dsh-config-manager restore`）把配置恢复回来。整个流程中 CLI 全程可用，与 DSH 是否健康无关。
 
 **`web` —— 离线救急台（不想在终端里敲命令时用这个）。** 它在本机起一个**只绑 127.0.0.1** 的小网页，
 把上面的诊断信息与救急动作都摊在浏览器里：
@@ -546,7 +565,7 @@ dsh-config-manager web            # 启动并自动打开浏览器（终端里
 不能。校验和检查不通过会直接拒绝导入（防止损坏或篡改）。
 
 **Q：重复导入会重复吗？**
-不会。按插件 ID / MCP 名称 / 技能名等稳定标识去重，重复导入自动跳过已有项。
+不会。按插件 ID / MCP 名称 / 技能名等稳定标识配对：完全一致的跳过，与目标机有差异的会列为**冲突由你决定**（保留本机 / 用导入的），不会静默覆盖。
 
 **Q：加密备份导入时需要密码吗？**
 需要。导入向导会要求输入导出时设置的加密密码并验证通过后才能继续执行；密码仅存于内存、绝不保存。密码错误或缺失都会阻止导入（密码正确时凭据直接从备份解密恢复，无需重新填写）。
@@ -561,10 +580,11 @@ dsh-config-manager web            # 启动并自动打开浏览器（终端里
 1. **安装/更新插件或 MCP 后需重启 DSH 才生效**
 2. **部分界面状态不迁移**（如任务看板数据、面板宽度——它们存在浏览器里，不在 DSH 配置文件内）
 3. **keybindings / workflows 配置 / commands**：DSH 当前没有这些概念，因此不会导出相关内容。全局 agent 规则已由**全局指令（Agent Instructions）**承接（`~/.dsh/AGENTS.md`，注入每个会话）；项目级 `AGENTS.md` / `CLAUDE.md` 属于各项目仓库本身，不在个人配置迁移范围内
-4. **历史会话默认不迁移**（v1 仅支持文件级复制）
+4. **历史会话是显式可选项** —— DSH 自己的会话只有在导出 / 同步时**显式勾选 `sessions` 分区**才会带走（同步通道还要求两侧都放行）；**其它 Agent 的历史会话在你选中那个来源时迁移**。DSH 会话格式里没有位置的对话状态（模型思考过程、图片、压缩检查点）一律**如实计数并报告**，绝不伪造
 5. **加密备份**：密码丢失则无法解密（设计使然——请牢记密码）
 6. **快照恢复是离线的、诚实的**：离线引擎无法恢复的条目（快照无整文件备份时的 settings namespace / patch 行、存在 DSH storages 里的 workspace 记录）会如实列为跳过并指向在线回滚；凭据**值**绝不自动改写（只提示人工补录）；无插件基线的旧快照只提示人工核对新增插件
-7. **本地源插件（`link:` / `file:`）随备份打包**：导出时执行 `npm pack` 把本地开发中的插件打成 tarball 一并备份，导入时解包到 `$DSH_HOME/dsh-config-manager/local-plugins/` 后按 `file:` 安装。因此：① 备份体积会随本地插件的体积增大（单插件超过 100 MB 会被跳过并告警，建议先发布到 registry / git 再备份）；② 插件**源码**会进入备份（与「密钥永不进备份」不冲突——密钥仍被排除，这里进的是代码）；③ 打包需要本机有可用的 `npm`，无 npm 时该插件退化为原行为（保留原 spec，换机后仍需手工安装）
+7. **从其它 Agent 导入有两处已知空白**：**Copilot 不支持导入历史会话**（其会话格式在本机无法取证，只导入它的配置）；Cursor 的项目历史要靠它自己的目录 slug 反解，个别项目可能对不上。用**旧版本**导入过的会话请先删掉再重导（同一 id 二次导入会如实报**跳过** `session-id-conflict`，不会合并）
+8. **本地源插件（`link:` / `file:`）随备份打包**：导出时执行 `npm pack` 把本地开发中的插件打成 tarball 一并备份，导入时解包到 `$DSH_HOME/dsh-config-manager/local-plugins/` 后按 `file:` 安装。因此：① 备份体积会随本地插件的体积增大（单插件超过 100 MB 会被跳过并告警，建议先发布到 registry / git 再备份）；② 插件**源码**会进入备份（与「密钥永不进备份」不冲突——密钥仍被排除，这里进的是代码）；③ 打包需要本机有可用的 `npm`，无 npm 时该插件退化为原行为（保留原 spec，换机后仍需手工安装）
 
 ## 💬 反馈与建议
 

package/lib/adapters/credentials.js

@@ -1,5 +1,5 @@
 import { msgOf, zhMsg } from '../core/messages.js';
-import { resolveNamespaces } from './settings.js';
+import { namespaceFromMap, readNamespaceMap, resolveNamespaces } from './settings.js';
 import { sectionMeta } from '../schema/section-registry.js';
 import { validateJsonSection } from './json-section.js';
 /** 缺省 ref 收集：遍历 settings namespace，收集 llm apiKeyEnv / providers[].apiKeyEnv，
@@ -9,9 +9,12 @@ import { validateJsonSection } from './json-section.js';
 export function defaultCredentialRefs(namespaces) {
     return async (ctx) => {
         const refs = new Set();
-        for (const ns of await resolveNamespaces(namespaces, ctx)) {
+        const names = await resolveNamespaces(namespaces, ctx);
+        // 快路径：宿主能一次读回全部 namespace 时只读一趟（理由见 settings.ts readNamespaceMap）
+        const all = names.length > 0 ? await readNamespaceMap(ctx) : null;
+        for (const ns of names) {
             try {
-                const info = await ctx.settings.describe(ns, { redactSecrets: true });
+                const info = all !== null ? namespaceFromMap(all, ns) : await ctx.settings.describe(ns, { redactSecrets: true });
                 const value = (info.value ?? {});
                 // 引用类字段名（值 = env/凭据引用名，非秘密本身）
                 const REFERENCE_REF_FIELDS = new Set([

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

@@ -103,10 +103,30 @@ export declare abstract class FileCollectionAdapter implements ConfigAdapter<Fil
      * - `size`：优先 `ctx.fs.statSize`（只 stat，不读内容）；门面未实现或返回 null（文件消失 /
      *   读不到）时**退回 readFile** —— 与改造前把「读不到」暴露成同一个错误，绝不把未知体积
      *   当成 0（0 会让字节闸门少算，把本该剔除的单元放进预览，预览与导出就分叉了）。
+     *
+     * 受保护而非私有（issue #71）：`SkillsAdapter` 的成员有一部分**不在磁盘上**
+     * （来自 `ctx.skills` 技能服务的技能被重建成 `<name>/SKILL.md` 虚拟路径），
+     * 需要在这里按路径分流 —— 覆写后基类的单元分组 / 字节闸门 / 告警 / 预览-导出一致性全部照旧。
      */
-    private readMember;
+    protected readMember(ctx: HostContext, rel: string, mode: 'content' | 'size', statTimes?: Map<string, number>): Promise<{
+        data: Uint8Array;
+        sizeBytes: number;
+        contentHash: string;
+    }>;
     /** 单元清单（零 I/O：直接由 export 产物归并）。 */
     listUnits(section: ExportSection<FilesSection>): ExportUnit[];
+    /**
+     * 幂等比对用的内容（相对 baseDir 路径 + 盘上/包内字节 → 参与哈希比对的字节）。
+     *
+     * 缺省 = **原字节**：对文件类分区来说「相对路径 + 内容哈希」就是身份语义，不得改动。
+     * 覆写者只应用于剔除**不属于「配置身份」的易变字段**（见 SelfAdapter 的两个调度配置：
+     * 运行态每轮都被改写，整文件哈希会恒判 Conflict —— issue #73）。两条契约：
+     *   1. **必须收敛**：applyItem 写盘后再分析一次必须判 Skip，否则同步永不收敛；
+     *   2. **未改写时返回同一引用** —— 调用方据此复用导入侧已算好的 contentHash，
+     *      不给 sessions 这类大分区白算一遍哈希。
+     * 判不出可比形态（解析失败等）时必须**原样返回**：绝不把「判不出来」当成「相同」或「不同」。
+     */
+    protected comparableContent(_relativePath: string, data: Uint8Array): Uint8Array;
     analyzeImport(data: FilesSection, ctx: ImportContext): Promise<PlanItem[]>;
     applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;
     /**

package/lib/adapters/file-collection.js

@@ -262,6 +262,10 @@ export class FileCollectionAdapter {
      * - `size`：优先 `ctx.fs.statSize`（只 stat，不读内容）；门面未实现或返回 null（文件消失 /
      *   读不到）时**退回 readFile** —— 与改造前把「读不到」暴露成同一个错误，绝不把未知体积
      *   当成 0（0 会让字节闸门少算，把本该剔除的单元放进预览，预览与导出就分叉了）。
+     *
+     * 受保护而非私有（issue #71）：`SkillsAdapter` 的成员有一部分**不在磁盘上**
+     * （来自 `ctx.skills` 技能服务的技能被重建成 `<name>/SKILL.md` 虚拟路径），
+     * 需要在这里按路径分流 —— 覆写后基类的单元分组 / 字节闸门 / 告警 / 预览-导出一致性全部照旧。
      */
     async readMember(ctx, rel, mode, statTimes) {
         if (mode === 'size') {
@@ -285,6 +289,20 @@ export class FileCollectionAdapter {
     listUnits(section) {
         return unitsFromFiles(this.id, section.data.files, (rel) => this.unitIdOf(rel));
     }
+    /**
+     * 幂等比对用的内容（相对 baseDir 路径 + 盘上/包内字节 → 参与哈希比对的字节）。
+     *
+     * 缺省 = **原字节**：对文件类分区来说「相对路径 + 内容哈希」就是身份语义，不得改动。
+     * 覆写者只应用于剔除**不属于「配置身份」的易变字段**（见 SelfAdapter 的两个调度配置：
+     * 运行态每轮都被改写，整文件哈希会恒判 Conflict —— issue #73）。两条契约：
+     *   1. **必须收敛**：applyItem 写盘后再分析一次必须判 Skip，否则同步永不收敛；
+     *   2. **未改写时返回同一引用** —— 调用方据此复用导入侧已算好的 contentHash，
+     *      不给 sessions 这类大分区白算一遍哈希。
+     * 判不出可比形态（解析失败等）时必须**原样返回**：绝不把「判不出来」当成「相同」或「不同」。
+     */
+    comparableContent(_relativePath, data) {
+        return data;
+    }
     async analyzeImport(data, ctx) {
         const msg = ctx.msg;
         const items = [];
@@ -317,15 +335,21 @@ export class FileCollectionAdapter {
                     target: { adapter: this.id, ref: file.relativePath },
                 });
             }
-            else if (sha256Hex(current) === file.contentHash) {
-                items.push({ id, unitId, kind: 'Skip', adapter: this.id, description: msg('adapter.fileSame', { path: file.relativePath }), severity: 'info' });
-            }
             else {
-                items.push({
-                    id, unitId, kind: 'Conflict', adapter: this.id,
-                    description: msg('adapter.fileDiff', { path: file.relativePath }), severity: 'warning',
-                    target: { adapter: this.id, ref: file.relativePath },
-                });
+                // 幂等判定统一走 comparableContent（缺省 = 原字节）；包内文件未被改写时复用已算好的
+                // contentHash，不给 sessions 这类大分区白算一遍哈希（盘上文件本来就要现算）。
+                const importedComparable = this.comparableContent(file.relativePath, file.data);
+                const importedHash = importedComparable === file.data ? file.contentHash : sha256Hex(importedComparable);
+                if (sha256Hex(this.comparableContent(file.relativePath, current)) === importedHash) {
+                    items.push({ id, unitId, kind: 'Skip', adapter: this.id, description: msg('adapter.fileSame', { path: file.relativePath }), severity: 'info' });
+                }
+                else {
+                    items.push({
+                        id, unitId, kind: 'Conflict', adapter: this.id,
+                        description: msg('adapter.fileDiff', { path: file.relativePath }), severity: 'warning',
+                        target: { adapter: this.id, ref: file.relativePath },
+                    });
+                }
             }
         }
         return items;

package/lib/adapters/mcp.d.ts

@@ -1,18 +1,28 @@
 import type { MsgFunc } from '../core/messages.ts';
 import type { McpServerEntry } from '../schema/types.ts';
 import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
-/** 导出记录：McpServerEntry 之外附加来源 patch 行 id（导入写回定位用） */
+/** 导出记录：McpServerEntry 之外附加来源 patch 行 id 与所在层（导入写回定位用） */
 export interface McpExportEntry extends McpServerEntry {
     sourceLineId: string;
+    /**
+     * 来源 patch 层（相对 homeDir 的 POSIX 路径；见 core/patch-layers.ts）。
+     * 缺省 = 用户层（旧备份包没有该字段 → 按旧行为写回 home 层）。
+     */
+    sourceFile?: string;
 }
 export interface McpExportSection {
     version: 1;
     servers: McpExportEntry[];
 }
-/** 从 patch 行数组中提取 MCP server 条目（以 config.serverName 存在为判定） */
+/**
+ * 从 patch 行数组中提取 MCP server 条目（以 config.serverName 存在为判定）。
+ *
+ * 行对象可带 `file`（层身份）：带上时逐条目记录 `sourceFile`，导入写回落回原层。
+ */
 export declare function extractMcpServers(lines: {
     lineId: string;
     raw: unknown;
+    file?: string;
 }[]): McpExportEntry[];
 /** 由导出条目构造写回 patch 行 raw（单行形态，与 dsh-mcp-client 组合 config 语义一致） */
 export declare function buildMcpPatchLine(lineId: string, server: McpServerEntry): Record<string, unknown>;

package/lib/adapters/mcp.js

@@ -5,13 +5,22 @@
  * dependencyChecker 执行（§15：缺失不阻塞，标记 Requires Attention）。
  *
  * patch 行 raw 支持两种形态：单行 { id, name, config } 与块 { insert: [{ id, name, config }] }。
+ *
+ * issue #71（真机报告「备份不到外壳 mcp」）：数据源是**两层** patch —— home 层
+ * （$DSH_HOME/cordis.patch.yml）与 profile 层（$DSH_HOME/profiles/<p>/cordis.patch.yml）。
+ * 此前只读 home 层，而 DSH 自己的 MCP 配置工具把 server 写进 profile 层，于是备份里
+ * servers 恒为空数组。现在两层都读，每行记住自己来自哪个文件，写回时落回原层。
  */
 import { isDeepStrictEqual } from 'node:util';
 import { msgOf, zhMsg } from '../core/messages.js';
 import { sectionMeta } from '../schema/section-registry.js';
 import { validateJsonSection } from './json-section.js';
-import { USER_PATCH_FILE } from './plugins.js';
-/** 从 patch 行数组中提取 MCP server 条目（以 config.serverName 存在为判定） */
+import { locatePatchLineLayer, readEffectivePatchLines, resolveWriteLayer } from '../core/patch-layers.js';
+/**
+ * 从 patch 行数组中提取 MCP server 条目（以 config.serverName 存在为判定）。
+ *
+ * 行对象可带 `file`（层身份）：带上时逐条目记录 `sourceFile`，导入写回落回原层。
+ */
 export function extractMcpServers(lines) {
     const servers = [];
     for (const line of lines) {
@@ -34,6 +43,7 @@ export function extractMcpServers(lines) {
                 url: typeof c['url'] === 'string' ? c['url'] : undefined,
                 headers: c['headers'] !== null && typeof c['headers'] === 'object' ? c['headers'] : undefined,
                 sourceLineId: line.lineId,
+                ...(line.file !== undefined ? { sourceFile: line.file } : {}),
             });
         }
     }
@@ -85,14 +95,12 @@ export class McpAdapter {
     portability = sectionMeta('mcp').portability;
     async export(ctx, _options) {
         const warnings = [];
-        let lines = [];
-        try {
-            lines = await ctx.patchFile.readPatchLines(USER_PATCH_FILE);
-        }
-        catch (err) {
-            warnings.push(msgOf(ctx)('adapter.patchReadFailedMCP', { reason: err instanceof Error ? err.message : String(err) }));
+        // issue #71：两层都读（home 层优先），否则 profile 层里的 server 全部丢失
+        const read = await readEffectivePatchLines(ctx.patchFile, ctx.profile);
+        for (const f of read.failures) {
+            warnings.push(msgOf(ctx)('adapter.patchReadFailedMCP', { reason: `${f.file}: ${f.reason}` }));
         }
-        const servers = extractMcpServers(lines);
+        const servers = extractMcpServers(read.lines);
         return {
             sectionId: 'mcp',
             data: { version: 1, servers },
@@ -103,13 +111,15 @@ export class McpAdapter {
     async analyzeImport(data, ctx) {
         const msg = ctx.msg;
         const items = [];
-        const targetLines = await ctx.target.patchFile.readPatchLines(USER_PATCH_FILE);
+        // issue #71：目标行跨两层；同一 lineId 只保留优先级最高的一层（与 DSH 合并序一致）
+        const targetLines = (await readEffectivePatchLines(ctx.target.patchFile, ctx.target.profile)).lines;
         const targetServers = extractMcpServers(targetLines);
         for (const server of data.servers) {
             const id = `mcp:${server.serverName}`;
             const existing = targetServers.find((s) => s.serverName === server.serverName);
             const comparable = { ...server };
             delete comparable.sourceLineId;
+            delete comparable.sourceFile;
             if (!existing) {
                 const lineId = server.sourceLineId && targetLines.some((l) => l.lineId === server.sourceLineId)
                     ? `${server.sourceLineId}-imported`
@@ -119,12 +129,14 @@ export class McpAdapter {
                     description: msg('adapter.mcpCreate', { serverName: server.serverName }),
                     detail: `${server.type === 'stdio' ? `${server.command} ${(server.args ?? []).join(' ')}` : server.url}`,
                     severity: 'info',
-                    target: { adapter: 'mcp', ref: lineId },
+                    // 目标层随计划项一起走：导入前快照要按**这一层**记原行，回滚才能写回原文件
+                    target: { adapter: 'mcp', ref: lineId, file: resolveWriteLayer(server.sourceFile, ctx.target.profile) },
                 });
             }
             else {
                 const existingComparable = { ...existing };
                 delete existingComparable.sourceLineId;
+                delete existingComparable.sourceFile;
                 if (isDeepStrictEqual(existingComparable, comparable)) {
                     items.push({ id, kind: 'Skip', adapter: 'mcp', description: msg('adapter.mcpSame', { serverName: server.serverName }), severity: 'info' });
                 }
@@ -134,7 +146,7 @@ export class McpAdapter {
                         description: msg('adapter.mcpDiff', { serverName: server.serverName }),
                         detail: `current=${JSON.stringify(existingComparable)} imported=${JSON.stringify(comparable)}`.slice(0, 200),
                         severity: 'warning',
-                        target: { adapter: 'mcp', ref: existing.sourceLineId },
+                        target: { adapter: 'mcp', ref: existing.sourceLineId, file: existing.sourceFile },
                     });
                 }
             }
@@ -152,7 +164,12 @@ 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, [
+        // issue #71：Create 落「来源层的同语义层」（来源是 profile 层 → 目标机当前 profile 层），
+        // Update 落「该行当前所在层」—— 两种情况都不把行搬到另一层去（否则同一 lineId 两层各一份）
+        const file = item.kind === 'Create'
+            ? resolveWriteLayer(server.sourceFile, ctx.target.profile)
+            : await locatePatchLineLayer(ctx.target.patchFile, ctx.target.profile, ref);
+        await ctx.target.patchFile.applyPatchChanges(file, [
             { lineId: ref, raw, action: item.kind === 'Create' ? 'insert' : 'update' },
         ]);
         return { ok: true, needsRestart: true, message: msg('adapter.mcpWritten', { serverName }) };

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

@@ -12,6 +12,14 @@ export declare class PluginFilesAdapter implements ConfigAdapter<FilesSection> {
     private readonly collectDir?;
     constructor(whitelist?: string[], collectDir?: string);
     export(ctx: HostContext, options: ExportOptions): Promise<ExportSection<FilesSection>>;
+    /**
+     * 读失败之后判定「这个路径本来就不存在」还是「存在但读不到」（ui-F2）。
+     *
+     * 为什么不用错误码：门面错误的形状并不统一（内存 mock 与各平台 EACCES 文案不同），
+     * 而 `exists()` 是 FileSystemFacade 契约里唯一稳定的存在性判据。`exists()` 自己也失败时
+     * 按「存在」处理（保守：宁可让这次导出显式失败，也不静默丢一个文件）。
+     */
+    private absentOnDisk;
     /** 单元清单（零 I/O）：逐文件单元，id 与导入侧 `pluginFiles:<relPath>` 一致。 */
     listUnits(section: ExportSection<FilesSection>): ExportUnit[];
     analyzeImport(data: FilesSection, ctx: ImportContext): Promise<PlanItem[]>;