dsh-config-manager 0.1.86 → 0.2.0

package/src/client/locales.ts

@@ -289,6 +289,19 @@ export const zh = {
   'import.paths.kind.homeMismatch': '基础路径不同',
   'import.paths.unresolved': '还有 {count} 条路径未映射（留空将跳过该路径，可以继续）',
   'import.paths.empty': '无需映射路径',
+  // 「选择本机路径」弹窗（第③项）：浏览器拿不到本机真实路径，目录列举走宿主只读端点
+  'import.paths.browse': '选择本机路径',
+  'import.paths.picker.title': '选择本机路径',
+  'import.paths.picker.up': '上一层',
+  'import.paths.picker.home': '主目录',
+  'import.paths.picker.thisPc': '此电脑',
+  'import.paths.picker.useCurrent': '使用当前目录',
+  'import.paths.picker.empty': '这个目录里没有可进入的项',
+  'import.paths.picker.truncated': '只显示前 {count} 项',
+  'import.paths.picker.notFound': '这个路径不存在（已为你打开上一级）',
+  'import.paths.picker.denied': '没有读取这个目录的权限',
+  'import.paths.picker.notAbsolute': '请填绝对路径（如 D:\\ 或 /）',
+  'import.paths.picker.failed': '读取这个目录失败',
   // —— 快照恢复 ——
   'home.schedule.title': '定时备份',
   'snapshots.selectHint': '选择快照以预览恢复计划（只读预览，不会改动任何设置）：',
@@ -1160,6 +1173,18 @@ export const en: Record<keyof typeof zh, string> = {
   'import.paths.kind.homeMismatch': 'Different base path',
   'import.paths.unresolved': '{count} path(s) unmapped (blank = skip that path, you can continue)',
   'import.paths.empty': 'No paths to map',
+  'import.paths.browse': 'Choose a local path',
+  'import.paths.picker.title': 'Choose a local path',
+  'import.paths.picker.up': 'Up one level',
+  'import.paths.picker.home': 'Home folder',
+  'import.paths.picker.thisPc': 'This PC',
+  'import.paths.picker.useCurrent': 'Use this folder',
+  'import.paths.picker.empty': 'Nothing to open in this folder',
+  'import.paths.picker.truncated': 'Showing the first {count} entries',
+  'import.paths.picker.notFound': 'That path does not exist (opened its parent instead)',
+  'import.paths.picker.denied': 'No permission to read this folder',
+  'import.paths.picker.notAbsolute': 'Enter an absolute path (e.g. D:\\ or /)',
+  'import.paths.picker.failed': 'Could not read this folder',
   'home.schedule.title': 'Schedule',
   'snapshots.selectHint': 'Select a snapshot to preview its restore plan (read-only preview, changes nothing):',
   'snapshots.status': 'Status',

package/src/client/lucide-icons.d.ts

@@ -29,6 +29,8 @@ declare module 'lucide-react/dist/esm/icons/download.mjs' { const i: LucideIconC
 declare module 'lucide-react/dist/esm/icons/eye.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/file.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/folder-input.mjs' { const i: LucideIconComponent; export default i }
+declare module 'lucide-react/dist/esm/icons/folder.mjs' { const i: LucideIconComponent; export default i }
+declare module 'lucide-react/dist/esm/icons/folder-open.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/hard-drive-download.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/history.mjs' { const i: LucideIconComponent; export default i }
 declare module 'lucide-react/dist/esm/icons/info.mjs' { const i: LucideIconComponent; export default i }

package/src/client/sync/SyncPanel.tsx

@@ -74,7 +74,7 @@ import type {
 import {
   buildSelectionRequest, buildSyncChannelBody, buildSyncConfigBody, buildSyncPushBody,
   channelBackfillFromStatus, channelRemoteReady, cloudFormFromStatus, computeEncryptInvalid, encryptToggle,
-  githubPollDecision, hasSelectedSections, includeSecretsToggle, isGithubFlowInFlight, resolveInitialChannel,
+  githubPollDecision, hasSelectedSections, includeSecretsToggle, isGithubFlowInFlight, pickSyncPrimary, resolveInitialChannel,
   needsSessionInventory, saveQueueOnFlush, saveQueueOnRequest, saveQueueOnSettled, toggleSectionSelection,
   validateCloudForm, DEFAULT_S3_PROVIDER,
   SYNC_CONFIG_SAVE_DEBOUNCE_MS,
@@ -1261,10 +1261,10 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
         {ready && (
           <Card>
             {/* 动作行（方案 A 定案）：用户只面对两个方向 —— 下行「一键同步」/ 上行「推送到远端」。
-                合并裁决并入一键同步（有基线走三方裁决视图、无基线走老导入确认），不再单独占按钮。 */}
+                合并裁决并入一键同步（有基线走三方裁决视图、无基线走老导入确认）；并排两个按钮看不出该按哪个（issue 115）⇒ 按已确证远端事实只让一个落在 primary。 */}
             <div className={css.actionRow}>
               <Button
-                variant="primary"
+                variant={pickSyncPrimary(state.statusInfo, channel) === 'sync' ? 'primary' : 'ghost'}
                 disabled={busy}
                 loading={state.busy === 'sync'}
                 onClick={() => { void runSyncSmart(channel) }}
@@ -1273,7 +1273,7 @@ export function SyncPanel({ api, t, cmT }: SyncPanelProps) {
                   ? (syncPhase === 'preview' ? t('syncflow.checkingRemote') : t('syncflow.syncing'))
                   : t('syncflow.button')}
               </Button>
-              <Button disabled={!computeSyncButtons(state.busy, ready, uiT).canPush || githubBusy || !hasSelectedSections(cs) || computeEncryptInvalid(cs)} onClick={() => { switchChannel(channel); void runPushPreview() }}>
+              <Button variant={pickSyncPrimary(state.statusInfo, channel) === 'push' ? 'primary' : 'ghost'} disabled={!computeSyncButtons(state.busy, ready, uiT).canPush || githubBusy || !hasSelectedSections(cs) || computeEncryptInvalid(cs)} onClick={() => { switchChannel(channel); void runPushPreview() }}>
                 {computeSyncButtons(state.busy, ready, uiT).pushLabel}
               </Button>
               {/* 测试连接（只读自检）：与两个主操作同一行、排在最后；结果走 toast（不再占页面高度） */}

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

@@ -294,7 +294,7 @@ export function cloudIssueKey(code: string): SyncKey | null {
 /* ------------------------------------------------ G-34：gist 通道不适合大分区 */
 
 /**
- * G-34（docs/spec/known-gaps.md）：gist 通道**刻意不做内容寻址外置** —— 一次 GET 把全部
+ * G-34（docs/maintenance/known-gaps.md）：gist 通道**刻意不做内容寻址外置** —— 一次 GET 把全部
  * 文件内容取回、单文件内容超限会被截断、文件数还有上限，因此会话这类大分区不适合走 gist。
  *
  * 本常量 = 「gist 表单」常驻提示的字典键（组件按它取 sync 字典文案渲染 hint）。

package/src/core/native-path-picker.test.ts

@@ -0,0 +1,118 @@
+/**
+ * 原生目录选择器的调度逻辑单测（不弹窗、不 spawn 真进程：全部走注入的 spawner）。
+ *
+ * 真机那半（PowerShell 的 IFileOpenDialog 到底能不能弹出来）无法在无头测试里断言，
+ * 由方案的 `Probe` 自检 + 人工目测覆盖；本文件只钉住**我们自己的**判断逻辑：
+ * 三态区分（ok / canceled / unsupported·failed）、取消不当错误、能力缺失必须回落、
+ * 起始路径与标题经环境变量传递、以及路径归一化不毁掉盘符根。
+ */
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import {
+  PICK_ENV_START,
+  PICK_ENV_TITLE,
+  defaultSpawner,
+  pickNativeDirectory,
+} from './native-path-picker.ts';
+import type { NativePickExec, NativePickRun } from './native-path-picker.ts';
+
+/** 造一个 spawner：按调用顺序吐出预设结果，并记录每次 run（便于断言 argv/env）。 */
+function scripted(results: Partial<NativePickExec>[]): { spawner: (run: NativePickRun) => Promise<NativePickExec>; runs: NativePickRun[] } {
+  const runs: NativePickRun[] = [];
+  let index = 0;
+  return {
+    runs,
+    spawner: async (run) => {
+      runs.push(run);
+      const preset = results[index] ?? {};
+      index += 1;
+      return { code: 0, stdout: '', stderr: '', missing: false, ...preset };
+    },
+  };
+}
+
+test('win32：选中路径 → ok，且起始路径/标题走环境变量而不是命令行', async () => {
+  const { spawner, runs } = scripted([{ code: 0, stdout: 'D:\\Projects\\picked\\\r\n' }]);
+  const result = await pickNativeDirectory({ platform: 'win32', startPath: 'D:\\Projects', title: '选择本机路径', spawner });
+  assert.deepEqual(result, { ok: true, path: 'D:\\Projects\\picked' });
+  const run = runs[0];
+  assert.ok(run !== undefined);
+  assert.equal(run.file, 'powershell');
+  // -STA 必须在：PowerShell 7 默认 MTA，COM 模态窗口会直接失败。
+  assert.ok(run.args.includes('-STA'));
+  assert.equal(run.env[PICK_ENV_START], 'D:\\Projects');
+  assert.equal(run.env[PICK_ENV_TITLE], '选择本机路径');
+  // 用户给的字符串绝不进 argv（否则就等于拼进脚本了）。
+  assert.ok(!run.args.some((arg) => arg.includes('picked') || arg.includes('选择本机路径')));
+});
+
+test('win32：退出码 2（用户取消）→ canceled，不是失败', async () => {
+  const { spawner } = scripted([{ code: 2 }]);
+  assert.deepEqual(await pickNativeDirectory({ platform: 'win32', spawner }), { ok: false, reason: 'canceled' });
+});
+
+test('win32：HRESULT 错误 → failed 并带回 detail', async () => {
+  const { spawner } = scripted([{ code: 3, stderr: 'ERR:-2147024809\r\n' }]);
+  const result = await pickNativeDirectory({ platform: 'win32', spawner });
+  assert.deepEqual(result, { ok: false, reason: 'failed', detail: 'ERR:-2147024809' });
+});
+
+test('win32：powershell 不存在 → unsupported（客户端回落内置浏览器）', async () => {
+  const { spawner } = scripted([{ missing: true, code: null }]);
+  const result = await pickNativeDirectory({ platform: 'win32', spawner });
+  assert.equal(result.ok, false);
+  assert.equal(result.ok === false ? result.reason : '', 'unsupported');
+});
+
+test('win32：空 stdout 当作取消处理（窗口关了但没给路径）', async () => {
+  const { spawner } = scripted([{ code: 0, stdout: '  \r\n' }]);
+  assert.deepEqual(await pickNativeDirectory({ platform: 'win32', spawner }), { ok: false, reason: 'canceled' });
+});
+
+test('win32：盘符根与 POSIX 根的原样保留 / 常规尾部反斜杠剥离', async () => {
+  for (const [stdout, expected] of [
+    ['D:\\\r\n', 'D:\\'],
+    ['D:\\Apps\\nodejs\\\r\n', 'D:\\Apps\\nodejs'],
+    ['/home/me/docs/\r\n', '/home/me/docs'],
+    ['/\r\n', '/'],
+  ] as const) {
+    const { spawner } = scripted([{ code: 0, stdout }]);
+    const result = await pickNativeDirectory({ platform: 'win32', spawner });
+    assert.deepEqual(result, { ok: true, path: expected }, `归一化 ${JSON.stringify(stdout)} 期望 ${expected}`);
+  }
+});
+
+test('darwin：osascript 选中 → ok；取消（-128 / 退出码 1）→ canceled', async () => {
+  const ok = scripted([{ code: 0, stdout: '/Users/me/Documents\n' }]);
+  assert.deepEqual(await pickNativeDirectory({ platform: 'darwin', spawner: ok.spawner }), { ok: true, path: '/Users/me/Documents' });
+  assert.equal(ok.runs[0]?.file, 'osascript');
+
+  const canceled = scripted([{ code: 0, stderr: 'execution error: User canceled. (-128)\n' }]);
+  assert.deepEqual(await pickNativeDirectory({ platform: 'darwin', spawner: canceled.spawner }), { ok: false, reason: 'canceled' });
+});
+
+test('linux：zenity 缺失时自动换 kdialog；两个都没有 → unsupported', async () => {
+  const fallback = scripted([{ missing: true, code: null }, { code: 0, stdout: '/home/me\n' }]);
+  assert.deepEqual(await pickNativeDirectory({ platform: 'linux', startPath: '/home', spawner: fallback.spawner }), { ok: true, path: '/home/me' });
+  assert.equal(fallback.runs[0]?.file, 'zenity');
+  assert.equal(fallback.runs[1]?.file, 'kdialog');
+
+  const none = scripted([{ missing: true, code: null }, { missing: true, code: null }]);
+  const result = await pickNativeDirectory({ platform: 'linux', spawner: none.spawner });
+  assert.equal(result.ok === false ? result.reason : '', 'unsupported');
+});
+
+test('其他平台：直接 unsupported，且根本不 spawn', async () => {
+  const { spawner, runs } = scripted([]);
+  const result = await pickNativeDirectory({ platform: 'freebsd', spawner });
+  assert.equal(result.ok === false ? result.reason : '', 'unsupported');
+  assert.equal(runs.length, 0);
+});
+
+test('defaultSpawner：超时也保留子进程已经吐出的 stderr（排障线索不能丢）', async () => {
+  const script = 'process.stderr.write("boom\\n"); setTimeout(() => {}, 10000)';
+  const exec = await defaultSpawner({ file: process.execPath, args: ['-e', script], env: {}, timeoutMs: 400 });
+  assert.equal(exec.code, null);
+  assert.match(exec.stderr, /timed out/);
+  assert.match(exec.stderr, /boom/);
+});