dsh-config-manager 0.1.71 → 0.1.73

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

@@ -44,6 +44,23 @@ export const zh = {
   'channel.configured': '已配置',
   'channel.notConfigured': '未配置',
   'channel.currentUrl': '当前地址',
+  // issue #79：Git 工作副本（origin 是否跟随仓库地址 + 显式重建入口）
+  'workdir.title': '工作副本',
+  'workdir.hint': '同步使用的 Git 工作副本。每次同步都会让它的 origin 跟随当前仓库地址；改地址后若仍失败，可在这里重指向或重新克隆。',
+  'workdir.path': '路径',
+  'workdir.origin': 'origin',
+  'workdir.match': '已跟随仓库地址',
+  'workdir.mismatch': '仍指向旧地址',
+  'workdir.missing': '尚未创建（首次同步时克隆）',
+  'workdir.unknown': '读不出工作副本状态',
+  'workdir.relink': '重指向仓库地址',
+  'workdir.reclone': '重新克隆工作副本',
+  'workdir.recloneConfirmTitle': '重新克隆工作副本？',
+  'workdir.recloneConfirmMessage': '将删除本机工作副本目录并从远端重新克隆。本机配置与远端快照都不受影响，但工作副本里尚未推送的本地提交会被丢弃 —— 需要时请先在同步页执行一次推送。',
+  'workdir.recloneConfirm': '重新克隆',
+  'toast.workdirRelinked': '工作副本已重指向当前仓库地址',
+  'toast.workdirRecloned': '工作副本已重新克隆',
+  'toast.workdirResetFailed': '重建工作副本失败',
   'syncStatus.lastSync': '上次同步',
   'syncStatus.sections': '可同步分区',
   'syncStatus.state': '配置状态',
@@ -58,6 +75,14 @@ export const zh = {
   'webdav.passwordSaved': '凭据已配置',
   'webdav.passwordPlaceholder': '密码（可选）',
   'webdav.presetHint': '选择常见 WebDAV 服务器可快速填入地址；含 <占位符> 的模板请替换为你的真实服务器/用户名。',
+  // 预设服务器的显示名（英文界面零中文：中文名只住在 zh 目录，en 用品牌英文名）
+  'webdav.preset.custom': 'Custom URL',
+  'webdav.preset.jianguoyun': '坚果云 (Jianguoyun)',
+  'webdav.preset.nextcloud': 'Nextcloud',
+  'webdav.preset.owncloud': 'ownCloud',
+  'webdav.preset.seafile': 'Seafile',
+  'webdav.preset.synology': 'Synology NAS (WebDAV)',
+  'webdav.preset.box': 'Box',
   // GitHub OAuth 登录（device flow，无需手动输入 token）
   'github.title': 'GitHub 登录',
   'github.description': '通过 GitHub OAuth 设备码流程授权：无需手动输入 token，在浏览器中确认授权后，token 自动写入 DSH credentials。',
@@ -146,10 +171,18 @@ export const zh = {
   'syncflow.rollback': '回滚到应用前',
   'syncflow.rollingBack': '正在回滚…',
   'syncflow.rollbackDone': '已回滚到应用前',
+  // 诚实性（2026-10）：部分回滚绝不报「已回滚」——列出未恢复项与人工提示
+  'syncflow.rollbackPartialToast': '回滚未完成：{n} 项没能恢复',
+  'syncflow.rollbackIncomplete': '回滚未完成：{n} 项无法自动恢复（配置可能停留在中间状态）',
+  'syncflow.rollbackFailedItems': '未回滚项（需人工处理）',
+  'syncflow.importRollbackIncomplete': '导入失败，且整体回滚未完成：有改动没能恢复（见下方告警）',
   'syncflow.needsRestart': '部分改动需要重启 DSH 后生效',
   // P0-②：push 前只读预览确认弹窗
   'syncflow.pushPreviewTitle': '确认推送',
   'syncflow.pushPreviewSections': '将推送的分区',
+  // 推送预览逐行标签（原先硬编码英文 'changed' / 'unchanged'，中文界面里是英文枚举）
+  'syncflow.pushChanged': '有改动',
+  'syncflow.pushUnchanged': '无改动',
   'syncflow.pushConfirm': '确认推送',
   'syncflow.pushing': '正在推送…',
   'syncflow.pushFirstBaseline': '远端暂无快照：本次将创建首个同步基线',
@@ -157,11 +190,13 @@ export const zh = {
   'mode.title': '同步分区',
   'mode.hint': '点按钮在弹窗里勾选要同步的分区：勾选集合就是同步范围（默认已勾选推荐分区，可随时改）。',
   'mode.selectedCount': '已勾选 {n} 个分区',
-  'mode.sectionsHint': '默认可同步的是可移植分区；设备相关分区（插件文件、凭据状态、历史会话）只有你在这里主动勾选才参与同步。',
+  'mode.sectionsHint': '默认可同步的是可移植分区；平台相关分区（MCP 服务器）与设备相关分区（插件文件、凭据状态、历史会话）只有你在这里主动勾选才参与同步。',
   'mode.atLeastOne': '请至少勾选一个同步分区',
   'mode.sectionPortable': '可移植',
   'mode.sectionRecommended': '推荐',
   'mode.sectionDeviceSpecific': '设备相关',
+  'mode.sectionPlatformSpecific': '平台相关',
+  'mode.mcpHint': 'MCP 服务器按 patch 行写回（导入时落回原层）。按包安装的 stdio 服务器（npx / uvx / pipx）配置本身可跨机；若 command / args / cwd 里是绝对路径，或目标机没装对应运行时，导入分析会给出提示 —— 配置会照常写入，但服务器在目标机可能起不来。',
   'mode.sessionsLimit': '同步最近多少个会话',
   'mode.sessionsLimitHint': '历史会话内容敏感，默认只带最近的 5 个（0 = 只勾选不带会话）；单位是一个会话目录，同一会话的全部日志一起走。',
   'mode.sessionsPick': '选择具体对话',
@@ -170,6 +205,7 @@ export const zh = {
   'mode.sessionsPickHint': '点名后只同步勾中的对话（优先于上面的数量上限）；一个都不勾 = 回到「最近 N 个」模式。',
   'mode.sessionsPickReset': '改为「最近 N 个」',
   'mode.sessionsWorkspaceWarn': '已勾选历史对话，但没有勾选「工作区」分区：目标机上这些对话可能归属不到任何工作区而显示不出来。建议一并勾选「工作区」。',
+  'mode.gistSessionsWarn': '当前通道是 GitHub Gist，且勾选了「历史会话」：gist 会一次取回全部文件内容、单文件超限即截断、文件数还有上限，大分区同步可能失败或内容被截断。建议改用 Git / WebDAV / 对象存储通道同步历史会话，或取消勾选该分区。',
   'mode.persistHint': '分区选择已保存到本机：自动同步和手动推送都会使用此配置（重启后仍生效）。',
   'mode.choose': '选择同步分区',
   'mode.pickerTitle': '选择同步分区',
@@ -219,6 +255,10 @@ export const zh = {
   'autosync.skipped': '已跳过',
   'autosync.failed': '失败',
   'autosync.partial': '部分成功',
+  // issue #79：跳过原因上状态行（改造前只进 info 级日志，界面完全看不到「为什么没同步」）
+  'autosync.skipReasonLabel': '跳过原因',
+  'autosync.skipReasonConflictCount': '{reason}（远端另有 {n} 个分区待确认，可在同步页手动处理）',
+  'autosync.lastMessage': '本轮消息',
   // 同步历史（含自动同步记录）
   'history.title': '同步历史',
   'history.empty': '尚无同步历史',
@@ -239,6 +279,12 @@ export const zh = {
   'history.autosyncReasonNoRemote': '无远端快照',
   'history.autosyncReasonNotConfigured': '未配置仓库',
   'history.autosyncReasonNetwork': '网络问题',
+  // F1 残留补齐（英文界面零中文）：这三类此前只有硬编码中文，只住在这里
+  'history.autosyncReasonEncrypted': '远端快照已加密，自动同步跳过（请手动同步）',
+  'history.autosyncReasonMutationLocked': '环境锁被占用（另一项任务进行中，或存在需回收的残留锁）',
+  'history.autosyncReasonUnknown': '未知',
+  'history.autosyncReasonUpToDate': '无变化（本地与远端一致）',
+  'history.autosyncReasonUnchanged': '远端无新快照，无需合并',
   'history.autosyncConflicted': '跳过冲突分区：{sections}',
   'history.autosyncApplied': '应用分区：{sections}',
   'history.autosyncError': '错误：{error}',
@@ -284,6 +330,10 @@ export const zh = {
   'load.failed': '加载同步状态失败',
   // 公共
   'common.close': '关闭',
+  // 标点/连接符也属界面文案（英文界面不得出现全角标点）：按当前语言取词
+  'common.labelSeparator': '：',
+  'common.parens': '（{text}）',
+  'common.listSeparator': '、',
   'common.retry': '重试',
   'common.loading': '加载中…',
   'common.infoHint': '查看说明',
@@ -326,6 +376,8 @@ export const zh = {
   'cloud.secretPlaceholder': '••••••••',
   'cloud.gistId': 'Gist ID',
   'cloud.gistIdHint': 'gist 地址末段的十六进制 id（如 https://gist.github.com/<用户>/<id>）。',
+  // G-34：gist 刻意不做内容寻址外置（一次 GET 全量、单文件超限截断、文件数上限）→ 大分区不适合
+  'cloud.gistLargeSectionHint': 'gist 通道不做内容外置：一次请求就把全部文件内容取回、单文件超限会被截断，且文件数有上限 —— 历史会话这类大分区不适合走 gist，请改用 Git / WebDAV / 对象存储通道。',
   'cloud.apiBaseUrl': 'API 根地址（可选）',
   'cloud.apiBaseUrlHint': '留空 = https://api.github.com；GitHub Enterprise 可改为自建地址。',
   'cloud.filePrefix': '文件名前缀（可选）',
@@ -387,6 +439,23 @@ export const en: Record<keyof typeof zh, string> = {
   'channel.configured': 'Configured',
   'channel.notConfigured': 'Not configured',
   'channel.currentUrl': 'Current URL',
+  // issue #79: Git working copy (origin follows the repository address; explicit rebuild entry)
+  'workdir.title': 'Working copy',
+  'workdir.hint': 'The Git working copy used for sync. Every sync makes its origin follow the configured repository address; if it still fails after an address change, re-point or clone it again here.',
+  'workdir.path': 'Path',
+  'workdir.origin': 'origin',
+  'workdir.match': 'Following the repository address',
+  'workdir.mismatch': 'Still pointing at the old address',
+  'workdir.missing': 'Not created yet (cloned on first sync)',
+  'workdir.unknown': 'Working-copy state unreadable',
+  'workdir.relink': 'Re-point repository address',
+  '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',
+  'toast.workdirRelinked': 'Working copy now points at the configured repository address',
+  'toast.workdirRecloned': 'Working copy cloned again',
+  'toast.workdirResetFailed': 'Rebuilding the working copy failed',
   'syncStatus.lastSync': 'Last sync',
   'syncStatus.sections': 'Syncable sections',
   'syncStatus.state': 'State',
@@ -400,6 +469,13 @@ export const en: Record<keyof typeof zh, string> = {
   'webdav.passwordSaved': 'Credential configured',
   'webdav.passwordPlaceholder': 'Password (optional)',
   'webdav.presetHint': 'Pick a common WebDAV server to prefill the URL; templates containing <placeholders> need to be replaced with your real server/username.',
+  'webdav.preset.custom': 'Custom URL',
+  'webdav.preset.jianguoyun': 'Jianguoyun (Nutstore)',
+  'webdav.preset.nextcloud': 'Nextcloud',
+  'webdav.preset.owncloud': 'ownCloud',
+  'webdav.preset.seafile': 'Seafile',
+  'webdav.preset.synology': 'Synology NAS (WebDAV)',
+  'webdav.preset.box': 'Box',
   'github.title': 'GitHub Sign-in',
   'github.description': 'Authorize via the GitHub OAuth device flow: no manual token entry — after you approve in the browser, the token is written into DSH credentials automatically.',
   'github.login': 'Sign in with GitHub',
@@ -419,7 +495,7 @@ export const en: Record<keyof typeof zh, string> = {
   'repoPicker.empty': 'No private repository available — use "Create a new private repository".',
   'repoPicker.loadFailed': 'Could not load the repository list — retry, or type the address below.',
   'repoPicker.updatedAt': 'Updated {time}',
-  'repoPicker.create': '＋ New private repository…',
+  'repoPicker.create': '+ New private repository…',
   'repoPicker.createTitle': 'Create a private repository',
   'repoPicker.name': 'Repository name',
   'repoPicker.namePlaceholder': 'e.g. dsh-configs',
@@ -483,10 +559,18 @@ export const en: Record<keyof typeof zh, string> = {
   'syncflow.rollback': 'Rollback',
   'syncflow.rollingBack': 'Rolling back…',
   'syncflow.rollbackDone': 'Rolled back',
+  // Honesty (2026-10): a partial rollback is never reported as "rolled back"
+  'syncflow.rollbackPartialToast': 'Rollback incomplete: {n} item(s) could not be restored',
+  'syncflow.rollbackIncomplete': 'Rollback incomplete: {n} item(s) could not be restored automatically (the configuration may be left partially changed)',
+  'syncflow.rollbackFailedItems': 'Items not rolled back (need manual handling)',
+  'syncflow.importRollbackIncomplete': 'Import failed and the overall rollback did not complete: some changes could not be restored (see the warnings below)',
   'syncflow.needsRestart': 'Some changes require a DSH restart to take effect',
   // P0-②: push read-only preview confirm dialog
   'syncflow.pushPreviewTitle': 'Confirm Push',
   'syncflow.pushPreviewSections': 'Sections to push',
+  // Per-row labels for the push preview (previously hardcoded English literals)
+  'syncflow.pushChanged': 'Changed',
+  'syncflow.pushUnchanged': 'Unchanged',
   'syncflow.pushConfirm': 'Push',
   'syncflow.pushing': 'Pushing…',
   'syncflow.pushFirstBaseline': 'No remote snapshots yet: this push creates the first sync baseline',
@@ -494,11 +578,13 @@ export const en: Record<keyof typeof zh, string> = {
   'mode.title': 'Sync Sections',
   'mode.hint': 'Click the button to tick the sections to sync: the ticked set is the sync scope (recommended sections are ticked by default and can be changed any time).',
   'mode.selectedCount': '{n} section(s) selected',
-  'mode.sectionsHint': 'Portable sections sync by default; device-specific sections (plugin files, credentials status, sessions) only participate when you explicitly tick them here.',
+  'mode.sectionsHint': 'Portable sections sync by default; platform-dependent sections (MCP servers) and device-specific sections (plugin files, credentials status, sessions) only participate when you explicitly tick them here.',
   'mode.atLeastOne': 'Select at least one section to sync',
   'mode.sectionPortable': 'Portable',
   'mode.sectionRecommended': 'Recommended',
   'mode.sectionDeviceSpecific': 'Device-specific',
+  'mode.sectionPlatformSpecific': 'Platform-dependent',
+  'mode.mcpHint': 'MCP servers are written back as patch lines (restored to their original layer on import). Stdio servers installed from a package (npx / uvx / pipx) are portable by themselves; if command / args / cwd contain absolute paths, or the target machine lacks the runtime, the import analysis will say so — the config is still written, but the server may fail to start there.',
   'mode.sessionsLimit': 'How many recent sessions to sync',
   'mode.sessionsLimitHint': 'Session content is sensitive, so only the latest 5 are included by default (0 = select the section but carry no sessions); the unit is a session directory, so all logs of one session travel together.',
   'mode.sessionsPick': 'Pick specific conversations',
@@ -507,6 +593,7 @@ export const en: Record<keyof typeof zh, string> = {
   'mode.sessionsPickHint': 'Only the picked conversations are synced (this wins over the count above). Picking none returns to the "latest N" mode.',
   'mode.sessionsPickReset': 'Use "latest N" instead',
   'mode.sessionsWorkspaceWarn': 'Conversations are selected but the "Workspaces" section is not: on the target machine they may not be attributed to any workspace and stay invisible. Selecting "Workspaces" too is recommended.',
+  'mode.gistSessionsWarn': 'The current channel is GitHub Gist and "Conversations" is selected: a gist returns all file content in one request, truncates any oversized single file, and caps the number of files, so syncing a large section may fail or be truncated. Use a Git / WebDAV / object-storage channel for conversations, or clear that section.',
   'mode.persistHint': 'The section selection is saved locally: both auto sync and manual push use this configuration (persists across restarts).',
   'mode.choose': 'Choose sync sections',
   'mode.pickerTitle': 'Choose Sync Sections',
@@ -555,6 +642,10 @@ export const en: Record<keyof typeof zh, string> = {
   'autosync.skipped': 'Skipped',
   'autosync.failed': 'Failed',
   'autosync.partial': 'Partial',
+  // issue #79: surface the skip reason in the status line (previously info-level log only)
+  'autosync.skipReasonLabel': 'Skip reason',
+  'autosync.skipReasonConflictCount': '{reason} ({n} more section(s) on the remote need confirmation — handle them on the sync page)',
+  'autosync.lastMessage': 'Last message',
   'history.title': 'Sync History',
   'history.empty': 'No sync history yet',
   'history.emptyHint': 'Records appear here after your first push / one-click sync / auto sync.',
@@ -574,6 +665,11 @@ export const en: Record<keyof typeof zh, string> = {
   'history.autosyncReasonNoRemote': 'No remote snapshot',
   'history.autosyncReasonNotConfigured': 'No repository configured',
   'history.autosyncReasonNetwork': 'Network issue',
+  '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.autosyncReasonUpToDate': 'No changes (local and remote match)',
+  'history.autosyncReasonUnchanged': 'No new remote snapshot to merge',
   'history.autosyncConflicted': 'Skipped conflict sections: {sections}',
   'history.autosyncApplied': 'Applied sections: {sections}',
   'history.autosyncError': 'Error: {error}',
@@ -616,6 +712,9 @@ export const en: Record<keyof typeof zh, string> = {
   // Page-level load failure (M-16: inline error state; loadError had no render point before)
   'load.failed': 'Failed to load sync status',
   'common.close': 'Close',
+  'common.labelSeparator': ': ',
+  'common.parens': '({text})',
+  'common.listSeparator': ', ',
   'common.retry': 'Retry',
   'common.loading': 'Loading…',
   'common.infoHint': 'Show description',
@@ -658,6 +757,8 @@ export const en: Record<keyof typeof zh, string> = {
   'cloud.secretPlaceholder': '••••••••',
   'cloud.gistId': 'Gist ID',
   'cloud.gistIdHint': 'The hex id at the end of the gist URL (e.g. https://gist.github.com/<user>/<id>).',
+  // G-34: gist deliberately has no content-addressed offloading (one full GET, per-file truncation, file cap)
+  'cloud.gistLargeSectionHint': 'The gist channel does no content offloading: a single request returns all file content, any oversized single file is truncated, and the number of files is capped — large sections such as conversations are a poor fit. Use a Git / WebDAV / object-storage channel instead.',
   'cloud.apiBaseUrl': 'API base URL (optional)',
   'cloud.apiBaseUrlHint': 'Blank = https://api.github.com; change it for GitHub Enterprise.',
   'cloud.filePrefix': 'File name prefix (optional)',

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

@@ -8,9 +8,11 @@ import assert from 'node:assert/strict'
 import type { ApplyItemsResponse, AutosyncStatusResponse, SyncConfirmItem } from './sync-api.ts'
 import {
   applyItemsReportView, autosyncIntervalMs, autosyncStatusText, buildAdoptions, confirmListSummary,
-  computeAutosyncCountdown, hasBulkDecidable, isBulkDecidable, isReviewItem, isToolchainChangeItem,
+  computeAutosyncCountdown, GIST_LARGE_SECTION_HINT_KEY, gistSessionsRiskKey, hasBulkDecidable,
+  isBulkDecidable, isReviewItem, isToolchainChangeItem,
   keepLocalAll, needsGitToken, reviewItems, summarizeConfirmItems, useRemoteAll,
 } from './sync-view.ts'
+import { zhUiT } from '../../ui/i18n.ts'
 
 /* ---------------------------------------------------------------- 一键同步差异确认 */
 
@@ -163,7 +165,7 @@ test('sync-view: buildAdoptions 收集用户决策；未列出项视为 adopt=fa
     ['c', true],
   ])
   const resolutions = new Map<string, 'useRemote' | 'keepLocal'>([['c', 'useRemote']])
-  const out = buildAdoptions(items, adopted, resolutions)
+  const out = buildAdoptions(items, adopted, resolutions, zhUiT)
   // 只有 adopt=true 的项进列表（a、c）；b 未采纳剔除
   const ids = out.map((o) => o.itemId)
   assert.deepEqual(ids, ['a', 'c'])
@@ -176,7 +178,7 @@ test('sync-view: buildAdoptions Conflict 项未给 resolution → 抛错（强
   ]
   const adopted = new Map<string, boolean>([['c', true]])
   const resolutions = new Map<string, 'useRemote' | 'keepLocal'>()
-  assert.throws(() => buildAdoptions(items, adopted, resolutions), /解决/)
+  assert.throws(() => buildAdoptions(items, adopted, resolutions, zhUiT), /解决/)
 })
 
 test('sync-view: applyItemsReportView 成功 → ok 头部含 applied 计数与 restoreId', () => {
@@ -184,7 +186,7 @@ test('sync-view: applyItemsReportView 成功 → ok 头部含 applied 计数与
     ok: true, applied: ['settings', 'plugins'], skipped: [], needsRestart: false,
     warnings: [], restoreId: 'rest-1', rolledBack: false, failed: [], result: {},
   }
-  const view = applyItemsReportView(report)
+  const view = applyItemsReportView(report, zhUiT)
   assert.notEqual(view, null)
   assert.equal(view?.kind, 'ok')
   assert.match(view?.headline ?? '', /2/)
@@ -197,13 +199,13 @@ test('sync-view: applyItemsReportView 失败且整体回滚 → rolledBack 渲
     warnings: [], restoreId: 'rest-2', rolledBack: true,
     failed: [{ itemId: 'x', message: '导入失败' }], result: {},
   }
-  const view = applyItemsReportView(report)
+  const view = applyItemsReportView(report, zhUiT)
   assert.equal(view?.kind, 'rolledBack')
   assert.equal(view?.restoreId, 'rest-2')
 })
 
 test('sync-view: applyItemsReportView null → null', () => {
-  assert.equal(applyItemsReportView(null), null)
+  assert.equal(applyItemsReportView(null, zhUiT), null)
 })
 
 /* ---------- issue #56：ok=true 但有未生效项（warning）必须呈现为「部分成功」 ---------- */
@@ -217,7 +219,7 @@ test('issue#56：有未生效项时 kind=partial（不得显示为成功）', ()
     ineffective: [{ itemId: 'plugins:some-plugin', adapter: 'plugins', message: '插件 some-plugin 安装失败：release-age-violation' }],
     result: {},
   }
-  const view = applyItemsReportView(report)
+  const view = applyItemsReportView(report, zhUiT)
   assert.equal(view?.kind, 'partial', 'ok=true 但有未生效项 ⇒ partial，绝不是 ok')
   assert.match(view?.headline ?? '', /1/, '头部要给出未生效条数')
   assert.deepEqual(view?.ineffective.map((i) => i.itemId), ['plugins:some-plugin'])
@@ -231,9 +233,9 @@ test('issue#56：未生效项不影响「全部成功」判定（空/缺字段
     warnings: [], restoreId: 'r', rolledBack: false, failed: [], result: {},
   } as ApplyItemsResponse
   // 空数组（新宿主明确回报「没有未生效项」）
-  assert.equal(applyItemsReportView({ ...base, ineffective: [] })?.kind, 'ok')
+  assert.equal(applyItemsReportView({ ...base, ineffective: [] }, zhUiT)?.kind, 'ok')
   // 缺字段（旧宿主）→ 按无未生效项处理，绝不误报部分成功
-  assert.equal(applyItemsReportView(base)?.kind, 'ok')
+  assert.equal(applyItemsReportView(base, zhUiT)?.kind, 'ok')
 })
 
 /* ---------------------------------------------------------------- 自动同步 */
@@ -276,16 +278,66 @@ test('sync-view: autosyncStatusText 覆盖未运行 / 各状态', () => {
   const status: AutosyncStatusResponse = {
     enabled: true, interval: '30m', consecutiveFailures: 0, elapsedMs: -1,
   }
-  assert.match(autosyncStatusText(status), /从未运行/)
+  assert.match(autosyncStatusText(status, zhUiT), /从未运行/)
   const ran: AutosyncStatusResponse = {
     enabled: true, interval: '30m', consecutiveFailures: 0, elapsedMs: 0,
     lastRunAt: '2026-08-17T10:00:00.000Z', lastRunStatus: 'success',
   }
-  assert.match(autosyncStatusText(ran), /成功/)
+  assert.match(autosyncStatusText(ran, zhUiT), /成功/)
   const failed: AutosyncStatusResponse = {
     enabled: true, interval: '30m', consecutiveFailures: 3, elapsedMs: 0,
     lastRunAt: '2026-08-17T10:00:00.000Z', lastRunStatus: 'failed', lastRunMessage: '认证失败',
   }
-  assert.match(autosyncStatusText(failed), /失败/)
-  assert.match(autosyncStatusText(failed), /连续失败 3 次/)
+  assert.match(autosyncStatusText(failed, zhUiT), /失败/)
+  assert.match(autosyncStatusText(failed, zhUiT), /连续失败 3 次/)
+})
+
+/* ---------------------- 诚实性：整体回滚「未完成」必须单独成态 ---------------------- */
+
+test('回滚未完成（rollbackFull=false）：kind=rollbackIncomplete，绝不渲染成「已整体回滚」', () => {
+  const report: ApplyItemsResponse = {
+    ok: false, applied: [], skipped: [], needsRestart: false,
+    warnings: ['回滚未完成：credentialsStatus:K —— DSH 不回读凭据值，无法自动恢复（请重新补录该凭据）'],
+    restoreId: 'rest-x', rolledBack: true, rollbackFull: false,
+    failed: [{ itemId: 'x', message: '导入失败' }], result: {},
+  }
+  const view = applyItemsReportView(report, zhUiT)
+  assert.equal(view?.kind, 'rollbackIncomplete', '半回滚必须与 rolledBack（整体已回滚）分开')
+  assert.equal(view?.rollbackFull, false)
+  assert.doesNotMatch(view?.headline ?? '', /已整体回滚/, '不得复用断言「已整体回滚」的失败文案')
+  assert.match(view?.headline ?? '', /回滚未完成/)
+  // 未恢复项在 warnings 里逐条给出（引擎已并入），界面据此列出
+  assert.match(view?.warnings.join(' ') ?? '', /credentialsStatus:K/)
+})
+
+test('回滚未完成：headline 走 sync 字典专用键（可注入本地化取词器）', () => {
+  const report: ApplyItemsResponse = {
+    ok: false, applied: [], skipped: [], needsRestart: false, warnings: [],
+    restoreId: 'r', rolledBack: true, rollbackFull: false, failed: [], result: {},
+  }
+  const view = applyItemsReportView(report, zhUiT, (key) => 'SYNC:' + key)
+  assert.equal(view?.headline, 'SYNC:syncflow.importRollbackIncomplete')
+})
+
+test('旧宿主不返回 rollbackFull：rolledBack=true 仍按「已整体回滚」处理（不误报半回滚）', () => {
+  const report: ApplyItemsResponse = {
+    ok: false, applied: [], skipped: [], needsRestart: false, warnings: [],
+    restoreId: 'r', rolledBack: true, failed: [{ itemId: 'x' }], result: {},
+  }
+  assert.equal(applyItemsReportView(report, zhUiT)?.kind, 'rolledBack')
+})
+
+/* ---------------------- G-34：gist 通道不适合大分区 ---------------------- */
+
+test('G-34：通道=gist 且勾选 sessions → 风险提示键；其它组合 → null', () => {
+  assert.equal(gistSessionsRiskKey('gist', ['sessions']), 'mode.gistSessionsWarn')
+  assert.equal(gistSessionsRiskKey('gist', ['skills', 'sessions']), 'mode.gistSessionsWarn', '顺序无关')
+  assert.equal(gistSessionsRiskKey('git', ['sessions']), null, '非 gist 通道不提示')
+  assert.equal(gistSessionsRiskKey('s3', ['sessions']), null)
+  assert.equal(gistSessionsRiskKey('gist', ['skills']), null, '没勾 sessions 不提示')
+  assert.equal(gistSessionsRiskKey('gist', []), null)
+})
+
+test('G-34：gist 表单常驻提示键指向 sync 字典的专用文案', () => {
+  assert.equal(GIST_LARGE_SECTION_HINT_KEY, 'cloud.gistLargeSectionHint')
 })