@xiaoyuyu6420/dsh-backup 0.14.2 → 0.14.3

package/README.en.md

@@ -152,6 +152,8 @@ Tried it? Tell us what broke, what's missing, what you liked — it directly sha
 <details>
 <summary>Recent releases</summary>
 
+- **0.14.3** — ships the security and reliability fixes from #139: validates archive/plugin paths, repairs rollback and operation locking, keeps retained credentials private, and preserves healthy backups when corrupt sessions are detected. Also fixes local-plugin migration, preview validation and large-archive rescue verification. tar/ZIP exports exclude a backup directory inside `DSH_HOME`, including its vault; move that entire directory outside `DSH_HOME` before a full restore. Includes 26 regression scenarios and 71/71 real-host checks on DSH `0.2.2-rc.1`. [Release notes](docs/promo/release-0.14.3.md).
+
 - **0.14.2** — review fixes: encryption/decryption now **stream in chunks** and write to a temp file before an atomic rename (no whole-archive buffering, no truncated ciphertext on crash); added the missing client descriptor for `setGithubToken` plus a reverse assertion that every panel method has a descriptor; braced `redactSyncChannel` (s3/gist no longer report a bogus `passwordSet:false`); copy now mentions Codex, the import preview no longer promises per-item override UI, multi-channel sync is documented as push-only, About gains a feedback link, and `rescue --fix --map` requires `--yes`. Verified: smoke 596 / settings 47 / client 62 / real-host e2e 70.
 
 - **0.14.1** — follow-up release: npm 0.14.0 shipped before Codex support landed; this version adds Codex chat-history import to the npm track (Claude Code / Codex: scan → preview → import as a new session, function calls paired by call_id into tool call/result, originals untouched) and syncs the verified numbers (smoke 587 / settings 47 / client 60 / real-host e2e 70).

package/README.md

@@ -154,6 +154,8 @@ dsh plugin --profile web add github:xiaoyuyu6420/dsh-backup
 <details>
 <summary>最近的版本</summary>
 
+- **0.14.3** —— 发布 #139 的安全与可靠性修复：限制归档与插件导入路径，修复失败回滚、凭据留档权限和操作锁；损坏会话不再触发删除健康备份；修复本地插件迁移、预览结果校验和救援大文件校验。备份目录位于 `DSH_HOME` 内时，tar/ZIP 会排除整个备份目录及 vault，避免重复打包和文件变化错误；整包恢复前需先将整个备份目录移到 `DSH_HOME` 外。新增 26 组回归，真实 DSH `0.2.2-rc.1` e2e 71/71。详情：[发布说明](docs/promo/release-0.14.3.md)。
+
 - **0.14.2** —— 复核修复：加密/解密改**分块流式**并「写临时文件 → 原子替换」（大归档不再整包入内存，崩溃不留半截密文）；补 `setGithubToken` 缺失的客户端 descriptor + 「面板方法必有 descriptor」反向断言；`redactSyncChannel` 补花括号（修掉 s3/gist 通道假的 `passwordSet:false`）；文案补 Codex、导入预览不再承诺界面逐项覆盖、多通道同步写清为单向推送、About 加反馈入口、`rescue --fix --map` 需 `--yes`；验收 smoke 596 / settings 47 / client 62 / 真机 e2e 70。
 
 - **0.14.1** —— 补发:npm 上的 0.14.0 先于 Codex 支持发布,本版把「Codex 聊天记录导入」补齐到 npm 版本(Claude Code / Codex 双来源:扫描 → 预览 → 导入为新会话,函数调用按 call_id 配对成工具调用/结果,原数据零改动),并同步验收数字(smoke 587 / settings 47 / client 60 / 真机 e2e 70)。

package/lib/client.js

@@ -553,5 +553,5 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   [data-dsh-backup] .dsb-item-actions { flex-wrap: wrap; }
   [data-dsh-backup] .dsb-kv { grid-template-columns: 1fr; }
 }
-`;var ym={name:"@xiaoyuyu6420/dsh-backup",version:"0.14.2",description:"\u4E00\u6761\u547D\u4EE4\u5907\u4EFD\u3001\u6062\u590D\u4E0E\u8FC1\u79FB DeepSeek Harness\uFF08dsh\uFF09\u7684\u5168\u90E8\u6570\u636E\uFF08~/.dsh\uFF1A\u4F1A\u8BDD\u3001\u8BBE\u7F6E\u3001\u63D2\u4EF6\u3001MCP\u3001\u6280\u80FD\uFF09\uFF1A\u5B9A\u65F6\u81EA\u52A8\u5907\u4EFD\u3001\u5347\u7EA7\u524D\u5FEB\u7167\u3001\u6362\u673A\u8FC1\u79FB\u3001\u4F1A\u8BDD\u65E5\u5FD7\u4F53\u68C0\u4FEE\u590D\u3001\u5BBF\u4E3B\u8D77\u4E0D\u6765\u4E5F\u80FD\u7528\u7684\u8FDB\u7A0B\u5916\u6551\u63F4\uFF1B\u51ED\u636E\u9ED8\u8BA4\u8131\u654F\u53EA\u5B58\u672C\u673A\u3002 Backup, restore & migrate all DeepSeek Harness (~/.dsh) data \u2014 sessions, settings, plugins, MCP, skills: scheduled backups, pre-upgrade snapshots, cross-machine migration, session-log doctor, out-of-process rescue console; credentials redacted to a local-only vault.",type:"module",packageManager:"pnpm@11.24.0",main:"lib/index.js",exports:{".":"./lib/index.js","./client":"./lib/client.js","./cordis.patch.yml":"./cordis.patch.yml","./package.json":"./package.json"},files:["lib","rescue","cordis.patch.yml","README.md","README.en.md","LICENSE"],bin:{"dsh-rescue":"./rescue/rescue.mjs"},dsh:{bundle:{patch:"./cordis.patch.yml"},client:{platform:"web",inject:["@deepseek-ai/dsh-client-runtime","@deepseek-ai/dsh-client-locale","@deepseek-ai/dsh-client-ui-settings"]}},keywords:["dsh","dsh-plugin","deepseek-harness","backup","\u5907\u4EFD","restore","\u6062\u590D","migration","\u8FC1\u79FB","\u6362\u673A","schedule","\u81EA\u52A8\u5907\u4EFD","cross-platform","cross-machine","rescue","doctor","upgrade-snapshot","mcp","skills","\u6280\u80FD","sessions","\u4F1A\u8BDD","workspace","\u5DE5\u4F5C\u533A","vault","\u6570\u636E\u5B89\u5168"],peerDependencies:{"@deepseek-ai/cordis":"^4.0.1","@deepseek-ai/dsh-commands":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-fs":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-settings":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-subprocess":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-tools":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-typert-protocol":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/schemastery":"^3.18.1"},devDependencies:{esbuild:"^0.25.0",react:"^19.0.0","react-dom":"^19.0.0",zod:"^4.4.3"},engines:{node:">=20",dsh:"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1"},license:"MIT",repository:{type:"git",url:"git+https://github.com/xiaoyuyu6420/dsh-backup.git"},homepage:"https://github.com/xiaoyuyu6420/dsh-backup#readme",bugs:{url:"https://github.com/xiaoyuyu6420/dsh-backup/issues"},publishConfig:{access:"public"}};var hi="settings.backupPanel",xb=ym.name,_b=["slots","locale","remote"],wb=c.object({destination:c.string(),dshHome:c.string(),keepDefault:c.number().int(),autoHours:c.number().int(),lastAuto:c.string().nullable(),backups:c.array(c.object({name:c.string(),size:c.number().int().nullable()})),typedBackups:c.array(c.object({name:c.string(),size:c.number().int().nullable(),types:c.array(c.string())})).optional()}),Sb=c.object({ok:c.boolean(),summary:c.string(),path:c.string(),sha:c.string(),stale:c.number().int(),keep:c.number().int(),encrypted:c.boolean().optional(),types:c.array(c.string()).optional(),hasCredentials:c.boolean().optional()}),zb=c.object({ok:c.boolean(),summary:c.string(),results:c.array(c.object({name:c.string(),ok:c.boolean(),note:c.string()}))}),Ib=c.object({ok:c.boolean(),dryRun:c.boolean(),summary:c.string(),archive:c.string().nullable().optional(),files:c.number().int().nullable().optional(),aside:c.string().nullable().optional(),snapshotPath:c.string().nullable().optional(),sample:c.array(c.string()).optional(),preflight:c.array(c.string()).optional(),targetExists:c.boolean().nullable().optional(),merge:c.boolean().optional(),types:c.array(c.string()).optional(),willOverwrite:c.array(c.string()).optional(),restored:c.number().int().optional(),kept:c.array(c.string()).optional(),encrypted:c.boolean().optional()}),Pb=c.object({ok:c.boolean(),hours:c.number().int(),summary:c.string()}),Nb=c.object({repoRaw:c.string().nullable(),repo:c.string().nullable(),tokenSet:c.boolean(),syncDir:c.string(),lastPush:c.string().nullable(),lastError:c.string().nullable()}),jb=c.object({ok:c.boolean(),summary:c.string(),pushed:c.boolean(),tooBig:c.array(c.string())}),Db=c.object({ok:c.boolean(),summary:c.string(),pulled:c.array(c.string()),corrupt:c.array(c.string()),total:c.number().int()}),Ub=c.object({ok:c.boolean(),summary:c.string()}),Tb=c.object({ok:c.boolean(),repo:c.string().nullable(),summary:c.string()}),Ob=c.object({ok:c.boolean(),current:c.string(),latest:c.string().nullable(),update:c.boolean(),error:c.string().nullable(),summary:c.string()}),Zb=c.object({ok:c.boolean(),updated:c.boolean(),current:c.string().nullable(),latest:c.string().nullable(),summary:c.string()}),Eb=c.object({ok:c.boolean(),summary:c.string(),path:c.string().optional(),name:c.string().optional(),size:c.number().int().optional(),encrypted:c.boolean().optional(),manifest:c.unknown().optional(),redactedFiles:c.array(c.string()).optional()}),Cb=c.object({ok:c.boolean(),summary:c.string(),encrypted:c.boolean().optional(),manifest:c.unknown().optional(),sections:c.array(c.object({key:c.string(),label:c.string().optional(),files:c.number().int().optional(),bytes:c.number().optional(),conflicts:c.array(c.object({name:c.string(),rel:c.string().optional(),exists:c.boolean().optional()})).optional()})).optional(),totalFiles:c.number().int().optional(),totalBytes:c.number().optional(),conflicts:c.array(c.object({name:c.string(),rel:c.string().optional(),section:c.string().optional(),exists:c.boolean().optional()})).optional(),remap:c.array(c.unknown()).optional(),compatibility:c.object({score:c.string().optional(),reasons:c.array(c.string()).optional()}).optional()}),Ab=c.object({ok:c.boolean(),summary:c.string(),encrypted:c.boolean().optional(),applied:c.number().int().optional(),skipped:c.number().int().optional(),overwrote:c.number().int().optional(),snapshot:c.string().nullable().optional(),remapped:c.number().int().optional()}),Rb=c.object({ok:c.boolean(),summary:c.string(),channels:c.object({github:c.unknown().optional(),webdav:c.unknown().optional(),s3:c.unknown().optional(),gist:c.unknown().optional()}).optional()}),Lb=c.object({ok:c.boolean(),summary:c.string(),pushed:c.boolean().optional(),count:c.number().int().optional(),at:c.string().optional(),tooBig:c.array(c.string()).optional(),gistUrl:c.string().nullable().optional()}),Fb=c.object({ok:c.boolean(),summary:c.string(),channel:c.string().optional()}),Vb=c.object({ok:c.boolean(),summary:c.string()}),Jb=c.object({ok:c.boolean(),held:c.boolean().optional(),stale:c.boolean().optional(),pid:c.number().int().nullable().optional(),operation:c.string().nullable().optional(),startedAt:c.string().nullable().optional(),heartbeatAt:c.string().nullable().optional()}),Mb=c.object({ok:c.boolean(),summary:c.string()}),Bb=c.object({ok:c.boolean(),total:c.number().optional(),totalText:c.string().optional(),categories:c.array(c.object({key:c.string(),label:c.string().optional(),bytes:c.number().optional(),files:c.number().int().optional()})).optional(),summary:c.string()}),Wb=c.object({ok:c.boolean(),removed:c.number().int().optional(),names:c.array(c.string()).optional(),summary:c.string()}),Kb=c.object({ok:c.boolean(),weekly:c.array(c.object({day:c.number().int(),time:c.string()})).optional(),summary:c.string()}),Hb=c.object({ok:c.boolean(),version:c.string().optional(),dshVersion:c.string().optional(),platform:c.string().optional(),node:c.string().optional(),profile:c.string().optional(),pluginDir:c.string().optional()}),Gb=c.object({ok:c.boolean(),summary:c.string(),profiles:c.array(c.object({name:c.string(),version:c.string().optional(),appOwned:c.boolean().optional(),readonly:c.boolean().optional(),running:c.boolean().optional(),pid:c.number().int().nullable().optional()})).optional()}),qb=c.object({ok:c.boolean(),summary:c.string(),name:c.string().optional()}),Xb=c.object({ok:c.boolean(),summary:c.string(),from:c.string().optional(),to:c.string().optional()}),Yb=c.object({ok:c.boolean(),summary:c.string(),name:c.string().optional()}),Qb=c.object({ok:c.boolean(),summary:c.string(),pid:c.number().int().nullable().optional(),running:c.boolean().optional()}),eh=c.object({ok:c.boolean(),summary:c.string(),running:c.boolean().optional()}),th=c.object({id:c.string(),name:c.string(),desc:c.string().optional(),sections:c.array(c.string()).optional(),url:c.string().optional(),source:c.string().optional(),risk:c.string().optional(),version:c.string().optional()}),_m=c.object({ok:c.boolean(),enabled:c.boolean().optional(),entries:c.array(th).optional(),summary:c.string()}),rh=_m,nh=c.object({ok:c.boolean(),dryRun:c.boolean().optional(),entry:c.object({id:c.string(),name:c.string().optional()}).optional(),preview:c.unknown().optional(),applied:c.unknown().optional(),supplyChain:c.array(c.string()).optional(),summary:c.string()}),ih=c.object({id:c.string(),label:c.string().optional(),detected:c.boolean().optional(),skills:c.number().int().optional(),instructions:c.string().nullable().optional(),mcpServers:c.array(c.string()).optional()}),oh=c.object({ok:c.boolean(),sources:c.array(ih).optional(),summary:c.string()}),wm=c.object({source:c.string(),label:c.string().optional(),skills:c.number().int().optional(),instructions:c.string().nullable().optional(),mcpServers:c.array(c.string()).optional(),totalFiles:c.number().int().optional(),totalBytes:c.number().optional()}),ah=c.object({ok:c.boolean(),report:wm.optional(),preview:c.unknown().optional(),summary:c.string()}),sh=c.object({ok:c.boolean(),dryRun:c.boolean().optional(),report:wm.optional(),preview:c.unknown().optional(),applied:c.unknown().optional(),summary:c.string()}),ch=c.object({id:c.string(),rel:c.string().optional(),file:c.string().optional(),cwd:c.string().nullable().optional(),version:c.number().int().optional()}),lh=c.object({ok:c.boolean(),sessions:c.array(ch).optional(),summary:c.string()}),uh=c.object({ok:c.boolean(),session:c.string().optional(),targetSeq:c.number().int().optional(),keepRecords:c.number().int().optional(),dropRecords:c.number().int().optional(),newId:c.string().optional(),newPath:c.string().optional(),warnings:c.array(c.string()).optional(),summary:c.string()}),dh=c.object({ok:c.boolean(),dryRun:c.boolean().optional(),session:c.string().optional(),newId:c.string().optional(),newPath:c.string().optional(),keepRecords:c.number().int().optional(),summary:c.string()}),ph=c.object({source:c.string().optional(),id:c.string(),file:c.string().optional(),project:c.string().optional(),messages:c.number().int().optional(),title:c.string().optional()}),mh=c.object({id:c.string(),label:c.string().optional(),detected:c.boolean().optional(),count:c.number().int().optional()}),fh=c.object({ok:c.boolean(),sources:c.array(mh).optional(),detected:c.boolean().optional(),sessions:c.array(ph).optional(),summary:c.string()}),$m=c.object({ok:c.boolean(),dryRun:c.boolean().optional(),source:c.string().optional(),session:c.string().optional(),file:c.string().optional(),messages:c.number().int().optional(),userCount:c.number().int().optional(),asstCount:c.number().int().optional(),toolCount:c.number().int().optional(),skipped:c.number().int().optional(),events:c.number().int().optional(),newId:c.string().optional(),path:c.string().optional(),warnings:c.array(c.string()).optional(),summary:c.string()});function L(t,r){return Object.freeze({mode:"strict",typeSymbol:t,schema:r,create:()=>r})}var gh={name:"keep",wire:"keep",source:"json",codec:L("dsh-backup/types#keep",c.number().int().positive().optional()),acceptsUndefined:!0},Vl={name:"selector",wire:"selector",source:"json",codec:L("dsh-backup/types#selector",c.string().optional()),acceptsUndefined:!0},vh={name:"dryRun",wire:"dryRun",source:"json",codec:L("dsh-backup/types#dryRun",c.boolean().optional()),acceptsUndefined:!0},bh={name:"syncDeps",wire:"syncDeps",source:"json",codec:L("dsh-backup/types#syncDeps",c.boolean().optional()),acceptsUndefined:!0},hh={name:"hours",wire:"hours",source:"json",codec:L("dsh-backup/types#hours",c.number().int().min(0).max(720)),acceptsUndefined:!0},yh={name:"token",wire:"token",source:"json",codec:L("dsh-backup/types#token",c.string()),acceptsUndefined:!1},$h=c.object({ok:c.boolean(),tokenSet:c.boolean().optional(),summary:c.string()}),kh={name:"repo",wire:"repo",source:"json",codec:L("dsh-backup/types#repo",c.string().optional()),acceptsUndefined:!0},km={name:"types",wire:"types",source:"json",codec:L("dsh-backup/types#types",c.array(c.string()).optional()),acceptsUndefined:!0},xm={name:"password",wire:"password",source:"json",codec:L("dsh-backup/types#password",c.string().optional()),acceptsUndefined:!0},$e={name:"options",wire:"options",source:"json",codec:L("dsh-backup/types#options",c.object({}).passthrough())},Jl={name:"channel",wire:"channel",source:"json",codec:L("dsh-backup/types#channel",c.string())},xh={name:"config",wire:"config",source:"json",codec:L("dsh-backup/types#config",c.object({}).passthrough())},_h={name:"force",wire:"force",source:"json",codec:L("dsh-backup/types#force",c.boolean().optional()),acceptsUndefined:!0},wh={name:"scope",wire:"scope",source:"json",codec:L("dsh-backup/types#scope",c.string())},Sh={name:"schedules",wire:"schedules",source:"json",codec:L("dsh-backup/types#schedules",c.array(c.object({day:c.number().int(),time:c.string()})))},bi={name:"name",wire:"name",source:"json",codec:L("dsh-backup/types#name",c.string())},zh={name:"old",wire:"old",source:"json",codec:L("dsh-backup/types#old",c.string())},Ih={name:"new",wire:"new",source:"json",codec:L("dsh-backup/types#new",c.string())},Ph={name:"query",wire:"query",source:"json",codec:L("dsh-backup/types#query",c.string().optional()),acceptsUndefined:!0},Nh={name:"session",wire:"session",source:"json",codec:L("dsh-backup/types#session",c.string())},jh={name:"seq",wire:"seq",source:"json",codec:L("dsh-backup/types#seq",c.number().int().optional()),acceptsUndefined:!0};function N(t,r,i,o){return Object.freeze({id:`dsh-backup#backupPanel/${t}`,service:"backupPanel",namespace:"backupPanel",method:t,invocation:Object.freeze({kind:"direct"}),parameters:Object.freeze(r.map(e=>Object.freeze({...e,codec:Object.freeze(e.codec)}))),...o?{cancellation:Object.freeze({parameter:"signal"})}:{},result:L(`dsh-backup/types#${t}Result`,i)})}var Sm=Object.freeze({package:"dsh-backup",descriptors:Object.freeze([N("status",[],wb,!1),N("backup",[gh,km,xm],Sb,!0),N("verify",[Vl],zb,!0),N("restore",[Vl,vh,km,bh,xm],Ib,!0),N("setAuto",[hh],Pb,!1),N("githubStatus",[],Nb,!1),N("githubSyncNow",[],jb,!0),N("githubPull",[],Db,!0),N("removeEntry",[Vl],Ub,!0),N("setGithubRepo",[kh],Tb,!1),N("setGithubToken",[yh],$h,!1),N("checkUpdate",[],Ob,!0),N("update",[],Zb,!0),N("exportConfig",[$e],Eb,!0),N("importPreview",[$e],Cb,!0),N("importApply",[$e],Ab,!0),N("syncStatus",[],Rb,!1),N("syncNow",[Jl],Lb,!0),N("setSyncChannel",[Jl,xh],Fb,!1),N("removeSyncChannel",[Jl],Vb,!1),N("lockStatus",[],Jb,!1),N("reclaimLock",[_h],Mb,!1),N("diskUsage",[],Bb,!0),N("cleanup",[wh],Wb,!0),N("setWeekly",[Sh],Kb,!1),N("about",[],Hb,!1),N("profilesList",[],Gb,!1),N("profileCreate",[bi],qb,!1),N("profileRename",[zh,Ih],Xb,!1),N("profileDelete",[bi],Yb,!1),N("profileLaunch",[bi],Qb,!1),N("profileStop",[bi],eh,!1),N("marketList",[],_m,!0),N("marketSearch",[Ph],rh,!0),N("marketInstall",[$e],nh,!0),N("foreignSources",[],oh,!1),N("foreignPreview",[$e],ah,!0),N("foreignImport",[$e],sh,!0),N("sessionRewindList",[],lh,!1),N("sessionRewindPreview",[Nh,jh],uh,!0),N("sessionRewindApply",[$e],dh,!0),N("chatSources",[],fh,!1),N("chatPreview",[$e],$m,!0),N("chatApply",[$e],$m,!0)])});function j(t){if(!t.ok){let r=t.error,i=r&&r.message?`${r.code}: ${r.message}`:"backupPanel \u8C03\u7528\u5931\u8D25";throw new Error(`\u64CD\u4F5C\u6CA1\u6709\u5B8C\u6210\uFF1A\u9762\u677F\u6682\u65F6\u8FDE\u4E0D\u4E0A\u540E\u53F0\uFF0C\u8BF7\u91CD\u8BD5\uFF1B\u82E5\u53CD\u590D\u51FA\u73B0\u8BF7\u91CD\u542F dsh web\uFF08\u6280\u672F\u7EC6\u8282: ${i}\uFF09`)}return t.value}function Dh(t){t.effect(()=>t.locale.register(hi,{zh:vm,en:bm}),"dsh-backup: dictionaries"),t.effect(()=>hm(),"dsh-backup: stylesheet");let r=!1,i=(o,e,n)=>{if(r&&e!==Fl)return;let a=o.locale.bind(hi);o.slots.inject("settings.plugins.tab",()=>o.slots.register({name:"settings.plugins.tab",id:"backup",order:35,label:()=>a("tab"),locale:hi,inject:()=>({panel:n})},e))};t.inject(["slots","locale"],o=>{t.inject(["remote"],e=>{t.effect(()=>{let n=null,a=!0,s=!1;return(async()=>{try{n=await e.remote.$mount(Sm)}catch(m){console.error("dsh-backup: backupPanel mount failed:",m),r=!0,i(o,Fl,{mountError:m})}a=!1,s&&n?.()})(),()=>{s=!0,a||n?.()}},"dsh-backup: remote contribution")}),t.inject(["remote.backupPanel"],e=>{let n=()=>e.remote.backupPanel;i(e,gm,{status:async()=>j(await n().status()),backup:async(s,m,d)=>j(await n().backup(s,m,d)),verify:async s=>j(await n().verify(s)),restore:async(s,m,d,p,b)=>j(await n().restore(s,m,d,p,b)),setAuto:async s=>j(await n().setAuto(s)),githubStatus:async()=>j(await n().githubStatus()),githubSyncNow:async()=>j(await n().githubSyncNow()),githubPull:async()=>j(await n().githubPull()),removeEntry:async s=>j(await n().removeEntry(s)),setGithubRepo:async s=>j(await n().setGithubRepo(s)),setGithubToken:async s=>j(await n().setGithubToken(s)),checkUpdate:async()=>j(await n().checkUpdate()),update:async()=>j(await n().update()),exportConfig:async s=>j(await n().exportConfig(s)),importPreview:async s=>j(await n().importPreview(s)),importApply:async s=>j(await n().importApply(s)),syncStatus:async()=>j(await n().syncStatus()),syncNow:async s=>j(await n().syncNow(s)),setSyncChannel:async(s,m)=>j(await n().setSyncChannel(s,m)),removeSyncChannel:async s=>j(await n().removeSyncChannel(s)),lockStatus:async()=>j(await n().lockStatus()),reclaimLock:async s=>j(await n().reclaimLock(s)),diskUsage:async()=>j(await n().diskUsage()),cleanup:async s=>j(await n().cleanup(s)),setWeekly:async s=>j(await n().setWeekly(s)),about:async()=>j(await n().about()),profilesList:async()=>j(await n().profilesList()),profileCreate:async s=>j(await n().profileCreate(s)),profileRename:async(s,m)=>j(await n().profileRename(s,m)),profileDelete:async s=>j(await n().profileDelete(s)),profileLaunch:async s=>j(await n().profileLaunch(s)),profileStop:async s=>j(await n().profileStop(s)),marketList:async()=>j(await n().marketList()),marketSearch:async s=>j(await n().marketSearch(s)),marketInstall:async s=>j(await n().marketInstall(s)),foreignSources:async()=>j(await n().foreignSources()),foreignPreview:async s=>j(await n().foreignPreview(s)),foreignImport:async s=>j(await n().foreignImport(s)),sessionRewindList:async()=>j(await n().sessionRewindList()),sessionRewindPreview:async(s,m)=>j(await n().sessionRewindPreview(s,m)),sessionRewindApply:async s=>j(await n().sessionRewindApply(s)),chatSources:async()=>j(await n().chatSources()),chatPreview:async s=>j(await n().chatPreview(s)),chatApply:async s=>j(await n().chatApply(s))})})})}
+`;var ym={name:"@xiaoyuyu6420/dsh-backup",version:"0.14.3",description:"\u4E00\u6761\u547D\u4EE4\u5907\u4EFD\u3001\u6062\u590D\u4E0E\u8FC1\u79FB DeepSeek Harness\uFF08dsh\uFF09\u7684\u5168\u90E8\u6570\u636E\uFF08~/.dsh\uFF1A\u4F1A\u8BDD\u3001\u8BBE\u7F6E\u3001\u63D2\u4EF6\u3001MCP\u3001\u6280\u80FD\uFF09\uFF1A\u5B9A\u65F6\u81EA\u52A8\u5907\u4EFD\u3001\u5347\u7EA7\u524D\u5FEB\u7167\u3001\u6362\u673A\u8FC1\u79FB\u3001\u4F1A\u8BDD\u65E5\u5FD7\u4F53\u68C0\u4FEE\u590D\u3001\u5BBF\u4E3B\u8D77\u4E0D\u6765\u4E5F\u80FD\u7528\u7684\u8FDB\u7A0B\u5916\u6551\u63F4\uFF1B\u51ED\u636E\u9ED8\u8BA4\u8131\u654F\u53EA\u5B58\u672C\u673A\u3002 Backup, restore & migrate all DeepSeek Harness (~/.dsh) data \u2014 sessions, settings, plugins, MCP, skills: scheduled backups, pre-upgrade snapshots, cross-machine migration, session-log doctor, out-of-process rescue console; credentials redacted to a local-only vault.",type:"module",packageManager:"pnpm@11.24.0",main:"lib/index.js",exports:{".":"./lib/index.js","./client":"./lib/client.js","./cordis.patch.yml":"./cordis.patch.yml","./package.json":"./package.json"},files:["lib","rescue","cordis.patch.yml","README.md","README.en.md","LICENSE"],bin:{"dsh-rescue":"./rescue/rescue.mjs"},dsh:{bundle:{patch:"./cordis.patch.yml"},client:{platform:"web",inject:["@deepseek-ai/dsh-client-runtime","@deepseek-ai/dsh-client-locale","@deepseek-ai/dsh-client-ui-settings"]}},keywords:["dsh","dsh-plugin","deepseek-harness","backup","\u5907\u4EFD","restore","\u6062\u590D","migration","\u8FC1\u79FB","\u6362\u673A","schedule","\u81EA\u52A8\u5907\u4EFD","cross-platform","cross-machine","rescue","doctor","upgrade-snapshot","mcp","skills","\u6280\u80FD","sessions","\u4F1A\u8BDD","workspace","\u5DE5\u4F5C\u533A","vault","\u6570\u636E\u5B89\u5168"],peerDependencies:{"@deepseek-ai/cordis":"^4.0.1","@deepseek-ai/dsh-commands":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-fs":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-settings":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-subprocess":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-tools":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/dsh-typert-protocol":"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1","@deepseek-ai/schemastery":"^3.18.1"},devDependencies:{esbuild:"^0.25.0",react:"^19.0.0","react-dom":"^19.0.0",zod:"^4.4.3"},engines:{node:">=20",dsh:"^0.1.1-rc.2 || ^0.1.2-rc.1 || ^0.1.5-rc.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.2.0-rc.1"},license:"MIT",repository:{type:"git",url:"git+https://github.com/xiaoyuyu6420/dsh-backup.git"},homepage:"https://github.com/xiaoyuyu6420/dsh-backup#readme",bugs:{url:"https://github.com/xiaoyuyu6420/dsh-backup/issues"},publishConfig:{access:"public"}};var hi="settings.backupPanel",xb=ym.name,_b=["slots","locale","remote"],wb=c.object({destination:c.string(),dshHome:c.string(),keepDefault:c.number().int(),autoHours:c.number().int(),lastAuto:c.string().nullable(),backups:c.array(c.object({name:c.string(),size:c.number().int().nullable()})),typedBackups:c.array(c.object({name:c.string(),size:c.number().int().nullable(),types:c.array(c.string())})).optional()}),Sb=c.object({ok:c.boolean(),summary:c.string(),path:c.string(),sha:c.string(),stale:c.number().int(),keep:c.number().int(),encrypted:c.boolean().optional(),types:c.array(c.string()).optional(),hasCredentials:c.boolean().optional()}),zb=c.object({ok:c.boolean(),summary:c.string(),results:c.array(c.object({name:c.string(),ok:c.boolean(),note:c.string()}))}),Ib=c.object({ok:c.boolean(),dryRun:c.boolean(),summary:c.string(),archive:c.string().nullable().optional(),files:c.number().int().nullable().optional(),aside:c.string().nullable().optional(),snapshotPath:c.string().nullable().optional(),sample:c.array(c.string()).optional(),preflight:c.array(c.string()).optional(),targetExists:c.boolean().nullable().optional(),merge:c.boolean().optional(),types:c.array(c.string()).optional(),willOverwrite:c.array(c.string()).optional(),restored:c.number().int().optional(),kept:c.array(c.string()).optional(),encrypted:c.boolean().optional()}),Pb=c.object({ok:c.boolean(),hours:c.number().int(),summary:c.string()}),Nb=c.object({repoRaw:c.string().nullable(),repo:c.string().nullable(),tokenSet:c.boolean(),syncDir:c.string(),lastPush:c.string().nullable(),lastError:c.string().nullable()}),jb=c.object({ok:c.boolean(),summary:c.string(),pushed:c.boolean(),tooBig:c.array(c.string())}),Db=c.object({ok:c.boolean(),summary:c.string(),pulled:c.array(c.string()),corrupt:c.array(c.string()),total:c.number().int()}),Ub=c.object({ok:c.boolean(),summary:c.string()}),Tb=c.object({ok:c.boolean(),repo:c.string().nullable(),summary:c.string()}),Ob=c.object({ok:c.boolean(),current:c.string(),latest:c.string().nullable(),update:c.boolean(),error:c.string().nullable(),summary:c.string()}),Zb=c.object({ok:c.boolean(),updated:c.boolean(),current:c.string().nullable(),latest:c.string().nullable(),summary:c.string()}),Eb=c.object({ok:c.boolean(),summary:c.string(),path:c.string().optional(),name:c.string().optional(),size:c.number().int().optional(),encrypted:c.boolean().optional(),manifest:c.unknown().optional(),redactedFiles:c.array(c.string()).optional()}),Cb=c.object({ok:c.boolean(),summary:c.string(),encrypted:c.boolean().optional(),manifest:c.unknown().optional(),sections:c.array(c.object({key:c.string(),label:c.string().optional(),files:c.number().int().optional(),bytes:c.number().optional(),conflicts:c.array(c.object({name:c.string(),rel:c.string().optional(),exists:c.boolean().optional()})).optional()})).optional(),totalFiles:c.number().int().optional(),totalBytes:c.number().optional(),conflicts:c.array(c.object({name:c.string(),rel:c.string().optional(),section:c.string().optional(),exists:c.boolean().optional()})).optional(),remap:c.array(c.unknown()).optional(),compatibility:c.object({score:c.number().min(0).max(100).optional(),reasons:c.array(c.string()).optional()}).optional()}),Ab=c.object({ok:c.boolean(),summary:c.string(),encrypted:c.boolean().optional(),applied:c.number().int().optional(),skipped:c.number().int().optional(),overwrote:c.number().int().optional(),snapshot:c.string().nullable().optional(),remapped:c.number().int().optional()}),Rb=c.object({ok:c.boolean(),summary:c.string(),channels:c.object({github:c.unknown().optional(),webdav:c.unknown().optional(),s3:c.unknown().optional(),gist:c.unknown().optional()}).optional()}),Lb=c.object({ok:c.boolean(),summary:c.string(),pushed:c.boolean().optional(),count:c.number().int().optional(),at:c.string().optional(),tooBig:c.array(c.string()).optional(),gistUrl:c.string().nullable().optional()}),Fb=c.object({ok:c.boolean(),summary:c.string(),channel:c.string().optional()}),Vb=c.object({ok:c.boolean(),summary:c.string()}),Jb=c.object({ok:c.boolean(),held:c.boolean().optional(),stale:c.boolean().optional(),pid:c.number().int().nullable().optional(),operation:c.string().nullable().optional(),startedAt:c.string().nullable().optional(),heartbeatAt:c.string().nullable().optional()}),Mb=c.object({ok:c.boolean(),summary:c.string()}),Bb=c.object({ok:c.boolean(),total:c.number().optional(),totalText:c.string().optional(),categories:c.array(c.object({key:c.string(),label:c.string().optional(),bytes:c.number().optional(),files:c.number().int().optional()})).optional(),summary:c.string()}),Wb=c.object({ok:c.boolean(),removed:c.number().int().optional(),names:c.array(c.string()).optional(),summary:c.string()}),Kb=c.object({ok:c.boolean(),weekly:c.array(c.object({day:c.number().int(),time:c.string()})).optional(),summary:c.string()}),Hb=c.object({ok:c.boolean(),version:c.string().optional(),dshVersion:c.string().optional(),platform:c.string().optional(),node:c.string().optional(),profile:c.string().optional(),pluginDir:c.string().optional()}),Gb=c.object({ok:c.boolean(),summary:c.string(),profiles:c.array(c.object({name:c.string(),version:c.string().optional(),appOwned:c.boolean().optional(),readonly:c.boolean().optional(),running:c.boolean().optional(),pid:c.number().int().nullable().optional()})).optional()}),qb=c.object({ok:c.boolean(),summary:c.string(),name:c.string().optional()}),Xb=c.object({ok:c.boolean(),summary:c.string(),from:c.string().optional(),to:c.string().optional()}),Yb=c.object({ok:c.boolean(),summary:c.string(),name:c.string().optional()}),Qb=c.object({ok:c.boolean(),summary:c.string(),pid:c.number().int().nullable().optional(),running:c.boolean().optional()}),eh=c.object({ok:c.boolean(),summary:c.string(),running:c.boolean().optional()}),th=c.object({id:c.string(),name:c.string(),desc:c.string().optional(),sections:c.array(c.string()).optional(),url:c.string().optional(),source:c.string().optional(),risk:c.string().optional(),version:c.string().optional()}),_m=c.object({ok:c.boolean(),enabled:c.boolean().optional(),entries:c.array(th).optional(),summary:c.string()}),rh=_m,nh=c.object({ok:c.boolean(),dryRun:c.boolean().optional(),entry:c.object({id:c.string(),name:c.string().optional()}).optional(),preview:c.unknown().optional(),applied:c.unknown().optional(),supplyChain:c.array(c.string()).optional(),summary:c.string()}),ih=c.object({id:c.string(),label:c.string().optional(),detected:c.boolean().optional(),skills:c.number().int().optional(),instructions:c.string().nullable().optional(),mcpServers:c.array(c.string()).optional()}),oh=c.object({ok:c.boolean(),sources:c.array(ih).optional(),summary:c.string()}),wm=c.object({source:c.string(),label:c.string().optional(),skills:c.number().int().optional(),instructions:c.string().nullable().optional(),mcpServers:c.array(c.string()).optional(),totalFiles:c.number().int().optional(),totalBytes:c.number().optional()}),ah=c.object({ok:c.boolean(),report:wm.optional(),preview:c.unknown().optional(),summary:c.string()}),sh=c.object({ok:c.boolean(),dryRun:c.boolean().optional(),report:wm.optional(),preview:c.unknown().optional(),applied:c.unknown().optional(),summary:c.string()}),ch=c.object({id:c.string(),rel:c.string().optional(),file:c.string().optional(),cwd:c.string().nullable().optional(),version:c.number().int().optional()}),lh=c.object({ok:c.boolean(),sessions:c.array(ch).optional(),summary:c.string()}),uh=c.object({ok:c.boolean(),session:c.string().optional(),targetSeq:c.number().int().optional(),keepRecords:c.number().int().optional(),dropRecords:c.number().int().optional(),newId:c.string().optional(),newPath:c.string().optional(),warnings:c.array(c.string()).optional(),summary:c.string()}),dh=c.object({ok:c.boolean(),dryRun:c.boolean().optional(),session:c.string().optional(),newId:c.string().optional(),newPath:c.string().optional(),keepRecords:c.number().int().optional(),summary:c.string()}),ph=c.object({source:c.string().optional(),id:c.string(),file:c.string().optional(),project:c.string().optional(),messages:c.number().int().optional(),title:c.string().optional()}),mh=c.object({id:c.string(),label:c.string().optional(),detected:c.boolean().optional(),count:c.number().int().optional()}),fh=c.object({ok:c.boolean(),sources:c.array(mh).optional(),detected:c.boolean().optional(),sessions:c.array(ph).optional(),summary:c.string()}),$m=c.object({ok:c.boolean(),dryRun:c.boolean().optional(),source:c.string().optional(),session:c.string().optional(),file:c.string().optional(),messages:c.number().int().optional(),userCount:c.number().int().optional(),asstCount:c.number().int().optional(),toolCount:c.number().int().optional(),skipped:c.number().int().optional(),events:c.number().int().optional(),newId:c.string().optional(),path:c.string().optional(),warnings:c.array(c.string()).optional(),summary:c.string()});function L(t,r){return Object.freeze({mode:"strict",typeSymbol:t,schema:r,create:()=>r})}var gh={name:"keep",wire:"keep",source:"json",codec:L("dsh-backup/types#keep",c.number().int().positive().optional()),acceptsUndefined:!0},Vl={name:"selector",wire:"selector",source:"json",codec:L("dsh-backup/types#selector",c.string().optional()),acceptsUndefined:!0},vh={name:"dryRun",wire:"dryRun",source:"json",codec:L("dsh-backup/types#dryRun",c.boolean().optional()),acceptsUndefined:!0},bh={name:"syncDeps",wire:"syncDeps",source:"json",codec:L("dsh-backup/types#syncDeps",c.boolean().optional()),acceptsUndefined:!0},hh={name:"hours",wire:"hours",source:"json",codec:L("dsh-backup/types#hours",c.number().int().min(0).max(720)),acceptsUndefined:!0},yh={name:"token",wire:"token",source:"json",codec:L("dsh-backup/types#token",c.string()),acceptsUndefined:!1},$h=c.object({ok:c.boolean(),tokenSet:c.boolean().optional(),summary:c.string()}),kh={name:"repo",wire:"repo",source:"json",codec:L("dsh-backup/types#repo",c.string().optional()),acceptsUndefined:!0},km={name:"types",wire:"types",source:"json",codec:L("dsh-backup/types#types",c.array(c.string()).optional()),acceptsUndefined:!0},xm={name:"password",wire:"password",source:"json",codec:L("dsh-backup/types#password",c.string().optional()),acceptsUndefined:!0},$e={name:"options",wire:"options",source:"json",codec:L("dsh-backup/types#options",c.object({}).passthrough())},Jl={name:"channel",wire:"channel",source:"json",codec:L("dsh-backup/types#channel",c.string())},xh={name:"config",wire:"config",source:"json",codec:L("dsh-backup/types#config",c.object({}).passthrough())},_h={name:"force",wire:"force",source:"json",codec:L("dsh-backup/types#force",c.boolean().optional()),acceptsUndefined:!0},wh={name:"scope",wire:"scope",source:"json",codec:L("dsh-backup/types#scope",c.string())},Sh={name:"schedules",wire:"schedules",source:"json",codec:L("dsh-backup/types#schedules",c.array(c.object({day:c.number().int(),time:c.string()})))},bi={name:"name",wire:"name",source:"json",codec:L("dsh-backup/types#name",c.string())},zh={name:"old",wire:"old",source:"json",codec:L("dsh-backup/types#old",c.string())},Ih={name:"new",wire:"new",source:"json",codec:L("dsh-backup/types#new",c.string())},Ph={name:"query",wire:"query",source:"json",codec:L("dsh-backup/types#query",c.string().optional()),acceptsUndefined:!0},Nh={name:"session",wire:"session",source:"json",codec:L("dsh-backup/types#session",c.string())},jh={name:"seq",wire:"seq",source:"json",codec:L("dsh-backup/types#seq",c.number().int().optional()),acceptsUndefined:!0};function N(t,r,i,o){return Object.freeze({id:`dsh-backup#backupPanel/${t}`,service:"backupPanel",namespace:"backupPanel",method:t,invocation:Object.freeze({kind:"direct"}),parameters:Object.freeze(r.map(e=>Object.freeze({...e,codec:Object.freeze(e.codec)}))),...o?{cancellation:Object.freeze({parameter:"signal"})}:{},result:L(`dsh-backup/types#${t}Result`,i)})}var Sm=Object.freeze({package:"dsh-backup",descriptors:Object.freeze([N("status",[],wb,!1),N("backup",[gh,km,xm],Sb,!0),N("verify",[Vl],zb,!0),N("restore",[Vl,vh,km,bh,xm],Ib,!0),N("setAuto",[hh],Pb,!1),N("githubStatus",[],Nb,!1),N("githubSyncNow",[],jb,!0),N("githubPull",[],Db,!0),N("removeEntry",[Vl],Ub,!0),N("setGithubRepo",[kh],Tb,!1),N("setGithubToken",[yh],$h,!1),N("checkUpdate",[],Ob,!0),N("update",[],Zb,!0),N("exportConfig",[$e],Eb,!0),N("importPreview",[$e],Cb,!0),N("importApply",[$e],Ab,!0),N("syncStatus",[],Rb,!1),N("syncNow",[Jl],Lb,!0),N("setSyncChannel",[Jl,xh],Fb,!1),N("removeSyncChannel",[Jl],Vb,!1),N("lockStatus",[],Jb,!1),N("reclaimLock",[_h],Mb,!1),N("diskUsage",[],Bb,!0),N("cleanup",[wh],Wb,!0),N("setWeekly",[Sh],Kb,!1),N("about",[],Hb,!1),N("profilesList",[],Gb,!1),N("profileCreate",[bi],qb,!1),N("profileRename",[zh,Ih],Xb,!1),N("profileDelete",[bi],Yb,!1),N("profileLaunch",[bi],Qb,!1),N("profileStop",[bi],eh,!1),N("marketList",[],_m,!0),N("marketSearch",[Ph],rh,!0),N("marketInstall",[$e],nh,!0),N("foreignSources",[],oh,!1),N("foreignPreview",[$e],ah,!0),N("foreignImport",[$e],sh,!0),N("sessionRewindList",[],lh,!1),N("sessionRewindPreview",[Nh,jh],uh,!0),N("sessionRewindApply",[$e],dh,!0),N("chatSources",[],fh,!1),N("chatPreview",[$e],$m,!0),N("chatApply",[$e],$m,!0)])});function j(t){if(!t.ok){let r=t.error,i=r&&r.message?`${r.code}: ${r.message}`:"backupPanel \u8C03\u7528\u5931\u8D25";throw new Error(`\u64CD\u4F5C\u6CA1\u6709\u5B8C\u6210\uFF1A\u9762\u677F\u6682\u65F6\u8FDE\u4E0D\u4E0A\u540E\u53F0\uFF0C\u8BF7\u91CD\u8BD5\uFF1B\u82E5\u53CD\u590D\u51FA\u73B0\u8BF7\u91CD\u542F dsh web\uFF08\u6280\u672F\u7EC6\u8282: ${i}\uFF09`)}return t.value}function Dh(t){t.effect(()=>t.locale.register(hi,{zh:vm,en:bm}),"dsh-backup: dictionaries"),t.effect(()=>hm(),"dsh-backup: stylesheet");let r=!1,i=(o,e,n)=>{if(r&&e!==Fl)return;let a=o.locale.bind(hi);o.slots.inject("settings.plugins.tab",()=>o.slots.register({name:"settings.plugins.tab",id:"backup",order:35,label:()=>a("tab"),locale:hi,inject:()=>({panel:n})},e))};t.inject(["slots","locale"],o=>{t.inject(["remote"],e=>{t.effect(()=>{let n=null,a=!0,s=!1;return(async()=>{try{n=await e.remote.$mount(Sm)}catch(m){console.error("dsh-backup: backupPanel mount failed:",m),r=!0,i(o,Fl,{mountError:m})}a=!1,s&&n?.()})(),()=>{s=!0,a||n?.()}},"dsh-backup: remote contribution")}),t.inject(["remote.backupPanel"],e=>{let n=()=>e.remote.backupPanel;i(e,gm,{status:async()=>j(await n().status()),backup:async(s,m,d)=>j(await n().backup(s,m,d)),verify:async s=>j(await n().verify(s)),restore:async(s,m,d,p,b)=>j(await n().restore(s,m,d,p,b)),setAuto:async s=>j(await n().setAuto(s)),githubStatus:async()=>j(await n().githubStatus()),githubSyncNow:async()=>j(await n().githubSyncNow()),githubPull:async()=>j(await n().githubPull()),removeEntry:async s=>j(await n().removeEntry(s)),setGithubRepo:async s=>j(await n().setGithubRepo(s)),setGithubToken:async s=>j(await n().setGithubToken(s)),checkUpdate:async()=>j(await n().checkUpdate()),update:async()=>j(await n().update()),exportConfig:async s=>j(await n().exportConfig(s)),importPreview:async s=>j(await n().importPreview(s)),importApply:async s=>j(await n().importApply(s)),syncStatus:async()=>j(await n().syncStatus()),syncNow:async s=>j(await n().syncNow(s)),setSyncChannel:async(s,m)=>j(await n().setSyncChannel(s,m)),removeSyncChannel:async s=>j(await n().removeSyncChannel(s)),lockStatus:async()=>j(await n().lockStatus()),reclaimLock:async s=>j(await n().reclaimLock(s)),diskUsage:async()=>j(await n().diskUsage()),cleanup:async s=>j(await n().cleanup(s)),setWeekly:async s=>j(await n().setWeekly(s)),about:async()=>j(await n().about()),profilesList:async()=>j(await n().profilesList()),profileCreate:async s=>j(await n().profileCreate(s)),profileRename:async(s,m)=>j(await n().profileRename(s,m)),profileDelete:async s=>j(await n().profileDelete(s)),profileLaunch:async s=>j(await n().profileLaunch(s)),profileStop:async s=>j(await n().profileStop(s)),marketList:async()=>j(await n().marketList()),marketSearch:async s=>j(await n().marketSearch(s)),marketInstall:async s=>j(await n().marketInstall(s)),foreignSources:async()=>j(await n().foreignSources()),foreignPreview:async s=>j(await n().foreignPreview(s)),foreignImport:async s=>j(await n().foreignImport(s)),sessionRewindList:async()=>j(await n().sessionRewindList()),sessionRewindPreview:async(s,m)=>j(await n().sessionRewindPreview(s,m)),sessionRewindApply:async s=>j(await n().sessionRewindApply(s)),chatSources:async()=>j(await n().chatSources()),chatPreview:async s=>j(await n().chatPreview(s)),chatApply:async s=>j(await n().chatApply(s))})})})}
 return module.exports; } });

package/lib/index.js

@@ -54,6 +54,7 @@
  * 插件的自有存储。
  */
 import { createHash, randomUUID } from 'node:crypto';
+import { AsyncLocalStorage } from 'node:async_hooks';
 import { createReadStream, existsSync, readFileSync, realpathSync } from 'node:fs';
 import { spawn } from 'node:child_process';
 import { mkdir, open, copyFile, chmod, readdir, readFile, rename, rm, stat as fsStat, lstat, unlink, writeFile, link } from 'node:fs/promises';
@@ -66,6 +67,8 @@ import * as zlib from 'node:zlib';
 import { decryptFile, encryptFile } from './encrypt.js';
 import { buildZip, listZip, extractZip, readZipEntry } from './zip.js';
 import { gfsProtectedSet } from './gfs.js';
+import { safeRelativePath, safeDestination, backupRootRelative, tarLiteralPattern } from './paths.js';
+import { matchesRedaction } from './redact.js';
 import { acquireLock, releaseLock, heartbeatLock, reclaimLock as reclaimOplock, isLockStale, LOCK_HEARTBEAT_MS } from './oplock.js';
 import { s3Put, webdavPut, gistSync, gistContent } from './sync-channels.js';
 import { defineTool } from '@deepseek-ai/dsh-tools';
@@ -151,7 +154,7 @@ const EXPORT_SECTIONS = Object.freeze([
   { key: 'settings', label: '设置', paths: ['settings.yaml', 'settings.json'] },
   { key: 'ui', label: '界面设置', paths: ['ui.json', 'ui-state.json', '.ui'] },
   { key: 'providers', label: '模型供应商', paths: ['providers'] },
-  { key: 'plugins', label: '插件 profiles', paths: ['profiles'] },
+  { key: 'plugins', label: '插件 profiles', paths: ['profiles', 'local-plugins'] },
   { key: 'mcp', label: 'MCP 配置', paths: ['cordis.patch.yml', 'cordis.yml'] },
   { key: 'skills', label: '技能', paths: ['skills'] },
   { key: 'prompts', label: '提示词', paths: ['prompts'] },
@@ -1351,7 +1354,33 @@ export function apply(ctx, pluginConfig) {
    * （rel 本身可含 glob）。
    */
   function redactExcludeFlags(base) {
-    return sensitivePaths().flatMap((rel) => [`--exclude=${base}/${rel}`, `--exclude=*/${rel}`]);
+    return sensitivePatterns().flatMap((rel) => [`--exclude=${base}/${rel}`, `--exclude=*/${rel}`]);
+  }
+
+  // Old releases left rollback copies beside live credentials. Exclude these too.
+  function sensitivePatterns() {
+    return sensitivePaths().flatMap((rel) => [rel, `${rel}.pre-merge-*`, `${rel}.pre-import-*`]);
+  }
+
+  function isSensitiveRelative(rel) {
+    return sensitivePatterns().some((pattern) => matchesRedaction(rel, pattern));
+  }
+
+  async function retainBeforeOverwrite(rel, kind, stamp) {
+    const { dshHome, root } = paths();
+    const sensitive = isSensitiveRelative(rel);
+    const keep = sensitive
+      ? await safeDestination(`${root}/${VAULT_DIR}/${PRESERVED_DIR}`, `${kind}-${stamp}/${rel}`)
+      : await safeDestination(dshHome, `${rel}.pre-${kind}-${stamp}`);
+    await mkdir(dirname(keep), { recursive: true, mode: 0o700 });
+    // Create exclusively and privately before copying; never follow a retained
+    // path left by an earlier operation or expose plaintext through the umask.
+    const fh = await open(keep, 'wx', 0o600);
+    // copyFile copies the source mode too, which could turn a private rollback
+    // file back into 0644. Stream through the already-private file descriptor.
+    try { await fh.writeFile(createReadStream(`${dshHome}/${rel}`)); }
+    finally { await fh.close(); }
+    return keep;
   }
 
   /**
@@ -1687,26 +1716,30 @@ export function apply(ctx, pluginConfig) {
   // 备份/恢复/导入/同步/doctor 这类重活会动 ~/.dsh 与备份目录（vault 刷新、
   // .dsh 挪旁、归档轮换），多实例/多 profile 并发会互相踩。锁文件在备份目录根
   // .oplock.json，记 pid+token+心跳；死锁（pid 已死）下次自动回收，活锁绝不误踢。
-  // 同进程重入（restore 内部的快照 doBackup 等）经 heldLock 内存标记直接放行。
+  // 同一异步操作链可重入（restore 内部的快照 doBackup 等）。
   let heldLock = null;
-  let heartbeatTimer = null;
+  const operationScope = new AsyncLocalStorage();
 
   async function withOperationLock(operation, fn) {
-    if (heldLock) return fn(); // 同进程重入：本进程已持锁，直接跑
+    // Only descendants of the current operation may reenter (restore -> snapshot).
+    // An unrelated RPC in the same process must still compete for the lock.
+    if (heldLock && operationScope.getStore() === heldLock.token) return fn();
     const { root } = paths();
     const lockPath = `${root}/${LOCK_FILE}`;
     const r = await acquireLock(lockPath, operation);
     if (!r.acquired) {
-      throw new Error(`另一操作正在进行（${r.heldBy?.operation ?? '未知'}，pid=${r.heldBy?.pid}）——请稍后重试；若确认是残留死锁可用 /backup lock reclaim 回收`);
+      throw new Error(`另一操作正在进行（${r.heldBy?.operation ?? '未知'}，pid=${r.heldBy?.pid ?? '未知'}）：${r.reason ?? ''}——请稍后重试；若确认是残留死锁可用 /backup lock reclaim 回收`);
     }
     heldLock = r.lock;
-    heartbeatTimer = setInterval(() => { heartbeatLock(lockPath, r.lock.token).catch(() => {}); }, LOCK_HEARTBEAT_MS);
+    let heartbeat = Promise.resolve();
+    const heartbeatTimer = setInterval(() => { heartbeat = heartbeat.then(() => heartbeatLock(lockPath, r.lock.token)).catch(() => {}); }, LOCK_HEARTBEAT_MS);
     try {
-      return await fn();
+      return await operationScope.run(r.lock.token, fn);
     } finally {
-      if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
+      clearInterval(heartbeatTimer);
+      await heartbeat;
       await releaseLock(lockPath, r.lock.token).catch(() => {});
-      heldLock = null;
+      if (heldLock?.token === r.lock.token) heldLock = null;
     }
   }
 
@@ -1716,6 +1749,7 @@ export function apply(ctx, pluginConfig) {
 
   async function doBackupInner(keep, signal, opts = {}) {
     const { home, dshHome, root } = paths();
+    const backupRel = backupRootRelative(dshHome, root);
     const keepN = keep && keep > 0 ? Math.floor(keep) : defaultKeep();
     // 状态文件先写：writeText 会自动创建备份目录，替代 mkdir -p（Windows 无 mkdir.exe）。
     await saveAutoState();
@@ -1735,10 +1769,11 @@ export function apply(ctx, pluginConfig) {
     // 不知情的情况下删掉最后一份好副本。检出项记入 meta.quarantined，恢复侧
     // 如实提示。体检失败不阻断备份（fail-open）。
     let quarantined = [];
+    let scanFailed = false;
     if (!opts?.skipScan) {
       try {
         quarantined = (await runDoctorScan(signal)).corrupt.map((c) => c.rel);
-      } catch { /* 扫描异常按无隔离处理 */ }
+      } catch { scanFailed = true; }
     }
     const quarantineFlags = quarantined.map((rel) => `--exclude=${base}/${rel}`);
 
@@ -1761,8 +1796,9 @@ export function apply(ctx, pluginConfig) {
     const redacted = skipVault ? await existingSensitive(dshHome) : await refreshVault(dshHome, home, signal);
     const tar = await ctx.subprocess.resolveExecutable('tar');
     const redactFlags = isTyped ? [] : redactExcludeFlags(base);
+    const destinationFlags = backupRel === null ? [] : [`--exclude=${tarLiteralPattern(`${base}/${backupRel}`)}`];
     try {
-      await spawnRun([tar, '--exclude=*node_modules*', '--exclude=.system', ...quarantineFlags, ...redactFlags, ...extraExcludes(), '-czf', name, '-C', parentTar(parent), ...(isTyped ? typePaths : [base])], root, signal);
+      await spawnRun([tar, '--exclude=*node_modules*', '--exclude=.system', ...destinationFlags, ...quarantineFlags, ...redactFlags, ...extraExcludes(), '-czf', name, '-C', parentTar(parent), ...(isTyped ? typePaths : [base])], root, signal);
     } catch (err) {
       // tar 失败前已创建 -f 目标——空壳归档留在备份目录会被面板当正常备份
       // 列出来（#88：29 字节静默空包）。删掉空壳再抛，让失败可见。
@@ -1848,7 +1884,8 @@ export function apply(ctx, pluginConfig) {
       monthly: Number(gfsCfg.gfsMonthly) > 0 ? Math.floor(Number(gfsCfg.gfsMonthly)) : 0,
       yearly: Number(gfsCfg.gfsYearly) > 0 ? Math.floor(Number(gfsCfg.gfsYearly)) : 0,
     });
-    const rotateStale = opts.skipRotate
+    const retentionPaused = quarantined.length > 0 || scanFailed;
+    const rotateStale = opts.skipRotate || retentionPaused || SNAPSHOT_PREFIXES.some((p) => name.startsWith(p))
       ? []
       : rotateTail.filter((b) => !tierProtectedSet(rotateTail, rotateBase[0]?.name).has(b.name) && !gfsProtect.has(b.name)).map((b) => b.name);
     if (rotateStale.length) await removeFiles(rotateStale.flatMap((n) => sidecarsFor(n)), root, signal);
@@ -1871,14 +1908,14 @@ export function apply(ctx, pluginConfig) {
       await saveAutoState();
     }
 
-    return { path: out, name, sha: shaText, total: rotateBase.length, stale: rotateStale.length, keep: keepN, quarantined, sync, ...(encrypted ? { encrypted: true } : {}), ...(isTyped ? { types, hasCredentials } : {}) };
+    return { path: out, name, sha: shaText, total: rotateBase.length, stale: rotateStale.length, keep: keepN, quarantined, retentionPaused, sync, ...(encrypted ? { encrypted: true } : {}), ...(isTyped ? { types, hasCredentials } : {}) };
   }
 
   /** 备份回执的隔离提示行：体检发现坏会话文件未入档时如实告知 + 指路修复。 */
   function quarantineNote(r) {
     return Array.isArray(r?.quarantined) && r.quarantined.length
-      ? `\n⚠️ ${r.quarantined.length} 个损坏会话文件未入档（防轮换毁掉好副本）；/backup doctor --repair 修复后可正常备份`
-      : '';
+      ? `\n⚠️ ${r.quarantined.length} 个损坏会话文件未入档，已暂停轮换以保留健康副本；/backup doctor --repair 修复后恢复轮换`
+      : r?.retentionPaused ? '\n⚠️ 会话体检未完成，已暂停轮换；体检恢复后再清理旧备份' : '';
   }
 
   // ---------- GitHub 同步 ----------
@@ -2016,7 +2053,8 @@ export function apply(ctx, pluginConfig) {
       } finally {
         await fh.close();
       }
-      await spawnRun([git, 'config', 'credential.helper', `store --file=${creds}`], syncDir, signal);
+      const quotedCreds = `'${creds.replace(/'/g, `'\\''`)}'`;
+      await spawnRun([git, 'config', 'credential.helper', `store --file=${quotedCreds}`], syncDir, signal);
     }
     // token 文件绝不能进仓库：git add -A 会把它当普通文件提交
     await writeOwned(`${syncDir}/.gitignore`, '.git-credentials\n');
@@ -2030,6 +2068,10 @@ export function apply(ctx, pluginConfig) {
    * 的 .git-credentials（credential helper），不进进程参数。
    */
   async function githubSync(signal) {
+    return withOperationLock('github-sync', () => githubSyncInner(signal));
+  }
+
+  async function githubSyncInner(signal) {
     const { root } = paths();
     const wt = await ensureSyncWorktree(signal);
     if (wt.reason) return { skipped: wt.reason };
@@ -2106,6 +2148,10 @@ export function apply(ctx, pluginConfig) {
    * 拉回的归档先做 sha256 校验（边车随仓库走），损坏即报且不落列表。
    */
   async function githubPull(signal) {
+    return withOperationLock('github-pull', () => githubPullInner(signal));
+  }
+
+  async function githubPullInner(signal) {
     const { root, home } = paths();
     const wt = await ensureSyncWorktree(signal);
     if (wt.reason) throw new Error(wt.reason);
@@ -2281,6 +2327,10 @@ export function apply(ctx, pluginConfig) {
    * error?, skipped?, gistUrl? }，凭据绝不进返回。
    */
   async function syncNow(channel, signal) {
+    return withOperationLock('sync', () => syncNowInner(channel, signal));
+  }
+
+  async function syncNowInner(channel, signal) {
     if (channel === 'github') return githubSync(signal);
     const ch = syncChannels[channel];
     if (!ch) return { error: `未配置同步通道 ${channel}（/backup sync ${channel} set … 或面板配置）` };
@@ -2619,9 +2669,10 @@ export function apply(ctx, pluginConfig) {
    * cwd 为备份目录、-f 用纯文件名（规避 Windows GNU tar 盘符冒号问题），
    * 逐行解析 -tvzf 输出并拒绝备份根之外的任何条目——含不安全条目直接抛错。
    */
-  async function safeArchiveEntries(pickedName, signal) {
-    const { root, dshHome } = paths();
-    const base = dshHome.split('/').pop();
+  async function safeArchiveEntries(pickedName, signal, options = {}) {
+    const env = paths();
+    const root = options.root ?? env.root;
+    const base = options.base ?? env.dshHome.split('/').pop();
     const tar = await ctx.subprocess.resolveExecutable('tar');
     // 清单流式读取（#119）：不用有界收集——大归档的清单超过 spill 上限时会被截断，
     // 碎片会被误判成"不安全条目"而拒绝整包（详见 streamListingLines 注释）。
@@ -2646,7 +2697,7 @@ export function apply(ctx, pluginConfig) {
       // 救援台全链路失效（#112）。硬链接不能跨文件系统、也不能指向目录，目标同为
       // 归档内相对路径时解压不会逃出备份根；符号链接（l）、设备等仍一律拒绝。
       const plainOk = Boolean(parsed) && Boolean(name) && (parsed.type === '-' || parsed.type === 'd') && insideBase(name);
-      const hardOk = Boolean(parsed) && parsed.type === 'h' && insideBase(name) && insideBase(link);
+      const hardOk = options.allowHardlinks !== false && Boolean(parsed) && parsed.type === 'h' && insideBase(name) && insideBase(link);
       if (!plainOk && !hardOk) {
         bad.push(parsed ? name : s);
       } else {
@@ -2763,13 +2814,17 @@ export function apply(ctx, pluginConfig) {
           targetExists, preflight: preflightLines(preflight, profileDirs),
         };
       }
-      // 留档将覆盖的现有文件（.pre-merge-<时间戳>），失败可逐个还原。
+      const newTargets = [];
+      for (const entry of fileTargets) {
+        const rel = entry.slice(`${base}/`.length);
+        await safeDestination(dshHome, rel);
+        if (!(await existsStat(`${dshHome}/${rel}`))) newTargets.push(rel);
+      }
+      // Validate every target before creating rollback copies or changing data.
       const stamp = stampNow();
       const kept = [];
       for (const w of willOverwrite) {
-        const keep = `${dshHome}/${w.rel}.pre-merge-${stamp}`;
-        await mkdir(dirname(keep), { recursive: true });
-        await copyFile(`${dshHome}/${w.rel}`, keep);
+        const keep = await retainBeforeOverwrite(w.rel, 'merge', stamp);
         kept.push({ ...w, keep });
       }
       try {
@@ -2780,14 +2835,18 @@ export function apply(ctx, pluginConfig) {
         // 时把留档路径交代清楚，绝不静默停在半截状态。
         const reason = err && err.message ? err.message : String(err);
         const restored = new Set();
-        for (const w of willOverwrite) {
+        for (const w of kept) {
           try { await copyFile(w.keep, `${dshHome}/${w.rel}`); restored.add(w.rel); } catch { /* 逐个失败落入下方报告 */ }
         }
-        if (restored.size === willOverwrite.length) {
+        const cleanupFailed = [];
+        for (const rel of newTargets) {
+          try { await rm(`${dshHome}/${rel}`, { recursive: true, force: true }); } catch { cleanupFailed.push(rel); }
+        }
+        if (restored.size === willOverwrite.length && !cleanupFailed.length) {
           throw new Error(`分类型恢复失败（${reason}）。已从留档还原全部覆盖现场，数据保持恢复前状态；排查后可重试`);
         }
-        const missing = willOverwrite.filter((w) => !restored.has(w.rel)).map((w) => w.rel);
-        throw new Error(`分类型恢复失败（${reason}），且部分现场未自动还原: ${missing.join(', ')}。对应的 *.pre-merge-${stamp} 留档仍在原目录旁，手工拷回即可`);
+        const missing = kept.filter((w) => !restored.has(w.rel)).map((w) => `${w.rel}（留档: ${w.keep}）`);
+        throw new Error(`分类型恢复失败（${reason}），且部分现场未自动还原: ${[...missing, ...cleanupFailed].join(', ')}。请从上述留档手工还原`);
       }
       // 可选依赖重装：merge 含 profiles 时对新解出的 profile 跑 pnpm install。
       const deps = { installed: [], failed: [], note: null };
@@ -2833,6 +2892,12 @@ export function apply(ctx, pluginConfig) {
       };
     }
 
+    // Moving DSH_HOME would also move the selected archive, vault and operation
+    // lock. Require relocating the complete backup directory before replacement.
+    if (backupRootRelative(dshHome, root) !== null) {
+      throw new Error('整包恢复前请把整个备份目录（含 vault）移到 DSH_HOME 外，并更新备份路径；当前备份目录位于待替换的数据目录内');
+    }
+
     // 恢复前自动快照当前数据，并把当前数据移到旁边（而非合并覆盖）。
     // 快照用 dsh-pre-restore- 前缀与用户常规备份区分，经 listBackups 过滤
     // 后不进列表/轮换/latest 选择；每次恢复清掉上一次的快照防累积。
@@ -2943,7 +3008,7 @@ export function apply(ctx, pluginConfig) {
         '✅ 分类型恢复完成',
         `  已合并写入: ${r.restored} 项 ← 来自 ${r.archive.split('/').pop()}（类型: ${types}）`,
       ];
-      if (r.kept?.length) lines.push(`  覆盖的旧文件已留档: ${r.kept.length} 个（.pre-merge-*，确认后可自行删除）`);
+      if (r.kept?.length) lines.push(`  覆盖的旧文件已留档: ${r.kept.length} 个（敏感文件在本机 vault/preserved，其余为 .pre-merge-*，确认后可自行删除）`);
       for (const p of r.preflight ?? []) if (p.startsWith('⚠️')) lines.push(`  ${p}`);
       if (r.deps?.note) lines.push(`  插件依赖: ${r.deps.note}`);
       else if (r.deps?.installed?.length) lines.push(`  插件依赖: 已装好 ${r.deps.installed.join(', ')}`);
@@ -3030,10 +3095,12 @@ export function apply(ctx, pluginConfig) {
    * .git/.system（任意深度）；凭据节段按 includeCredentials 决定入包或记入脱敏清单。
    */
   async function walkExportFiles(dshHome, includeCredentials, signal) {
+    const backupRel = backupRootRelative(dshHome, paths().root);
     const files = [];
     const redacted = [];
     const skipDirs = new Set(['node_modules', '.git', '.system']);
     async function walk(abs, rel) {
+      if (rel === backupRel) return;
       if (signal?.aborted) throw new Error('操作已取消');
       if (files.length >= EXPORT_MAX_FILES) throw new Error(`导出文件数超过上限（${EXPORT_MAX_FILES}），请检查 ~/.dsh 是否有异常目录树`);
       let st;
@@ -3051,7 +3118,7 @@ export function apply(ctx, pluginConfig) {
       }
       if (!st.isFile()) return;
       const section = sectionKeyForTop(rel.split('/')[0]);
-      if (section === 'credentials' && !includeCredentials) { redacted.push(rel); return; }
+      if (!includeCredentials && (section === 'credentials' || isSensitiveRelative(rel))) { redacted.push(rel); return; }
       files.push({ rel, abs, bytes: st.size, section });
     }
     await walk(dshHome, '');
@@ -3076,6 +3143,10 @@ export function apply(ctx, pluginConfig) {
 
   /** 导出：把 ~/.dsh 打成单文件 ZIP（可选加密）。 */
   async function exportConfig(opts, signal) {
+    return withOperationLock('export', () => exportConfigInner(opts, signal));
+  }
+
+  async function exportConfigInner(opts, signal) {
     const { home, dshHome, root } = paths();
     const includeCredentials = opts?.includeCredentials === true;
     const password = typeof opts?.password === 'string' && opts.password ? opts.password : null;
@@ -3093,9 +3164,11 @@ export function apply(ctx, pluginConfig) {
     // 本地 link:/file: 插件迁移：npm pack 成 tarball 打进导出，导入侧解包改 file:
     const localPlugins = await scanLocalPlugins(signal);
     const packedPlugins = localPlugins.filter((p) => p.status === 'packed');
+    // Different profiles may reference distinct packages with the same npm name/version.
+    for (const p of packedPlugins) p.exportName = `${randomUUID()}-${p.tarballName}`;
     const encrypted = Boolean(password);
     const manifest = buildManifest(home, encrypted, redacted, sectionStats);
-    manifest.localPlugins = localPlugins.map((p) => ({ profile: p.profile, name: p.name, spec: p.spec, status: p.status, tarball: p.tarballName ?? null, warning: p.warning ?? null }));
+    manifest.localPlugins = localPlugins.map((p) => ({ profile: p.profile, name: p.name, spec: p.spec, status: p.status, tarball: p.exportName ?? null, warning: p.warning ?? null }));
     const finalName = `dsh-config-${stampNow()}.zip`;
     const finalPath = `${root}/${finalName}`;
     const tmpPath = `${root}/.export-${stampNow()}.tmp.zip`;
@@ -3105,7 +3178,7 @@ export function apply(ctx, pluginConfig) {
     try {
       const entryList = [{ name: 'manifest.json', data: Buffer.from(JSON.stringify(manifest)) }];
       for (const f of files) entryList.push({ name: f.rel, sourcePath: f.abs });
-      for (const p of packedPlugins) entryList.push({ name: `local-plugins/${p.tarballName}`, sourcePath: p.tarballPath });
+      for (const p of packedPlugins) entryList.push({ name: `local-plugins/${p.exportName}`, sourcePath: p.tarballPath });
       await buildZip(tmpPath, entryList, { signal });
       if (encrypted) {
         const tmpEnc = `${finalPath}.enc-${stampNow()}.tmp`;
@@ -4100,6 +4173,28 @@ export function apply(ctx, pluginConfig) {
     if (Number(manifest?.version) > EXPORT_FORMAT_VERSION) {
       throw new Error(`导出包版本过新（version=${manifest.version}，本机支持 ${EXPORT_FORMAT_VERSION}）——请升级插件后导入`);
     }
+    if (manifest.localPlugins !== undefined) {
+      if (!Array.isArray(manifest.localPlugins)) throw new Error('manifest.localPlugins 必须是数组');
+      const seen = new Set();
+      manifest.localPlugins = manifest.localPlugins.map((p) => {
+        if (!p || typeof p !== 'object') throw new Error('本地插件元数据无效');
+        safeRelativePath(p.name);
+        if (!/^(?:@[A-Za-z0-9][A-Za-z0-9._-]*\/)?[A-Za-z0-9][A-Za-z0-9._-]*$/.test(p.name)) throw new Error('本地插件名称无效');
+        safeRelativePath(p.profile);
+        if (!/^[A-Za-z0-9._-]+$/.test(p.profile)) throw new Error('本地插件 profile 无效');
+        const key = `${p.profile}/${p.name}`;
+        if (seen.has(key)) throw new Error(`重复的本地插件: ${key}`);
+        seen.add(key);
+        // Canonical export field is tarball; accept the older import-side spelling too.
+        const tarball = p.tarball ?? p.tarballName;
+        if (p.tarball && p.tarballName && p.tarball !== p.tarballName) throw new Error('本地插件 tarball 字段冲突');
+        if (p.status === 'packed') {
+          safeRelativePath(tarball);
+          if (tarball.includes('/') || !tarball.endsWith('.tgz')) throw new Error('本地插件 tarball 路径无效');
+        }
+        return { ...p, tarball };
+      });
+    }
     return manifest;
   }
 
@@ -4212,7 +4307,7 @@ export function apply(ctx, pluginConfig) {
       const willWrite = [];
       const willSkip = [];
       for (const e of selected) {
-        const targetAbs = `${dshHome}/${e.name}`;
+        const targetAbs = await safeDestination(dshHome, e.name);
         const exists = await existsStat(targetAbs);
         if (exists && decisions[e.name] !== 'overwrite') { willSkip.push(e.name); continue; }
         willWrite.push({ ...e, targetAbs, conflict: exists });
@@ -4240,73 +4335,75 @@ export function apply(ctx, pluginConfig) {
         await prunePrefixedSnapshots(IMPORT_SNAPSHOT_PREFIX, 1, snap.name);
       } catch { /* 快照失败不阻断导入 */ }
 
-      
+
       // 解压到暂存目录（extractZip 内 Zip Slip/符号链接/zip bomb/CRC 全套防线），再拷入 ~/.dsh
-      staging = `${root}/.import-stage-${stampNow()}`;
+      staging = `${root}/.import-stage-${randomUUID()}`;
       await extractZip(zipPath, staging, { names: new Set(willWrite.map((e) => e.name)), signal });
       const stamp = stampNow();
       const backups = [];
       const applied = [];
       const overwrote = [];
+      const createdPluginDirs = [];
+      let remapped = 0;
+      let pluginsRestored = { restored: [], skipped: [] };
       try {
         for (const e of willWrite) {
           if (signal?.aborted) throw new Error('操作已取消');
+          await safeDestination(dshHome, e.name);
           await mkdir(dirname(e.targetAbs), { recursive: true });
           if (e.conflict) {
-            const keep = `${e.targetAbs}.pre-import-${stamp}`;
-            await copyFile(e.targetAbs, keep);
+            const keep = await retainBeforeOverwrite(e.name, 'import', stamp);
             backups.push({ name: e.name, targetAbs: e.targetAbs, keep });
           }
-          await copyFile(`${staging}/${e.name}`, e.targetAbs);
+          // Record before copyFile: even a failed copy may leave partial new bytes.
           applied.push(e.name);
+          await copyFile(`${staging}/${e.name}`, e.targetAbs);
           if (e.conflict) overwrote.push(e.name);
         }
+        // 校验：写入的文件必须存在（防半截写入被误判成功）
+        const missing = [];
+        for (const e of willWrite) if (!(await existsStat(e.targetAbs))) missing.push(e.name);
+        if (missing.length) throw new Error(`导入校验失败，部分文件未落盘: ${missing.slice(0, 5).join(', ')}（快照: ${snapshotName ?? '未生成'}）`);
+
+        // 跨机 remap：对写入的文本配置做 from→to 前缀替换（settings / cordis）
+        if (Array.isArray(opts?.remap) && opts.remap.length) {
+          for (const m of opts.remap) {
+            if (!m || typeof m.from !== 'string' || !m.from || typeof m.to !== 'string') continue;
+            for (const rel of ['settings.yaml', 'settings.json', 'cordis.yml', 'cordis.patch.yml']) {
+              if (!willWrite.some((e) => e.name === rel)) continue;
+              const p = `${dshHome}/${rel}`;
+              if (!(await existsStat(p))) continue;
+              const text = await readFile(p, 'utf8');
+              const next = text.split(m.from).join(m.to);
+              if (next !== text) { await writeFile(p, next, 'utf8'); remapped += 1; }
+            }
+          }
+        }
+
+        // Only selected, actually written tarballs and profile manifests may be changed.
+        pluginsRestored = await restoreLocalPlugins(manifest.localPlugins, signal, { willWrite, createdPluginDirs });
       } catch (err) {
         // 回滚：覆盖的先还原留档，新增的删除；回滚再失败则给出快照/留档指引，绝不静默停在半截。
         const failed = [];
+        for (const dir of createdPluginDirs.reverse()) {
+          try { await rm(dir, { recursive: true, force: true }); } catch { failed.push(dir); }
+        }
         for (const b of backups) {
-          try { await copyFile(b.keep, b.targetAbs); } catch { failed.push(b.name); }
+          try { await copyFile(b.keep, b.targetAbs); } catch { failed.push(`${b.name}（留档: ${b.keep}）`); }
         }
         for (const n of applied) {
-          if (!backups.some((b) => b.name === n)) await rm(`${dshHome}/${n}`, { force: true }).catch(() => {});
+          if (!backups.some((b) => b.name === n)) {
+            try { await rm(`${dshHome}/${n}`, { force: true }); } catch { failed.push(n); }
+          }
         }
         const snapNote = snapshotName ? `\n已自动快照: ${snapshotName}，可 /backup restore ${snapshotName} 整体回滚。` : '';
         if (failed.length) {
-          throw new Error(`导入失败并已尽力回滚：${friendlyReason(err)}。部分留档未还原: ${failed.join(', ')}（对应 *.pre-import-${stamp} 留档在原目录旁）。${snapNote}`);
+          throw new Error(`导入失败并已尽力回滚：${friendlyReason(err)}。部分留档未还原: ${failed.join(', ')}。${snapNote}`);
         }
         throw new Error(`导入失败，已自动回滚到导入前状态：${friendlyReason(err)}。${snapNote}`);
       }
 
-      // 校验：写入的文件必须存在（防半截写入被误判成功）
-      const missing = [];
-      for (const e of willWrite) if (!(await existsStat(e.targetAbs))) missing.push(e.name);
-      if (missing.length) throw new Error(`导入校验失败，部分文件未落盘: ${missing.slice(0, 5).join(', ')}（快照: ${snapshotName ?? '未生成'}）`);
-
-      // 跨机 remap：对写入的文本配置做 from→to 前缀替换（settings / cordis）
-      let remapped = 0;
-      if (Array.isArray(opts?.remap) && opts.remap.length) {
-        for (const m of opts.remap) {
-          if (!m || typeof m.from !== 'string' || !m.from || typeof m.to !== 'string') continue;
-          for (const rel of ['settings.yaml', 'settings.json', 'cordis.yml', 'cordis.patch.yml']) {
-            if (!willWrite.some((e) => e.name === rel)) continue;
-            const p = `${dshHome}/${rel}`;
-            if (!(await existsStat(p))) continue;
-            const text = await readFile(p, 'utf8');
-            const next = text.split(m.from).join(m.to);
-            if (next !== text) { await writeFile(p, next, 'utf8'); remapped += 1; }
-          }
-        }
-      }
-
-      // 本地 link:/file: 插件迁移：解包 local-plugins tarball 到 ~/.dsh/local-plugins/ 并改回 file:
-      const localPluginEntries = entries.filter((e) => !e.isDirectory && e.name.startsWith('local-plugins/'));
-      let pluginsRestored = { restored: [], skipped: [] };
-      if (localPluginEntries.length && Array.isArray(manifest?.localPlugins)) {
-        await extractZip(zipPath, dshHome, { names: new Set(localPluginEntries.map((e) => e.name)), signal });
-        pluginsRestored = await restoreLocalPlugins(manifest.localPlugins, signal);
-      }
-
-      const summary = `✅ 导入完成\n  已写入: ${applied.length} 个文件（覆盖 ${overwrote.length}、新增 ${applied.length - overwrote.length}、跳过已存在 ${willSkip.length}）${remapped ? `\n  已 remap: ${remapped} 个配置文件` : ''}${pluginsRestored.restored.length ? `\n  本地插件已装回 file:: ${pluginsRestored.restored.map((p) => p.name).join(', ')}` : ''}${pluginsRestored.skipped.length ? `\n  ⚠️ 本地插件需手动处理: ${pluginsRestored.skipped.map((p) => `${p.name}（${p.reason}）`).join(', ')}` : ''}${snapshotName ? `\n  导入前快照: ${snapshotName}` : '\n  ⚠️ 导入前快照未生成（建议确认无误后手动备份一次）'}${backups.length ? `\n  覆盖的旧文件已留档 *.pre-import-${stamp}（确认后可删）` : ''}\n  ⏸️ 待办: 重启 dsh 生效`;
+      const summary = `✅ 导入完成\n  已写入: ${applied.length} 个文件（覆盖 ${overwrote.length}、新增 ${applied.length - overwrote.length}、跳过已存在 ${willSkip.length}）${remapped ? `\n  已 remap: ${remapped} 个配置文件` : ''}${pluginsRestored.restored.length ? `\n  本地插件已装回 file:: ${pluginsRestored.restored.map((p) => p.name).join(', ')}` : ''}${pluginsRestored.skipped.length ? `\n  ⚠️ 本地插件需手动处理: ${pluginsRestored.skipped.map((p) => `${p.name}（${p.reason}）`).join(', ')}` : ''}${snapshotName ? `\n  导入前快照: ${snapshotName}` : '\n  ⚠️ 导入前快照未生成（建议确认无误后手动备份一次）'}${backups.length ? `\n  覆盖的旧文件已留档（敏感文件在本机 vault/preserved，其余在原目录旁；确认后可删）` : ''}\n  ⏸️ 待办: 重启 dsh 生效`;
       return { ok: true, encrypted, applied: applied.length, skipped: willSkip.length, overwrote: overwrote.length, snapshot: snapshotName, remapped, pluginsRestored, summary };
     } finally {
       if (staging) await rm(staging, { recursive: true, force: true }).catch(() => {});
@@ -5342,6 +5439,10 @@ export function apply(ctx, pluginConfig) {
 
   /** 分级清理：'cache' 只删可再生缓存/暂存；'expired' 再删过期备份（快照/同步/vault 永不删）。 */
   async function cleanup(scope, signal) {
+    return withOperationLock('cleanup', () => cleanupInner(scope, signal));
+  }
+
+  async function cleanupInner(scope, signal) {
     const { root } = paths();
     const removed = [];
     const rmdir = (dir) => rm(`${root}/${dir}`, { recursive: true, force: true });
@@ -5356,6 +5457,10 @@ export function apply(ctx, pluginConfig) {
       }
     }
     if (scope === 'expired') {
+      const scan = await runDoctorScan(signal);
+      if (scan.corruptCount) {
+        return { ok: true, removed: removed.length, names: removed, summary: `检测到 ${scan.corruptCount} 个损坏会话，已暂停过期备份清理，保留健康副本；请先修复会话` };
+      }
       // 过期备份：keep 窗口外且不在日/周/月/年分层保护内的全量归档才删
       const keepN = defaultKeep();
       const all = await listBackups();
@@ -5408,8 +5513,9 @@ export function apply(ctx, pluginConfig) {
   /** 校验 profile 名（拒绝空/路径段/非法字符/保留名）。 */
   function validateProfileName(name) {
     if (typeof name !== 'string' || !name.trim()) return 'profile 名不能为空';
-    if (!/^[A-Za-z0-9._-]+$/.test(name)) return `profile 名只能含字母数字 . _ -（收到 ${name}）`;
-    if (APP_OWNED_PROFILES.has(name)) return `profile ${name} 是应用内置 profile，只读不可改`;
+    if (name === '.' || name === '..' || !/^[A-Za-z0-9._-]+$/.test(name)) return `profile 名只能含字母数字 . _ -，且不能是 . 或 ..（收到 ${name}）`;
+    try { safeRelativePath(name); } catch { return `不安全的 profile 名: ${name}`; }
+    if (APP_OWNED_PROFILES.has(name.toLowerCase())) return `profile ${name} 是应用内置 profile，只读不可改`;
     return null;
   }
 
@@ -5568,32 +5674,54 @@ export function apply(ctx, pluginConfig) {
     return result;
   }
 
-  /** 导入侧：把打包的本地插件解包到 `<dshHome>/local-plugins/<name>/` 并改回 file:。 */
-  async function restoreLocalPlugins(localPlugins, signal) {
-    const { dshHome, root } = paths();
+  /** 导入侧：解包到本机独立目录并把选中的 profile 依赖改回 file:。 */
+  async function restoreLocalPlugins(localPlugins, signal, { willWrite, createdPluginDirs }) {
+    const { dshHome } = paths();
     const restored = [];
     const skipped = [];
+    const written = new Set(willWrite.map((e) => e.name));
     for (const p of Array.isArray(localPlugins) ? localPlugins : []) {
-      if (p.status !== 'packed' || !p.tarballName) { skipped.push({ name: p.name, reason: p.warning || p.status }); continue; }
-      // 导入包内 tarball 已随 export 打进了 ZIP（importApply 解压到暂存后经 names 落盘到 dshHome 下）
-      const src = `${dshHome}/local-plugins/${p.tarballName}`;
-      if (!(await existsStat(src))) { skipped.push({ name: p.name, reason: 'tarball 不在导入包内' }); continue; }
-      const targetDir = `${dshHome}/local-plugins/${p.name}`;
-      await mkdir(targetDir, { recursive: true });
-      const tar = await ctx.subprocess.resolveExecutable('tar');
-      await spawnRun([tar, '-xzf', src, '-C', parentTar(targetDir)], dshHome, signal);
-      // 把 profile 的 package.json 里 link:/file: 改回 file: 指向解包目录
-      const pkgPath = `${dshHome}/profiles/${p.profile}/package.json`;
+      if (p.status !== 'packed') { skipped.push({ name: p.name, reason: p.warning || p.status }); continue; }
+      const tarRel = `local-plugins/${p.tarball}`;
+      const pkgRel = `profiles/${p.profile}/package.json`;
+      if (!written.has(tarRel) || !written.has(pkgRel)) {
+        skipped.push({ name: p.name, reason: '插件包或 profile 未选中，或已选择保留本机' });
+        continue;
+      }
+      const src = await safeDestination(dshHome, tarRel);
+      const pkgPath = await safeDestination(dshHome, pkgRel);
+      const pkg = JSON.parse(await readFile(pkgPath, 'utf8'));
+      const fields = ['dependencies', 'devDependencies'].filter((field) =>
+        pkg[field] && Object.hasOwn(pkg[field], p.name) && /^(?:link|file):/.test(pkg[field][p.name]));
+      if (!fields.length) { skipped.push({ name: p.name, reason: 'profile 没有对应的本地插件依赖' }); continue; }
+      // npm pack always wraps files in package/. Reject traversal, links, and special
+      // entries before extracting into a fresh staging directory, never into live data.
+      await safeArchiveEntries(basename(src), signal, { root: dirname(src), base: 'package', allowHardlinks: false });
+      const installRel = `local-plugins/installed-${randomUUID()}`;
+      const installRoot = await safeDestination(dshHome, installRel);
+      await mkdir(dirname(installRoot), { recursive: true });
+      await mkdir(installRoot, { mode: 0o700 });
+      createdPluginDirs.push(installRoot);
+      // Stage on the target filesystem so external-disk backup destinations do
+      // not make the final rename fail with EXDEV.
+      const stage = `${installRoot}/.unpack`;
+      await mkdir(stage, { mode: 0o700 });
       try {
-        const pkg = JSON.parse(await readFile(pkgPath, 'utf8'));
-        for (const field of ['dependencies', 'devDependencies']) {
-          if (pkg[field] && typeof pkg[field] === 'object' && pkg[field][p.name]) {
-            pkg[field][p.name] = `file:${targetDir}`;
-          }
-        }
+        const tar = await ctx.subprocess.resolveExecutable('tar');
+        await spawnRun([tar, '-xzf', basename(src), '-C', stage], dirname(src), signal);
+        const packageJson = await safeDestination(stage, 'package/package.json');
+        const packed = JSON.parse(await readFile(packageJson, 'utf8'));
+        if (!packed || typeof packed !== 'object' || Array.isArray(packed)) throw new Error('本地插件 package.json 无效');
+        const targetDir = await safeDestination(installRoot, p.name);
+        await mkdir(dirname(targetDir), { recursive: true });
+        // Point file: at the actual package root, not the tar's parent directory.
+        await rename(`${stage}/package`, targetDir);
+        for (const field of fields) pkg[field][p.name] = `file:${targetDir}`;
         await writeOwned(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
-      } catch { /* package.json 改不了就跳过，如实标注 */ }
-      restored.push({ name: p.name, profile: p.profile, dir: targetDir });
+        restored.push({ name: p.name, profile: p.profile, dir: targetDir });
+      } finally {
+        await rm(stage, { recursive: true, force: true }).catch(() => {});
+      }
     }
     return { restored, skipped };
   }

package/lib/oplock.js

@@ -31,7 +31,7 @@ export function isPidAlive(pid) {
     process.kill(pid, 0);
     return true;
   } catch (err) {
-    return err && err.code === 'EPERM'; // 存在但无权限 → 视为活着，绝不误踢
+    return err?.code !== 'ESRCH'; // Only a confirmed missing process may be reclaimed
   }
 }
 
@@ -53,71 +53,95 @@ async function readLockFile(lockPath) {
   }
 }
 
-async function writeLockFile(lockPath, operation) {
+/**
+ * A short filesystem transaction serializes all lock mutations across processes.
+ * mkdir is exclusive; atomic rename of JSON alone is not mutual exclusion.
+ * An unreadable/orphaned guard fails closed (never steal a potentially live writer).
+ * The owner record identifies the process for manual recovery after an interrupted
+ * metadata transaction. Normal crash recovery uses the main lock's dead PID.
+ */
+export async function withLockGuard(lockPath, fn, { wait = false } = {}) {
+  const guard = `${lockPath}.guard`;
   await mkdir(dirname(lockPath), { recursive: true });
-  const lock = {
-    pid: process.pid,
-    token: randomUUID(),
-    startedAt: new Date().toISOString(),
-    heartbeatAt: new Date().toISOString(),
-    operation: operation || 'unknown',
-  };
-  // 原子写：临时文件 + rename，避免并发读锁文件读一半
+  for (let attempt = 0; ; attempt++) {
+    try {
+      await mkdir(guard, { mode: 0o700 });
+      break;
+    } catch (err) {
+      if (err.code !== 'EEXIST') throw err;
+      if (!wait || attempt >= 100) return { busy: true, guard };
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+  }
+  try {
+    const fh = await open(`${guard}/owner.json`, 'wx', 0o600);
+    try { await fh.writeFile(JSON.stringify({ pid: process.pid, startedAt: new Date().toISOString() })); }
+    finally { await fh.close(); }
+    return { value: await fn() };
+  } finally {
+    await rm(guard, { recursive: true, force: true });
+  }
+}
+
+async function writeLockFile(lockPath, lock) {
   const tmp = `${lockPath}.${randomUUID()}.tmp`;
-  await open(tmp, 'wx', 0o600).then(async (fh) => { await fh.writeFile(`${JSON.stringify(lock)}\n`, 'utf8'); await fh.close(); });
-  await rename(tmp, lockPath).catch(async (err) => { await rm(tmp, { force: true }).catch(() => {}); throw err; });
-  return lock;
+  try {
+    const fh = await open(tmp, 'wx', 0o600);
+    try { await fh.writeFile(`${JSON.stringify(lock)}\n`, 'utf8'); }
+    finally { await fh.close(); }
+    await rename(tmp, lockPath);
+  } finally {
+    await rm(tmp, { force: true }).catch(() => {});
+  }
 }
 
-/**
- * 尝试获取操作锁。
- * @returns {Promise<{acquired:boolean, lock?:object, reason?:string, heldBy?:object}>}
- *   acquired=true 时 lock 是本次写下的锁（含 token，供 release/heartbeat 使用）。
- */
+const heldBy = (lock) => ({ pid: lock.pid, operation: lock.operation, startedAt: lock.startedAt, heartbeatAt: lock.heartbeatAt });
+const busyReason = (guard) => `锁元数据正在更新（${guard}）；若进程异常退出，请先确认 guard/owner.json 中的进程已结束再清理该目录`;
+
 export async function acquireLock(lockPath, operation) {
-  const existing = await readLockFile(lockPath);
-  if (existing && !existing.unreadable && isLockStale(existing)) {
-    // 死锁：pid 已死，安全回收后重试
-    await rm(lockPath, { force: true }).catch(() => {});
-  } else if (existing) {
-    return { acquired: false, reason: '另一操作正在运行', heldBy: { pid: existing.pid, operation: existing.operation, startedAt: existing.startedAt, heartbeatAt: existing.heartbeatAt } };
-  }
-  const lock = await writeLockFile(lockPath, operation);
-  return { acquired: true, lock };
+  const result = await withLockGuard(lockPath, async () => {
+    const existing = await readLockFile(lockPath);
+    if (existing && (existing.unreadable || !isLockStale(existing))) {
+      return { acquired: false, reason: '另一操作正在运行', heldBy: heldBy(existing) };
+    }
+    const now = new Date().toISOString();
+    const lock = { pid: process.pid, token: randomUUID(), startedAt: now, heartbeatAt: now, operation: operation || 'unknown' };
+    await writeLockFile(lockPath, lock);
+    return { acquired: true, lock };
+  });
+  return result.busy ? { acquired: false, reason: busyReason(result.guard) } : result.value;
 }
 
-/** 刷新心跳（仅当 token 匹配、且 pid 仍是本进程时写）。 */
 export async function heartbeatLock(lockPath, token) {
-  const existing = await readLockFile(lockPath);
-  if (!existing || existing.token !== token) return false;
-  const lock = { ...existing, heartbeatAt: new Date().toISOString() };
-  const tmp = `${lockPath}.${randomUUID()}.tmp`;
-  await open(tmp, 'wx', 0o600).then(async (fh) => { await fh.writeFile(`${JSON.stringify(lock)}\n`, 'utf8'); await fh.close(); });
-  await rename(tmp, lockPath).catch(async (err) => { await rm(tmp, { force: true }).catch(() => {}); throw err; });
-  return true;
+  const result = await withLockGuard(lockPath, async () => {
+    const existing = await readLockFile(lockPath);
+    if (!existing || existing.token !== token || existing.pid !== process.pid) return false;
+    await writeLockFile(lockPath, { ...existing, heartbeatAt: new Date().toISOString() });
+    return true;
+  }, { wait: true });
+  return result.busy ? false : result.value;
 }
 
-/** 释放锁（仅 token 匹配才删，绝不删别人的锁）。 */
 export async function releaseLock(lockPath, token) {
-  const existing = await readLockFile(lockPath);
-  if (existing && existing.token === token) {
-    await rm(lockPath, { force: true }).catch(() => {});
+  const result = await withLockGuard(lockPath, async () => {
+    const existing = await readLockFile(lockPath);
+    if (!existing || existing.token !== token) return false;
+    await rm(lockPath, { force: true });
     return true;
-  }
-  return false;
+  }, { wait: true });
+  if (result.busy) throw new Error(busyReason(result.guard));
+  return result.value;
 }
 
-/**
- * 回收入口：死锁直接回收；活锁默认拒绝，force=true 时按用户显式确认强删。
- * @returns {Promise<{reclaimed:boolean, reason?:string, heldBy?:object}>}
- */
 export async function reclaimLock(lockPath, { force = false } = {}) {
-  const existing = await readLockFile(lockPath);
-  if (!existing) return { reclaimed: false, reason: '没有锁' };
-  const heldBy = { pid: existing.pid, operation: existing.operation, startedAt: existing.startedAt, heartbeatAt: existing.heartbeatAt };
-  if (isLockStale(existing) || force) {
-    await rm(lockPath, { force: true }).catch(() => {});
-    return { reclaimed: true, heldBy };
-  }
-  return { reclaimed: false, reason: '锁持有进程仍在运行（未回收，避免误踢活锁）', heldBy };
+  const result = await withLockGuard(lockPath, async () => {
+    const existing = await readLockFile(lockPath);
+    if (!existing) return { reclaimed: false, reason: '没有锁' };
+    if (isLockStale(existing) || force) {
+      await rm(lockPath, { force: true });
+      return { reclaimed: true, heldBy: heldBy(existing) };
+    }
+    return { reclaimed: false, reason: '锁持有进程仍在运行（未回收，避免误踢活锁）', heldBy: heldBy(existing) };
+  });
+  return result.busy ? { reclaimed: false, reason: busyReason(result.guard) } : result.value;
 }

package/lib/paths.js

@@ -0,0 +1,56 @@
+import { lstat } from 'node:fs/promises';
+import { realpathSync } from 'node:fs';
+import { basename, dirname, isAbsolute, relative, resolve, sep } from 'node:path';
+
+// Resolve existing ancestors too: a destination may not exist yet or may be
+// reached through a symlink outside DSH_HOME.
+function canonicalPath(value) {
+  const abs = resolve(value);
+  try { return realpathSync(abs); } catch (err) {
+    if (err.code !== 'ENOENT' || dirname(abs) === abs) throw err;
+    return resolve(canonicalPath(dirname(abs)), basename(abs));
+  }
+}
+
+/** Relative backup subtree to exclude, or null for an external destination. */
+export function backupRootRelative(dshHome, root) {
+  const rel = relative(canonicalPath(dshHome), canonicalPath(root));
+  if (!rel) throw new Error('备份目录不能等于 DSH_HOME，请选择独立的备份目录');
+  return rel === '..' || rel.startsWith(`..${sep}`) || isAbsolute(rel) ? null : rel.split(sep).join('/');
+}
+
+/** tar --exclude is a glob, even when the user configured a literal directory. */
+export function tarLiteralPattern(value) {
+  return value.replace(/[\\*?\[\]]/g, '\\$&');
+}
+
+/** Portable relative paths only; metadata is untrusted even when ZIP names are safe. */
+export function safeRelativePath(value) {
+  if (typeof value !== 'string' || !value || /[\\\u0000-\u001f\u007f:]/.test(value)
+    || value.startsWith('/') || value.split('/').some((part) => !part || part === '.' || part === '..'
+      || /[. ]$/.test(part) || /^(?:con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\.|$)/i.test(part))) {
+    throw new Error(`不安全的相对路径: ${String(value)}`);
+  }
+  return value;
+}
+
+/** Reject existing symlinks as well as lexical traversal before writing into a tree. */
+export async function safeDestination(root, rel) {
+  safeRelativePath(rel);
+  const base = resolve(root);
+  const target = resolve(base, rel);
+  const inside = relative(base, target);
+  if (!inside || inside === '..' || inside.startsWith(`..${sep}`) || isAbsolute(inside)) {
+    throw new Error(`写入路径越界: ${rel}`);
+  }
+  let current = base;
+  for (const part of ['', ...rel.split('/')]) {
+    if (part) current = resolve(current, part);
+    const info = await lstat(current).catch((err) => {
+      if (err.code === 'ENOENT') return null;
+      throw err;
+    });
+    if (info?.isSymbolicLink()) throw new Error(`写入路径含符号链接: ${rel}`);
+  }
+  return target;
+}

package/lib/redact.js

@@ -0,0 +1,37 @@
+const literal = (c) => c.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&');
+
+// tar excludes are unanchored globs and '*' may cross directory separators.
+// POSIX character classes depend on the tar process locale; conservatively match
+// any character for those classes instead of risking a plaintext ZIP disclosure.
+export function matchesRedaction(rel, pattern) {
+  let source = '';
+  for (let i = 0; i < pattern.length; i++) {
+    const c = pattern[i];
+    if (c === '*') source += '[\\s\\S]*';
+    else if (c === '?') source += '[\\s\\S]';
+    else if (c === '\\' && i + 1 < pattern.length) source += literal(pattern[++i]);
+    else if (c === '[') {
+      let end = i + 1;
+      if (pattern[end] === '!' || pattern[end] === '^') end++;
+      if (pattern[end] === ']') end++;
+      while (end < pattern.length && pattern[end] !== ']') {
+        if (pattern[end] === '[' && ':=.'.includes(pattern[end + 1] ?? ' ')) {
+          const innerEnd = pattern.indexOf(`${pattern[end + 1]}]`, end + 2);
+          if (innerEnd !== -1) { end = innerEnd + 2; continue; }
+        }
+        end++;
+      }
+      if (end === pattern.length) { source += '\\['; continue; }
+      const body = pattern.slice(i + 1, end);
+      const negated = body.startsWith('!') || body.startsWith('^');
+      const chars = (negated ? body.slice(1) : body).replace(/\\/g, '\\\\').replace(/\]/g, '\\]');
+      const bracket = `[${negated ? '^' : ''}${chars}]`;
+      try {
+        new RegExp(bracket);
+        source += body.includes('[') ? '[\\s\\S]' : bracket;
+      } catch { source += '[\\s\\S]'; }
+      i = end;
+    } else source += literal(c);
+  }
+  return new RegExp(`(?:^|/)${source}(?:/|$)`).test(rel);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaoyuyu6420/dsh-backup",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "description": "一条命令备份、恢复与迁移 DeepSeek Harness（dsh）的全部数据（~/.dsh：会话、设置、插件、MCP、技能）：定时自动备份、升级前快照、换机迁移、会话日志体检修复、宿主起不来也能用的进程外救援；凭据默认脱敏只存本机。 Backup, restore & migrate all DeepSeek Harness (~/.dsh) data — sessions, settings, plugins, MCP, skills: scheduled backups, pre-upgrade snapshots, cross-machine migration, session-log doctor, out-of-process rescue console; credentials redacted to a local-only vault.",
   "type": "module",
   "packageManager": "pnpm@11.24.0",

package/rescue/rescue.mjs

@@ -93,8 +93,6 @@ function run(argv, cwd) {
 const parentTar = (p) => (p.endsWith('/') ? p : `${p}/`);
 
 async function sha256File(absPath) {
-  const info = await fs.stat(absPath);
-  if (info.size > HASH_MAX_BYTES) throw new Error(`文件 ${Math.floor(info.size / 1048576)}MB 超过哈希上限`);
   return new Promise((resolve, reject) => {
     const h = createHash('sha256');
     createReadStream(absPath).on('data', (d) => h.update(d)).on('error', reject).on('end', () => resolve(h.digest('hex')));
@@ -510,6 +508,17 @@ async function restoreArchive(root, selector, apply) {
     return { dryRun: true, archive: picked.name, files: entries.length, sample: entries.slice(0, 12), preflight, profileDirs };
   }
 
+  // Keep this standalone rescue script dependency-free. A nested backup root
+  // would disappear when the source tree is moved aside during replacement.
+  const sourceReal = await fs.realpath(dshHome).catch((err) => {
+    if (err.code === 'ENOENT') return path.resolve(dshHome);
+    throw err;
+  });
+  const backupRel = path.relative(sourceReal, await fs.realpath(root));
+  if (!backupRel || (backupRel !== '..' && !backupRel.startsWith(`..${path.sep}`) && !path.isAbsolute(backupRel))) {
+    throw new Error('整包恢复前请把整个备份目录（含 vault）移到 DSH_HOME 外，并更新备份路径；当前备份目录位于待替换的数据目录内');
+  }
+
   // 现有数据：快照 + 挪旁；缺失（新机/全失）则直接解压
   let targetExists = true;
   try {
@@ -755,12 +764,30 @@ function isPidAlive(pid) {
     process.kill(pid, 0);
     return true;
   } catch (err) {
-    return err && err.code === 'EPERM';
+    return err?.code !== 'ESRCH';
   }
 }
 
 /** 回收残留死锁（owner 证明已死才回收）。 */
 async function recoverStaleLock(root) {
+  // Use the host's same exclusive transaction guard: never remove a lock while
+  // a live host is publishing a new owner or heartbeat.
+  const guard = `${root}/${LOCK_FILE}.guard`;
+  await fs.mkdir(root, { recursive: true });
+  try { await fs.mkdir(guard, { mode: 0o700 }); }
+  catch (err) {
+    if (err.code === 'EEXIST') throw new Error(`锁元数据正在更新（${guard}），请稍后重试`);
+    throw err;
+  }
+  try {
+    await fs.writeFile(`${guard}/owner.json`, JSON.stringify({ pid: process.pid }), { mode: 0o600 });
+    return await recoverStaleLockInner(root);
+  } finally {
+    await fs.rm(guard, { recursive: true, force: true });
+  }
+}
+
+async function recoverStaleLockInner(root) {
   const lockPath = `${root}/${LOCK_FILE}`;
   let lock;
   try {