dsh-config-manager 0.2.2 → 0.2.3

package/lib/core/messages-core.js

@@ -53,7 +53,7 @@ export const zh = {
     'core.journal.notTerminal': 'moveToCompleted 仅接受 terminal journal: {opId} state={state}',
     // ---------- run-registry ----------
     'core.run.autosyncBusy': '自动同步已在进行中',
-    'core.run.syncApplyBusy': '一键同步已在进行中',
+    'core.run.syncApplyBusy': '正在从远端合并',
     'core.run.backupScheduleBusy': '定时备份已在进行中',
     'core.run.restoreBusy': '快照恢复已在进行中（请等待当前恢复完成）',
     'core.run.recoveryBusy': '恢复/回滚已在进行中（请等待当前恢复完成）',
@@ -349,7 +349,7 @@ export const en = {
     'core.journal.notTerminal': 'moveToCompleted only accepts a terminal journal: {opId} state={state}',
     // ---------- run-registry ----------
     'core.run.autosyncBusy': 'Automatic sync is already in progress',
-    'core.run.syncApplyBusy': 'One-click sync is already in progress',
+    'core.run.syncApplyBusy': 'Merge from remote is already in progress',
     'core.run.backupScheduleBusy': 'Scheduled backup is already in progress',
     'core.run.restoreBusy': 'Snapshot restore is already in progress (wait for the current restore to finish)',
     'core.run.recoveryBusy': 'Recovery/rollback is already in progress (wait for the current recovery to finish)',

package/lib/index.d.ts

@@ -77,7 +77,7 @@ export declare const name = "config-manager";
 /** Services required before the engine can mount (present in every profile). */
 export declare const inject: string[];
 /** Plugin version, kept in sync with package.json ("version"). */
-export declare const PLUGIN_VERSION = "0.2.2";
+export declare const PLUGIN_VERSION = "0.2.3";
 /**
  * Star 引导弹窗指向的 GitHub 仓库（用户引导点 Star 的目标）。
  * 与 package.json 的 repository 字段保持一致；界面不可改（硬编码，参照

package/lib/index.js

@@ -136,7 +136,7 @@ export const name = 'config-manager';
 /** Services required before the engine can mount (present in every profile). */
 export const inject = ['settings', 'credentials'];
 /** Plugin version, kept in sync with package.json ("version"). */
-export const PLUGIN_VERSION = '0.2.2';
+export const PLUGIN_VERSION = '0.2.3';
 /** Plugin own package name — excluded from its own exported plugins list. */
 const PLUGIN_NAME = 'dsh-config-manager';
 /**

package/lib/routes/messages.d.ts

@@ -21,13 +21,13 @@ export declare const zh: {
     readonly 'route.syncPreviewFailed': '同步预览失败';
     readonly 'route.syncSessionExpired': '同步会话不存在或已过期，请重新拉取预览';
     readonly 'route.syncConflictResolutionRequired': '冲突项 {id} 必须提供 resolution（useRemote/keepLocal/skip）';
-    readonly 'route.syncApplySummary': '一键同步应用：{count} 项{status}{ineffective}';
+    readonly 'route.syncApplySummary': '从远端合并：{count} 项{status}{ineffective}';
     readonly 'route.syncRollbackIncomplete': '（回滚未完成）';
     readonly 'route.syncRolledBack': '（已回滚）';
     readonly 'route.syncIneffectiveSuffix': '（{count} 项未生效）';
     readonly 'route.syncApplyPartial': '同步应用部分成功：有项未生效（见告警明细）';
     readonly 'route.syncApplyFailed': '同步应用未完全成功';
-    readonly 'route.syncRollbackSummary': '一键同步回滚（{id}）';
+    readonly 'route.syncRollbackSummary': '从远端合并回滚（{id}）';
     readonly 'route.recoverySessionRepairRollback': '会话修复回滚';
     readonly 'route.recoverySessionRepairDropped': '会话修复（丢弃重放重复行 {count} 行）';
     readonly 'route.recoverySessionRepairRejected': '会话修复被拒绝：{reason}';

package/lib/routes/messages.js

@@ -39,13 +39,13 @@ export const zh = {
     'route.syncPreviewFailed': '同步预览失败',
     'route.syncSessionExpired': '同步会话不存在或已过期，请重新拉取预览',
     'route.syncConflictResolutionRequired': '冲突项 {id} 必须提供 resolution（useRemote/keepLocal/skip）',
-    'route.syncApplySummary': '一键同步应用：{count} 项{status}{ineffective}',
+    'route.syncApplySummary': '从远端合并：{count} 项{status}{ineffective}',
     'route.syncRollbackIncomplete': '（回滚未完成）',
     'route.syncRolledBack': '（已回滚）',
     'route.syncIneffectiveSuffix': '（{count} 项未生效）',
     'route.syncApplyPartial': '同步应用部分成功：有项未生效（见告警明细）',
     'route.syncApplyFailed': '同步应用未完全成功',
-    'route.syncRollbackSummary': '一键同步回滚（{id}）',
+    'route.syncRollbackSummary': '从远端合并回滚（{id}）',
     // ---------- 事故恢复 ----------
     'route.recoverySessionRepairRollback': '会话修复回滚',
     'route.recoverySessionRepairDropped': '会话修复（丢弃重放重复行 {count} 行）',
@@ -79,13 +79,13 @@ export const en = {
     'route.syncPreviewFailed': 'Sync preview failed',
     'route.syncSessionExpired': 'The sync session does not exist or has expired; pull a fresh preview',
     'route.syncConflictResolutionRequired': 'Conflict item {id} must provide a resolution (useRemote/keepLocal/skip)',
-    'route.syncApplySummary': 'One-click sync apply: {count} item(s){status}{ineffective}',
+    'route.syncApplySummary': 'Merge from remote: {count} item(s){status}{ineffective}',
     'route.syncRollbackIncomplete': ' (rollback incomplete)',
     'route.syncRolledBack': ' (rolled back)',
     'route.syncIneffectiveSuffix': ' ({count} item(s) had no effect)',
     'route.syncApplyPartial': 'Sync apply partially succeeded: some items had no effect (see the warning details)',
     'route.syncApplyFailed': 'Sync apply did not fully succeed',
-    'route.syncRollbackSummary': 'One-click sync rollback ({id})',
+    'route.syncRollbackSummary': 'Merge from remote rollback ({id})',
     'route.recoverySessionRepairRollback': 'Session repair rollback',
     'route.recoverySessionRepairDropped': 'Session repair (dropped {count} replayed duplicate row(s))',
     'route.recoverySessionRepairRejected': 'Session repair was rejected: {reason}',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-config-manager",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "license": "MIT",
   "description": "Backup, restore, export, import, migrate and sync your DeepSeek Harness (DSH) configuration: settings, plugins, MCP servers, skills, agent presets and workspaces. One-click migration to another machine. DSH 配置一键备份、恢复、导出、导入、迁移与同步插件。",
   "icon": "./icon.svg",

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

@@ -71,7 +71,7 @@ export const zh = {
   'history.kind.profile-rename': '档案重命名',
   'history.kind.profile-save': '档案保存',
   'history.kind.profile-import': '档案导入',
-  'history.kind.sync-apply': '一键同步应用',
+  'history.kind.sync-apply': '从远端合并',
   'history.kind.autosync': '自动同步',
   'history.kind.recovery': '恢复/回滚编排',
   'history.kind.backup': '定时备份',
@@ -118,7 +118,7 @@ export const en = {
   'history.kind.profile-rename': 'Profile rename',
   'history.kind.profile-save': 'Profile save',
   'history.kind.profile-import': 'Profile import',
-  'history.kind.sync-apply': 'Sync apply',
+  'history.kind.sync-apply': 'Merge from remote',
   'history.kind.autosync': 'Autosync',
   'history.kind.recovery': 'Recovery/rollback',
   'history.kind.backup': 'Scheduled backup',

package/src/client/locales.ts

@@ -123,7 +123,7 @@ export const zh = {
   'overview.kind.other': '其他操作',
   // 状态横幅
   // —— 导出 ——
-  'export.hint': '默认导出推荐分区（可迁移、不含设备专属数据）。点「选择要导出的内容」可按分区、逐条目调整（技能、插件、工作区、会话等）。',
+  'export.hint': '默认导出推荐分区（可迁移、不含设备专属数据）。',
   'export.encrypt': '加密备份',
   'export.encryptHint': '用密码加密整个备份文件（AES-256-GCM）。密码仅用于本次加密，不会写入备份或任何配置文件；导入时必须输入该密码才能解锁。',
   'export.password': '备份加密密码',
@@ -640,7 +640,7 @@ export const zh = {
   'runs.kind.export': '导出',
   'runs.kind.import': '导入',
   'runs.kind.autosync': '自动同步',
-  'runs.kind.sync-apply': '一键同步',
+  'runs.kind.sync-apply': '从远端合并',
   'runs.kind.backup-schedule': '定时备份',
   'runs.kind.restore': '快照恢复',
   'runs.kind.profile-switch': '档案切换',
@@ -1013,7 +1013,7 @@ export const en: Record<keyof typeof zh, string> = {
   'overview.kind.snapshot-delete': 'Snapshot delete',
   'overview.kind.snapshot-prune': 'Snapshot prune',
   'overview.kind.other': 'Other operation',
-  'export.hint': 'Exports the recommended sections by default (portable, no device-specific data). Click "Choose what to export" to adjust per section and per item (skills, plugins, workspaces, sessions, …).',
+  'export.hint': 'Exports the recommended sections by default (portable, no device-specific data).',
   'export.encrypt': 'Encrypt backup',
   'export.encryptHint': 'Encrypt the entire backup file with a password (AES-256-GCM). The password is used once and never written into the backup or any config file; it is required to unlock the backup on import.',
   'export.password': 'Backup encryption password',
@@ -1518,7 +1518,7 @@ export const en: Record<keyof typeof zh, string> = {
   'runs.kind.export': 'Export',
   'runs.kind.import': 'Import',
   'runs.kind.autosync': 'Auto sync',
-  'runs.kind.sync-apply': 'One-click sync',
+  'runs.kind.sync-apply': 'Merge from remote',
   'runs.kind.backup-schedule': 'Scheduled backup',
   'runs.kind.restore': 'Snapshot restore',
   'runs.kind.profile-switch': 'Profile switch',

package/src/client/market/MyConfigsView.tsx

@@ -35,7 +35,6 @@ import type { MyConfigsApi, MyItemEntry } from './my-configs-api.ts'
 import type { ListingStatusResponse } from '../../market/my-repo.ts'
 import type { SyncApi, GithubPollResponse } from '../sync/sync-api.ts'
 import { Button, Card, SectionTitle } from '../common/ui.tsx'
-import { InfoHint } from '../common/InfoHint.tsx'
 import { ConfirmDialog } from '../common/ConfirmDialog.tsx'
 import { toast } from '../common/toast-store.ts'
 import { redact } from '../../security/redaction.ts'
@@ -773,10 +772,11 @@ export function MyConfigsView({
         <>
           {/* 一键上传入口：点按钮 → 免责（首次）→ 弹窗向导 */}
           <Card>
-            {/* 卡片里只有一个动作：按钮本身已经写明「一键上传」，不再重复一个同名标题；ⓘ 跟着动作走 */}
+            {/* 卡片里只有一个动作：按钮本身已写明作用对象（上传配置包），不再重复标题。
+                此处不再放 ⓘ：它的「先在导出页生成 zip / 含密钥的备份会被拒绝」已在点开后的
+                向导头（MyConfigsWizard 的 Modal.Header trailing）逐字出现，入口再放一遍是同一条信息两次。 */}
             <div className={css.actionRow}>
               <Button variant="primary" onClick={openUpload}>{t('myconfigs.upload.run')}</Button>
-              <InfoHint text={t('myconfigs.upload.selectHint')} label={t('common.infoHint')} />
             </div>
           </Card>
           {renderList()}

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

@@ -145,11 +145,11 @@ export const zh = {
   'myconfigs.upload.mode.migrate': '迁移（保留全部内容）',
   'myconfigs.upload.mode.share': '分享（自动排除敏感内容）',
   'myconfigs.upload.mode.shareHint': '分享模式将自动排除设备/平台相关分区（凭据状态 / 会话 / MCP / 工作区等），并对隐私内容强制拦截——发现任何敏感痕迹将拒绝发布，而不是仅警告。',
-  'myconfigs.upload.run': '一键上传',
+  'myconfigs.upload.run': '上传配置包',
   'myconfigs.update.title': '更新配置',
   'myconfigs.update.hint': '版本自动 +1',
   'myconfigs.update.run': '一键更新',
-  'myconfigs.update.zipHint': '更新需要新的配置包：选择新 zip 后自动校验，通过后即可一键更新。',
+  'myconfigs.update.zipHint': '选择新 zip 后自动校验，通过才能更新。',
   'myconfigs.update.selectZip': '选择新 ZIP…',
   // 上传/更新结果卡
   'myconfigs.result.title': '上传/更新完成',
@@ -324,11 +324,11 @@ export const en: Record<keyof typeof zh, string> = {
   'myconfigs.upload.mode.migrate': 'Migrate (keep everything)',
   'myconfigs.upload.mode.share': 'Share (auto-exclude sensitive content)',
   'myconfigs.upload.mode.shareHint': 'Share mode auto-excludes device/platform-specific sections (credentials status / sessions / MCP / workspaces, etc.) and enforces privacy scanning — any sensitive trace blocks publishing instead of just warning.',
-  'myconfigs.upload.run': 'Upload',
+  'myconfigs.upload.run': 'Upload bundle',
   'myconfigs.update.title': 'Update config',
   'myconfigs.update.hint': 'version +1 automatically',
   'myconfigs.update.run': 'Update',
-  'myconfigs.update.zipHint': 'Updating needs a new config zip: pick one and it will be validated automatically, then you can update.',
+  'myconfigs.update.zipHint': 'Pick a new zip and it will be validated automatically; only a passing zip can be installed.',
   'myconfigs.update.selectZip': 'Choose new ZIP…',
   'myconfigs.result.title': 'Upload/update complete',
   'myconfigs.result.version': 'version {version}',

package/src/client/sync/SyncPanel.tsx

@@ -1260,8 +1260,8 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
         )}
         {ready && (
           <Card>
-            {/* 动作行（方案 A 定案）：用户只面对两个方向 —— 下行「一键同步」/ 上行「推送到远端」。
-                合并裁决并入一键同步（有基线走三方裁决视图、无基线走老导入确认）；并排两个按钮看不出该按哪个（issue 115）⇒ 按已确证远端事实只让一个落在 primary。 */}
+            {/* 动作行（方案 A 定案）：用户只面对两个方向 —— 下行「从远端合并到本机」/ 上行「推送到远端」。
+                合并裁决并入下行按钮（有基线走三方裁决视图、无基线走老导入确认）；并排两个按钮看不出该按哪个（issue 115）⇒ 按已确证远端事实只让一个落在 primary。 */}
             <div className={css.actionRow}>
               <Button
                 variant={pickSyncPrimary(state.statusInfo, channel) === 'sync' ? 'primary' : 'ghost'}

package/src/client/sync/SyncProbeRow.tsx

@@ -111,9 +111,10 @@ export function SyncProbeRow({ api, t, body, remoteReady, busy, presentation = '
 
   return (
     <>
-      {/* action 形态：直接摊进调用方自己的动作行（不再套一层 .actionRow），结果走 toast */}
+      {/* action 形态：直接摊进调用方自己的动作行（不再套一层 .actionRow），结果走 toast。
+          动作行里只留按钮：与同排其它按钮并排时，ⓘ 会被读成该按钮的开关（issue 121 用户要求移除）。 */}
       {actionMode
-        ? <>{button}{hintNode}</>
+        ? <>{button}</>
         : <div className={css.actionRow}>{button}{hintNode}</div>}
       {!actionMode && error !== null && (
         <ErrorBanner

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

@@ -20,8 +20,8 @@ export const zh = {
   'config.tokenMissing': '未配置令牌：可拉取公开仓库，无法推送',
   'config.tokenPlaceholder': 'ghp_…（可选）',
   // 配置保存（自动保存 + 显式保存按钮）
-  'config.save': '保存配置',
-  'config.saveHint': '表单改动会自动保存（密码/token 安全写入 DSH credentials，不会写入同步文件或日志）；也可点击按钮立即保存。',
+  'config.save': '立即保存',
+  'config.saveHint': '表单改动会自动保存：密码/token 安全写入 DSH credentials，不会写入同步文件或日志。',
   // 通道选择器
   'channel.title': '同步通道',
   'channel.git': 'Git 私有仓库',
@@ -31,7 +31,7 @@ export const zh = {
   'channel.perChannelHint': '每条通道（Git / WebDAV / 对象存储 / Gist）的自动同步、同步模式、加密与远端快照各自独立配置。',
   // 通道入口卡（弹窗驱动：点按钮 → 弹窗内配置通道）
   'channel.open': '配置…',
-  'channel.openHint': '远程同步通过「同步通道」进行：Git 私有仓库或 WebDAV 服务器。点击按钮在弹窗中配置或修改。',
+  'channel.openHint': '远程同步通过「同步通道」进行：Git 私有仓库或 WebDAV 服务器。',
   // 断开通道配置（用户实测要求：配置过就必须能删掉，否则打不通的通道会永久占位）
   'channel.expand': '展开通道详情',
   'channel.collapse': '收起通道详情',
@@ -125,9 +125,11 @@ export const zh = {
   'push.title': '推送结果',
   'sections.title': '同步分区',
   'warnings.title': '分区告警',
-  // 一键同步（方案 A：拉取 → 逐项确认 → apply-items）
-  'syncflow.title': '一键同步',
-  'syncflow.button': '一键同步',
+  // 从远端合并到本机（方案 A：拉取 → 逐项确认 → apply-items）
+  // 名字必须写明方向（issue 121）：这条链路只下行、绝不上传 —— 叫「同步」会被读成双向。
+  'syncflow.title': '从远端合并到本机',
+  'syncflow.button': '从远端合并到本机',
+  // 方向说明（ⓘ，挂在动作行）：只下行 + 双向该去哪儿；常驻成行会与按钮名重复（DESIGN.md §7）
   // 方案 A：有基线且三方合并全部 skip = 远端与本机一致，不必同步
   'syncflow.upToDate': '已是最新，无需同步',
   'syncflow.syncing': '正在同步…',
@@ -177,7 +179,7 @@ export const zh = {
   'syncflow.remoteEmptyGuide': '远端还没有任何快照：这是首次同步，先点「推送到远端」把本机配置推上去（推送会创建第一个快照），之后才能拉取。',
   // 同步模式（默认快速导出 / 高级自定义导出）
   'mode.title': '同步分区',
-  'mode.hint': '点按钮在弹窗里勾选要同步的分区：勾选集合就是同步范围（默认已勾选推荐分区，可随时改）。',
+  'mode.hint': '同步范围 = 勾选的分区集合（默认已勾选推荐分区，可随时改）。',
   'mode.selectedCount': '已勾选 {n} 个',
   'mode.sectionsHint': '默认可同步的是可移植分区；平台相关分区（MCP 服务器）与设备相关分区（插件文件、凭据状态、历史会话）只有你在这里主动勾选才参与同步。',
   'mode.atLeastOne': '请至少勾选一个同步分区',
@@ -216,7 +218,7 @@ export const zh = {
   'mode.includeSecretsHint': '把真实凭据值（~/.dsh/.credentials.yaml）写入加密快照，可在另一台机器上随同步一并写回本机凭据；勾选时自动选中加密，密钥绝不进入未加密快照。',
   'mode.encryptAutosyncNotice': '加密快照仅通过手动推送/拉取使用；自动同步无密码，遇到加密快照会跳过并在历史中提示。',
   'mode.decryptPassword': '解密密码（加密快照拉取/同步用，可选）',
-  'mode.decryptPasswordHint': '输入后保存在本机凭据库，下次拉取自动使用；只有拉取的快照确实加密时才会用到 —— 未加密的备份不会使用密码。删除请点「删除已保存密码」。',
+  'mode.decryptPasswordHint': '输入后保存在本机凭据库，下次拉取自动使用；只有拉取的快照确实加密时才会用到 —— 未加密的备份不会使用密码。',
   'mode.decryptPasswordSaved': '已保存到本机',
   'mode.decryptPasswordPlaceholder': '已保存（留空即沿用）',
   'mode.clearSavedPassword': '删除已保存密码',
@@ -257,7 +259,7 @@ export const zh = {
   // 同步历史（含自动同步记录）
   'history.title': '同步历史',
   'history.empty': '尚无同步历史',
-  'history.emptyHint': '完成首次 push / 一键同步 / 自动同步后，这里会显示记录。',
+  'history.emptyHint': '完成首次推送 / 从远端合并 / 自动同步后，这里会显示记录。',
   'history.colTime': '时间',
   'history.colDetail': '详情',
   'history.kindAutosync': '自动同步',
@@ -304,7 +306,7 @@ export const zh = {
   'toast.pushPreviewFailed': '推送预览失败',
   'toast.pushFailed': '推送失败',
   'toast.pushDone': '推送完成',
-  'toast.syncStartFailed': '一键同步失败',
+  'toast.syncStartFailed': '从远端合并失败',
   'toast.autosyncUpdateFailed': '自动同步设置更新失败',
   'toast.autosyncUpdated': '自动同步设置已更新',
   'toast.snapshotsLoadFailed': '读取远端快照失败',
@@ -474,8 +476,8 @@ export const en: Record<keyof typeof zh, string> = {
   'config.tokenMissing': 'No token: public repos can be pulled, but pushing will fail',
   'config.tokenPlaceholder': 'ghp_… (optional)',
   // Config save (auto-save + explicit save button)
-  'config.save': 'Save config',
-  'config.saveHint': 'Form changes are saved automatically (password/token written securely into DSH credentials, never into sync files or logs); you can also save explicitly with the button.',
+  'config.save': 'Save now',
+  'config.saveHint': 'Form changes are saved automatically: password/token goes securely into DSH credentials, never into sync files or logs.',
   'channel.title': 'Sync Channel',
   'channel.git': 'Git private repo',
   'channel.webdav': 'WebDAV server',
@@ -484,7 +486,7 @@ export const en: Record<keyof typeof zh, string> = {
   'channel.perChannelHint': 'Auto sync, sync mode, encryption and remote snapshots are configured independently for each channel (Git / WebDAV / object storage / Gist).',
   // Channel entry card (dialog-driven: click the button → configure the channel in the dialog)
   'channel.open': 'Configure…',
-  'channel.openHint': 'Remote sync runs through a sync channel: a private Git repository or a WebDAV server. Click the button to configure or change it in the dialog.',
+  'channel.openHint': 'Remote sync runs through a sync channel: a private Git repository or a WebDAV server.',
   // Disconnect channel config (user report: once configured there was no way out)
   'channel.expand': 'Expand channel details',
   'channel.collapse': 'Collapse channel details',
@@ -573,8 +575,8 @@ export const en: Record<keyof typeof zh, string> = {
   'push.title': 'Push Result',
   'sections.title': 'Synced Sections',
   'warnings.title': 'Section Warnings',
-  'syncflow.title': 'One-Click Sync',
-  'syncflow.button': 'One-click sync',
+  'syncflow.title': 'Merge from remote',
+  'syncflow.button': 'Merge from remote',
   // Plan A: with a baseline, an all-skip three-way merge means local and remote already match
   'syncflow.upToDate': 'Already up to date; nothing to sync',
   'syncflow.syncing': 'Syncing…',
@@ -623,7 +625,7 @@ export const en: Record<keyof typeof zh, string> = {
   'syncflow.remoteEmptyGuide': 'No remote snapshots yet: this is the first sync — click "Push to remote" to upload your local config (that push creates the first snapshot); pulling only works afterwards.',
   // Sync mode (default quick export / advanced custom export)
   '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.hint': 'Sync scope = the ticked set of sections (recommended sections are ticked by default and can be changed any time).',
   'mode.selectedCount': '{n} selected',
   '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',
@@ -662,7 +664,7 @@ export const en: Record<keyof typeof zh, string> = {
   'mode.includeSecretsHint': 'Write real credential values (~/.dsh/.credentials.yaml) into the encrypted snapshot so another machine can restore them with the sync; checking this auto-selects encryption, and secrets never enter a plaintext snapshot.',
   'mode.encryptAutosyncNotice': 'Encrypted snapshots are only produced/consumed by manual push/pull; auto sync has no password, so it skips encrypted snapshots and reports them in history.',
   'mode.decryptPassword': 'Decryption password (for encrypted snapshot pull/sync, optional)',
-  'mode.decryptPasswordHint': 'Once entered it is saved in the local credential store and reused automatically; it is only ever used when the pulled snapshot is actually encrypted — plaintext backups never use the password. Use "Delete saved password" to remove it.',
+  'mode.decryptPasswordHint': 'Once entered it is saved in the local credential store and reused automatically; it is only ever used when the pulled snapshot is actually encrypted — plaintext backups never use the password.',
   'mode.decryptPasswordSaved': 'Saved locally',
   'mode.decryptPasswordPlaceholder': 'Saved (leave empty to reuse)',
   'mode.clearSavedPassword': 'Delete saved password',
@@ -701,7 +703,7 @@ export const en: Record<keyof typeof zh, string> = {
   '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.',
+  'history.emptyHint': 'Records appear here after your first push / merge from remote / auto sync.',
   'history.colTime': 'Time',
   'history.colDetail': 'Detail',
   'history.kindAutosync': 'Auto Sync',
@@ -745,7 +747,7 @@ export const en: Record<keyof typeof zh, string> = {
   'toast.pushPreviewFailed': 'Failed to build push preview',
   'toast.pushFailed': 'Push failed',
   'toast.pushDone': 'Push completed',
-  'toast.syncStartFailed': 'One-click sync failed',
+  'toast.syncStartFailed': 'Merge from remote failed',
   'toast.autosyncUpdateFailed': 'Failed to update auto-sync settings',
   'toast.autosyncUpdated': 'Auto-sync settings updated',
   'toast.snapshotsLoadFailed': 'Failed to load remote snapshots',

package/src/core/messages-core.ts

@@ -67,7 +67,7 @@ export const zh = {
 
   // ---------- run-registry ----------
   'core.run.autosyncBusy': '自动同步已在进行中',
-  'core.run.syncApplyBusy': '一键同步已在进行中',
+  'core.run.syncApplyBusy': '正在从远端合并',
   'core.run.backupScheduleBusy': '定时备份已在进行中',
   'core.run.restoreBusy': '快照恢复已在进行中（请等待当前恢复完成）',
   'core.run.recoveryBusy': '恢复/回滚已在进行中（请等待当前恢复完成）',
@@ -381,7 +381,7 @@ export const en: Record<keyof typeof zh, string> = {
 
   // ---------- run-registry ----------
   'core.run.autosyncBusy': 'Automatic sync is already in progress',
-  'core.run.syncApplyBusy': 'One-click sync is already in progress',
+  'core.run.syncApplyBusy': 'Merge from remote is already in progress',
   'core.run.backupScheduleBusy': 'Scheduled backup is already in progress',
   'core.run.restoreBusy': 'Snapshot restore is already in progress (wait for the current restore to finish)',
   'core.run.recoveryBusy': 'Recovery/rollback is already in progress (wait for the current recovery to finish)',

package/src/index.ts

@@ -180,7 +180,7 @@ export const name = 'config-manager'
 export const inject = ['settings', 'credentials']
 
 /** Plugin version, kept in sync with package.json ("version"). */
-export const PLUGIN_VERSION = '0.2.2'
+export const PLUGIN_VERSION = '0.2.3'
 
 /** Plugin own package name — excluded from its own exported plugins list. */
 const PLUGIN_NAME = 'dsh-config-manager'

package/src/routes/messages.ts

@@ -41,13 +41,13 @@ export const zh = {
   'route.syncPreviewFailed': '同步预览失败',
   'route.syncSessionExpired': '同步会话不存在或已过期，请重新拉取预览',
   'route.syncConflictResolutionRequired': '冲突项 {id} 必须提供 resolution（useRemote/keepLocal/skip）',
-  'route.syncApplySummary': '一键同步应用：{count} 项{status}{ineffective}',
+  'route.syncApplySummary': '从远端合并：{count} 项{status}{ineffective}',
   'route.syncRollbackIncomplete': '（回滚未完成）',
   'route.syncRolledBack': '（已回滚）',
   'route.syncIneffectiveSuffix': '（{count} 项未生效）',
   'route.syncApplyPartial': '同步应用部分成功：有项未生效（见告警明细）',
   'route.syncApplyFailed': '同步应用未完全成功',
-  'route.syncRollbackSummary': '一键同步回滚（{id}）',
+  'route.syncRollbackSummary': '从远端合并回滚（{id}）',
   // ---------- 事故恢复 ----------
   'route.recoverySessionRepairRollback': '会话修复回滚',
   'route.recoverySessionRepairDropped': '会话修复（丢弃重放重复行 {count} 行）',
@@ -82,13 +82,13 @@ export const en: Record<keyof typeof zh, string> = {
   'route.syncPreviewFailed': 'Sync preview failed',
   'route.syncSessionExpired': 'The sync session does not exist or has expired; pull a fresh preview',
   'route.syncConflictResolutionRequired': 'Conflict item {id} must provide a resolution (useRemote/keepLocal/skip)',
-  'route.syncApplySummary': 'One-click sync apply: {count} item(s){status}{ineffective}',
+  'route.syncApplySummary': 'Merge from remote: {count} item(s){status}{ineffective}',
   'route.syncRollbackIncomplete': ' (rollback incomplete)',
   'route.syncRolledBack': ' (rolled back)',
   'route.syncIneffectiveSuffix': ' ({count} item(s) had no effect)',
   'route.syncApplyPartial': 'Sync apply partially succeeded: some items had no effect (see the warning details)',
   'route.syncApplyFailed': 'Sync apply did not fully succeed',
-  'route.syncRollbackSummary': 'One-click sync rollback ({id})',
+  'route.syncRollbackSummary': 'Merge from remote rollback ({id})',
   'route.recoverySessionRepairRollback': 'Session repair rollback',
   'route.recoverySessionRepairDropped': 'Session repair (dropped {count} replayed duplicate row(s))',
   'route.recoverySessionRepairRejected': 'Session repair was rejected: {reason}',