dsh-config-manager 0.1.71 → 0.1.73

package/src/client/sync/ChannelClearConfirmDialog.tsx

@@ -19,7 +19,7 @@ import { Banner } from '../common/ui.tsx'
 import { toast } from '../common/toast-store.ts'
 import { redact } from '../../security/redaction.ts'
 import type { SyncApi } from './sync-api.ts'
-import type { SyncChannel } from './sync-view.ts'
+import { SYNC_CHANNEL_LABEL_KEY, type SyncChannel } from './sync-view.ts'
 
 export function ChannelClearConfirmDialog({ open, channel, api, t, onCancel, onCleared }: {
   open: boolean
@@ -30,7 +30,10 @@ export function ChannelClearConfirmDialog({ open, channel, api, t, onCancel, onC
   /** 成功回调：调用方据此清表单残留、撤销在途自动保存并重拉 status（本组件不碰页面状态） */
   onCleared: () => void
 }) {
-  const channelLabel = channel === 'webdav' ? t('channel.webdav') : t('channel.git')
+  // 四个通道一律走穷尽映射（SYNC_CHANNEL_LABEL_KEY: Record<SyncChannel, SyncKey>）：
+  // 此前写成「webdav ? webdav : git」，在 s3/gist 卡上点「断开配置」时，危险确认框与成功回执
+  // 都会把该通道说成「Git 私有仓库」——用户会以为断错了通道而取消（或反之误判已断的通道）。
+  const channelLabel = t(SYNC_CHANNEL_LABEL_KEY[channel])
   return (
     <ConfirmDialog
       open={open}
@@ -45,7 +48,7 @@ export function ChannelClearConfirmDialog({ open, channel, api, t, onCancel, onC
           toast.ok(t('toast.channelCleared', { channel: channelLabel }))
           onCleared()
         } catch (err) {
-          toast.error(`${t('toast.channelClearFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+          toast.error(t('toast.channelClearFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
         }
       }}
       onCancel={onCancel}

package/src/client/sync/ChannelConfigDialog.tsx

@@ -18,6 +18,7 @@ import {
   cloudIssueKey, cloudSecretRefName, presetById, presetIdForUrl, privateRepoHint,
   S3_PROVIDER_LABEL_KEY, SYNC_CHANNEL_LABEL_KEY, WEBDAV_PRESETS,
 } from './sync-view.ts'
+import { GIST_LARGE_SECTION_HINT_KEY } from './sync-view.ts'
 import type { GithubLoginView } from './sync-view.ts'
 import { S3_PROVIDERS } from '../../ui/sync-settings-view.ts'
 import type { CloudFormIssue, SyncFormSnapshot } from '../../ui/sync-settings-view.ts'
@@ -137,6 +138,7 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
               {t('config.token')}
               {' '}
               {statusInfo?.credentialConfigured === true && <Badge kind="ok">{t('config.tokenSaved')}</Badge>}
+              <InfoHint text={t('config.tokenHint', { ref: SYNC_CREDENTIAL_REF })} label={t('common.infoHint')} />
             </span>
             <input
               type="password"
@@ -149,7 +151,6 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
                 onFormChange({ token: e.target.value })
               }}
             />
-            <span className={css.hint}>{t('config.tokenHint', { ref: SYNC_CREDENTIAL_REF })}</span>
           </label>
 
           {/* GitHub OAuth 登录（device flow）：弹窗内仅 git 通道显示；已登录（token 有效）时整块隐藏 */}
@@ -161,7 +162,7 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
               <span className={css.groupLabel}>{t('github.title')} <InfoHint text={t('github.description')} label={t('common.infoHint')} /></span>
               {githubView.showCode && (
                 <div className={css.statRow}>
-                  <Badge kind="info">{t('github.userCode')}：<strong>{githubView.userCode}</strong></Badge>
+                  <Badge kind="info">{t('github.userCode')}{t('common.labelSeparator')}<strong>{githubView.userCode}</strong></Badge>
                   <a
                     className={css.ghostButton}
                     href={githubView.verificationUri}
@@ -192,9 +193,6 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
                   {githubView.statusText}
                 </Badge>
               </div>
-              {githubView.phase === 'error' && (
-                <span className={css.hint}>{t('config.tokenHint', { ref: SYNC_CREDENTIAL_REF })}</span>
-              )}
             </>
           )}
         </>
@@ -215,7 +213,7 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
                 const preset = presetById(next)
                 onFormChange({ webdavUrl: preset.url })
               }}
-              options={WEBDAV_PRESETS.map((preset) => ({ value: preset.id, label: preset.label }))}
+              options={WEBDAV_PRESETS.map((preset) => ({ value: preset.id, label: t(preset.labelKey) }))}
             />
             <InfoHint text={t('webdav.presetHint')} label={t('common.infoHint')} />
           </div>
@@ -257,6 +255,7 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
               {t('webdav.password')}
               {' '}
               {statusInfo?.webdav?.passwordConfigured === true && <Badge kind="ok">{t('webdav.passwordSaved')}</Badge>}
+              <InfoHint text={t('webdav.passwordHint', { ref: SYNC_WEBDAV_CREDENTIAL_REF })} label={t('common.infoHint')} />
             </span>
             <input
               type="password"
@@ -269,7 +268,6 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
                 onFormChange({ webdavPassword: e.target.value })
               }}
             />
-            <span className={css.hint}>{t('webdav.passwordHint', { ref: SYNC_WEBDAV_CREDENTIAL_REF })}</span>
           </label>
         </>
       )}
@@ -359,6 +357,7 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
               {t('cloud.secret')}
               {' '}
               {statusInfo?.s3?.secretStored === true && <Badge kind="ok">{t('cloud.secretSaved')}</Badge>}
+              <InfoHint text={t('cloud.secretHint', { ref: cloudSecretRef })} label={t('common.infoHint')} />
             </span>
             <input
               type="password"
@@ -369,7 +368,6 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
               disabled={busy}
               onChange={(e: ChangeEvent<HTMLInputElement>) => { onFormChange({ s3Secret: e.target.value }) }}
             />
-            <span className={css.hint}>{t('cloud.secretHint', { ref: cloudSecretRef })}</span>
           </label>
         </>
       )}
@@ -377,7 +375,9 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
       {/* gist 通道分支（GitHub Gist：走 REST，token 只写 DSH 凭据槽位） */}
       {channel === 'gist' && (
         <>
-          <span className={css.groupLabel}>{t('cloud.gistTitle')}</span>
+          {/* G-34：gist 刻意不外置 blob（一次 GET 全量 / 单文件超限截断 / 文件数上限）⇒ 大分区不适合走 gist；
+              该说明属机制类，收进标题 ⓘ（2026-10-12 用户要求） */}
+          <span className={css.groupLabel}>{t('cloud.gistTitle')} <InfoHint text={t(GIST_LARGE_SECTION_HINT_KEY)} label={t('common.infoHint')} /></span>
           <label className={css.field}>
             <span className={css.fieldLabel}>{t('cloud.gistId')} <InfoHint text={t('cloud.gistIdHint')} label={t('common.infoHint')} /></span>
             <input
@@ -417,6 +417,7 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
               {t('cloud.token')}
               {' '}
               {statusInfo?.gist?.secretStored === true && <Badge kind="ok">{t('cloud.tokenSaved')}</Badge>}
+              <InfoHint text={t('cloud.tokenHint', { ref: cloudSecretRef })} label={t('common.infoHint')} />
             </span>
             <input
               type="password"
@@ -427,7 +428,6 @@ export function ChannelConfigDialog({ open, onClose, api, t, uiT, form, cloudIss
               disabled={busy}
               onChange={(e: ChangeEvent<HTMLInputElement>) => { onFormChange({ gistToken: e.target.value }) }}
             />
-            <span className={css.hint}>{t('cloud.tokenHint', { ref: cloudSecretRef })}</span>
           </label>
         </>
       )}

package/src/client/sync/DecryptPasswordCard.tsx

@@ -7,6 +7,7 @@
 import type { ChangeEvent } from 'react'
 import type { TranslateNS } from '../client-types.ts'
 import { Button, Card } from '../common/ui.tsx'
+import { InfoHint } from '../common/InfoHint.tsx'
 import type { ChannelSyncState } from './sync-view.ts'
 import type { SyncChannelSettingsPatch } from '../../ui/sync-settings-view.ts'
 import css from '../config-manager.module.css'
@@ -22,7 +23,7 @@ export function DecryptPasswordCard({ t, settings, onPatchSettings, onPersistDec
   return (
     <Card>
       <label className={css.field}>
-        <span className={css.fieldLabel}>{t('mode.decryptPassword')}</span>
+        <span className={css.fieldLabel}>{t('mode.decryptPassword')} <InfoHint text={t('mode.decryptPasswordHint')} label={t('common.infoHint')} /></span>
         <input
           type="password"
           className={css.input}
@@ -32,7 +33,6 @@ export function DecryptPasswordCard({ t, settings, onPatchSettings, onPersistDec
           onChange={(e: ChangeEvent<HTMLInputElement>) => { onPatchSettings({ decryptPassword: e.target.value }) }}
           onBlur={onPersistDecryptPassword}
         />
-        <span className={css.hint}>{t('mode.decryptPasswordHint')}</span>
       </label>
       {settings.decryptPasswordSaved && (
         <div className={css.actionRow}>

package/src/client/sync/SecurityOptionsCard.tsx

@@ -7,6 +7,7 @@
 import type { ChangeEvent } from 'react'
 import type { TranslateNS } from '../client-types.ts'
 import { Card, Checkbox } from '../common/ui.tsx'
+import { InfoHint } from '../common/InfoHint.tsx'
 import type { ChannelSyncState } from './sync-view.ts'
 import type { SyncChannelSettingsPatch } from '../../ui/sync-settings-view.ts'
 import css from '../config-manager.module.css'
@@ -26,19 +27,27 @@ export function SecurityOptionsCard({ t, settings, onToggleEncrypt, onToggleIncl
   return (
     <Card>
       <span className={css.groupLabel}>{t('mode.security')}</span>
-      <Checkbox
-        checked={settings.encrypt}
-        onChange={onToggleEncrypt}
-        label={<span className={css.categoryName}>{t('mode.encrypt')}</span>}
-      />
-      <div className={css.hint}>{t('mode.encryptHint')}</div>
-      {settings.encrypt && settings.encryptPasswordSaved && (
-        <div className={css.hint}>{t('mode.passwordSavedHint')}</div>
-      )}
+      {/* 说明性文案一律进 ⓘ（2026-10-12 用户要求：卡里只留勾选项与控件）。
+          「加密方式 + 密码存哪 + 自动同步跳过加密快照」两句合成同一颗 ⓘ。 */}
+      <div className={css.controlRow}>
+        <Checkbox
+          checked={settings.encrypt}
+          onChange={onToggleEncrypt}
+          label={<span className={css.categoryName}>{t('mode.encrypt')}</span>}
+        />
+        <InfoHint
+          text={t('mode.encryptHint') + ' ' + t('mode.encryptAutosyncNotice')}
+          label={t('common.infoHint')}
+        />
+      </div>
       {settings.encrypt && (
         <div className={css.secretFields}>
           <label className={css.field}>
-            <span className={css.fieldLabel}>{t('mode.password')}</span>
+            <span className={css.fieldLabel}>
+              {t('mode.password')}
+              {' '}
+              {settings.encryptPasswordSaved && <InfoHint text={t('mode.passwordSavedHint')} label={t('common.infoHint')} />}
+            </span>
             <input
               type="password"
               className={css.input}
@@ -71,13 +80,14 @@ export function SecurityOptionsCard({ t, settings, onToggleEncrypt, onToggleIncl
           <span className={css.hint}>{t('mode.passwordClearNotice')}</span>
         </div>
       )}
-      <Checkbox
-        checked={settings.includeSecrets}
-        onChange={onToggleIncludeSecrets}
-        label={<span className={css.categoryName}>{t('mode.includeSecrets')}</span>}
-      />
-      <div className={css.hint}>{t('mode.includeSecretsHint')}</div>
-      <span className={css.hint}>{t('mode.encryptAutosyncNotice')}</span>
+      <div className={css.controlRow}>
+        <Checkbox
+          checked={settings.includeSecrets}
+          onChange={onToggleIncludeSecrets}
+          label={<span className={css.categoryName}>{t('mode.includeSecrets')}</span>}
+        />
+        <InfoHint text={t('mode.includeSecretsHint')} label={t('common.infoHint')} />
+      </div>
     </Card>
   )
 }

package/src/client/sync/SyncChannelEntryCard.tsx

@@ -10,7 +10,7 @@ import { ExpandChevron } from '../common/Icon.tsx'
 import { InfoHint } from '../common/InfoHint.tsx'
 import type { SyncStatusResponse } from './sync-api.ts'
 import type { SyncChannel } from './sync-view.ts'
-import { formatSyncStatusTimestamp, formatSyncUrlPreview } from '../../ui/sync-settings-view.ts'
+import { formatSyncStatusTimestamp, formatSyncUrlPreview, workdirStateKey, workdirStateBadgeKind } from '../../ui/sync-settings-view.ts'
 import { needsGitToken, SYNC_CHANNEL_LABEL_KEY } from './sync-view.ts'
 import css from '../config-manager.module.css'
 
@@ -38,6 +38,11 @@ export function SyncChannelEntryCard({ t, channel, statusInfo, remoteReady, repo
   contentId?: string
   onToggleExpanded?: () => void
 }) {
+  // issue #79：工作副本状态（git 专属）。只在**需要人管**的状态（仍指旧地址 / 读不出）挂徽章 ——
+  // 「尚未创建」是首次同步前的正常态，不值得占一个徽章位；完整事实在展开区的「工作副本」卡里。
+  const workdirKey = channel === 'git' ? workdirStateKey(statusInfo?.workDir) : null
+  const workdirKind = workdirStateBadgeKind(workdirKey)
+  const showWorkdirBadge = workdirKind === 'warn'
   /** 事实行里的「当前远端」预览：按通道取那个真正标识远端的字段（gist 用 id，没有 URL） */
   const previewRemote = channel === 'webdav'
     ? webdavUrl
@@ -73,13 +78,20 @@ export function SyncChannelEntryCard({ t, channel, statusInfo, remoteReady, repo
         {channel === 'gist' && statusInfo?.gist?.secretStored === true && (
           <Badge kind="ok">{t('cloud.tokenSaved')}</Badge>
         )}
+        {/* issue #79：改仓库地址后工作副本仍指旧地址（下一轮同步会自动重指向）—— 在卡上直接可见 */}
+        {showWorkdirBadge && workdirKey !== null && workdirKind !== null && (
+          <Badge kind={workdirKind}>{t(workdirKey)}</Badge>
+        )}
       </div>
       {/* 状态事实行（Workbench：配置状态/上次同步/可同步分区——未配置时也要给硬事实） */}
       <div className={css.factGrid} style={{ marginTop: 8 }}>
         <div className={css.factCell}>
           <span className={css.factLabel}>{t('syncStatus.state')}</span>
           <span className={css.factValue}>
-            {statusInfo?.configured === true ? t('channel.configured') : t('channel.notConfigured')}
+            {/* 判据必须与徽章同源（本卡自己的 remoteReady）：statusInfo.configured 是**全局**语义
+                （任一通道配置过即为 true），照它渲染会让「只配了 git」时另外三张卡同时出现
+                「未配置」徽章 +「已配置」事实行。 */}
+            {remoteReady ? t('channel.configured') : t('channel.notConfigured')}
           </span>
         </div>
         <div className={css.factCell}>

package/src/client/sync/SyncConfirmView.tsx

@@ -22,7 +22,7 @@ import {
   buildAdoptions, confirmListSummary, hasBulkDecidable, keepLocalAll, kindLabel, reviewItems, severityLabel,
   summarizeConfirmItems, useRemoteAll, type BulkDecision, type SyncConflictResolution,
 } from './sync-view.ts'
-import type { ApplyItemsResponse } from './sync-api.ts'
+import type { ApplyItemsResponse, SyncRollbackResponse } from './sync-api.ts'
 import type { TranslateNS } from '../client-types.ts'
 import type { SyncConfirmDecisions } from '../run-store.ts'
 import { compatibilityBadgeKind, compatibilityLevel, type CompatibilityLevel } from '../../ui/import-wizard.ts'
@@ -86,6 +86,8 @@ export function SyncConfirmView(props: SyncConfirmViewProps): ReactNode {
   // 执行阶段：'idle' | 'applying' | 'done' | 'failed' | 'cancelling'
   const [phase, setPhase] = useState<'idle' | 'applying' | 'done' | 'failed' | 'cancelling'>('idle');
   const [applyResult, setApplyResult] = useState<ApplyItemsResponse | null>(null);
+  /** 一键回滚的诚实结果：full=false 时留在界面列出未恢复项（绝不只弹一句「已回滚」） */
+  const [rollbackResult, setRollbackResult] = useState<SyncRollbackResponse | null>(null);
   const [error, setError] = useState<string | null>(null);
   /** Phase 7 迁移前咨询：远端快照咨询报告（本地 state，非敏感） */
   const [consultReport, setConsultReport] = useState<ConsultReport | null>(null);
@@ -155,7 +157,7 @@ export function SyncConfirmView(props: SyncConfirmViewProps): ReactNode {
         const res = states[it.itemId]?.resolution;
         if (res !== undefined) resolutions.set(it.itemId, res);
       }
-      const adoptions = buildAdoptions(items, adoptedMap, resolutions);
+      const adoptions = buildAdoptions(items, adoptedMap, resolutions, api.t);
       // T1：一键同步的确认页尚无「中止 / 跳过 / 引导」三选一控件（服务端已支持三态校验），
       // 因此显式传 `guide`：不改变既有写入行为，也避免缺省 abort 把用户挡在门外。
       const result = await api.applyItems({ syncSessionId, adoptions, sessionFormatDisposition: 'guide' });
@@ -196,13 +198,23 @@ export function SyncConfirmView(props: SyncConfirmViewProps): ReactNode {
     setPhase('applying');
     setError(null);
     try {
-      await api.rollback({ restoreId });
+      const result = await api.rollback({ restoreId });
+      const failed = result.failed ?? [];
       setPhase('done');
       setApplyResult(null);
-      // R-04：回滚成功改走 Toast（原 ok Banner 只在「回滚成功」这一条路径出现；
-      // 操作已完成、用户可离开，不需要停留阅读）。下方「关闭」按钮保留。
-      toast.ok(t('syncflow.rollbackDone'));
-      onRollbackDone?.();
+      if (result.full === false) {
+        // 诚实性（2026-10）：部分回滚**绝不**弹「已回滚」Toast —— 留在卡里列出未恢复项
+        // 与人工提示（凭据这类无法自动恢复的项会带 manualHint）。
+        setRollbackResult(result);
+        toast.warn(t('syncflow.rollbackPartialToast', { n: String(failed.length) }));
+        // 回滚没完成 ⇒ 不通知上层清空 lastRestoreId：那个回滚点仍然相关，用户可能想重试/排查。
+      } else {
+        setRollbackResult(null);
+        // R-04：回滚成功改走 Toast（原 ok Banner 只在「回滚成功」这一条路径出现；
+        // 操作已完成、用户可离开，不需要停留阅读）。下方「关闭」按钮保留。
+        toast.ok(t('syncflow.rollbackDone'));
+        onRollbackDone?.();
+      }
     } catch (err) {
       setPhase('failed');
       setError(err instanceof Error ? err.message : String(err));
@@ -336,6 +348,28 @@ export function SyncConfirmView(props: SyncConfirmViewProps): ReactNode {
       )}
       {(phase === 'done' || phase === 'failed') && applyResult === null && (
         <>
+          {/* 诚实性（2026-10）：回滚未完成（full=false）时逐条列出未恢复项与人工提示，
+              绝不用「已回滚」这一句话盖过去。完整回滚仍走 Toast（见 runRollback）。 */}
+          {rollbackResult !== null && rollbackResult.full === false && (
+            <>
+              <Banner kind="error">
+                {t('syncflow.rollbackIncomplete', { n: String((rollbackResult.failed ?? []).length) })}
+              </Banner>
+              {(rollbackResult.failed ?? []).length > 0 && (
+                <div>
+                  <span className={css.fieldLabel}>{t('syncflow.rollbackFailedItems')}</span>
+                  <ul className={css.warnList}>
+                    {(rollbackResult.failed ?? []).map((f, i) => (
+                      <li key={i}>
+                        {redact(f.item)} —— {redact(f.reason)}
+                        {f.manualHint !== undefined && f.manualHint !== '' ? t('common.parens', { text: redact(f.manualHint) }) : ''}
+                      </li>
+                    ))}
+                  </ul>
+                </div>
+              )}
+            </>
+          )}
           {/* R-04：回滚成功的 ok Banner 已改为 Toast（见 runRollback）。此处仅保留收尾「关闭」按钮；
              一并消除了原实现在 runApply 抛错（phase=failed 且 applyResult 仍为 null）时
               误显示「已回滚到应用前」的问题 —— 那种情况下方 error Banner 才是唯一事实。 */}
@@ -418,7 +452,11 @@ function ApplyResultCard({ result, busy, t, onRollback }: ApplyResultCardProps):
       {/* R-05：成功分支已改走 Toast（见 runApply）；此处只保留失败 Banner ——
           K-06 要求失败后用户停留本卡阅读 warnings 明细并决定是否回滚，
           自动消失的 Toast 无法承载这个决策入口。 */}
-      {!ok && <Banner kind="error">{t('syncflow.importFailed')}</Banner>}
+      {!ok && (result.rollbackFull === false
+        // 诚实性（2026-10）：rolledBack=true 但整体回滚未完成时，'syncflow.importFailed'
+        //（文案断言「已整体回滚」）是错的 —— 换专用措辞，未恢复项见下方 warnings 列表。
+        ? <Banner kind="error">{t('syncflow.importRollbackIncomplete')}</Banner>
+        : <Banner kind="error">{t('syncflow.importFailed')}</Banner>)}
       {/* issue #56：部分成功必须**留在卡里**（Toast 会消失，而用户需要据此判断
           「我这次到底缺了什么、要不要回滚」）。措辞与事实同强度：不是失败，是 N 项没生效。 */}
       {ok && ineffective.length > 0 && (

package/src/client/sync/SyncLogList.tsx

@@ -83,7 +83,7 @@ export function SyncLogList({ api, t }: SyncLogListProps): ReactNode {
 
   return (
     <Card>
-      <SectionTitle title={t('history.title') + '（' + String(rows.length) + '）'} />
+      <SectionTitle title={t('history.title') + t('common.parens', { text: String(rows.length) })} />
       {/* 头部统计摘要（先扫结论）；失败/跳过仅在存在时出现，并给语义色 */}
       <div className={css.statRow} aria-label={t('history.stats.summary')}>
         <Badge kind="info">{t('history.stats.total', { count: String(stats.total) })}</Badge>

package/src/client/sync/SyncPanel.tsx

@@ -62,6 +62,7 @@ import type {
 import {
   channelMapOf, channelStateMap, computeGithubLoginView, computeSyncButtons, defaultChannelSyncState,
   githubPollMessage, isClientChannel, kindLabel, pullReportView, pushPreviewView, pushReportView, readStoredChannel,
+  gistSessionsRiskKey,
   initialSyncSections, normalizeSessionsLimit, severityLabel, syncSectionOptions, writeStoredChannel,
 } from './sync-view.ts'
 import type {
@@ -87,6 +88,7 @@ import type { ExportPreviewResponse } from '../api.ts'
 import { SecurityOptionsCard } from './SecurityOptionsCard.tsx'
 import { DecryptPasswordCard } from './DecryptPasswordCard.tsx'
 import { AutosyncCard } from './AutosyncCard.tsx'
+import { WorkDirCard } from './WorkDirCard.tsx'
 import { Collapse } from '../common/Motion.tsx'
 import { SyncLogList } from './SyncLogList.tsx'
 import { UnreadableSnapshotsBanner } from './UnreadableSnapshotsBanner.tsx'
@@ -444,7 +446,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
   // 未接线的值一律按「无记录」处理并回落 localStorage 记忆 —— 不把未接线通道混进 UI 状态机。
   const remembered: SyncChannel | null = isClientChannel(info.lastSyncChannel) ? info.lastSyncChannel : readStoredChannel()
       // 可同步分区目录回填（host adapters 唯一事实源；仅 portable；两通道共用）
-      const catalog = info.syncSections !== undefined ? syncSectionOptions(info.syncSections) : []
+      const catalog = info.syncSections !== undefined ? syncSectionOptions(info.syncSections, uiT) : []
       // 每通道回填：优先该通道的持久化配置（syncSelectionByChannel / autosyncByChannel）；
       // 无持久化 → 默认模式 + 推荐分区
       const selByCh = info.syncSelectionByChannel
@@ -505,7 +507,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       })
     } catch (err) {
       // R-20：读取自动同步状态失败（此前写入页面最底部的共享 error Banner，常滚出视野）
-      toast.error(`${t('toast.autosyncLoadFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.autosyncLoadFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     }
   }
 
@@ -547,7 +549,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
     } catch (err) {
       // M-18/M-21：拉取远端快照失败原先完全静默（下拉留空），用户无法区分
       // 「远端确实没有快照」与「读取失败」。不阻断主流程，仅以 Toast 如实告知。
-      toast.error(`${t('toast.snapshotsLoadFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.snapshotsLoadFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     } finally {
       loadingSnapshotsRef.current[ch] = false
       patchChannelState(ch, { loadingSnapshots: false })
@@ -664,7 +666,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       }
     } catch (err) {
       // R-20：保存失败**始终**提示（无论手动还是自动）——用户的改动没有落盘
-      toast.error(`${t('toast.configSaveFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.configSaveFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
       patch({ savingConfig: false })
     } finally {
       // 保存期间又排入的新改动 → 立即补发（保底，不丢输入）
@@ -871,7 +873,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
     } catch (err) {
       // R-20：预览失败（此前写共享 error Banner，渲染在页面最底部而按钮在中部）
       patch({ busy: null })
-      toast.error(`${t('toast.pushPreviewFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.pushPreviewFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     }
   }
 
@@ -901,7 +903,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       }
     } catch (err) {
       patch({ busy: null })
-      toast.error(`${t('toast.pushFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.pushFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     }
   }
 
@@ -916,11 +918,12 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       const report = await api.pull({ ...payload(), ...decrypt })
       patch({ busy: null, pullReport: report, token: '', webdavPassword: '' })
       patchChannel({ decryptPassword: '' })
-      // M-19：拉取终局回执（弹窗关闭后无痕迹）
-      toast.ok(t('toast.pullDone'))
+      // 必须按 report.ok 分流（与 runPush 同口径）：校验不通过时宿主仍回 HTTP 200 + ok:false
+      if (report.ok) toast.ok(t('toast.pullDone'))
+      else toast.error(t('toast.pullFailed'))
     } catch (err) {
       patch({ busy: null })
-      toast.error(`${t('toast.pullFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.pullFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     }
   }
 
@@ -947,7 +950,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       })
     } catch (err) {
       // R-20/M-22：同步设置持久化失败（此前写共享 error Banner，与刚点的按钮相距整屏）
-      toast.error(t('toast.selectionSaveFailed') + '：' + redact(err instanceof Error ? err.message : String(err)))
+      toast.error(t('toast.selectionSaveFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     }
   }
 
@@ -1036,7 +1039,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       if (!session.ok) {
         // R-20：一键同步启动失败（宿主明确回报 message，无异常抛出）
         patch({ busy: null })
-        toast.error(`${t('toast.syncStartFailed')}：${redact(session.message ?? t('syncflow.syncFailed'))}`)
+        toast.error(t('toast.syncStartFailed') + t('common.labelSeparator') + redact(session.message ?? t('syncflow.syncFailed')))
         return
       }
       patch({ busy: null, confirmSession: session, confirmDecisions: null, token: '', webdavPassword: '' })
@@ -1044,7 +1047,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       void loadSnapshots()
     } catch (err) {
       patch({ busy: null })
-      toast.error(`${t('toast.syncStartFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.syncStartFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     }
   }
 
@@ -1081,7 +1084,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       toast.ok(t('toast.autosyncUpdated'))
     } catch (err) {
       // R-20/M-20：失败必须提示 —— 界面是乐观更新，用户会以为开关已生效
-      toast.error(`${t('toast.autosyncUpdateFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.autosyncUpdateFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     }
   }
 
@@ -1092,7 +1095,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
       patchChannelOf(channel, { autosync: updated, autosyncEnabled: updated.enabled, autosyncInterval: updated.interval })
       toast.ok(t('toast.autosyncUpdated'))
     } catch (err) {
-      toast.error(`${t('toast.autosyncUpdateFailed')}：${redact(err instanceof Error ? err.message : String(err))}`)
+      toast.error(t('toast.autosyncUpdateFailed') + t('common.labelSeparator') + redact(err instanceof Error ? err.message : String(err)))
     }
   }
 
@@ -1172,9 +1175,9 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
                 的断行。标题内联沿用 AboutPanel / EnvironmentPanel 的既有写法（零新增样式）。 */}
             <span className={css.groupLabel}>{t('mode.title')} <InfoHint text={t('mode.hint')} label={t('common.infoHint')} /></span>
             <span className={css.categoryDesc}>
-              {state.catalog.length === 0
-                ? t('common.loading')
-                : t('mode.selectedCount', { n: String(cs.syncSections.length) })}
+              {state.loadError !== null ? t('load.failed')
+                : state.catalog.length === 0 ? t('common.loading')
+                  : t('mode.selectedCount', { n: String(cs.syncSections.length) })}
             </span>
             <div className={css.actionRowTop}>
               <Button onClick={() => { openSectionPickerFor(channel) }} disabled={busy}>
@@ -1183,6 +1186,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
               <InfoHint text={t('mode.persistHint')} label={t('common.infoHint')} />
             </div>
             {cs.syncSections.length === 0 && <Banner kind="warn">{t('mode.atLeastOne')}</Banner>}
+            {gistSessionsRiskKey(channel, cs.syncSections) !== null && <Banner kind="warn">{t(gistSessionsRiskKey(channel, cs.syncSections)!)}</Banner>}
           </Card>
         )}
         {ready && (
@@ -1279,6 +1283,8 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
             onClearSavedPassword={() => { clearSavedDecryptPassword(channel) }}
           />
         )}
+        {/* issue #79：工作副本（git 专属；确认弹窗/宿主调用/回执全在 WorkDirCard.tsx） */}
+        {ready && channel === 'git' && <WorkDirCard t={t} api={api} workDir={state.statusInfo?.workDir} busy={busy} onChanged={() => { void loadStatus() }} />}
         {/* issue #59：远端快照列表不完整时的常驻告知（push 报成功但列表为空时，这里是唯一线索）。
             v3：跟着**它所属的通道**走（此前挂页面级 = 显示的是隐式当前通道的列表）。 */}
         {ready && <UnreadableSnapshotsBanner items={cs.unreadableSnapshots} t={t} />}
@@ -1290,14 +1296,14 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
   /* ------------------------------------------------ 渲染 */
   return (
     <div className={css.viewBody}>
-      <SectionTitle title={t('section.label')} subtitle={t('section.description')} />
+      <SectionTitle title={t('section.label')} info={<InfoHint text={t('section.description')} label={t('common.infoHint')} />} />
 
           {/* M-16：页面级加载失败就地提示（此前 loadError 只写不读，宿主不可达时整页显示
               「未配置」假象）。此处保留可就地重试的 ErrorBanner —— 它是**页面是否可用**
               的前提条件，必须常驻到用户重试成功，不能交给会自动消失的 Toast。 */}
           {state.loadError !== null && (
             <ErrorBanner
-              error={`${t('load.failed')}：${redact(state.loadError)}`}
+              error={t('load.failed') + t('common.labelSeparator') + redact(state.loadError)}
               onRetry={() => { void loadStatus() }}
               retrying={state.loading}
               t={api.t}
@@ -1350,6 +1356,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
             open={sectionPickerOpen}
             t={t}
             cmT={cmT}
+            uiT={uiT}
             sectionName={sectionName}
             catalog={state.catalog}
             sections={chState.syncSections}
@@ -1390,7 +1397,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
               closeDisabled={state.busy === 'push'}
             />
             <Modal.Body scroll>
-              <PushPreviewCard preview={state.pushPreview.preview} t={t} uiT={uiT} />
+              <PushPreviewCard preview={state.pushPreview.preview} t={t} uiT={uiT} sectionName={sectionName} />
             </Modal.Body>
             <Modal.Footer>
               <Button
@@ -1538,10 +1545,11 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
 }
 
 /** P0-②：push 预览内容（绑 src/ui/i18n.ts 的 UiT 文案；纯展示，无敏感字段）。 */
-function PushPreviewCard({ preview, t, uiT }: {
+function PushPreviewCard({ preview, t, uiT, sectionName }: {
   preview: SyncPushPreview | null
   t: TranslateNS<'config-manager-sync'>
   uiT: UiT
+  sectionName: (id: SectionId) => string
 }) {
   const view = pushPreviewView(preview, uiT)
   if (view === null) return null
@@ -1561,8 +1569,8 @@ function PushPreviewCard({ preview, t, uiT }: {
           <ul className={css.reportList}>
             {view.rows.map((row) => (
               <li key={row.section}>
-                <span className={css.kindTag}>{row.changed ? 'changed' : 'unchanged'}</span>
-                {' '}{row.section} · {row.count}
+                <span className={css.kindTag}>{row.changed ? t('syncflow.pushChanged') : t('syncflow.pushUnchanged')}</span>
+                {' '}{sectionName(row.section)} · {row.count}
               </li>
             ))}
           </ul>

package/src/client/sync/SyncRepositoryPicker.tsx

@@ -123,7 +123,7 @@ export function SyncRepositoryPicker({ open, api, t, repoUrl, busy, onPick }: Sy
     } catch (err) {
       const detail = err instanceof Error ? err.message : String(err)
       setCreateError(detail)
-      toast.error(t('repoPicker.createFailed') + '：' + redact(detail))
+      toast.error(t('repoPicker.createFailed') + t('common.labelSeparator') + redact(detail))
     } finally {
       setCreating(false)
     }
@@ -166,12 +166,12 @@ export function SyncRepositoryPicker({ open, api, t, repoUrl, busy, onPick }: Sy
         {/* 空态 / 失败说明留在原地（不进 ⓘ）：用户正卡在这里，说明必须看得见 */}
         {loaded && privateRepos.length === 0 && <span className={css.hint}>{t('repoPicker.empty')}</span>}
         {loadError !== null && (
-          <span className={css.formError}>{t('repoPicker.loadFailed')}（{redact(loadError)}）</span>
+          <span className={css.formError}>{t('repoPicker.loadFailed')}{t('common.parens', { text: redact(loadError) })}</span>
         )}
       </div>
       {createOpen && (
         <div className={css.field}>
-          <span className={css.groupLabel}>{t('repoPicker.createTitle')}</span>
+          <span className={css.groupLabel}>{t('repoPicker.createTitle')} <InfoHint text={t('repoPicker.privateOnly')} label={t('common.infoHint')} /></span>
           <label className={css.field}>
             <span className={css.fieldLabel}>{t('repoPicker.name')}</span>
             <input
@@ -197,8 +197,6 @@ export function SyncRepositoryPicker({ open, api, t, repoUrl, busy, onPick }: Sy
               onChange={(e: ChangeEvent<HTMLInputElement>) => { setDescription(e.target.value) }}
             />
           </label>
-          {/* 安全说明常驻可见（不进 ⓘ）：新建的仓库恒为私有 */}
-          <span className={css.hint}>{t('repoPicker.privateOnly')}</span>
           {nameHint !== null && <span className={css.formError}>{nameHint}</span>}
           {createError !== null && <span className={css.formError}>{redact(createError)}</span>}
           <div className={css.actionRowTop}>