dsh-config-manager 0.1.26 → 0.1.28

package/README.md

@@ -32,7 +32,7 @@ DSH is your AI assistant workbench — it holds your settings: model configs, pl
 | 👀 | **Preview before import** | Full preview first — **never touches your config silently** |
 | ⚔️ | **Conflict handling** | Keep Current / Use Imported — you decide |
 | 🗺️ | **Path auto-mapping** | Detects dead absolute paths and lets you remap them |
-| 🔒 | **Secret safety** | API Keys are never exported; re-enter them after import |
+| 🔒 | **Secret safety** | API Keys are never exported; encrypted backups restore them with the password, non-encrypted imports ask you to re-enter |
 | ↩️ | **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 a private Git repo (secrets never sync) |
@@ -178,7 +178,8 @@ When the target already has a same-named item, you choose:
 |---|---|
 | Default backup | **No secret values at all** — only records which keys are needed |
 | Encrypted backup (optional) | AES-256-GCM with a password; the password is **never written to the file** |
-| After import | "3 secrets need re-entry" — values stay in memory only |
+| Encrypted backup import | The export-time password is required: enter → verify → credentials are restored; **no password, no import** |
+| After non-encrypted import | "3 secrets need re-entry" — values stay in memory only |
 
 ### 🗂️ Profiles
 
@@ -260,6 +261,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: 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).
+
 ---
 
 ## 📋 Known limitations (user-facing)

package/README.zh-CN.md

@@ -32,7 +32,7 @@ DSH 是你的 AI 助手工作台，里面存着你的各种设置：模型配置
 | 👀 | **先预览再导入** | 导入前完整预览，**绝不偷偷改你的配置** |
 | ⚔️ | **冲突处理** | 遇到同名配置，让你自己选：保留现有的 / 用导入的 |
 | 🗺️ | **路径自动映射** | 换了电脑路径变了？自动检测并让你重新指定 |
-| 🔒 | **密钥安全** | API Key 默认不导出；导入后提醒你重新填写 |
+| 🔒 | **密钥安全** | API Key 默认不导出；加密备份用密码解锁恢复，非加密导入后提醒重新填写 |
 | ↩️ | **自动回滚** | 导入失败自动恢复原样，不会弄坏现有配置 |
 | 📸 | **快照恢复** | 撤销一次导入：整文件还原 + 卸载新增插件（CLI 与 GUI 均支持） |
 | 🔄 | **远程同步** | 通过 Git 私有仓库推送 / 拉取可移植配置（密钥永不参与同步） |
@@ -177,7 +177,8 @@ dsh plugin --profile web add dsh-config-manager@latest --config.auto-install-pee
 |---|---|
 | 默认备份 | **不含任何密钥值**，只记录"哪些密钥需要填写" |
 | 加密备份（可选） | 设置密码后用 AES-256-GCM 加密，密码**绝不写入备份文件** |
-| 导入后 | 提示「3 个密钥需要重新填写」，输入后仅保存在内存中写入 |
+| 加密备份导入 | 必须输入导出时的加密密码解锁：输入→验证密码→凭据自动恢复，**无密码无法导入** |
+| 非加密导入后 | 提示「3 个密钥需要重新填写」，输入后仅保存在内存中写入 |
 
 ### 🗂️ 配置档案（Profiles）
 
@@ -259,6 +260,9 @@ dsh-config-manager restore --id <snapshot-id>
 **Q：重复导入会重复吗？**
 不会。按插件 ID / MCP 名称 / 技能名等稳定标识去重，重复导入自动跳过已有项。
 
+**Q：加密备份导入时需要密码吗？**
+需要。导入向导会要求输入导出时设置的加密密码并验证通过后才能继续执行；密码仅存于内存、绝不保存。密码错误或缺失都会阻止导入（密码正确时凭据直接从备份解密恢复，无需重新填写）。
+
 ---
 
 ## 📋 已知限制（用户须知）

package/lib/client.d.ts

@@ -115,6 +115,8 @@ interface ImportAnalysis {
     item: string;
     dependency: string;
   }[];
+  /** 备份是否加密（manifest.security.encrypted）：加密备份的凭据必须用解密密码恢复 */
+  encrypted: boolean;
 }
 interface ImportDecisions {
   strategy: GlobalConflictStrategy;
@@ -529,6 +531,16 @@ interface UploadResponse {
   name: string;
   sizeBytes: number;
 }
+/** decrypt-verify 端点响应：校验加密备份密码是否可解开 secrets.enc（零写入） */
+interface DecryptVerifyResponse {
+  ok: boolean;
+  /** 该备份是否加密（password 非空时恒 true；用于 UI 双保险） */
+  encrypted: boolean;
+  /** 解密成功后将恢复的凭据数（普通备份为 0） */
+  secretCount: number;
+  /** 解密覆盖的凭据 ref 名（非值）；UI 据此从补录阶段剔除已恢复项 */
+  refs: string[];
+}
 /** restore 端点响应：dryRun=true 返回 plan；执行返回 report（与 CLI 一致的诚实报告） */
 interface RestoreResponse {
   dryRun: boolean;
@@ -576,11 +588,14 @@ declare class ConfigManagerApi {
   analyzeImport(zipPath: string): Promise<ImportAnalysis>;
   /** ImportPort.createImportPlan：用用户决策（冲突/路径映射/策略）生成最终计划（Dry Run 零写入） */
   createImportPlan(zipPath: string, decisions: ImportDecisions): Promise<ImportPlan>;
+  /** 验证加密备份的解密密码（只读零写入）：成功返回将恢复的凭据数；密码错误抛 ConfigManagerApiError */
+  verifyDecrypt(zipPath: string, password: string): Promise<DecryptVerifyResponse>;
   /** ImportPort.executeImportPlan：快照→分阶段 apply→validate→commit/rollback */
   executeImportPlan(zipPath: string, plan: ImportPlan, opts: {
     confirm: boolean;
     secretInputs?: Record<string, string>;
     rollbackOnError: boolean;
+    decryptPassword?: string;
   }): Promise<ImportResult & {
     runId: string;
   }>;
@@ -953,12 +968,22 @@ declare const zh$1: {
   readonly 'import.preview.restart': "导入后需重启 DSH 生效";
   readonly 'import.confirm.execute': "确认导入";
   readonly 'import.confirm.warning': "导入将修改当前 DSH 配置；执行前会自动创建安全快照，失败时整体回滚。";
+  readonly 'import.confirm.encrypted': "将用备份密码解密并恢复 {count} 个凭据。";
   readonly 'import.rollbackOnError': "失败时整体回滚（推荐）";
   readonly 'import.importing': "正在导入…（插件安装较多时可能需要几分钟，请勿关闭页面）";
   readonly 'import.secrets.title': "补录密钥";
   readonly 'import.secrets.hint': "以下凭据未随备份导出（安全设计）。如需在目标 DSH 使用，请手动补录；留空将跳过。";
   readonly 'import.secrets.optional': "（可选）";
   readonly 'import.secrets.required': "（必需）";
+  readonly 'import.decrypt.badge': "加密备份";
+  readonly 'import.decrypt.title': "解密备份";
+  readonly 'import.decrypt.hint': "此备份包含加密的凭据，必须输入导出时设置的加密密码才能解锁并继续导入。";
+  readonly 'import.decrypt.passwordPlaceholder': "输入备份加密密码";
+  readonly 'import.decrypt.verify': "验证密码";
+  readonly 'import.decrypt.verifying': "验证中…";
+  readonly 'import.decrypt.verified': "密码正确，解密将恢复 {count} 个凭据";
+  readonly 'import.decrypt.verifiedEmpty': "密码正确（该备份没有可恢复的凭据）";
+  readonly 'import.decrypt.previewHint': "加密备份：下一步需输入导出时的加密密码才能解锁凭据。";
   readonly 'import.conflicts.title': "解决冲突";
   readonly 'import.conflicts.hint': "以下配置项在目标 DSH 已存在且与备份不同，请逐项决策。";
   readonly 'import.conflicts.keepCurrent': "保留当前";