ygc-dsh-sync 1.1.0 → 1.2.1

package/client.js

@@ -113,7 +113,8 @@ function makePanel(React) {
     const [note, setNote] = useState(null);
     const [midDraft, setMidDraft] = useState('');
     const [scan, setScan] = useState(null);
-    const [registerPicks, setRegisterPicks] = useState([]);
+    // 特征文件夹采纳：面板上待人工决定的那些（路径数组）
+    const [featurePicks, setFeaturePicks] = useState([]);
     const [patrolTime, setPatrolTime] = useState('');
     const [skillScan, setSkillScan] = useState(null);
     const [skillPicks, setSkillPicks] = useState([]);
@@ -186,10 +187,19 @@ function makePanel(React) {
       setBusy('backup');
       setNote(null);
       try {
-        const r = await call('/backup', { workspaceIds: selected || [] });
+        // 只执行「选中」的工作区；一个都没选就什么都不做（不默认全选）
+        const ids = selected || [];
+        if (!ids.length) {
+          setNote({ tone: 'err', text: '请先勾选要备份的工作区' });
+          return;
+        }
+        const r = await call('/backup', { workspaceIds: ids });
+        const skipped = (r.skipped || []).length;
         setNote({
           tone: 'ok',
-          text: `备份完成：新增 ${r.summary.created}、更新 ${r.summary.updated}，共 ${fmtBytes(r.summary.bytes)}`,
+          text:
+            `备份完成：新增 ${r.summary.created}、更新 ${r.summary.updated}，共 ${fmtBytes(r.summary.bytes)}` +
+            (skipped ? `；跳过 ${skipped} 个没有本机特征文件夹的` : ''),
         });
         await load();
       } catch (e) {
@@ -203,17 +213,26 @@ function makePanel(React) {
       setBusy('pull');
       setNote(null);
       try {
-        const r = await call('/pull', { workspaceIds: selected || [] });
+        const ids = selected || [];
+        if (!ids.length) {
+          setNote({ tone: 'err', text: '请先勾选要拉取的工作区' });
+          return;
+        }
+        const r = await call('/pull', { workspaceIds: ids });
         const s = r.summary;
         const parts = [`新增 ${s.imported}`, `更新 ${s.updated}`];
         if (s.forked) parts.push(`分叉 ${s.forked}`);
+        // 归属登记是拉取的一部分，不再单列按钮
         if (s.attached) parts.push(`登记归属 ${s.attached}`);
         if (s.attachFailed) parts.push(`登记失败 ${s.attachFailed}`);
+        if (r.unregistered && r.unregistered.length) {
+          parts.push(`${r.unregistered.length} 个目录要你先建特征文件夹`);
+        }
         setNote({
           tone: r.needsRestart ? 'warn' : 'ok',
           text: `拉取完成：${parts.join('、')}${
             r.needsRestart
-              ? '。有会话没能登记进工作区，重启 DSH 后仍会落在「未分组」，请看状态栏提示。'
+              ? '。有会话没能登记进工作区，重启 DSH 后仍会落在「未分组」。'
               : '。会话已归到对应工作区，侧栏可直接看到。'
           }`,
         });
@@ -226,23 +245,84 @@ function makePanel(React) {
     };
 
     /**
-     * 补登记：把旧版拉进来、但没进工作区归属账的会话修回去。
+     * 采纳：在选中的目录里建本机特征文件夹（未注册的顺带注册成工作区）。
      *
-     * 默认只补拉取产物；自动化/子代理留下的会话不算，不会一次刷出上百条。
+     * 这是「检测到匹配的工作区文件夹 → 人工选择」的那个人工入口。
+     * 点完立刻生效：进侧边栏，参与备份与拉取。
      */
-    const doAttachRepair = async () => {
-      setBusy('attach');
+    const doAdopt = async (paths) => {
+      const list = (paths || featurePicks || []).filter(Boolean);
+      if (!list.length) {
+        setNote({ tone: 'err', text: '请先勾选要建特征文件夹的目录' });
+        return;
+      }
+      setBusy('adopt');
       setNote(null);
       try {
-        const r = await call('/attach/repair', { workspaceIds: selected || [] });
-        const s = r.summary;
+        const r = await call('/features/adopt', { paths: list });
+        const bits = [`已建本机特征文件夹 ${r.adopted.length} 个`];
+        if (r.registered && r.registered.length) bits.push(`注册工作区 ${r.registered.length} 个`);
+        if (r.errors && r.errors.length) bits.push(`${r.errors.length} 个失败`);
+        setNote({ tone: r.errors && r.errors.length ? 'warn' : 'ok', text: bits.join('，') });
+        setFeaturePicks([]);
+        await load();
+      } catch (e) {
+        setNote({ tone: 'err', text: String((e && e.message) || e) });
+      } finally {
+        setBusy('');
+      }
+    };
+
+    /** 跳过：这个目录本机不建格子，之后巡检不再反复问（可在面板上改主意）。 */
+    const doDecline = async (paths) => {
+      const list = (paths || featurePicks || []).filter(Boolean);
+      if (!list.length) {
+        setNote({ tone: 'err', text: '请先勾选要跳过的目录' });
+        return;
+      }
+      setBusy('decline');
+      setNote(null);
+      try {
+        await call('/features/decline', { paths: list });
+        setNote({ tone: 'ok', text: `已跳过 ${list.length} 个目录（本机不建特征文件夹）` });
+        setFeaturePicks([]);
+        await load();
+      } catch (e) {
+        setNote({ tone: 'err', text: String((e && e.message) || e) });
+      } finally {
+        setBusy('');
+      }
+    };
+
+    /**
+     * 删工作区（= 删本机特征文件夹，1.2.1 起两者是同一件事）。
+     *
+     * 插件里不再提供「只删格子、留着工作区」的入口：那条路会让工作区变成
+     * 「已注册但没格子」，下一轮巡检必然把它列回人工队列，用户看到的就是
+     * 「删了又自己冒出来」。所以这里只保留一个动作，且必须删注册。
+     */
+    const doDrop = async (paths) => {
+      const list = (paths || []).filter(Boolean);
+      if (!list.length) return;
+      if (typeof window !== 'undefined' && typeof window.confirm === 'function') {
+        if (
+          !window.confirm(
+            '会从侧边栏删除这个工作区，并清掉本机特征文件夹（本机不再同步它）。\n目录内容、会话文件、其他机器的备份都不受影响。继续？',
+          )
+        ) {
+          return;
+        }
+      }
+      setBusy('drop');
+      setNote(null);
+      try {
+        const r = await call('/features/drop', { paths: list });
+        const errs = (r.errors || []).length;
         setNote({
-          tone: s.failed ? 'warn' : s.attached ? 'ok' : 'ok',
-          text: s.attached
-            ? `补登记完成：${s.attached} 个会话已归回工作区${s.failed ? `，${s.failed} 个失败（路径不可达）` : ''}`
-            : s.failed
-              ? `没有可补的会话；${s.failed} 个登记失败，多半是工作区路径当前不可访问`
-              : '补登记完成：没有需要补的会话（都已在正确的工作区里）',
+          tone: errs ? 'warn' : 'ok',
+          text: `已删除 ${r.dropped.length} 个工作区，并清掉对应本机特征文件夹${
+            errs ? `；${errs} 个失败：${r.errors[0].message}` : ''
+          }`,
         });
         await load();
       } catch (e) {
@@ -274,13 +354,14 @@ function makePanel(React) {
       try {
         const r = await call('/patrol/scan', {});
         setScan(r);
-        const nd = r.discover.length;
-        const nr = r.repair.length;
+        const np = (r.pending || []).length;
+        // 只勾选还没表态过的（被拒绝过的默认不勾，免得误操作）
+        setFeaturePicks((r.pending || []).filter((p) => p.why === 'unregistered' || p.why === 'existing').map((p) => p.path));
         setNote({
-          tone: nd || nr ? 'warn' : 'ok',
-          text: nd || nr
-            ? `巡检完成：发现 ${nd} 个待注册文件夹、${nr} 个缺特征文件夹的工作区`
-            : '巡检完成：没有需要处理的项目',
+          tone: np ? 'warn' : 'ok',
+          text: np
+            ? `巡检完成：${np} 个目录等你决定要不要在本机建特征文件夹`
+            : '巡检完成：没有需要你决定的项目',
         });
         await load();
       } catch (e) {
@@ -290,38 +371,18 @@ function makePanel(React) {
       }
     };
 
-    const doRegister = async () => {
-      const picked = (scan && scan.discover ? scan.discover : [])
-        .filter((d) => (registerPicks || []).includes(d.path))
-        .map((d) => d.path);
-      if (!picked.length) {
-        setNote({ tone: 'err', text: '请先勾选要注册的文件夹' });
+    /** 补建格子：只补面板上选中的工作区（不再「一点就全补」）。 */
+    const doRepair = async () => {
+      const ids = selected || [];
+      const targets = (state.workspaces || []).filter((w) => ids.includes(w.id)).map((w) => w.path);
+      if (!targets.length) {
+        setNote({ tone: 'err', text: '请先在「匹配的工作区」里勾选要补建特征文件夹的工作区' });
         return;
       }
-      setBusy('register');
-      try {
-        const r = await call('/patrol/register', { paths: picked });
-        setNote({
-          tone: r.errors.length ? 'warn' : 'ok',
-          text: `已注册 ${r.registered.length} 个工作区${
-            r.errors.length ? `，${r.errors.length} 个失败` : ''
-          }，本机特征文件夹已补齐`,
-        });
-        setRegisterPicks([]);
-        setScan(null);
-        await load();
-      } catch (e) {
-        setNote({ tone: 'err', text: String((e && e.message) || e) });
-      } finally {
-        setBusy('');
-      }
-    };
-
-    const doRepair = async () => {
       setBusy('repair');
       try {
-        const r = await call('/patrol/repair', {});
-        setNote({ tone: 'ok', text: `已补全 ${r.created.length} 个特征文件夹` });
+        const r = await call('/patrol/repair', { paths: targets });
+        setNote({ tone: 'ok', text: `已补建 ${r.created.length} 个本机特征文件夹` });
         await load();
       } catch (e) {
         setNote({ tone: 'err', text: String((e && e.message) || e) });
@@ -648,7 +709,7 @@ function makePanel(React) {
         h(
           'p',
           { className: 'dsb-sub', style: { marginBottom: 12 } },
-          '扫描特定文件夹下的直接子目录：含 .dsh-sync/ 但未注册的会列出来等你确认；已注册但缺本机特征文件夹的自动补齐。',
+          '扫描特定文件夹下的直接子目录：含 .dsh-sync/ 但本机还没建特征文件夹的会列出来等你在下面勾选；建了格子才参与备份与拉取。被别人/别的工具删掉的格子会自动补回来。',
         ),
         h(
           'div',
@@ -660,8 +721,8 @@ function makePanel(React) {
           ),
           h(
             'button',
-            { className: 'dsb-btn dsb-btn-sm', onClick: doRepair, disabled: !!busy },
-            busy === 'repair' ? '补全中…' : '补全特征文件夹',
+            { className: 'dsb-btn dsb-btn-sm', onClick: doRepair, disabled: !!busy || !(selected || []).length },
+            busy === 'repair' ? '补建中…' : '给选中项补建格子',
           ),
           h(
             'label',
@@ -695,71 +756,103 @@ function makePanel(React) {
           h('span', { className: 'dsb-row-t' }, '分钟巡检一次'),
         ),
 
-        // 扫描结果
-        scan
-          ? h(
-              'div',
-              { style: { marginTop: 14 } },
-              scan.discover.length
-                ? h(
-                    'div',
-                    null,
-                    h('div', { className: 'dsb-row-t', style: { marginBottom: 6 } }, `发现 ${scan.discover.length} 个待注册文件夹`),
-                    scan.discover.map((d) =>
+        // 巡检结果：待人工决定的采纳候选
+        (scan || (state.features && state.features.pendingCount))
+          ? (() => {
+              const pendingList = (scan && scan.pending) || (state.features && state.features.pending) || [];
+              const whyText = {
+                // 矩阵里唯一要人决定的两档
+                othersOnly: '别的机器有特征文件夹，本机没有',
+                structureOnly: '目录里有同步结构，本机没建特征文件夹',
+                unregistered: '检测到匹配目录，本机没建特征文件夹',
+                existing: '已注册成工作区，本机没建特征文件夹',
+                declined: '你之前选了不建（可改主意）',
+              };
+              return h(
+                'div',
+                { style: { marginTop: 14 } },
+                pendingList.length
+                  ? h(
+                      'div',
+                      null,
                       h(
                         'div',
-                        { className: 'dsb-ws', key: d.path },
-                        h('input', {
-                          type: 'checkbox',
-                          className: 'dsb-chk',
-                          checked: registerPicks.includes(d.path),
-                          onChange: () =>
-                            setRegisterPicks((cur) =>
-                              cur.includes(d.path) ? cur.filter((x) => x !== d.path) : [...cur, d.path],
-                            ),
-                        }),
+                        { className: 'dsb-row-t', style: { marginBottom: 6 } },
+                        `${pendingList.length} 个目录等你决定：要不要在本机建特征文件夹`,
+                      ),
+                      pendingList.map((d) =>
                         h(
                           'div',
-                          { className: 'dsb-ws-body' },
-                          h('div', { className: 'dsb-row-t' }, d.title),
-                          h('div', { className: 'dsb-row-d' }, d.path),
+                          { className: 'dsb-ws', key: d.path },
+                          h('input', {
+                            type: 'checkbox',
+                            className: 'dsb-chk',
+                            checked: featurePicks.includes(d.path),
+                            onChange: () =>
+                              setFeaturePicks((cur) =>
+                                cur.includes(d.path) ? cur.filter((x) => x !== d.path) : [...cur, d.path],
+                              ),
+                          }),
+                          h(
+                            'div',
+                            { className: 'dsb-ws-body' },
+                            h(
+                              'div',
+                              { className: 'dsb-row-t' },
+                              d.title,
+                              h('span', { className: 'dsb-tag dsb-tag-warn' }, whyText[d.why] || d.why),
+                            ),
+                            h('div', { className: 'dsb-row-d' }, d.path),
+                            d.others && d.others.length
+                              ? h('div', { className: 'dsb-row-d' }, `别的机器：${d.others.join(' · ')}`)
+                              : null,
+                          ),
                         ),
                       ),
-                    ),
-                    h(
-                      'div',
-                      { className: 'dsb-actions', style: { marginTop: 10 } },
                       h(
-                        'button',
-                        {
-                          className: 'dsb-btn dsb-btn-primary dsb-btn-sm',
-                          disabled: !!busy || !registerPicks.length,
-                          onClick: doRegister,
-                        },
-                        busy === 'register' ? '注册中…' : `注册选中（${registerPicks.length}）`,
+                        'div',
+                        { className: 'dsb-actions', style: { marginTop: 10 } },
+                        h(
+                          'button',
+                          {
+                            className: 'dsb-btn dsb-btn-primary dsb-btn-sm',
+                            disabled: !!busy || !featurePicks.length,
+                            onClick: () => doAdopt(),
+                          },
+                          busy === 'adopt' ? '建立中…' : `建特征文件夹并注册（${featurePicks.length}）`,
+                        ),
+                        h(
+                          'button',
+                          {
+                            className: 'dsb-btn dsb-btn-sm',
+                            disabled: !!busy || !featurePicks.length,
+                            onClick: () => doDecline(),
+                          },
+                          busy === 'decline' ? '记录中…' : '跳过这些目录',
+                        ),
+                        h(
+                          'button',
+                          {
+                            className: 'dsb-btn dsb-btn-sm',
+                            onClick: () => setFeaturePicks(pendingList.map((d) => d.path)),
+                          },
+                          '全选',
+                        ),
+                        h(
+                          'button',
+                          { className: 'dsb-btn dsb-btn-sm', onClick: () => setFeaturePicks([]) },
+                          '清空选择',
+                        ),
                       ),
                       h(
-                        'button',
-                        {
-                          className: 'dsb-btn dsb-btn-sm',
-                          onClick: () => setRegisterPicks(scan.discover.map((d) => d.path)),
-                        },
-                        '全选',
+                        'p',
+                        { className: 'dsb-sub', style: { marginTop: 8 } },
+                        '建完立刻进侧边栏、参与备份与拉取；跳过的目录本机不建格子，也不参与同步。',
                       ),
-                    ),
-                  )
-                : h('div', { className: 'dsb-empty' }, '没有待注册的文件夹'),
-              scan.repair.length
-                ? h(
-                    'div',
-                    { style: { marginTop: 12 } },
-                    h('div', { className: 'dsb-row-t' }, `缺本机特征文件夹：${scan.repair.length} 个`),
-                    scan.repair.map((r) =>
-                      h('div', { className: 'dsb-row-d', key: r.path }, `${r.title} — ${r.path}`),
-                    ),
-                  )
-                : null,
-            )
+                    )
+                  : h('div', { className: 'dsb-empty' }, '没有待你决定的目录'),
+              );
+            })()
           : null,
       ),
 
@@ -837,20 +930,21 @@ function makePanel(React) {
           { className: 'dsb-actions', style: { marginTop: 14 } },
           h(
             'button',
-            { className: 'dsb-btn dsb-btn-primary', onClick: doBackup, disabled: !!busy || ws.length === 0 },
-            busy === 'backup' ? '备份中…' : '立即备份全部',
+            { className: 'dsb-btn dsb-btn-primary', onClick: doBackup, disabled: !!busy || !(selected || []).length },
+            busy === 'backup' ? '备份中…' : `备份选中的 ${(selected || []).length} 个`,
           ),
           h(
             'button',
-            { className: 'dsb-btn', onClick: doPull, disabled: !!busy || ws.length === 0 },
-            busy === 'pull' ? '拉取中…' : '一键拉取',
+            { className: 'dsb-btn', onClick: doPull, disabled: !!busy || !(selected || []).length },
+            busy === 'pull' ? '拉取中…' : `拉取选中的 ${(selected || []).length} 个`,
           ),
           h(
-            'button',
-            { className: 'dsb-btn', onClick: doAttachRepair, disabled: !!busy || ws.length === 0 },
-            busy === 'attach' ? '补登记中…' : '补登记归属',
+            'span',
+            { className: 'dsb-row-d' },
+            (selected || []).length
+              ? `已选 ${(selected || []).length} 个工作区（只对有本机特征文件夹的生效；拉取时自动登记归属）`
+              : '请先勾选工作区：按钮只执行选中项',
           ),
-          h('span', { className: 'dsb-row-d' }, `已选 ${(selected || []).length} 个工作区`),
         ),
       ),
 
@@ -860,7 +954,7 @@ function makePanel(React) {
         h(
           'div',
           { className: 'dsb-card-h' },
-          h('h3', { className: 'dsb-card-t' }, '匹配的工作区'),
+          h('h3', { className: 'dsb-card-t' }, '匹配的工作区（有本机特征文件夹）'),
           ws.length
             ? h(
                 'button',
@@ -873,7 +967,11 @@ function makePanel(React) {
             : null,
         ),
         ws.length === 0
-          ? h('div', { className: 'dsb-empty' }, '没有工作区落在已设置的文件夹里。')
+          ? h(
+              'div',
+              { className: 'dsb-empty' },
+              '还没有工作区建好本机特征文件夹。在上面的巡检结果里勾选目录、点「建特征文件夹并注册」才会出现在这里。',
+            )
           : ws.map((w) =>
               h(
                 'div',
@@ -912,9 +1010,58 @@ function makePanel(React) {
                         w.others.map((o) => `${o.machineId}：${o.sessions} 个`).join(' · '),
                       )
                     : null,
+                  h(
+                    'div',
+                    { className: 'dsb-actions', style: { marginTop: 6 } },
+                    h(
+                      'button',
+                      {
+                        className: 'dsb-btn dsb-btn-sm dsb-btn-danger',
+                        disabled: !!busy,
+                        title: '删除工作区，连带清掉本机特征文件夹；目录内容与别人的备份不动',
+                        onClick: () => doDrop([w.path]),
+                      },
+                      '删除工作区',
+                    ),
+                  ),
                 ),
               ),
             ),
+
+        // 匹配但没建格子的：列在这里，方便随时补上
+        (state.inactive || []).length
+          ? h(
+              'div',
+              { style: { marginTop: 14 } },
+              h(
+                'div',
+                { className: 'dsb-row-t', style: { marginBottom: 6 } },
+                `未参与同步：${state.inactive.length} 个（没有本机特征文件夹）`,
+              ),
+              (state.inactive || []).map((w) =>
+                h(
+                  'div',
+                  { className: 'dsb-row', key: w.id },
+                  h(
+                    'div',
+                    { className: 'dsb-row-main' },
+                    h('div', { className: 'dsb-row-t' }, w.title),
+                    h('div', { className: 'dsb-row-d' }, w.reason || '未建本机特征文件夹'),
+                    h('div', { className: 'dsb-row-d' }, w.path),
+                  ),
+                  h(
+                    'button',
+                    {
+                      className: 'dsb-btn dsb-btn-sm',
+                      disabled: !!busy,
+                      onClick: () => doAdopt([w.path]),
+                    },
+                    '建特征文件夹',
+                  ),
+                ),
+              ),
+            )
+          : null,
       ),
 
       // 插件清单同步（1.0.0 从自动更新器迁入）