dsh-config-manager 0.1.78 → 0.1.80

package/src/client/sync/sync-locales.ts

@@ -54,11 +54,21 @@ export const zh = {
   'workdir.missing': '尚未创建（首次同步时克隆）',
   'workdir.unknown': '读不出工作副本状态',
   'workdir.relink': '重指向仓库地址',
+  // issue #104：换仓库 / 远端历史被重写后，本地与远端两条历史不相交，pull --ff-only 永远失败。
+  // adopt = 把远端历史合并进来（不改写本地提交，可 revert；冲突自动撤销），是 reclone 的非破坏替代。
+  'workdir.adopt': '采纳远端历史',
+  'workdir.adoptHint': '把远端的提交历史合并进本机工作副本（用于「换了仓库或远端历史被重写」后无法合并的情况）。不会改写本地提交，合并后可 git revert 撤销；一旦冲突会自动撤销这次合并，工作副本回到操作前。',
   'workdir.reclone': '重新克隆工作副本',
   'workdir.recloneConfirmTitle': '重新克隆工作副本？',
   'workdir.recloneConfirmMessage': '将删除本机工作副本目录并从远端重新克隆。本机配置与远端快照都不受影响，但工作副本里尚未推送的本地提交会被丢弃 —— 需要时请先在同步页执行一次推送。',
   'workdir.recloneConfirm': '重新克隆',
+  // issue #104 建议 3：本地积压与远端快照数（只显示数字；告警文案见下两条）
+  'workdir.ahead': '未上传的本地提交',
+  'workdir.remoteSnapshots': '远端快照数',
+  'workdir.backlogAhead': '有本地提交还没上传到远端',
+  'workdir.backlogNeverSynced': '本地领先，但远端从未收到过快照 —— 这条通道可能一直没在真正备份',
   'toast.workdirRelinked': '工作副本已重指向当前仓库地址',
+  'toast.workdirAdopted': '已采纳远端历史（本地提交未改写，已生成一次合并提交）',
   'toast.workdirRecloned': '工作副本已重新克隆',
   'toast.workdirResetFailed': '重建工作副本失败',
   'syncStatus.lastSync': '上次同步',
@@ -137,7 +147,11 @@ export const zh = {
   // 一键同步（方案 A：拉取 → 逐项确认 → apply-items）
   'syncflow.title': '一键同步',
   'syncflow.button': '一键同步',
+  // 方案 A：有基线且三方合并全部 skip = 远端与本机一致，不必同步
+  'syncflow.upToDate': '已是最新，无需同步',
   'syncflow.syncing': '正在同步…',
+  // 阶段文案：一键同步先拉远端快照做只读合并预览（最慢的一步），必须有可见反馈
+  'syncflow.checkingRemote': '正在检查远端变更…',
   'syncflow.syncFailed': '同步失败',
   'syncflow.snapshotOption': '（{date} · {count} 分区）',
   'syncflow.selectSnapshot': '选择历史快照',
@@ -237,7 +251,17 @@ export const zh = {
   'autosync.description': '开启后，DSH 在后台保持配置一致：本地配置有改动时自动上传，检测到远端有新快照时才自动拉取合并；定时器仅作兜底轮询，无变化不重复动作。仅在无冲突且无需人工干预时才自动写入本地。',
   'autosync.enable': '启用自动同步',
   'autosync.interval': '兜底轮询间隔',
-  'autosync.intervalHint': '间隔到点 / DSH 启动时检查远端是否有新快照，有才拉取合并（不上传本地）；本地配置改动会触发上传。',
+  'autosync.intervalHint': '兜底检查节奏：间隔到点 / DSH 启动时检查远端是否有新快照，有才拉取合并。启用「本地改动即时同步」后，保存配置会立刻触发一轮，不必等这里。',
+  'autosync.realtime': '本地改动即时同步',
+  'autosync.realtimeHint': '监听本机可同步的配置（settings.yaml、cordis.patch.yml、skills、profiles 下的插件清单等），保存后立即上传；关闭则只在兜底间隔到点时检查。',
+  'autosync.autoApplyTier': '自动应用范围',
+  'autosync.autoApplyTierHint': '决定远端改动能自动写回本机的范围：「仅低风险分区」= settings / ui / providers / prompts / skills 等；「含 plugins 与 mcp」= 连中风险分区也自动落盘（缺省）。凭据、插件数据类分区永不自动写入。',
+  'autosync.tierLow': '仅低风险分区',
+  'autosync.tierMedium': '含 plugins 与 mcp（推荐）',
+  'autosync.conflictPolicy': '双侧都改时',
+  'autosync.conflictPolicyHint': '本机与远端都改了同一分区时：「保留本机并推上去」= 本机版本成为新的远端最新（被覆盖的远端快照仍在历史里，可回滚）；「保留冲突待我确认」= 上下行都停下，等你在同步页裁决。',
+  'autosync.conflictLocal': '保留本机并推上去',
+  'autosync.conflictAsk': '保留冲突待我确认',
   'autosync.interval5m': '5 分钟',
   'autosync.interval15m': '15 分钟',
   'autosync.interval30m': '30 分钟',
@@ -283,6 +307,7 @@ export const zh = {
   'history.autosyncReasonEncrypted': '远端快照已加密，自动同步跳过（请手动同步）',
   'history.autosyncReasonMutationLocked': '环境锁被占用（另一项任务进行中，或存在需回收的残留锁）',
   'history.autosyncReasonUnknown': '未知',
+  'history.autosyncReasonConflictKeptLocal': '已按策略保留本机并覆盖远端',
   'history.autosyncReasonUpToDate': '无变化（本地与远端一致）',
   'history.autosyncReasonUnchanged': '远端无新快照，无需合并',
   'history.autosyncConflicted': '跳过冲突分区：{sections}',
@@ -401,6 +426,97 @@ export const zh = {
   'cloud.apiBaseUrlInvalid': 'API 根地址必须是 http(s) 且不含用户名/密码',
   'cloud.secretWriterRequired': '宿主未提供凭据写入通道，无法保存密钥',
   'cloud.credentialsWriteFailed': '密钥写入 DSH 凭据失败（配置未保存）',
+  // ---------- T-ui-merge：远程合并裁决（**分区级**裁决；冲突明细只读展示） ----------
+  'merge.title': '远程合并',
+  'merge.subtitle': '读取远端快照做三方合并（本地 / 远端 / 共同基准），列出需要你裁决的分区；预览阶段零写入。',
+  'merge.entry': '检查远程合并',
+  'merge.entryHint': '只读：先看远端与本地差在哪、哪些分区需要裁决。不会写任何内容。',
+  'merge.loading': '正在读取远端快照并合并…',
+  'merge.reload': '重新预览',
+  'merge.empty': '没有需要合并的内容',
+  'merge.emptyHint': '远端与本地一致，或当前没有分区参与同步。',
+  'merge.noAncestor': '没有共同基准快照：合并退化为两方比较，两侧不一致的分区一律按冲突处理，需要你逐个裁决。',
+  'merge.summary.auto': '可自动应用',
+  'merge.summary.review': '待裁决',
+  'merge.summary.conflicts': '冲突',
+  'merge.summary.skipped': '无变化',
+  'merge.section.title': '分区裁决',
+  'merge.scopeNotice': '冲突按分区整体裁决（本版不做逐条裁决）。',
+  'merge.skipNotice': '跳过 ≠ 已解决：跳过的冲突不会推进同步基线，下次同步仍会出现。',
+  'merge.decision.useRemote': '采用远端',
+  'merge.decision.keepLocal': '保留本地',
+  'merge.decision.merge': '自动合并',
+  'merge.decision.skip': '无变化',
+  'merge.decision.conflict': '需裁决',
+  'merge.kind.key': '键',
+  'merge.kind.file': '文件',
+  'merge.reason.bothModified': '两侧都改动了同一位置',
+  'merge.reason.modifyDelete': '一侧改动、另一侧删除',
+  'merge.reason.deleteModify': '一侧删除、另一侧改动',
+  'merge.reason.noAncestor': '没有共同基准，无法判断谁改动了',
+  'merge.reason.binary': '二进制内容无法安全合并',
+  'merge.reason.format': '内容格式不支持自动合并',
+  'merge.reason.array': '数组无法按位置合并',
+  'merge.reason.section': '整个分区冲突',
+  'merge.conflictCount': '{n} 处冲突',
+  'merge.autoMergedCount': '已自动并入 {n} 处改动',
+  'merge.col.path': '冲突位置',
+  'merge.col.local': '本地',
+  'merge.col.remote': '远端',
+  'merge.col.ancestor': '基准',
+  'merge.preview.empty': '（空）',
+  'merge.action.useLocal': '采用本地',
+  'merge.action.useRemote': '采用远端',
+  'merge.action.useMerged': '采用自动合并',
+  'merge.action.useMergedDisabled': '该分区没有可用的自动合并结果（两侧改动重叠），只能采用一侧或跳过。',
+  'merge.action.skip': '跳过',
+  'merge.action.current': '当前裁决',
+  'merge.bulk.keepLocal': '全部采用本地',
+  'merge.bulk.useRemote': '全部采用远端',
+  'merge.bulk.useMerged': '全部采用自动合并',
+  'merge.bulk.autoOnly': '仅处理无冲突项',
+  'merge.bulk.leavePending': '冲突留到下次',
+  'merge.bulk.hint': '「全部采用自动合并」只对真有自动合并结果的分区生效；「冲突留到下次」把需要你裁决的分区全部移出本次操作（不写入、不推进基线），下次同步它们还会出现。',
+  'merge.bulk.title': '批量',
+  'merge.apply': '执行合并',
+  'merge.applying': '执行中…',
+  'merge.apply.nothing': '当前没有会产生写入的裁决：所有待裁决分区都停在「跳过」。',
+  'merge.apply.summary': '已裁决 {decided} / 待裁决 {needs} 个分区',
+  'merge.apply.skips': '其中 {n} 个是「跳过」（不会推进同步基线）',
+  'merge.apply.undecided': '还有 {n} 个分区未裁决（未裁决不会被执行，等同跳过）。',
+  'merge.apply.pendingHint': '还有 {n} 个分区待裁决：本次不会应用它们，下次同步仍会出现。',
+  'merge.apply.nothingPending': '所有分区都没有变化，本次不需要执行合并。',
+  'merge.apply.willApply': '本次会应用 {n} 个分区',
+  'merge.result.title': '合并结果',
+  'merge.result.applied': '已应用分区',
+  'merge.result.skipped': '已跳过',
+  'merge.result.warnings': '警告',
+  'merge.result.restoreId': '回滚点',
+  'merge.result.rolledBack': '已整体回滚',
+  'merge.result.rollbackIncomplete': '整体回滚不完整：有项未恢复（见警告）',
+  'merge.result.none': '没有分区被改动',
+  'merge.result.pending': '仍有 {n} 个分区待裁决（跳过 ≠ 已解决，下次同步仍会出现）',
+  'merge.result.rollback': '一键回滚',
+  'merge.result.rollingBack': '回滚中…',
+  'merge.result.rolledBackTo': '已回滚到 {id}',
+  'merge.result.failed': '{n} 项失败',
+  'merge.result.ineffective': '{n} 项未生效',
+  'merge.error.previewFailed': '合并预览失败',
+  'merge.toast.applyFailed': '执行合并失败',
+  'merge.toast.applied': '合并已执行',
+  'merge.toast.rollbackFailed': '回滚失败',
+  'merge.toast.previewFailed': '读取远程合并预览失败',
+  // ---- cloud-sync 借鉴项 ②：测试连接（只读连通性自检）----
+  'probe.run': '测试连接',
+  'probe.running': '正在测试连接…',
+  'probe.hint': '只读自检：凭据 / 端点 / 目标容器 / 目录可达。WebDAV 通道可能幂等创建上级目录（那正是它要修的故障）；不会推送或改动任何快照。',
+  'probe.createdCollections': '已在远端自动创建目录：{list}',
+  'probe.snapshotCount': '远端现有快照：{count} 份',
+  // 「不支持自检」= 能力边界（不是故障）：中性提示 + 一句解释，绝不显示「操作失败」
+  'probe.unsupported': '该通道不提供连通性自检',
+  'probe.unsupportedHint': '这是能力边界，不是故障：该通道的同步功能不受影响，只是没有自检这项能力。',
+  // ---- cloud-sync 借鉴项 ⑥：快照的推送方设备（旧快照没有该字段 → 不显示设备行）----
+  'syncflow.snapshotDevice': '由 {device} 推送',
 } as const;
 
 export const en: Record<keyof typeof zh, string> = {
@@ -449,11 +565,22 @@ export const en: Record<keyof typeof zh, string> = {
   'workdir.missing': 'Not created yet (cloned on first sync)',
   'workdir.unknown': 'Working-copy state unreadable',
   'workdir.relink': 'Re-point repository address',
+  // issue #104: after a repository swap / rewritten remote history, local and remote histories are
+  // unrelated, so pull --ff-only can never succeed. adopt merges the remote history in (no local commit
+  // is rewritten, revertible; a conflict aborts the merge) — the non-destructive alternative to reclone.
+  'workdir.adopt': 'Adopt remote history',
+  'workdir.adoptHint': 'Merges the remote commit history into this local working copy (for the case where the repository was swapped or the remote history was rewritten and pulls can never merge). No local commit is rewritten and the merge can be undone with git revert; if there are conflicts the merge is aborted and the working copy returns to its previous state.',
   'workdir.reclone': 'Clone working copy again',
   'workdir.recloneConfirmTitle': 'Clone the working copy again?',
   'workdir.recloneConfirmMessage': 'The local working-copy directory will be deleted and cloned again from the remote. Your local config and the remote snapshots are unaffected, but local commits that were never pushed will be lost — push once from the sync page first if you need them.',
   'workdir.recloneConfirm': 'Clone again',
+  // issue #104 suggestion 3: local backlog and remote snapshot count
+  'workdir.ahead': 'Local commits not pushed',
+  'workdir.remoteSnapshots': 'Remote snapshots',
+  'workdir.backlogAhead': 'Local commits are waiting to be pushed',
+  'workdir.backlogNeverSynced': 'Local is ahead but the remote has never received a snapshot - this channel may not be backing up at all',
   'toast.workdirRelinked': 'Working copy now points at the configured repository address',
+  'toast.workdirAdopted': 'Remote history adopted (no local commit was rewritten; one merge commit was created)',
   'toast.workdirRecloned': 'Working copy cloned again',
   'toast.workdirResetFailed': 'Rebuilding the working copy failed',
   'syncStatus.lastSync': 'Last sync',
@@ -525,7 +652,10 @@ export const en: Record<keyof typeof zh, string> = {
   'warnings.title': 'Section Warnings',
   'syncflow.title': 'One-Click Sync',
   'syncflow.button': 'One-click sync',
+  // Plan A: with a baseline, an all-skip three-way merge means local and remote already match
+  'syncflow.upToDate': 'Already up to date; nothing to sync',
   'syncflow.syncing': 'Syncing…',
+  'syncflow.checkingRemote': 'Checking remote changes…',
   'syncflow.syncFailed': 'Sync failed',
   'syncflow.snapshotOption': '({date} · {count} sections)',
   'syncflow.selectSnapshot': 'Select snapshot',
@@ -624,7 +754,17 @@ export const en: Record<keyof typeof zh, string> = {
   'autosync.description': 'When enabled, DSH keeps config in sync in the background: uploads locally-changed config automatically, pulls and merges only when it detects a new remote snapshot; the timer is just a fallback poll and no-ops when nothing changed. Local writes happen only when there are no conflicts or manual-decision items.',
   'autosync.enable': 'Enable auto sync',
   'autosync.interval': 'Fallback poll interval',
-  'autosync.intervalHint': 'On interval / DSH startup, checks for a new remote snapshot and pulls+merges only if one exists (no upload); local config changes trigger an upload.',
+  'autosync.intervalHint': 'Fallback cadence: on interval / DSH startup it checks whether the remote has a newer snapshot and only then pulls and merges (no upload). With "Sync local changes immediately" on, saving a config triggers a run right away.',
+  'autosync.realtime': 'Sync local changes immediately',
+  'autosync.realtimeHint': 'Watches the syncable local config (settings.yaml, cordis.patch.yml, skills, plugin manifests under profiles…) and uploads right after a save; turn it off to only check on the fallback interval.',
+  'autosync.autoApplyTier': 'Auto-apply scope',
+  'autosync.autoApplyTierHint': 'How much of the remote side may be written back automatically: "Low-risk sections only" covers settings / ui / providers / prompts / skills; "Include plugins and MCP" (default) also applies the medium-risk sections. Credential and plugin-data sections are never auto-applied.',
+  'autosync.tierLow': 'Low-risk sections only',
+  'autosync.tierMedium': 'Include plugins and MCP (recommended)',
+  'autosync.conflictPolicy': 'When both sides changed',
+  'autosync.conflictPolicyHint': 'When the same section changed locally and remotely: "Keep local and push it" makes the local version the new remote latest (the replaced remote snapshot stays in history and can be rolled back); "Keep the conflict for review" stops both directions until you resolve it on the sync page.',
+  'autosync.conflictLocal': 'Keep local and push it',
+  'autosync.conflictAsk': 'Keep the conflict for review',
   'autosync.interval5m': '5 min',
   'autosync.interval15m': '15 min',
   'autosync.interval30m': '30 min',
@@ -668,6 +808,7 @@ export const en: Record<keyof typeof zh, string> = {
   'history.autosyncReasonEncrypted': 'The remote snapshot is encrypted, so auto sync skipped it (sync manually)',
   'history.autosyncReasonMutationLocked': 'The environment lock is held (another task is running, or a stale lock needs reclaiming)',
   'history.autosyncReasonUnknown': 'Unknown',
+  'history.autosyncReasonConflictKeptLocal': 'Kept the local version and overwrote the remote as configured',
   'history.autosyncReasonUpToDate': 'No changes (local and remote match)',
   'history.autosyncReasonUnchanged': 'No new remote snapshot to merge',
   'history.autosyncConflicted': 'Skipped conflict sections: {sections}',
@@ -782,6 +923,97 @@ export const en: Record<keyof typeof zh, string> = {
   'cloud.apiBaseUrlInvalid': 'API base URL must be http(s) and contain no username/password',
   'cloud.secretWriterRequired': 'The host exposes no credential writer, so the secret cannot be saved',
   'cloud.credentialsWriteFailed': 'Writing the secret into DSH credentials failed (config was not saved)',
+  // ---------- T-ui-merge: remote merge decisions (section-level; conflict rows are read-only) ----------
+  'merge.title': 'Remote merge',
+  'merge.subtitle': 'Reads the remote snapshot and runs a three-way merge (local / remote / common ancestor), then lists the sections that need your decision. Nothing is written while previewing.',
+  'merge.entry': 'Check remote merge',
+  'merge.entryHint': 'Read-only: see where the remote differs from local and which sections need a decision. Nothing is written.',
+  'merge.loading': 'Reading the remote snapshot and merging…',
+  'merge.reload': 'Preview again',
+  'merge.empty': 'Nothing to merge',
+  'merge.emptyHint': 'Local and remote match, or no section participates in this sync.',
+  'merge.noAncestor': 'No common ancestor snapshot: the merge degrades to a two-way comparison, so every section that differs on both sides is treated as a conflict and needs your decision.',
+  'merge.summary.auto': 'Auto-applicable',
+  'merge.summary.review': 'Needs decision',
+  'merge.summary.conflicts': 'Conflicts',
+  'merge.summary.skipped': 'Unchanged',
+  'merge.section.title': 'Section decisions',
+  'merge.scopeNotice': 'Conflicts are decided per section as a whole (this version has no per-item decisions).',
+  'merge.skipNotice': 'Skip is not resolved: a skipped conflict does not advance the sync baseline and will come back on the next sync.',
+  'merge.decision.useRemote': 'Use remote',
+  'merge.decision.keepLocal': 'Keep local',
+  'merge.decision.merge': 'Auto-merged',
+  'merge.decision.skip': 'Unchanged',
+  'merge.decision.conflict': 'Needs decision',
+  'merge.kind.key': 'Key',
+  'merge.kind.file': 'File',
+  'merge.reason.bothModified': 'Both sides changed the same place',
+  'merge.reason.modifyDelete': 'One side changed it, the other deleted it',
+  'merge.reason.deleteModify': 'One side deleted it, the other changed it',
+  'merge.reason.noAncestor': 'No common ancestor, so it is impossible to tell which side changed',
+  'merge.reason.binary': 'Binary content cannot be merged safely',
+  'merge.reason.format': 'This content format does not support auto-merge',
+  'merge.reason.array': 'Arrays cannot be merged position by position',
+  'merge.reason.section': 'The whole section conflicts',
+  'merge.conflictCount': '{n} conflict(s)',
+  'merge.autoMergedCount': '{n} change(s) merged automatically',
+  'merge.col.path': 'Conflict location',
+  'merge.col.local': 'Local',
+  'merge.col.remote': 'Remote',
+  'merge.col.ancestor': 'Ancestor',
+  'merge.preview.empty': '(empty)',
+  'merge.action.useLocal': 'Use local',
+  'merge.action.useRemote': 'Use remote',
+  'merge.action.useMerged': 'Use auto-merge',
+  'merge.action.useMergedDisabled': 'This section has no usable auto-merged result (both sides changed the same place), so pick one side or skip it.',
+  'merge.action.skip': 'Skip',
+  'merge.action.current': 'Current decision',
+  'merge.bulk.keepLocal': 'Use local for all',
+  'merge.bulk.useRemote': 'Use remote for all',
+  'merge.bulk.useMerged': 'Use auto-merge for all',
+  'merge.bulk.autoOnly': 'Handle conflict-free sections only',
+  'merge.bulk.leavePending': 'Leave conflicts for next sync',
+  'merge.bulk.hint': '"Use auto-merge for all" only affects sections that really have an auto-merged result; "Leave conflicts for next sync" moves every section that needs your decision out of this run (nothing is written, the baseline does not advance) — they come back on the next sync.',
+  'merge.bulk.title': 'Bulk',
+  'merge.apply': 'Apply merge',
+  'merge.applying': 'Applying…',
+  'merge.apply.nothing': 'No decision would write anything: every section that needs a decision is still on Skip.',
+  'merge.apply.summary': '{decided} of {needs} section(s) decided',
+  'merge.apply.skips': '{n} of them are skipped (the sync baseline will not advance)',
+  'merge.apply.undecided': '{n} section(s) still have no decision (undecided sections are not applied, which is the same as skipping).',
+  'merge.apply.pendingHint': '{n} section(s) still need a decision: nothing is applied to them now, and they come back on the next sync.',
+  'merge.apply.nothingPending': 'Nothing changed in any section, so there is nothing to apply here.',
+  'merge.apply.willApply': '{n} section(s) will be applied now',
+  'merge.result.title': 'Merge result',
+  'merge.result.applied': 'Applied sections',
+  'merge.result.skipped': 'Skipped',
+  'merge.result.warnings': 'Warnings',
+  'merge.result.restoreId': 'Restore point',
+  'merge.result.rolledBack': 'Rolled back in full',
+  'merge.result.rollbackIncomplete': 'Rollback was incomplete: some items were not restored (see warnings)',
+  'merge.result.none': 'No section was changed',
+  'merge.result.pending': '{n} section(s) still need a decision (skip is not resolved, so they will come back on the next sync)',
+  'merge.result.rollback': 'Roll back',
+  'merge.result.rollingBack': 'Rolling back…',
+  'merge.result.rolledBackTo': 'Rolled back to {id}',
+  'merge.result.failed': '{n} failed',
+  'merge.result.ineffective': '{n} had no effect',
+  'merge.error.previewFailed': 'Merge preview failed',
+  'merge.toast.applyFailed': 'Applying the merge failed',
+  'merge.toast.applied': 'Merge applied',
+  'merge.toast.rollbackFailed': 'Rollback failed',
+  'merge.toast.previewFailed': 'Failed to read the remote merge preview',
+  // ---- cloud-sync borrowing ②: test connection (read-only self-check) ----
+  'probe.run': 'Test connection',
+  'probe.running': 'Testing connection…',
+  'probe.hint': 'Read-only self-check: credentials / endpoint / target container / directory reachability. The WebDAV channel may create the parent directory (that is the failure it fixes); no snapshot is pushed or changed.',
+  'probe.createdCollections': 'Created remote directories automatically: {list}',
+  'probe.snapshotCount': 'Snapshots on the remote: {count}',
+  // "Unsupported" is a capability boundary, not a failure: neutral wording, never "operation failed"
+  'probe.unsupported': 'This channel does not offer a connectivity self-check',
+  'probe.unsupportedHint': 'This is a capability boundary, not a failure: syncing on this channel is unaffected — it simply has no self-check.',
+  // ---- cloud-sync borrowing ⑥: device that pushed each snapshot (old snapshots have no such field, so no device line is shown) ----
+  'syncflow.snapshotDevice': 'Pushed by {device}',
 };
 
 /** 字典键联合（注册处 compile-time 校验） */

package/src/client/sync/sync-view.test.ts

@@ -11,7 +11,7 @@ import type { AutosyncStatusResponse, GithubPollResponse, SyncSectionInfo, SyncS
 import {
   autosyncIntervalMs, computeAutosyncCountdown, computeGithubLoginView, computeSyncButtons, computeSyncStatus,
   DEFAULT_SYNC_SESSIONS_LIMIT, defaultChannelSyncState, formatDateTime, formatIntervalDuration, formatLastSync,
-  autosyncSkipDetail,
+  autosyncFailureMessage, autosyncSkipDetail,
   githubPollMessage, initialSyncSections, kindLabel, normalizeSessionsLimit, privateRepoHint,
   pullReportView, pushReportView, presetById, presetIdForUrl, readStoredChannel, recommendedSyncSections,
   severityLabel, summarizePullChanges, syncSectionGroups, syncSectionOptions, WEBDAV_PRESETS, writeStoredChannel,
@@ -560,3 +560,20 @@ test('issue #79：autosyncSkipDetail —— en 界面下不得出现中文（文
   assert.match(String(en), /2/)
 })
 
+/* ------------------------------------------------- issue #105：卡片不得渲染上一轮的旧错误 */
+
+test('sync-view: autosyncFailureMessage —— 只有本轮失败才渲染错误原文（issue #105）', () => {
+  assert.equal(
+    autosyncFailureMessage({ lastRunStatus: 'failed', lastRunMessage: '认证失败' }),
+    '认证失败',
+    'failed + 有原文 → 渲染',
+  );
+  // 关键回归：同步已成功，但宿主/文件里还留着十天前的错误 —— 不得渲染
+  assert.equal(autosyncFailureMessage({ lastRunStatus: 'success', lastRunMessage: '十天前: 认证失败' }), null);
+  assert.equal(autosyncFailureMessage({ lastRunStatus: 'skipped', lastRunMessage: '十天前: 认证失败' }), null);
+  assert.equal(autosyncFailureMessage({ lastRunStatus: 'partial', lastRunMessage: '十天前: 认证失败' }), null);
+  // 空串 / 缺字段 / 从未运行 → 都不渲染
+  assert.equal(autosyncFailureMessage({ lastRunStatus: 'failed', lastRunMessage: '' }), null);
+  assert.equal(autosyncFailureMessage({ lastRunStatus: 'failed' }), null);
+  assert.equal(autosyncFailureMessage({}), null);
+});

package/src/client/sync/sync-view.ts

@@ -378,6 +378,8 @@ export interface ChannelSyncState {
   autosyncEnabled: boolean
   /** 该通道自动同步间隔（回填自 autosync） */
   autosyncInterval: AutosyncInterval
+  /** 本地改动即时触发（回填自 autosync；缺省 true —— 真·自动同步的开关） */
+  autosyncRealtime: boolean
 }
 
 /** 四通道的缺省状态表（`Record<SyncChannel, ChannelSyncState>`；组件 state 与快照复制共用）。 */
@@ -407,6 +409,7 @@ export function defaultChannelSyncState(): ChannelSyncState {
     autosync: null,
     autosyncEnabled: false,
     autosyncInterval: '30m',
+    autosyncRealtime: true,
   }
 }
 
@@ -1090,6 +1093,23 @@ export function autosyncSkipDetail(
   return label
 }
 
+/**
+ * 卡片该不该渲染「上一轮失败原因」（issue #105）。
+ *
+ * 此前卡片只看 lastRunMessage 非空就渲染，而该字段语义历史上是混用的：既可能是本轮错误原文，
+ * 也可能残留十天前那次失败、或被「连续失败通知」文案占用 —— 于是认证早已修好、同步也成功过，
+ * 卡片上仍挂着"认证失败"，用户据此去查一个不存在的故障。
+ *
+ * 渲染权只认一个判据：**本轮状态是 failed**。success/skipped/partial 一律不渲染旧错误。
+ * （宿主侧同一判据 = autosync-config.lastRunFailureMessage，此处是渲染层守门，双保险。）
+ */
+export function autosyncFailureMessage(
+  status: Pick<AutosyncStatusResponse, 'lastRunStatus' | 'lastRunMessage'>,
+): string | null {
+  if (status.lastRunStatus !== 'failed') return null
+  const message = status.lastRunMessage
+  return message === undefined || message === '' ? null : message
+}
 /** 自动同步状态行的可读文案（未运行 / 上次状态 / 连续失败计数）。 */
 export function autosyncStatusText(status: AutosyncStatusResponse, t: UiT): string {
   if (status.lastRunAt === undefined || status.lastRunAt === '' || status.lastRunStatus === undefined) {

package/src/core/backup.test.ts

@@ -30,6 +30,7 @@ import os from 'node:os';
 import path from 'node:path';
 
 import { FileSnapshotStore, createSnapshot, normalizeDshVersion, resolveFileTarget, verifySnapshot } from './backup.ts';
+import { rollback } from './rollback.ts';
 import { makeContext, MemSnapshotStore } from '../adapters/test-helpers.ts';
 import type { ImportPlan, Snapshot, SnapshotStore } from './types.ts';
 import type { SectionId } from '../schema/types.ts';
@@ -420,3 +421,43 @@ test('保留清理：快照目录名与内部 id 不一致时跳过并留痕（
   assert.ok(remaining.includes(second.id), '新建的快照当然还在');
   assert.ok(warned.some((m) => m.includes('不一致')), '跳过必须留痕（绝不静默）：' + JSON.stringify(warned));
 });
+
+/* ---------------- 方案 C：MCP 连接器存储文件（整文件快照 / 回滚） ---------------- */
+
+test('mcp 连接器：storages/mcp_connector.json 进快照为整文件条目，回滚按原字节还原', async () => {
+  const { ctx } = countingCtx();
+  const rel = 'storages/mcp_connector.json';
+  // 用引擎真正会读的那个路径播种（file 类目标由 resolveFileTarget 拼绝对路径）
+  const abs = resolveFileTarget(ctx, 'mcp', rel);
+  const original = JSON.stringify({
+    unit: { name: 'mcp_connector', version: 1 },
+    global: null,
+    tables: { connections: { 'a-a': { key: 'a-a', serverName: 'a' } }, grants: { g1: { key: 'g1' } }, tool_catalog: { t: 1 } },
+  });
+  await ctx.fs.writeFile(abs, Buffer.from(original, 'utf8'));
+
+  const plan: ImportPlan = {
+    items: [{
+      id: 'mcp-connector:a-a', kind: 'Create' as const, adapter: 'mcp' as const,
+      description: 'a', severity: 'info' as const, target: { adapter: 'mcp' as const, ref: rel },
+    }],
+    globalStrategy: 'merge', pathMappings: [], missingSecrets: [], needsRestart: false,
+    estimatedActions: {} as Record<SectionId, number>,
+  };
+  const store = new MemSnapshotStore();
+  const snapshot = await createSnapshot({ ctx, plan, sourceZip: 'unit.zip', store, adapters: [] });
+
+  const entry = snapshot.entries.find((e) => e.adapter === 'mcp' && e.ref === rel);
+  assert.equal(entry?.kind, 'file', '连接器存储必须走整文件快照（patchLine 语义撤不回它）');
+  assert.equal(entry?.existed, true);
+  assert.ok(entry?.copiedTo, '必须真的拷出一份 blob，否则回滚无字节可写回');
+  const blob = new TextDecoder().decode(await store.readBlob(snapshot.id, entry!.copiedTo!));
+  assert.equal(blob, original, '快照必须逐字节含全部表（grants/tool_catalog 不能被裁掉）');
+
+  // 模拟导入改写（只留 connections）→ 回滚必须回到原字节
+  await ctx.fs.writeFile(abs, Buffer.from('{"tables":{"connections":{}}}', 'utf8'));
+  const report = await rollback({ ctx, snapshot, store });
+  assert.equal(report.full, true, JSON.stringify(report.failed));
+  assert.deepEqual(report.restored, ['mcp:' + rel], '回滚必须报告真正被还原的那一条');
+  assert.equal(new TextDecoder().decode(await ctx.fs.readFile(abs)), original);
+});

package/src/core/backup.ts

@@ -16,6 +16,7 @@ import { normalizePath } from '../utils/paths.ts';
 import { atomicWriteFile } from '../utils/atomic-write.ts';
 import { SECTION_IDS, isFileSection } from '../schema/config.ts';
 import { isPatchLayerRel, PROFILE_PATCH_FILENAME, USER_PATCH_FILE } from './patch-layers.ts';
+import { MCP_CONNECTOR_STORE_REL } from './mcp-connector-store.ts';
 import type { SectionId } from '../schema/types.ts';
 import type {
   ConfigAdapter, FileSystemFacade, HostContext, HostFileBackup, ImportPlan, PlanItem, Snapshot,
@@ -346,6 +347,25 @@ async function engineSnapshotEntry(ctx: HostContext, target: SnapshotTarget): Pr
           copiedTo: `blobs/${crypto.randomUUID()}`,
         };
       }
+      // mcp 分区的第二个数据源（连接器插件的 storage domain 文件）：整文件快照。
+      // 没有这条分支时，连接器导入的写入撤不回来（该文件不在 patch 层里，走 patchLine 语义会
+      // 变成「读过一行 patch」→ 回滚时不还原文件 → 用户的 4 个 MCP 连接被永久改掉）。
+      if (target.adapter === 'mcp' && target.ref === MCP_CONNECTOR_STORE_REL) {
+        const fsFacade = fsForSection(ctx, target.adapter);
+        const abs = resolveFileTarget(ctx, target.adapter, target.ref);
+        if (!(await fsFacade.exists(abs))) {
+          return { kind: 'file', adapter: target.adapter, ref: target.ref, before: null, existed: false };
+        }
+        const data = await fsFacade.readFile(abs);
+        return {
+          kind: 'file',
+          adapter: target.adapter,
+          ref: target.ref,
+          before: { contentHash: sha256Hex(data) },
+          existed: true,
+          copiedTo: `blobs/${crypto.randomUUID()}`,
+        };
+      }
       // patchLine：从**该行所在的 patch 层**读取原行（issue #71）。
       // target.file 缺省 = 用户层（旧调用方 / 旧计划项），只接受合法层路径，绝不把任意字符串
       // 当文件名传给宿主门面（那会抛「仅支持管理 …」）。