dsh-config-manager 0.2.2 → 0.2.4

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.4'
 
 /** 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}',

package/src/sync/git/git-probe.test.ts

@@ -48,7 +48,11 @@ test('git probe：匿名 ls-remote 成功 → 连接正常，且**只**发这一
   assert.equal(result.snapshotCount, undefined, '不得报快照数（统计它需要 fetch 工作副本）');
   assert.deepEqual(result.createdCollections ?? [], [], 'git 通道不在远端建目录');
   assert.equal(calls.length, 1, '探针只准发一条 ls-remote');
-  assert.deepEqual(calls[0], ['ls-remote', REPO]);
+  // 前置的 `-c <key=value>` 是网络低速上限（issue #122），不属于命令本体
+  const argv = calls[0]!;
+  let i = 0;
+  while (argv[i] === '-c') i += 2;
+  assert.deepEqual(argv.slice(i), ['ls-remote', REPO]);
 });
 
 test('git probe：匿名被拒、带凭据成功 → 连接正常（私有仓库 + 凭据可用）', async () => {

package/src/sync/git/git-transport.test.ts

@@ -11,7 +11,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { execFile } from 'node:child_process';
 
-import { clearInspectFactsCache, GitTransport, GitTransportError } from './git-transport.ts';
+import { clearInspectFactsCache, defaultGitExec, GitTransport, GitTransportError } from './git-transport.ts';
 import type { GitExecFn, GitExecResult, GitTransportOptions } from './git-transport.ts';
 import { encryptSectionsPayload } from '../snapshot-crypto.ts';
 import { computeSnapshotMeta, DEFAULT_SYNC_TIMEOUT_MS, isEncryptedSections, SyncTransportError } from '../transport.ts';
@@ -119,6 +119,18 @@ function joinedArgs(calls: CallRecord[], needle: string): string[] {
   return calls.filter((c) => c.args.join(' ').includes(needle)).map((c) => c.args.join(' '));
 }
 
+/**
+ * 拉取命令判定（issue #122）：fetch 与 origin 之间现在会插 `--no-tags`/`--filter=blob:none`，
+ * 所以不能再按 'fetch origin' 子串匹配。
+ */
+function isFetchArgs(args: string[]): boolean {
+  return args.includes('fetch') && args.includes('origin');
+}
+
+function fetchCalls(calls: CallRecord[]): string[] {
+  return calls.filter((c) => isFetchArgs(c.args)).map((c) => c.args.join(' '));
+}
+
 /** 构造加密快照（sections 为 EncryptedSections 密文载荷；含文件分区以覆盖字节往返）。 */
 async function encryptedSnapshot(overrides: Partial<SyncSnapshot> = {}): Promise<SyncSnapshot> {
   const base = sampleSnapshot();
@@ -896,7 +908,7 @@ function pullScriptedExec(calls: CallRecord[], pullResults: GitExecResult[]): Gi
     const joined = args.join(' ');
     if (joined.includes('rev-parse') && joined.includes('--abbrev-ref')) return { stdout: 'main', stderr: '', code: 0 };
     if (joined.includes('rev-parse')) return { stdout: 'sha', stderr: '', code: 0 };
-    if (joined.includes('fetch origin')) {
+    if (isFetchArgs(args)) {
       const r = pullResults[Math.min(i, pullResults.length - 1)]!;
       i += 1;
       return r;
@@ -916,7 +928,7 @@ test('t24：幂等读（list）遇瞬时网络故障 → 指数退避重试后
     workDir: dir, exec, retry: { attempts: 3, baseDelayMs: 1, sleep: async () => {} },
   }));
   assert.deepEqual(await transport.list(), [], '重试后应成功（空远端）');
-  assert.equal(joinedArgs(calls, 'fetch origin').length, 2, '第一次瞬时失败 → 重试一次即成功');
+  assert.equal(fetchCalls(calls).length, 2, '第一次瞬时失败 → 重试一次即成功');
 });
 
 test('t24：重试耗尽后上抛带分类的错误（network / retryable=true），尝试次数 = attempts', async (t) => {
@@ -933,7 +945,7 @@ test('t24：重试耗尽后上抛带分类的错误（network / retryable=true
     assert.equal(err.retryable, true);
     return true;
   });
-  assert.equal(joinedArgs(calls, 'fetch origin').length, 3, 'attempts=3 → 恰好 3 次尝试');
+  assert.equal(fetchCalls(calls).length, 3, 'attempts=3 → 恰好 3 次尝试');
 });
 
 test('t24：不可重试错误（仓库不存在 / 鉴权失败）→ 只尝试一次且分类正确', async (t) => {
@@ -954,7 +966,7 @@ test('t24：不可重试错误（仓库不存在 / 鉴权失败）→ 只尝试
       assert.equal(err.retryable, false, '不可重试: ' + stderr);
       return true;
     });
-    assert.equal(joinedArgs(calls, 'fetch origin').length, 1, '不可重试错误不得重试: ' + stderr);
+    assert.equal(fetchCalls(calls).length, 1, '不可重试错误不得重试: ' + stderr);
   }
 });
 
@@ -968,7 +980,9 @@ test('远端同步命令序列：显式 refspec fetch + merge --ff-only，绝不
   const joined = calls.map((c) => c.args.join(' '));
   assert.ok(!joined.some((j) => /^pull(\s|$)/.test(j)), '不得再执行 git pull: ' + joined.join(' | '));
   // 网络命令前面会挂 credential helper 的 -c 参数，所以按「末尾 3 个参数」判命令本身
-  const fetched = calls.some((c) => c.args.slice(-3).join(' ') === 'fetch origin +refs/heads/main:refs/remotes/origin/main');
+  // issue #122：fetch 与 origin 之间还会插 `--no-tags`（partial clone 时另有 `--filter=blob:none`），
+  // 所以按「含 fetch / 含 origin / 末尾是显式 refspec」判定，而不是钉死参数个数
+  const fetched = calls.some((c) => isFetchArgs(c.args) && c.args.at(-1) === '+refs/heads/main:refs/remotes/origin/main');
   assert.ok(fetched, '必须显式 refspec fetch: ' + joined.join(' | '));
   assert.ok(joined.includes('merge --ff-only origin/main'), '必须显式远端分支快进合并: ' + joined.join(' | '));
 });
@@ -981,7 +995,7 @@ test('远端还没有同名分支（空仓库 / 分支被改名）→ 与「无
     const joined = args.join(' ');
     if (joined.includes('--abbrev-ref')) return { stdout: 'main', stderr: '', code: 0 };
     if (joined.includes('rev-parse')) return { stdout: 'sha', stderr: '', code: 0 };
-    if (joined.includes('fetch origin')) {
+    if (isFetchArgs(args)) {
       return { stdout: '', stderr: "fatal: couldn't find remote ref refs/heads/main", code: 128 };
     }
     return { stdout: '', stderr: '', code: 0 };
@@ -991,6 +1005,168 @@ test('远端还没有同名分支（空仓库 / 分支被改名）→ 与「无
   assert.equal(calls.filter((c) => c.args.includes('merge')).length, 0, '没 fetch 到东西就不该 merge');
 });
 
+/* ---------------- issue #122：远端仓库远大于同步内容时不许卡死 ---------------- */
+
+const SHA_A = 'a'.repeat(40);
+const SHA_B = 'b'.repeat(40);
+
+test('issue #122：远端 sha 与本地跟踪引用一致且已合并 → 整轮零 fetch、零 merge（只花一次 ls-remote）', async (t) => {
+  const dir = await makeGitWorkDir(t);
+  const calls: CallRecord[] = [];
+  const exec: GitExecFn = async (_cmd, args) => {
+    calls.push({ cmd: 'git', args });
+    const joined = args.join(' ');
+    if (joined.includes('--abbrev-ref')) return { stdout: 'main', stderr: '', code: 0 };
+    if (joined.includes('ls-remote')) return { stdout: `${SHA_A}\trefs/heads/main\n`, stderr: '', code: 0 };
+    if (joined.includes('rev-parse')) return { stdout: SHA_A, stderr: '', code: 0 };
+    return { stdout: '', stderr: '', code: 0 };
+  };
+  const transport = new GitTransport(makeOptions({ workDir: dir, exec }));
+  assert.deepEqual(await transport.list(), []);
+  const trace = calls.map((c) => c.args.join(' ')).join(' | ');
+  assert.equal(fetchCalls(calls).length, 0, '稳态不得发 fetch: ' + trace);
+  assert.equal(calls.filter((c) => c.args.includes('merge')).length, 0, '稳态不得 merge: ' + trace);
+  assert.equal(joinedArgs(calls, 'ls-remote').length, 1, '稳态只允许一次 ls-remote: ' + trace);
+});
+
+test('issue #122：refs 已是最新但 HEAD 落后（上次 merge 没跑完）→ 跳过 fetch、仍本地 merge', async (t) => {
+  const dir = await makeGitWorkDir(t);
+  const calls: CallRecord[] = [];
+  const exec: GitExecFn = async (_cmd, args) => {
+    calls.push({ cmd: 'git', args });
+    const joined = args.join(' ');
+    if (joined.includes('--abbrev-ref')) return { stdout: 'main', stderr: '', code: 0 };
+    if (joined.includes('ls-remote')) return { stdout: `${SHA_A}\trefs/heads/main\n`, stderr: '', code: 0 };
+    // 远端跟踪引用已指向远端最新，但 HEAD 还停在旧提交
+    if (joined.includes('refs/remotes/origin/main')) return { stdout: SHA_A, stderr: '', code: 0 };
+    if (joined.includes('rev-parse')) return { stdout: SHA_B, stderr: '', code: 0 };
+    return { stdout: '', stderr: '', code: 0 };
+  };
+  const transport = new GitTransport(makeOptions({ workDir: dir, exec }));
+  assert.deepEqual(await transport.list(), []);
+  assert.equal(fetchCalls(calls).length, 0, '没有新对象可拉 → 不 fetch');
+  assert.equal(joinedArgs(calls, 'merge --ff-only origin/main').length, 1, '本地没合并完 → 必须继续 merge');
+});
+
+test('issue #122：远端有新提交 → 正常 fetch + merge，fetch 带 --no-tags（同步仓库不需要 tag）', async (t) => {
+  const dir = await makeGitWorkDir(t);
+  const calls: CallRecord[] = [];
+  const exec: GitExecFn = async (_cmd, args) => {
+    calls.push({ cmd: 'git', args });
+    const joined = args.join(' ');
+    if (joined.includes('--abbrev-ref')) return { stdout: 'main', stderr: '', code: 0 };
+    if (joined.includes('ls-remote')) return { stdout: `${SHA_A}\trefs/heads/main\n`, stderr: '', code: 0 };
+    if (joined.includes('refs/remotes/origin/main')) return { stdout: SHA_B, stderr: '', code: 0 };
+    if (joined.includes('rev-parse')) return { stdout: SHA_B, stderr: '', code: 0 };
+    return { stdout: '', stderr: '', code: 0 };
+  };
+  const transport = new GitTransport(makeOptions({ workDir: dir, exec }));
+  assert.deepEqual(await transport.list(), []);
+  const fetches = fetchCalls(calls);
+  assert.equal(fetches.length, 1, '远端有新提交 → 必须 fetch: ' + calls.map((c) => c.args.join(' ')).join(' | '));
+  assert.ok(fetches[0]!.includes('--no-tags'), 'fetch 必须带 --no-tags: ' + fetches[0]!);
+  assert.ok(!fetches[0]!.includes('--filter='), '非 partial clone 不得加 blob 过滤: ' + fetches[0]!);
+  assert.equal(joinedArgs(calls, 'merge --ff-only origin/main').length, 1, 'fetch 之后必须 ff 合并');
+});
+
+test('issue #122：partial clone 的 fetch 保持 --filter=blob:none（不因过滤丢失后续 checkout 需要的 blob）', async (t) => {
+  const dir = await makeGitWorkDir(t);
+  const calls: CallRecord[] = [];
+  const exec: GitExecFn = async (_cmd, args) => {
+    calls.push({ cmd: 'git', args });
+    const joined = args.join(' ');
+    if (joined.includes('remote.origin.promisor')) return { stdout: 'true\n', stderr: '', code: 0 };
+    if (joined.includes('--abbrev-ref')) return { stdout: 'main', stderr: '', code: 0 };
+    if (joined.includes('ls-remote')) return { stdout: `${SHA_A}\trefs/heads/main\n`, stderr: '', code: 0 };
+    if (joined.includes('refs/remotes/origin/main')) return { stdout: SHA_B, stderr: '', code: 0 };
+    if (joined.includes('rev-parse')) return { stdout: SHA_B, stderr: '', code: 0 };
+    return { stdout: '', stderr: '', code: 0 };
+  };
+  const transport = new GitTransport(makeOptions({ workDir: dir, exec }));
+  assert.deepEqual(await transport.list(), []);
+  const fetches = fetchCalls(calls);
+  assert.equal(fetches.length, 1);
+  assert.ok(fetches[0]!.includes('--filter=blob:none'), 'partial clone 必须保持 blob 过滤: ' + fetches[0]!);
+});
+
+test('issue #122：网络子命令一律带低速上限，本地子命令不带', async (t) => {
+  const dir = await makeGitWorkDir(t);
+  const calls: CallRecord[] = [];
+  const transport = new GitTransport(makeOptions({ workDir: dir, exec: pullScriptedExec(calls, [{ stdout: '', stderr: '', code: 0 }]) }));
+  await transport.list();
+  const net = calls.filter((c) => ['clone', 'fetch', 'push', 'ls-remote'].some((sub) => c.args.includes(sub)));
+  assert.ok(net.length > 0, '至少应有 ls-remote/fetch: ' + calls.map((c) => c.args.join(' ')).join(' | '));
+  for (const c of net) {
+    const j = c.args.join(' ');
+    assert.ok(j.includes('http.lowSpeedLimit=1000') && j.includes('http.lowSpeedTime=30'), '网络命令必须带低速上限: ' + j);
+  }
+  const local = calls.filter((c) => c.args.includes('rev-parse'));
+  assert.ok(local.length > 0);
+  for (const c of local) assert.ok(!c.args.join(' ').includes('lowSpeedLimit'), '本地命令不该带 http 配置: ' + c.args.join(' '));
+});
+
+test('issue #122：首次 clone 走 partial clone + sparse-checkout，只 materialize 三个同步目录', async (t) => {
+  const dir = await makeTempDir(t); // 空目录 → 走 clone
+  const calls: CallRecord[] = [];
+  const transport = new GitTransport(makeOptions({ workDir: dir, exec: mockExec(calls) }));
+  await transport.list();
+  const clone = calls.find((c) => c.args.includes('clone'));
+  assert.ok(clone !== undefined, '应触发 clone: ' + calls.map((c) => c.args.join(' ')).join(' | '));
+  assert.ok(clone.args.includes('--filter=blob:none'), 'clone 必须 partial（只取 commit+tree）: ' + clone.args.join(' '));
+  assert.ok(clone.args.includes('--no-checkout'), 'clone 先不落地文件: ' + clone.args.join(' '));
+  assert.equal(joinedArgs(calls, 'clone').length, 1, '不允许多 clone 一次');
+  const sparse = calls.find((c) => c.args.includes('sparse-checkout'));
+  assert.ok(sparse !== undefined, '必须设置 sparse-checkout');
+  assert.equal(
+    sparse.args.join(' '),
+    'sparse-checkout set --cone snapshots snapshots-encrypted blobs',
+    'sparse 面必须与同步目录同源: ' + sparse.args.join(' '),
+  );
+  assert.equal(calls.filter((c) => c.args.includes('checkout')).length, 1, 'sparse 之后必须 checkout 一次');
+});
+
+test('issue #122：老 git 不认 --filter → 回落全量 clone（绝不因优化失败）', async (t) => {
+  const dir = await makeTempDir(t);
+  const calls: CallRecord[] = [];
+  const exec: GitExecFn = async (_cmd, args) => {
+    calls.push({ cmd: 'git', args });
+    if (args.includes('--filter=blob:none')) {
+      return { stdout: '', stderr: "error: unknown option `filter=blob:none'", code: 129 };
+    }
+    return { stdout: '', stderr: '', code: 0 };
+  };
+  const transport = new GitTransport(makeOptions({ workDir: dir, exec }));
+  await transport.list();
+  const clones = calls.filter((c) => c.args.includes('clone'));
+  assert.equal(clones.length, 2, '必须先试 partial、再回落全量: ' + clones.map((c) => c.args.join(' ')).join(' | '));
+  assert.ok(!clones[1]!.args.includes('--filter=blob:none'), '回落那次不得带 --filter');
+  assert.equal(calls.filter((c) => c.args.includes('sparse-checkout')).length, 0, '回落路径不做 sparse');
+});
+
+test('issue #122：超时 kill 整棵进程树，且有界收尾（孙进程不再继续跑）', async (t) => {
+  const dir = await makeTempDir(t);
+  const marker = path.join(dir, 'grandchild-alive.txt');
+  // 父进程拉起孙进程后常驻；孙进程 1.5 s 后写标记文件 —— 只杀父进程时它会照写
+  await fs.writeFile(path.join(dir, 'grandchild.cjs'), [
+    "setTimeout(() => { require('node:fs').writeFileSync(process.argv[2], 'alive'); }, 1500);",
+    '',
+  ].join('\n'));
+  await fs.writeFile(path.join(dir, 'parent.cjs'), [
+    "const { spawn } = require('node:child_process');",
+    "spawn(process.execPath, [require('node:path').join(__dirname, 'grandchild.cjs'), process.argv[2]], { stdio: 'ignore' });",
+    'setInterval(() => {}, 1000);',
+    '',
+  ].join('\n'));
+  const started = Date.now();
+  const res = await defaultGitExec(process.execPath, [path.join(dir, 'parent.cjs'), marker], { timeoutMs: 200 });
+  const elapsed = Date.now() - started;
+  assert.notEqual(res.code, 0, '超时必须是非零退出');
+  assert.match(res.stderr, /timed out after 200ms/, '超时文案必须让分类器判 timeout（瞬时、可重试）');
+  assert.ok(elapsed < 4000, `超时收尾必须有界（实际 ${String(elapsed)}ms）`);
+  await new Promise((resolve) => setTimeout(resolve, 2500));
+  await assert.rejects(fs.stat(marker), '孙进程必须被一起杀掉（否则它会继续写文件/继续下 pack）');
+});
+
 test('并发驱动同一工作副本（两个 transport 实例）→ git 调用被工作副本锁串行化', async (t) => {
   const dir = await makeGitWorkDir(t);
   let active = 0;
@@ -1194,7 +1370,7 @@ test('issue #79：Host key verification failed → 可操作指纹指引（含 h
     calls.push({ cmd: 'git', args });
     const joined = args.join(' ');
     if (joined.includes('remote get-url')) return { stdout: repoUrl, stderr: '', code: 0 };
-    if (joined.includes('fetch origin')) {
+    if (isFetchArgs(args)) {
       return { stdout: '', stderr: 'Host key verification failed.\nfatal: Could not read from remote repository.', code: 128 };
     }
     return { stdout: 'sha', stderr: '', code: 0 };