dsh-config-manager 0.1.78 → 0.1.80

package/src/client/library/ArtifactRow.tsx

@@ -43,10 +43,16 @@ export interface ArtifactRowViewProps {
   onAction: (capability: ArtifactCapability, row: ArtifactRow) => void
   /** 该行有动作在跑：禁用行内按钮（防重复提交） */
   busy?: boolean
+  /**
+   * cloud-sync 借鉴项 ⑥：该行远端快照的**推送方设备**文案（如「由 <设备名> 推送」）。
+   * 只有快照 manifest 真的带 deviceName 时才由调用方给出 —— 缺省 undefined 表示**不渲染**
+   * （旧快照没有该字段，绝不显示空串或占位）。
+   */
+  deviceLabel?: string | undefined
 }
 
 export function ArtifactRowView({
-  row, t, uiT, formatTime, expanded, onToggle, onAction, busy = false,
+  row, t, uiT, formatTime, expanded, onToggle, onAction, busy = false, deviceLabel,
 }: ArtifactRowViewProps) {
   const detailId = useId()
   const primary = row.capabilities[0]
@@ -77,7 +83,11 @@ export function ArtifactRowView({
           </div>
           {/* 元数据是**自由序列**而不是表格列：某一段没有（如快照没有体积）就整段不出现，
               绝不补一个「—」占位 —— 这里没有对齐问题，占位只会变成噪音（§3 第三条） */}
-          {row.meta.length > 0 && <div className={css.artifactMeta}>{row.meta.join(' · ')}</div>}
+          {(row.meta.length > 0 || deviceLabel !== undefined) && (
+            <div className={css.artifactMeta}>
+              {[...row.meta, ...(deviceLabel === undefined ? [] : [deviceLabel])].join(' · ')}
+            </div>
+          )}
         </div>
         {row.badges.length > 0 && (
           <div className={css.artifactBadges}>

package/src/client/library/LibraryActions.tsx

@@ -24,6 +24,7 @@ import type { SyncApi } from '../sync/sync-api.ts'
 import { formatDateTimeFull } from '../sync/history-model.ts'
 import type { TranslateNS } from '../client-types.ts'
 import { Banner, Button, Empty, Spinner } from '../common/ui.tsx'
+import { Skeleton, SkeletonList, SkeletonTable } from '../common/Skeleton.tsx'
 import { InfoHint } from '../common/InfoHint.tsx'
 import { ConfirmDialog } from '../common/ConfirmDialog.tsx'
 import { Modal } from '../common/Modal.tsx'
@@ -380,7 +381,8 @@ export function LibraryActions({ api, syncApi, t, target, onDone, onChanged, onO
           {consult !== null && (
             <>
               <div className={css.hint}>{fileNameOf(consult.row)}</div>
-              {consult.loading && <Spinner label={api.t('consult.loading')} />}
+              {/* 迁移前咨询：正文块（多段报告）→ 按行铺骨架 */}
+              {consult.loading && <Skeleton shape="line" count={5} label={api.t('consult.loading')} />}
               {consult.error !== null && <Banner kind="error">{consult.error}</Banner>}
               {consult.report !== null && <ConsultCard report={consult.report} t={api.t} />}
             </>
@@ -441,7 +443,8 @@ export function LibraryActions({ api, syncApi, t, target, onDone, onChanged, onO
           trailing={<InfoHint text={t('snapshots.selectHint')} label={t('common.infoHint')} />}
         />
         <Modal.Body scroll>
-          {plan?.loading === true && <Spinner label={t('common.loading')} />}
+          {/* 恢复计划预览：结果是一张「文件 → 动作」表 → 按表格铺骨架 */}
+          {plan?.loading === true && <SkeletonTable rows={6} label={t('common.loading')} />}
           {plan?.error !== null && plan?.error !== undefined && <Banner kind="error">{plan.error}</Banner>}
           {plan?.plan != null && plan.plan.actions.length === 0 && <Empty>{t('snapshots.noActions')}</Empty>}
           {plan?.plan != null && plan.plan.actions.length > 0 && (
@@ -511,7 +514,7 @@ export function LibraryActions({ api, syncApi, t, target, onDone, onChanged, onO
         <Modal.Header title={t('backupFiles.inspect')} closeLabel={t('common.close')} onClose={() => { setInspect(null) }} />
         <Modal.Body scroll>
           {inspect !== null && <div className={css.hint} data-testid="inspect-backup-name">{inspect.name}</div>}
-          {inspect?.loading === true && <Spinner label={t('backupFiles.inspectLoading')} />}
+          {inspect?.loading === true && <SkeletonList count={3} label={t('backupFiles.inspectLoading')} />}
           {inspect?.error != null && <Banner kind="error">{inspect.error}</Banner>}
           {inspect !== null && !inspect.loading && inspect.result === null && inspect.error === null && <Empty>{t('backupFiles.inspectEmpty')}</Empty>}
           {inspect?.result != null && <BackupInspectView result={inspect.result} t={t} />}

package/src/client/library/LibraryPanel.tsx

@@ -21,8 +21,10 @@ import type { SyncApi, SyncSnapshotLite } from '../sync/sync-api.ts'
 import type { MarketApi } from '../market/market-api.ts'
 import type { TranslateNS } from '../client-types.ts'
 import { formatDateTimeFull } from '../sync/history-model.ts'
+import { deviceLabelsById } from '../sync/remote-device-view.ts'
 import { runStore, type LibraryStoreSlice } from '../run-store.ts'
-import { Badge, Button, Card, Empty, Spinner } from '../common/ui.tsx'
+import { Badge, Button, Card, Empty } from '../common/ui.tsx'
+import { SkeletonRows } from '../common/Skeleton.tsx'
 import { redact } from '../../security/redaction.ts'
 import { InfoHint } from '../common/InfoHint.tsx'
 import { ArtifactRowView } from './ArtifactRow.tsx'
@@ -139,6 +141,19 @@ export function LibraryPanel({ api, syncApi, marketApi, t, uiT, onAction, onOpen
     () => filterArtifacts(rows, { kind: lib.sourceFilter, text: lib.query, sort: lib.sort }),
     [rows, lib.sourceFilter, lib.query, lib.sort],
   )
+
+  /**
+   * cloud-sync 借鉴项 ⑥：远端快照 id → 「由 <设备名> 推送」文案。
+   * **只有**快照 manifest 真的带 deviceName 的行才进表：旧快照没有该字段，界面就不显示设备行
+   * （绝不渲染空串占位，也绝不把 undefined 变成文案）。
+   */
+  const deviceLabelOf = useMemo(
+    () => deviceLabelsById(
+      remote.status === 'ready' ? remote.items : [],
+      (device) => t('library.remoteDevice', { device }),
+    ),
+    [remote, t],
+  )
   const counts = countByKind(rows)
   const failedSources = [snapshots, files, remote, market].filter((s) => s.status === 'error').length
 
@@ -216,8 +231,10 @@ export function LibraryPanel({ api, syncApi, marketApi, t, uiT, onAction, onOpen
       {/* 还有来源在路上（本机两源已就绪但为空）时也走加载态：绝不先给「暂无产物」的结论。
           与空态共用同一个 .libraryListState 契约（守卫要求恰好两处：加载态 + 空态）。 */}
       {(loading || (anySourcePending && filtered.length === 0)) && (
-        <div className={css.libraryListState}>
-          <Spinner label={t('common.loading')} />
+        <div className={css.libraryListState + ' ' + css.librarySkeletonRegion}>
+          {/* 骨架：行数按一屏可见行给（8 行 ≈ 564×720 画布的列表区），行高与 .artifactRowHead 对齐，
+              数据到货时列表从同一位置长出来，不再「空页面 + 居中转圈」整块跳变。 */}
+          <SkeletonRows count={8} label={t('common.loading')} />
         </div>
       )}
 
@@ -246,6 +263,7 @@ export function LibraryPanel({ api, syncApi, marketApi, t, uiT, onAction, onOpen
                 runStore.patch({ library: { expandedKey: lib.expandedKey === row.key ? null : row.key } })
               }}
               onAction={onAction}
+              deviceLabel={row.kind === 'remote-snapshot' ? deviceLabelOf.get(row.ref.remoteId ?? '') : undefined}
             />
           ))}
         </ul>

package/src/client/library/RestorePlanView.tsx

@@ -19,7 +19,8 @@ import type { TranslateNS } from '../client-types.ts'
 import { toRestorePlanView, withLoadedStatus, type RestorePlanRow } from '../../ui/restore-plan-view.ts'
 import { DiffTable } from '../common/DiffTable.tsx'
 import { formatBytes } from '../../ui/report.ts'
-import { Badge, Banner, Spinner } from '../common/ui.tsx'
+import { Badge, Banner } from '../common/ui.tsx'
+import { SkeletonTable } from '../common/Skeleton.tsx'
 import { ExpandChevron } from '../common/Icon.tsx'
 import { Collapse } from '../common/Motion.tsx'
 import css from '../config-manager.module.css'
@@ -104,7 +105,8 @@ function reasonLabel(t: TranslateNS<'config-manager'>, reason: SnapshotFileDiffR
 
 
 function DiffPane({ state, t }: { state: DiffState; t: TranslateNS<'config-manager'> }) {
-  if (state.status === 'loading') return <Spinner label={t('snapshots.plan.loadingDiff')} />
+  // 差异是「逐行文档」形状：加载时按表格铺骨架，与 DiffTable 的行高同一节奏
+  if (state.status === 'loading') return <SkeletonTable rows={6} label={t('snapshots.plan.loadingDiff')} />
   if (state.status === 'error') return <Banner kind="error">{redact(state.message)}</Banner>
   const diff = state.diff
   if (diff.reason !== undefined) return <div className={css.hint}>{reasonLabel(t, diff.reason, diff)}</div>

package/src/client/locales.ts

@@ -827,6 +827,8 @@ export const zh = {
   'library.kind.snapshot': '本机快照',
   'library.kind.backupFile': '备份文件',
   'library.kind.remote': '远端快照',
+  // cloud-sync 借鉴项 ⑥：快照的推送方设备（仅当快照 manifest 带 deviceName 时才渲染；旧快照不显示占位）
+  'library.remoteDevice': '由 {device} 推送',
   'library.kind.market': '市场配置',
   'library.title': '产物库',
   'library.refresh': '刷新',
@@ -1769,6 +1771,7 @@ export const en: Record<keyof typeof zh, string> = {
   'library.kind.snapshot': 'Local snapshot',
   'library.kind.backupFile': 'Backup file',
   'library.kind.remote': 'Remote snapshot',
+  'library.remoteDevice': 'Pushed by {device}',
   'library.kind.market': 'Market config',
   'library.title': 'Artifact library',
   'library.refresh': 'Refresh',

package/src/client/market/market-api.test.ts

@@ -181,12 +181,13 @@ test('M-07 错误映射：4xx 携带 error → ConfigManagerApiError', async ()
   });
 });
 
-test('M-08 服务未挂载：404（非 JSON 体）→ ConfigManagerApiError 提示插件未加载', async () => {
+test('M-08 接口路径未命中：404（非 JSON 体）→ 提示请求前缀而不是「插件未挂载」（issue #108）', async () => {
   installFetchMock(() => new Response('Not Found', { status: 404 }));
   const api = new MarketApi(zhUiT);
   await assert.rejects(api.status(), (err: unknown) => {
     assert.ok(err instanceof ConfigManagerApiError);
-    assert.match(err.message, /未挂载/);
+    assert.match(err.message, /接口路径未命中/);
+    assert.doesNotMatch(err.message, /未挂载/);
     return true;
   });
 });

package/src/client/recovery/RecoveryPanel.tsx

@@ -25,7 +25,7 @@ import type { TranslateNS } from '../client-types.ts'
 import { Badge, Banner, Button, Card, Empty, FoldToggle, IconButton, SectionTitle, Spinner, StatusDot } from '../common/ui.tsx'
 import { DiskUsageCard } from '../environment/maintenance/DiskUsageCard.tsx'
 import { RollbackCard } from './RollbackCard.tsx'
-import { SkeletonList } from '../common/Skeleton.tsx'
+import { SkeletonList, SkeletonTable } from '../common/Skeleton.tsx'
 import { ConfirmDialog } from '../common/ConfirmDialog.tsx'
 import { Modal } from '../common/Modal.tsx'
 import { Icon } from '../common/Icon.tsx'
@@ -76,7 +76,7 @@ import { runStore, type RecoveryStoreSlice } from '../run-store.ts'
 import type { CrashReport, IncidentApi, RescueStatus } from './incident-api.ts'
 import { IncompleteCopiesSection } from './IncompleteCopiesSection.tsx'
 import {
-  isSnapshotTrusted, isVerdictAttention, isVerdictSuccess, toRecoveryPreviewView,
+  isSnapshotTrusted, isVerdictAttention, isVerdictSuccess, recoveryBlockReason, toRecoveryPreviewView,
   toRecoveryView,
   crashAdviceKey,
   crashReasonKey,
@@ -874,7 +874,8 @@ function SessionHealthDialog(props: SessionHealthDialogProps) {
           {phase === 'error' && <Banner kind="error">{error ?? t('common.unknownError')}</Banner>}
 
           {/* 首次扫描（还没有任何结果）：给出进行中反馈 —— 旧实现在这里只留一片空白 */}
-          {phase === 'loading' && response === null && <Spinner label={t('sessions.scanning')} />}
+          {/* 首次扫描：按会话表的形状铺骨架（表格行），扫描结果到货时表格原地长出来 */}
+          {phase === 'loading' && response === null && <SkeletonTable rows={6} label={t('sessions.scanning')} />}
 
           {phase === 'ready' && response !== null && (
             <>
@@ -1486,6 +1487,14 @@ export function RecoveryPanel(props: RecoveryPanelProps) {
   const previewView = state.preview !== null ? toRecoveryPreviewView(state.preview) : null
   /** 真有待处理事项（口径唯一来源 = 纯函数 recovery-view.ts 的 recoveryRequired）：决定副标题与空态 */
   const needsAttention = view?.recoveryRequired === true
+  /**
+   * 选中项是否属于「正在正常执行中」的操作。是 ⇒ 恢复/放弃都不该点：它还在跑，
+   * quarantine 会把在跑的 journal 从 active/ 抽走。据此给出**原因**而不是灰按钮。
+   */
+  const selectedLive = selected !== undefined
+    && (view?.activeOperations.some((op) => op.operationId === selected.operationId) ?? false)
+  /** 选中项「执行恢复」不可用的原因（null = 可用）——见 recovery-view.ts recoveryBlockReason */
+  const selectedBlockReason = selected !== undefined ? recoveryBlockReason(selected) : null
 
   return (
     <div className={css.viewBody}>
@@ -1514,9 +1523,15 @@ export function RecoveryPanel(props: RecoveryPanelProps) {
       )}
 
       {/* —— 状态与待处理事项（先异常、后诊断）：三块诊断卡在下方，缺省只展开磁盘占用 —— */}
-      {/* SAFE MODE / recovery-required 状态提示（正常态不渲染任何横幅——无事项即静默） */}
+      {/* SAFE MODE / recovery-required 状态提示（正常态不渲染任何横幅——无事项即静默）。
+          **文案必须与真实阻断态同源**：recoveryRequired 只是「有待处理事项」，不等于写操作已被
+          暂停（残留锁 / 中断的档案复制都不会让 safeMode.blocked 为 true）。此前这里无条件说
+          「已进入安全模式（会修改配置的操作已暂停）」⇒ 用户看到保护提示，实际上许多写操作照常
+          成功，属于假警报（也让真正被阻断的场景失去可信度）。 */}
       {view?.recoveryRequired === true && (
-        <Banner kind="error">{t('recovery.currentState.safeMode')}</Banner>
+        <Banner kind="error">
+          {view.safeModeBlocked ? t('recovery.currentState.safeMode') : t('recovery.currentState.itemsOnly')}
+        </Banner>
       )}
 
       {state.status === 'loading' && <SkeletonList label={t('recovery.loading')} />}
@@ -1564,6 +1579,26 @@ export function RecoveryPanel(props: RecoveryPanelProps) {
         </Card>
       )}
 
+      {/* 正在正常执行的操作（不是 incident）：给一句「会自行结束」，避免用户以为面板出了故障。
+          这一块存在的理由：此前 autosync push 在跑的 12 秒里，它被当成了待处理事故。 */}
+      {state.status === 'ready' && (view?.activeOperations.length ?? 0) > 0 && (
+        <Card className={css.card}>
+          <div className={css.groupLabel}>{t('recovery.live.title')}</div>
+          <div className={css.hint}>{t('recovery.live.hint')}</div>
+          <div className={css.snapshotList}>
+            {view!.activeOperations.map((op) => (
+              <div key={op.operationId} className={css.snapshotRow}>
+                <span className={css.snapshotRowMain} title={op.operationId}>
+                  <span>{op.operationType}</span>
+                  <span>{new Date(op.startedAt).toLocaleString()}</span>
+                  <span><Badge kind="info">{incidentStateLabel(t, op.state)}</Badge></span>
+                </span>
+              </div>
+            ))}
+          </div>
+        </Card>
+      )}
+
       {state.status === 'ready' && (view?.incidents.length ?? 0) > 0 && (
         <>
           {/* 进行中 recovery run 提示 */}
@@ -1691,13 +1726,25 @@ export function RecoveryPanel(props: RecoveryPanelProps) {
 
               {state.actionError !== null && <Banner kind="error">{state.actionError}</Banner>}
 
+              {/* 「执行恢复」不可用的原因：灰按钮不带解释 = 用户只能盲猜（这正是事故里的体验）。
+                  三种原因互斥且都能被代码逐条证明：操作仍在跑 / 无绑定快照 / 决策为需人工处理。 */}
+              {selectedLive ? (
+                <Banner kind="info">{t('recovery.incident.liveBlocked')}</Banner>
+              ) : state.verifyResult === null && selectedBlockReason !== null ? (
+                <div className={css.hint}>
+                  {selectedBlockReason === 'noSnapshot'
+                    ? t('recovery.incident.blockReason.noSnapshot')
+                    : t('recovery.incident.blockReason.needsAttention')}
+                </div>
+              ) : null}
+
               {/* 动作区 */}
               <div className={css.actionRow}>
                 {state.verifyResult === null && (
                   <>
                     <Button
                       variant="danger"
-                      disabled={state.running || !(previewView?.actionable ?? false)}
+                      disabled={state.running || selectedLive || !(previewView?.actionable ?? false)}
                       loading={state.running}
                       onClick={() => { setConfirmOpen(true) }}
                     >
@@ -1705,7 +1752,7 @@ export function RecoveryPanel(props: RecoveryPanelProps) {
                     </Button>
                     <Button
                       variant="ghost"
-                      disabled={state.running}
+                      disabled={state.running || selectedLive}
                       onClick={() => { setDismissOpen(true) }}
                     >
                       {t('recovery.dismiss')}

package/src/client/recovery/RollbackCard.tsx

@@ -57,6 +57,7 @@ import type {
 } from '../../ui/rollback-view.ts'
 import { redact } from '../../security/redaction.ts'
 import { Badge, Banner, Button, Card, Checkbox, Empty, IconButton, SectionTitle, Spinner } from '../common/ui.tsx'
+import { SkeletonList } from '../common/Skeleton.tsx'
 import { Icon } from '../common/Icon.tsx'
 import { InfoHint } from '../common/InfoHint.tsx'
 import { Modal } from '../common/Modal.tsx'
@@ -460,7 +461,7 @@ export function RollbackCard({ recoveryApi, t }: RollbackCardProps) {
           </>
         )}
 
-        {status === 'loading' && <Spinner label={t('recovery.loading')} />}
+        {status === 'loading' && <SkeletonList count={3} label={t('recovery.loading')} />}
         {status === 'error' && (
           <div className={css.actionRow}>
             <Banner kind="error">{error !== null ? error : t('rollback.apiMissing')}</Banner>
@@ -544,7 +545,7 @@ export function RollbackCard({ recoveryApi, t }: RollbackCardProps) {
             )}
           />
           <Modal.Body scroll>
-            {status === 'loading' && <Spinner label={t('recovery.loading')} />}
+            {status === 'loading' && <SkeletonList count={3} label={t('recovery.loading')} />}
             {status === 'error' && (
               <div className={css.actionRow}>
                 <Banner kind="error">{error !== null ? error : t('rollback.apiMissing')}</Banner>
@@ -829,6 +830,10 @@ export function RollbackCard({ recoveryApi, t }: RollbackCardProps) {
                       {segment.unavailableCount > 0 && (
                         <span>{t('rollback.result.unavailable', { n: segment.unavailableCount })}</span>
                       )}
+                      {segment.unclaimedCount > 0 && (
+                        <span>{t('rollback.result.unclaimed', { n: segment.unclaimedCount })}</span>
+                      )}
+                      {segment.unclaimedPaths.map((line) => <span key={'unclaimed:' + line}>{line}</span>)}
                       {segment.concurrentCount > 0 && (
                         <span>{t('rollback.result.concurrent', { n: segment.concurrentCount })}</span>
                       )}

package/src/client/recovery/RollbackDiffPane.tsx

@@ -12,7 +12,8 @@ import type { TranslateNS } from '../client-types.ts'
 import type { RollbackFileDiffResult } from '../../ui/rollback-view.ts'
 import { rollbackFileDiffComparable, rollbackFileDiffReasonKey } from '../../ui/rollback-view.ts'
 import { redact } from '../../security/redaction.ts'
-import { Banner, Spinner } from '../common/ui.tsx'
+import { Banner } from '../common/ui.tsx'
+import { SkeletonTable } from '../common/Skeleton.tsx'
 import { DiffTable } from '../common/DiffTable.tsx'
 import css from '../config-manager.module.css'
 
@@ -48,7 +49,7 @@ export function RollbackDiffPane({ state, rt, title, fill }: RollbackDiffPanePro
    */
   const shell = (body: ReactNode): ReactNode =>
     fill === true ? <div className={css.diffPane + ' ' + css.diffPaneFill}>{body}</div> : body
-  if (state.status === 'loading') return shell(<Spinner label={rt('rollback.diff.loading')} />)
+  if (state.status === 'loading') return shell(<SkeletonTable rows={8} label={rt('rollback.diff.loading')} />)
   if (state.status === 'error') return shell(<Banner kind="error">{state.message === null ? rt('rollback.diff.failed') : redact(state.message)}</Banner>)
   const diff = state.diff
   if (diff.ok !== true) {

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

@@ -23,7 +23,8 @@ export const zh = {
   'recovery.banner': '配置修改已被保护：存在未完成的恢复事项。请先处理后继续。',
   'recovery.bannerAction': '去处理',
   'recovery.required': '需要恢复',
-  'recovery.requiredHint': '检测到一次操作未正常完成，为安全起见已暂停所有会修改配置的操作。请处理以下恢复事项以恢复正常。',
+  // 「有待处理事项」≠「写操作已被暂停」：后者只有 safeMode.blocked 才成立（横幅文案另有一对键）。
+  'recovery.requiredHint': '存在需要处理的恢复事项（残留锁、未完成的操作或中断的复制）。处理完这些事项即恢复正常。',
   'recovery.rollbackRecommended': '建议回滚',
   'recovery.rollbackContinue': '续跑回滚',
   'recovery.inProgress': '恢复进行中',
@@ -54,6 +55,15 @@ export const zh = {
   // 当前状态
   'recovery.currentState.title': '当前状态',
   'recovery.currentState.safeMode': '已进入安全模式（会修改配置的操作已暂停）',
+  // 有待处理事项、但 safeMode.blocked 为 false（残留锁 / 中断复制 / 旧宿主）：不得声称写操作已被暂停
+  'recovery.currentState.itemsOnly': '存在需要处理的恢复事项（写操作未被暂停）',
+  // 正在正常执行的操作（不是 incident）
+  'recovery.live.title': '正在执行的操作',
+  'recovery.live.hint': '这些操作正在正常执行中，不是未完成的恢复事项；结束后会自动消失。',
+  // 「执行恢复 / 放弃恢复」不可用的原因（灰按钮必须能自证）
+  'recovery.incident.liveBlocked': '该操作仍在进行中，现在不能恢复也不能放弃，请等它结束。',
+  'recovery.incident.blockReason.noSnapshot': '本次操作没有绑定可信恢复快照，因此无法执行恢复。',
+  'recovery.incident.blockReason.needsAttention': '该事项被判定为需要人工处理，无法自动恢复。',
   'recovery.currentState.hasSnapshot': '存在可信恢复快照',
   'recovery.currentState.noSnapshot': '无可信恢复快照',
   // 快照信息
@@ -450,6 +460,7 @@ export const zh = {
   'rollback.result.conflict': '{n} 个文件两侧改到同一处，已保持原样 —— 需要你手工处理',
   'rollback.result.unavailable': '{n} 个文件无法安全撤销（缺少中间版本 / 二进制 / 差异过大），已保持原样',
   'rollback.result.concurrent': '{n} 个文件在回退过程中又被改过，已保持原样',
+  'rollback.result.unclaimed': '{n} 个文件无法判定属于哪个对话（改动时没有任何对话在运行），已保持原样',
   'rollback.result.selectionSkipped': '{n} 个文件按你的勾选跳过了',
   'rollback.preview.files.empty': '工作区与该回退点一致，无需恢复',
   /* —— T15：**预览态**（点「回退」之前那一屏）的四态文案 ——
@@ -634,7 +645,7 @@ export const en: Record<keyof typeof zh, string> = {
   'recovery.banner': 'Configuration changes are protected: there is an unfinished recovery item. Resolve it before continuing.',
   'recovery.bannerAction': 'Go to recovery',
   'recovery.required': 'Recovery Required',
-  'recovery.requiredHint': 'An operation did not complete normally. To stay safe, all config-modifying operations are paused. Handle the recovery item(s) below to restore normal operation.',
+  'recovery.requiredHint': 'Recovery item(s) need handling (a stale lock, an unfinished operation, or an interrupted copy). Resolve them to restore normal operation.',
   'recovery.rollbackRecommended': 'Rollback recommended',
   'recovery.rollbackContinue': 'Continue rollback',
   'recovery.inProgress': 'Recovery in progress',
@@ -661,6 +672,12 @@ export const en: Record<keyof typeof zh, string> = {
   'recovery.verify.verdict.unknown': 'Unknown',
   'recovery.currentState.title': 'Current state',
   'recovery.currentState.safeMode': 'Safe mode active (config-modifying operations paused)',
+  'recovery.currentState.itemsOnly': 'Recovery item(s) need handling (write operations are not paused)',
+  'recovery.live.title': 'Running operations',
+  'recovery.live.hint': 'These operations are running normally; they are not unfinished recovery items and will disappear when they finish.',
+  'recovery.incident.liveBlocked': 'This operation is still running, so it cannot be recovered or dismissed yet. Wait for it to finish.',
+  'recovery.incident.blockReason.noSnapshot': 'This operation has no trusted recovery snapshot bound to it, so recovery cannot run.',
+  'recovery.incident.blockReason.needsAttention': 'This item is classified as needing manual handling and cannot be recovered automatically.',
   'recovery.currentState.hasSnapshot': 'Trusted recovery snapshot available',
   'recovery.currentState.noSnapshot': 'No trusted recovery snapshot',
   'recovery.snapshot.title': 'Recovery snapshot',
@@ -1033,6 +1050,7 @@ export const en: Record<keyof typeof zh, string> = {
   'rollback.result.conflict': '{n} file(s) were changed on both sides in the same place and were left as they are — they need your decision',
   'rollback.result.unavailable': '{n} file(s) could not be reverted safely (no common ancestor / binary / diff too large) and were left as they are',
   'rollback.result.concurrent': '{n} file(s) changed again while this rewind was running and were left as they are',
+  'rollback.result.unclaimed': '{n} file(s) could not be attributed to any conversation (nothing was running when they changed) and were left as they are',
   'rollback.result.selectionSkipped': '{n} file(s) skipped by your selection',
   'rollback.preview.files.empty': 'The workspace already matches this rollback point, nothing to restore',
   'rollback.preview.files.unavailable': 'The workspace state of this rollback point has no usable record (reason: {reason}), nothing to restore',

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

@@ -9,7 +9,7 @@ import test from 'node:test';
 import assert from 'node:assert/strict';
 
 import {
-  isSnapshotTrusted, isVerdictAttention, isVerdictSuccess, sortIncidentsByNewest,
+  isSnapshotTrusted, isVerdictAttention, isVerdictSuccess, recoveryBlockReason, sortIncidentsByNewest,
   toRecoveryPreviewView, toRecoveryView, verdictToUiState,
 } from './recovery-view.ts';
 import type { RecoveryStatus } from '../../ui/types.ts';
@@ -220,3 +220,41 @@ test('sortIncidentsByNewest：按 createdAt 倒序', () => {
   assert.equal(sorted[0]!.operationId, 'b');
   assert.equal(sorted[1]!.operationId, 'a');
 });
+
+// ---------- 正在正常执行的操作（本轮修复：不再当成「未完成的恢复事项」） ----------
+
+test('toRecoveryView：live[] 映射为 activeOperations，且不改变 state / recoveryRequired', () => {
+  const v = toRecoveryView(mkStatus({
+    live: [{
+      operationId: '00000000-0000-4000-8000-0000000000bb',
+      operationType: 'autosync-push',
+      state: 'APPLYING',
+      startedAt: '2026-01-01T00:00:00.000Z',
+    }],
+  }));
+  assert.equal(v.activeOperations.length, 1);
+  assert.equal(v.activeOperations[0]!.operationType, 'autosync-push');
+  assert.equal(v.activeOperations[0]!.state, 'APPLYING');
+  // 正在跑不是问题：既不进 incidents，也不触发「需要恢复」的横幅
+  assert.deepEqual(v.incidents, []);
+  assert.equal(v.recoveryRequired, false);
+  assert.equal(v.state, 'NORMAL');
+});
+
+test('toRecoveryView：旧宿主不返回 live 字段 → activeOperations 为空数组（不误报正在跑）', () => {
+  const v = toRecoveryView({ incidents: [], running: [] });
+  assert.deepEqual(v.activeOperations, []);
+});
+
+test('recoveryBlockReason：与 actionable 严格互补（面板据此解释「为什么灰」）', () => {
+  // needs-attention 优先：即使有快照，阻塞原因是「需人工处理」而不是「没快照」
+  assert.equal(recoveryBlockReason({ decision: 'needs-attention', snapshotId: 'snap-1' }), 'needsAttention');
+  assert.equal(recoveryBlockReason({ decision: 'needs-attention', snapshotId: null }), 'needsAttention');
+  // 能恢复的决策但没有可信快照 → 无快照可回滚
+  assert.equal(recoveryBlockReason({ decision: 'rollback-recommended', snapshotId: null }), 'noSnapshot');
+  // 判据必须与 actionable 逐字同口径（:108 只认 null / ''），所以这里也只断言这两种形态
+  assert.equal(recoveryBlockReason({ decision: 'rollback-recommended', snapshotId: '' }), 'noSnapshot');
+  // 可执行 → 无阻塞原因
+  assert.equal(recoveryBlockReason({ decision: 'rollback-recommended', snapshotId: 'snap-1' }), null);
+  assert.equal(recoveryBlockReason({ decision: 'rollback-continue', snapshotId: 'snap-1' }), null);
+});

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

@@ -20,7 +20,7 @@
  * NEEDS_ATTENTION 显示为 recovered、绝不在 snapshot 不可信时显示可恢复。
  */
 import type {
-  RecoveryDecision, RecoveryIncident, RecoveryPreview, RecoveryStatus, RecoveryVerdict,
+  RecoveryActiveOperation, RecoveryDecision, RecoveryIncident, RecoveryPreview, RecoveryStatus, RecoveryVerdict,
 } from '../../ui/types.ts';
 
 /** UI 顶层状态分类。 */
@@ -71,6 +71,12 @@ export interface RecoveryView {
   incidents: RecoveryIncidentView[];
   /** 进行中的 recovery run（runId + status）。 */
   running: { runId: string; status: string }[];
+  /**
+   * 正在正常执行的操作（不是 incident）。决定两件事：
+   *  ① 面板要给出一句「这些在执行中，会自行结束」，而不是让用户对着灰按钮猜；
+   *  ② 若某条 incident 恰好也在跑（宿主判定放宽/旧宿主），对应行的「执行恢复/放弃恢复」要解释原因。
+   */
+  activeOperations: RecoveryActiveOperation[];
   /** 需用户显式处理的残留锁（attention=true 时才非 null）。 */
   lock: RecoveryLockView | null;
   /**
@@ -128,6 +134,8 @@ export function toRecoveryView(status: RecoveryStatus): RecoveryView {
     recoveryRequired,
     incidents,
     running: status.running,
+    // 旧宿主不返回 live → 空数组（绝不误报「有操作在跑」）
+    activeOperations: status.live ?? [],
     lock,
     safeModeStuck,
     safeModeBlocked,
@@ -136,6 +144,20 @@ export function toRecoveryView(status: RecoveryStatus): RecoveryView {
   };
 }
 
+/**
+ * 「执行恢复」为什么不可用（面板显示原因，而不是丢一个没有任何解释的灰按钮）。
+ *
+ * 判据与 `actionable` 严格互补（同一条规则两处呈现）：decision=needs-attention 断了
+ * 恢复路径，snapshotId 为空断了快照来源。返回 null = 可执行。
+ */
+export function recoveryBlockReason(
+  incident: Pick<RecoveryIncidentView, 'decision' | 'snapshotId'>,
+): 'needsAttention' | 'noSnapshot' | null {
+  if (incident.decision === 'needs-attention') return 'needsAttention';
+  if (incident.snapshotId === null || incident.snapshotId === '') return 'noSnapshot';
+  return null;
+}
+
 /** 单个 preview 的渲染模型。 */
 export interface RecoveryPreviewView {
   operationId: string;

package/src/client/run-store.test.ts

@@ -1617,7 +1617,7 @@ test('P0-9: 持久化字段清单显式化（键集合断言 —— 新增字段
     'loadError', 'pullReport', 'pushPreview', 'pushReport', 'repoUrl', 'webdavUrl', 'webdavUsername',
   ])
   assert.deepEqual(keys(p.sync.byChannel.git), [
-    'autosync', 'autosyncEnabled', 'autosyncInterval', 'encrypt', 'includeSecrets',
+    'autosync', 'autosyncEnabled', 'autosyncInterval', 'autosyncRealtime', 'encrypt', 'includeSecrets',
     'loadingSnapshots', 'selectedSnapshotId', 'sessionsInclude', 'sessionsLimit', 'snapshots',
     'syncMode', 'syncSections',
   ])

package/src/client/run-store.ts

@@ -1023,6 +1023,8 @@ export function toPersistedState(state: StoreState): PersistedState {
     autosync: c.autosync,
     autosyncEnabled: c.autosyncEnabled,
     autosyncInterval: c.autosyncInterval,
+    // 真·自动同步的本地监听开关（用户设置，非敏感；缺省 true）
+    autosyncRealtime: c.autosyncRealtime,
   })
   return {
     v: 1,
@@ -1645,6 +1647,8 @@ export class RunStore {
               autosync: null,
               autosyncEnabled: false,
               autosyncInterval: '30m',
+              // 旧版持久化载荷没有这个字段 → 缺省开启（真·自动同步是缺省行为）
+              autosyncRealtime: true,
             }
           : undefined
         return {