dsh-config-manager 0.1.78 → 0.1.80

package/src/client/sync/WorkDirCard.tsx

@@ -3,8 +3,10 @@
  *
  * 为什么需要它：改仓库地址后同步失败时，App 内此前**没有任何自救路径** —— 只能手工
  * `git remote set-url`，或删掉 `<dataDir>/sync/work` 重来。这里给出工作副本的只读事实
- * （路径 / origin / 与配置地址是否一致）与两条出口：
+ * （路径 / origin / 与配置地址是否一致）与三条出口：
  *  - 「重指向仓库地址」= host 的 relink（非破坏性：只改 git 配置，不碰工作树与本地提交）；
+ *  - 「采纳远端历史」= host 的 adopt（issue #104：把远端分支合并进本地工作副本 —— 换仓库 / 远端历史
+ *    被重写后两条历史不相交，pull --ff-only 永远失败。不改写本地提交，可 revert，冲突自动 abort）；
  *  - 「重新克隆工作副本」= host 的 reclone（**丢弃未上行的本地提交**）→ danger 二次确认。
  *
  * 约定（与 ChannelClearConfirmDialog 同族）：确认弹窗、宿主调用与终局回执都在本文件内自持，
@@ -19,10 +21,18 @@ import { ConfirmDialog } from '../common/ConfirmDialog.tsx'
 import { toast } from '../common/toast-store.ts'
 import { redact } from '../../security/redaction.ts'
 import {
-  canRecloneWorkdir, formatSyncUrlPreview, needsWorkdirRelink, workdirStateBadgeKind, workdirStateKey,
+  canAdoptWorkdir, canRecloneWorkdir, formatSyncUrlPreview, needsWorkdirRelink, workdirBacklog, workdirStateBadgeKind,
+  workdirStateKey,
 } from '../../ui/sync-settings-view.ts'
 import css from '../config-manager.module.css'
 
+/** 三种出口各自的终局回执（zh/en 都在 sync-locales，禁止在这里拼用户可见文案）。 */
+const WORKDIR_TOAST = {
+  relink: 'toast.workdirRelinked',
+  adopt: 'toast.workdirAdopted',
+  reclone: 'toast.workdirRecloned',
+} as const
+
 export function WorkDirCard({ t, api, workDir, busy, onChanged }: {
   t: TranslateNS<'config-manager-sync'>
   api: SyncApi
@@ -34,20 +44,27 @@ export function WorkDirCard({ t, api, workDir, busy, onChanged }: {
 }) {
   /** 重新克隆的二次确认（破坏性：丢弃未上行的本地提交） */
   const [recloneOpen, setRecloneOpen] = useState(false)
-  /** 本次发起的出口（relink / reclone）：请求在途时卡片按钮就地转加载态。
+  /** 本次发起的出口（relink / adopt / reclone）：请求在途时卡片按钮就地转加载态。
    *  为什么必须有：reclone 要删目录 + 重新 clone（真机可达数十秒），此前点了只有 toast 在**结束**时才响，
    *  用户无从判断是否正在执行，容易重复点击或以为没反应。 */
-  const [pending, setPending] = useState<'relink' | 'reclone' | null>(null)
+  const [pending, setPending] = useState<'relink' | 'adopt' | 'reclone' | null>(null)
   const stateKey = workdirStateKey(workDir)
   const badgeKind = workdirStateBadgeKind(stateKey)
   const facts = workDir !== undefined && 'facts' in workDir ? workDir.facts : null
+  /** issue #104 建议 3：本地攒了提交、远端却一个快照都没有 —— 这一条必须显式喊出来 */
+  const backlog = workdirBacklog(workDir)
+  const backlogBadge = backlog.kind === 'never-synced'
+    ? { kind: 'warn' as const, key: 'workdir.backlogNeverSynced' as const }
+    : backlog.kind === 'ahead'
+      ? { kind: 'warn' as const, key: 'workdir.backlogAhead' as const }
+      : null
 
-  const reset = async (mode: 'relink' | 'reclone'): Promise<void> => {
+  const reset = async (mode: 'relink' | 'adopt' | 'reclone'): Promise<void> => {
     setRecloneOpen(false)
     setPending(mode)
     try {
       await api.workdirReset(mode === 'reclone' ? { mode, confirm: true } : { mode })
-      toast.ok(t(mode === 'relink' ? 'toast.workdirRelinked' : 'toast.workdirRecloned'))
+      toast.ok(t(WORKDIR_TOAST[mode]))
       onChanged()
     } catch (err) {
       toast.error(t('toast.workdirResetFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
@@ -63,6 +80,7 @@ export function WorkDirCard({ t, api, workDir, busy, onChanged }: {
       {stateKey !== null && badgeKind !== null && (
         <div className={css.statRow}>
           <Badge kind={badgeKind}>{t(stateKey)}</Badge>
+          {backlogBadge !== null && <Badge kind={backlogBadge.kind}>{t(backlogBadge.key)}</Badge>}
         </div>
       )}
       {workDir === undefined ? (
@@ -83,6 +101,18 @@ export function WorkDirCard({ t, api, workDir, busy, onChanged }: {
               </span>
             </span>
           </div>
+          {backlog.kind !== 'unknown' && (
+            <div className={css.factCell}>
+              <span className={css.factLabel}>{t('workdir.ahead')}</span>
+              <span className={css.factValue}>{backlog.kind === 'clean' ? 0 : backlog.ahead}</span>
+            </div>
+          )}
+          {(backlog.kind === 'clean' || backlog.kind === 'ahead') && (
+            <div className={css.factCell}>
+              <span className={css.factLabel}>{t('workdir.remoteSnapshots')}</span>
+              <span className={css.factValue}>{backlog.remoteSnapshots}</span>
+            </div>
+          )}
         </div>
       )}
       <div className={css.actionRowTop}>
@@ -91,6 +121,14 @@ export function WorkDirCard({ t, api, workDir, busy, onChanged }: {
             {t('workdir.relink')}
           </Button>
         )}
+        {canAdoptWorkdir(workDir) && (
+          <>
+            <Button disabled={busy || pending !== null} loading={pending === 'adopt'} onClick={() => { void reset('adopt') }}>
+              {t('workdir.adopt')}
+            </Button>
+            <InfoHint text={t('workdir.adoptHint')} label={t('common.infoHint')} />
+          </>
+        )}
         {canRecloneWorkdir(workDir) && (
           <Button variant="danger" disabled={busy || pending !== null} loading={pending === 'reclone'} onClick={() => { setRecloneOpen(true) }}>
             {t('workdir.reclone')}

package/src/client/sync/history-model.ts

@@ -87,7 +87,7 @@ export function autosyncStatusLabel(status: AutosyncHistoryEntry['status'], t: S
  * 跳过原因 → 可读描述（host 透传语义；未知原因回退原串）。
  *
  * client-F1（本次收口）：conflict / no-remote / not-configured / network / encrypted /
- * mutation-locked / 未知 **七类全部**走 history.autosyncReason* 字典键 —— 此前后三类是
+ * mutation-locked / conflict-kept-local / 未知 **八类全部**走 history.autosyncReason* 字典键 —— 此前部分码是
  * 硬编码中文（sync-locales.ts 当时不可写），英文界面下会原样透出。
  */
 export function skipReasonKey(reason: string | undefined): SyncKey | null {
@@ -106,6 +106,9 @@ export function skipReasonKey(reason: string | undefined): SyncKey | null {
     // 客户端拿不到细分 reason → 文案必须同时覆盖「活锁占用」与「残留锁需回收」两种可能，
     // 并给出可操作方向（否则界面只显示裸 token，用户无从判断要不要处理）。
     case 'mutation-locked': return 'history.autosyncReasonMutationLocked';
+    // 真·自动同步（conflictPolicy='local'）：冲突已按策略「保留本机并推上去」消解，
+    // 远端那一版被覆盖（仍在远端历史快照里，可回滚）—— 必须与「冲突待裁决」分开说。
+    case 'conflict-kept-local': return 'history.autosyncReasonConflictKeptLocal';
     // 未知原因：没有字典键（调用方决定回退策略）
     default: return null;
   }

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

@@ -0,0 +1,248 @@
+/**
+ * T-ui-merge：远程合并裁决**纯函数**单测（node:test，零依赖、无 DOM）。
+ *
+ * 覆盖验收：决策/成因字典映射（禁止裸枚举）、冲突行投影与截断+redact、
+ * 保守缺省（空草稿 = 未点名的分区引擎不应用）、批量裁决语义、裁决计数与可应用判据、结果归一化。
+ */
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+import {
+  applyBulkResolution, buildMergeResolutions, decideSyncEntry, decisionWillApply, hasApplicableSections, initialResolutionDraft,
+  mergeDecisionCounts, mergeDecisionKey, mergeDecisionTone, mergeKindKey, mergeReasonKey,
+  mergeResultView, mergeSectionRows, mergeSummaryItems, needsNoAncestorNotice,
+  normalizeDecision, setSectionAction, truncatePreview, MERGE_PREVIEW_MAX_CHARS,
+} from './merge-view.ts'
+import type { MergePreviewResponse, MergePreviewSection, MergeSectionDecision } from './sync-api.ts'
+
+/** 构造一份预览（分区 id 用真实 SectionId 形态，便于与宿主口径对齐）。 */
+function preview(overrides: Partial<MergePreviewResponse> = {}): MergePreviewResponse {
+  return {
+    ok: true,
+    snapshotId: 'snap-1',
+    hasAncestor: true,
+    sections: [],
+    summary: { auto: 0, review: 0, conflicts: 0, skipped: 0 },
+    ...overrides,
+  }
+}
+
+test('merge-view: normalizeDecision —— 未知值 fail-closed 归入「需裁决」，不静默当无变化', () => {
+  assert.equal(normalizeDecision('useRemote'), 'useRemote')
+  assert.equal(normalizeDecision('conflict'), 'conflict')
+  assert.equal(normalizeDecision('brand-new-decision'), 'conflict')
+  assert.equal(normalizeDecision(undefined), 'conflict')
+  assert.equal(normalizeDecision(42), 'conflict')
+})
+
+test('merge-view: 决策/成因/类型一律经字典键映射（界面不出现裸枚举）', () => {
+  assert.equal(mergeDecisionKey('merge'), 'merge.decision.merge')
+  assert.equal(mergeDecisionKey('nope'), 'merge.decision.conflict')
+  assert.equal(mergeDecisionTone('merge'), 'ok')
+  assert.equal(mergeDecisionTone('conflict'), 'warn')
+  assert.equal(mergeReasonKey('modify-delete'), 'merge.reason.modifyDelete')
+  assert.equal(mergeReasonKey('unknown-reason'), 'merge.reason.bothModified')
+  assert.equal(mergeReasonKey(undefined), 'merge.reason.bothModified')
+  assert.equal(mergeKindKey('file'), 'merge.kind.file')
+  assert.equal(mergeKindKey('key'), 'merge.kind.key')
+  assert.equal(mergeKindKey(undefined), 'merge.kind.key')
+})
+
+test('merge-view: truncatePreview —— 渲染前再过一次 redact，且按上限截断', () => {
+  const secret = 'ghp_abcdefghijklmnopqrstuvwxyz012345'
+  const masked = truncatePreview('Authorization: ' + secret)
+  assert.ok(masked.includes('REDACTED'), '密钥形状必须被掩码，实际：' + masked)
+  assert.ok(!masked.includes(secret))
+  assert.equal(truncatePreview(undefined), '')
+  assert.equal(truncatePreview(null), '')
+  assert.equal(truncatePreview(123), '123', '非字符串按 String() 展示，绝不 undefined')
+  const long = 'x'.repeat(MERGE_PREVIEW_MAX_CHARS + 40)
+  const cut = truncatePreview(long)
+  assert.equal(cut.length, MERGE_PREVIEW_MAX_CHARS + 1, '截断到上限 + 一个省略号')
+  assert.ok(cut.endsWith('…'))
+})
+
+test('merge-view: mergeSectionRows —— conflict 分区需裁决且「自动合并」不可用；merge 分区可用', () => {
+  const p = preview({
+    sections: [
+      { id: 'settings', decision: 'conflict', conflictCount: 1, conflicts: [{ path: 'foo', kind: 'key', reason: 'both-modified', localPreview: 'l', remotePreview: 'r', ancestorPreview: 'a' }] },
+      { id: 'providers', decision: 'merge', autoMerged: 2, conflictCount: 0, conflicts: [] },
+    ],
+  })
+  const rows = mergeSectionRows(p)
+  assert.equal(rows.length, 2)
+  const conflict = rows[0]!
+  assert.equal(conflict.needsDecision, true)
+  assert.equal(conflict.canUseMerged, false, 'conflict 分区没有 merged 载荷 → 采用自动合并必须禁用')
+  assert.equal(conflict.resolutionId, 'settings', '裁决单 id = 分区 id（无复合 id）')
+  assert.deepEqual(conflict.conflicts[0], {
+    path: 'foo',
+    kindKey: 'merge.kind.key',
+    reasonKey: 'merge.reason.bothModified',
+    localPreview: 'l',
+    remotePreview: 'r',
+    ancestorPreview: 'a',
+  })
+  const merged = rows[1]!
+  assert.equal(merged.needsDecision, false)
+  assert.equal(merged.canUseMerged, true)
+  assert.equal(merged.autoMerged, 2)
+})
+
+test('merge-view: mergeSectionRows —— 缺字段时用冲突数组长度兜底，不显示 undefined', () => {
+  const p = preview({
+    sections: [{ id: 'mcp', decision: 'conflict', conflictCount: undefined as unknown as number, conflicts: [{ path: 'a', kind: 'key', localPreview: '', remotePreview: '', ancestorPreview: '' }] }],
+  })
+  const rows = mergeSectionRows(p)
+  assert.equal(rows[0]!.conflictCount, 1)
+  assert.equal(rows[0]!.autoMerged, null)
+})
+
+test('merge-view: initialResolutionDraft —— 空草稿（未点名的分区引擎不应用，界面不再预置 skip）', () => {
+  const p = preview({
+    sections: [
+      { id: 'settings', decision: 'conflict', conflictCount: 2, conflicts: [] },
+      { id: 'providers', decision: 'useRemote', conflictCount: 0, conflicts: [] },
+    ],
+  })
+  assert.deepEqual(initialResolutionDraft(p), {}, '空草稿：请求体里不出现任何分区')
+  assert.deepEqual(initialResolutionDraft(null), {})
+  assert.deepEqual(buildMergeResolutions({}), [], '空草稿 = 空请求体')
+})
+
+test('merge-view: 批量裁决 —— 本地/远端覆盖全部分区；自动合并只碰 merge 分区；留到下次 = 清空待裁决', () => {
+  const p = preview({
+    sections: [
+      { id: 'settings', decision: 'conflict', conflictCount: 1, conflicts: [] },
+      { id: 'mcp', decision: 'conflict', conflictCount: 1, conflicts: [] },
+      { id: 'providers', decision: 'merge', autoMerged: 1, conflictCount: 0, conflicts: [] },
+    ],
+  })
+  const base = initialResolutionDraft(p)
+  assert.deepEqual(applyBulkResolution(p, base, 'useRemote'), { settings: 'useRemote', mcp: 'useRemote', providers: 'useRemote' })
+  assert.deepEqual(applyBulkResolution(p, base, 'keepLocal'), { settings: 'keepLocal', mcp: 'keepLocal', providers: 'keepLocal' })
+  assert.deepEqual(
+    applyBulkResolution(p, base, 'useMerged'),
+    { providers: 'useMerged' },
+    'conflict 分区不因批量操作被静默改成别的动作，只有有 merged 载荷的分区可写 useMerged',
+  )
+  assert.deepEqual(applyBulkResolution(p, base, 'leavePending'), {}, '冲突留到下次 = 把待裁决分区移出草稿')
+  // 已裁决的分区被「留到下次」清掉，未裁决分区本来就不在草稿里
+  assert.deepEqual(applyBulkResolution(p, setSectionAction(base, 'settings', 'useRemote'), 'leavePending'), {})
+})
+
+test('merge-view: 单分区裁决 + 请求体排序稳定', () => {
+  const p = preview({
+    sections: [
+      { id: 'settings', decision: 'conflict', conflictCount: 1, conflicts: [] },
+      { id: 'mcp', decision: 'conflict', conflictCount: 1, conflicts: [] },
+    ],
+  })
+  const d = setSectionAction(initialResolutionDraft(p), 'mcp', 'useRemote')
+  assert.deepEqual(buildMergeResolutions(d), [{ id: 'mcp', action: 'useRemote' }])
+  assert.deepEqual(buildMergeResolutions(setSectionAction({}, 'settings', 'keepLocal')), [{ id: 'settings', action: 'keepLocal' }])
+})
+
+test('merge-view: hasApplicableSections —— 预览可应用 或 已裁决会写盘（issue #106）', () => {
+  const onlySkip = preview({ sections: [{ id: 'settings', decision: 'skip', conflictCount: 0, conflicts: [] }] })
+  assert.equal(hasApplicableSections(onlySkip), false, '全部无变化 → 执行合并必须禁用')
+  assert.equal(hasApplicableSections(onlySkip, {}), false)
+  assert.equal(hasApplicableSections(null), false)
+  const withAuto = preview({
+    sections: [
+      { id: 'settings', decision: 'conflict', conflictCount: 1, conflicts: [] },
+      { id: 'providers', decision: 'useRemote', conflictCount: 0, conflicts: [] },
+    ],
+  })
+  assert.equal(hasApplicableSections(withAuto), true, '只有冲突 + 一个可应用分区 → 可执行（冲突留待下次）')
+  const onlyConflict = preview({ sections: [{ id: 'settings', decision: 'conflict', conflictCount: 1, conflicts: [] }] })
+  assert.equal(hasApplicableSections(onlyConflict), false, '未裁决的冲突 → 没有可应用内容')
+
+  // ---- issue #106 回归：0 可自动应用 + 全是冲突时，裁决完必须可为 ----
+  assert.equal(hasApplicableSections(onlyConflict, setSectionAction({}, 'settings', 'useRemote')), true, '已裁决 useRemote → 会写盘，必须可用')
+  assert.equal(hasApplicableSections(onlyConflict, setSectionAction({}, 'settings', 'keepLocal')), true, '已裁决 keepLocal → 会写盘，必须可用')
+  assert.equal(hasApplicableSections(onlyConflict, setSectionAction({}, 'other', 'useRemote')), false, '草稿点的是别的分区 → 仍然禁用')
+  assert.equal(hasApplicableSections(onlyConflict, setSectionAction({}, 'settings', 'useMerged')), false, '冲突分区没有 merged 载荷 → 该裁决什么也不写')
+  const mergeable = preview({ sections: [{ id: 'settings', decision: 'merge', autoMerged: 2, conflictCount: 0, conflicts: [] }] })
+  assert.equal(hasApplicableSections(mergeable, setSectionAction({}, 'settings', 'useMerged')), true, '有 merged 载荷 → useMerged 会写盘')
+  // 批量「全部采用本机」会把 skip 分区也写进草稿，此时它同样会落盘
+  assert.equal(hasApplicableSections(onlySkip, setSectionAction({}, 'settings', 'keepLocal')), true)
+  assert.equal(decisionWillApply(mergeSectionRows(mergeable)[0]!, 'useMerged'), true)
+  assert.equal(decisionWillApply(mergeSectionRows(onlyConflict)[0]!, 'useMerged'), false)
+  assert.equal(decisionWillApply(mergeSectionRows(onlyConflict)[0]!, undefined), false)
+})
+
+test('merge-view: mergeDecisionCounts —— 待裁决覆盖 + 本次可应用分区数分别可数', () => {
+  const p = preview({
+    sections: [
+      { id: 'settings', decision: 'conflict', conflictCount: 2, conflicts: [] },
+      { id: 'mcp', decision: 'conflict', conflictCount: 1, conflicts: [] },
+      { id: 'providers', decision: 'merge', autoMerged: 1, conflictCount: 0, conflicts: [] },
+      { id: 'skills', decision: 'skip', conflictCount: 0, conflicts: [] },
+    ],
+  })
+  const empty = mergeDecisionCounts(p, {})
+  assert.deepEqual(empty, { needsDecision: 2, decided: 0, undecided: 2, conflictItems: 3, applicable: 1 })
+  assert.deepEqual(
+    mergeDecisionCounts(p, setSectionAction({}, 'settings', 'useRemote')),
+    { needsDecision: 2, decided: 1, undecided: 1, conflictItems: 3, applicable: 2 },
+  )
+  assert.deepEqual(
+    mergeDecisionCounts(p, setSectionAction(setSectionAction({}, 'settings', 'useRemote'), 'mcp', 'keepLocal')),
+    { needsDecision: 2, decided: 2, undecided: 0, conflictItems: 3, applicable: 3 },
+  )
+})
+
+test('merge-view: mergeSummaryItems —— 缺字段按 0，绝不 undefined', () => {
+  assert.deepEqual(mergeSummaryItems(null), [
+    { labelKey: 'merge.summary.auto', value: 0, tone: 'ok' },
+    { labelKey: 'merge.summary.review', value: 0, tone: 'warn' },
+    { labelKey: 'merge.summary.conflicts', value: 0, tone: 'warn' },
+    { labelKey: 'merge.summary.skipped', value: 0, tone: 'info' },
+  ])
+  assert.equal(mergeSummaryItems(preview({ summary: { auto: 1, review: 2, conflicts: 3, skipped: 4 } }))[2]!.value, 3)
+})
+
+test('merge-view: mergeResultView —— pendingConflicts 必须暴露出来（跳过 ≠ 已解决）', () => {
+  assert.equal(mergeResultView(null), null)
+  const v = mergeResultView({
+    ok: false,
+    applied: ['settings'],
+    skipped: ['mcp'],
+    warnings: ['w'],
+    restoreId: '',
+    rolledBack: true,
+    pendingConflicts: ['mcp'],
+    failed: [{ itemId: 'x' }],
+    ineffective: [{ itemId: 'y', adapter: 'z' }],
+  })!
+  assert.equal(v.restoreId, null, '空串 restoreId 不当作可回滚')
+  assert.equal(v.rollbackFull, null, '旧宿主缺 rollbackFull 不得当成「完整」')
+  assert.equal(v.hasPendingConflicts, true)
+  assert.deepEqual(v.pendingConflicts, ['mcp'])
+  assert.equal(v.failedCount, 1)
+  assert.equal(v.ineffectiveCount, 1)
+  assert.equal(v.rolledBack, true)
+})
+
+test('merge-view: decideSyncEntry —— 无基准/预览失败一律回退老路径（fail-safe），全 skip 视为已最新', () => {
+  const sec = (decision: MergeSectionDecision): MergePreviewSection => ({ id: 'settings', decision, conflictCount: 0, conflicts: [] })
+  const ok = (sections: MergePreviewSection[]): Pick<MergePreviewResponse, 'ok' | 'sections'> => ({ ok: true, sections })
+  assert.equal(decideSyncEntry(undefined, null), 'fallback', '缺省（旧宿主）= 未知 → 老路径')
+  assert.equal(decideSyncEntry(false, null), 'fallback')
+  assert.equal(decideSyncEntry('true', null), 'fallback', '非布尔 true 一律回退')
+  assert.equal(decideSyncEntry(true, null), 'fallback', '预览缺失 → 老路径')
+  assert.equal(decideSyncEntry(true, { ok: false, sections: [] }), 'fallback', '宿主明确未产出 → 老路径')
+  assert.equal(decideSyncEntry(true, ok([])), 'upToDate', '无分区 = 无差异')
+  assert.equal(decideSyncEntry(true, ok([sec('skip'), sec('skip')])), 'upToDate', '全 skip = 已是最新')
+  assert.equal(decideSyncEntry(true, ok([sec('skip'), sec('conflict')])), 'merge')
+  assert.equal(decideSyncEntry(true, ok([sec('merge')])), 'merge')
+  // 宿主未来版本可能回传新决策值：类型上不可能，运行时必须 fail-closed（用 cast 模拟线上数据）
+  assert.equal(decideSyncEntry(true, ok([sec('brand-new' as MergeSectionDecision)])), 'merge', '未知决策 fail-closed 归入需裁决')
+})
+
+test('merge-view: needsNoAncestorNotice —— hasAncestor=false 才提示，null 预览不提示', () => {
+  assert.equal(needsNoAncestorNotice(null), false)
+  assert.equal(needsNoAncestorNotice(preview({ hasAncestor: true })), false)
+  assert.equal(needsNoAncestorNotice(preview({ hasAncestor: false })), true)
+})