nx-kv 0.5.0 → 0.7.0

package/src/modules/sessiontask/view.jsx

@@ -36,6 +36,15 @@ export default function SessionTaskView() {
   const [editText, setEditText] = useState('');
   const [editSaving, setEditSaving] = useState(false);
 
+  // 拖拽重排（仅待领取任务）
+  const [dragId, setDragId] = useState(null);
+  const [over, setOver] = useState(null); // { id, pos:'top'|'bottom' }
+  const [reordering, setReordering] = useState(false);
+
+  // 主题勾选（批量删除）
+  const [selected, setSelected] = useState(() => new Set());
+  const [deleting, setDeleting] = useState(false);
+
   const load = useCallback(async () => {
     try {
       setOverview(await api('/api/sessiontasks'));
@@ -101,8 +110,27 @@ export default function SessionTaskView() {
     setActiveKey(w.key);
   }, [topics, activeKey]);
 
+  // 主题被删除后，从勾选集合里剔除失效 key
+  useEffect(() => {
+    setSelected((s) => {
+      const valid = new Set([...s].filter((k) => topics.some((t) => t.key === k)));
+      return valid.size === s.size ? s : valid;
+    });
+  }, [topics]);
+
   const active = topics.find((t) => t.key === activeKey) || null;
 
+  const toggleSelect = (key) =>
+    setSelected((s) => {
+      const n = new Set(s);
+      if (n.has(key)) n.delete(key);
+      else n.add(key);
+      return n;
+    });
+  const allSelected = topics.length > 0 && selected.size === topics.length;
+  const toggleAll = () =>
+    setSelected(allSelected ? new Set() : new Set(topics.map((t) => t.key)));
+
   const submit = () =>
     guard(async () => {
       const body = text.trim();
@@ -138,6 +166,56 @@ export default function SessionTaskView() {
       await load();
     });
 
+  // 删除整个主题（卡片上的「删除主题」）；等待中需二次确认并 force
+  const deleteTopic = (t) =>
+    guard(async () => {
+      const msg = t.waiting
+        ? `主题「${t.name}」正在等待中，删除后其 agent 将超时收尾，确认删除？`
+        : `删除主题「${t.name}」及其全部 ${t.total} 条任务？`;
+      if (!window.confirm(msg)) return;
+      setDeleting(true);
+      try {
+        await api('/api/sessiontasks/topic', {
+          method: 'DELETE',
+          body: t.waiting ? { key: t.key, force: true } : { key: t.key },
+        });
+        setSelected((s) => {
+          const n = new Set(s);
+          n.delete(t.key);
+          return n;
+        });
+        toast('已删除主题');
+        await load();
+      } finally {
+        setDeleting(false);
+      }
+    });
+
+  // 批量删除勾选主题；含等待中时 force 并提示
+  const batchDelete = () =>
+    guard(async () => {
+      if (!selected.size) return;
+      const sel = topics.filter((t) => selected.has(t.key));
+      const waitingCount = sel.filter((t) => t.waiting).length;
+      let msg = `确认删除选中的 ${sel.length} 个主题？`;
+      if (waitingCount) msg += `（其中 ${waitingCount} 个等待中，删除后其 agent 将超时收尾）`;
+      if (!window.confirm(msg)) return;
+      setDeleting(true);
+      try {
+        const r = await api('/api/sessiontasks/topics/remove', {
+          method: 'POST',
+          body: { keys: [...selected], force: waitingCount > 0 },
+        });
+        toast(
+          `已删除 ${r.count} 个主题` + (r.skipped.length ? `，跳过 ${r.skipped.length} 个` : '')
+        );
+        setSelected(new Set());
+        await load();
+      } finally {
+        setDeleting(false);
+      }
+    });
+
   const startEdit = (t) => {
     setEditingId(t.id);
     setEditText(t.text);
@@ -169,6 +247,55 @@ export default function SessionTaskView() {
 
   const tasks = active ? active.tasks.slice().reverse() : [];
 
+  // 待领取任务按「领取优先级」（数组真实顺序，未反转）排列；上移/置后据此定位相邻项
+  const pendingOrder = active ? active.tasks.filter((t) => t.status !== 'consumed') : [];
+
+  // 把 dragId 移到 beforeId 之前 / afterId 之后（数组顺序）
+  const applyReorder = (id, { beforeId, afterId }) =>
+    guard(async () => {
+      setReordering(true);
+      try {
+        await api('/api/sessiontasks/reorder', {
+          method: 'PATCH',
+          body: { cwd: active.cwd, id, beforeId, afterId },
+        });
+        toast('已调整领取优先级');
+        await load();
+      } finally {
+        setReordering(false);
+        setDragId(null);
+        setOver(null);
+      }
+    });
+
+  // 提前/置后一步（在 pending 子序列里移动），作为拖拽之外的兜底（窄屏/触屏友好）
+  const stepPriority = (t, dir) => {
+    const i = pendingOrder.findIndex((x) => x.id === t.id);
+    if (dir === 'up' && i > 0) applyReorder(t.id, { beforeId: pendingOrder[i - 1].id });
+    if (dir === 'down' && i < pendingOrder.length - 1) applyReorder(t.id, { afterId: pendingOrder[i + 1].id });
+  };
+
+  // 表格反转显示：视觉上「上方」= 数组里更靠后。落点在目标行上半 → 拖到它数组之后；
+  // 下半 → 拖到它数组之前。
+  const onRowDragOver = (e, t) => {
+    if (dragId === null || t.status === 'consumed' || dragId === t.id) return;
+    e.preventDefault();
+    e.dataTransfer.dropEffect = 'move';
+    const rect = e.currentTarget.getBoundingClientRect();
+    const pos = e.clientY < rect.top + rect.height / 2 ? 'top' : 'bottom';
+    setOver((o) => (o && o.id === t.id && o.pos === pos ? o : { id: t.id, pos }));
+  };
+  const onRowDrop = (e, t) => {
+    if (dragId === null || t.status === 'consumed' || dragId === t.id) return;
+    e.preventDefault();
+    const rect = e.currentTarget.getBoundingClientRect();
+    const top = e.clientY < rect.top + rect.height / 2;
+    const moved = dragId;
+    setDragId(null);
+    setOver(null);
+    applyReorder(moved, top ? { afterId: t.id } : { beforeId: t.id });
+  };
+
   return (
     <>
       <div className="card" style={{ padding: '10px 14px' }}>
@@ -202,17 +329,34 @@ export default function SessionTaskView() {
       </div>
 
       <div className="colhead">
+        <input
+          type="checkbox"
+          checked={allSelected}
+          onChange={toggleAll}
+          disabled={!topics.length}
+          title="全选 / 取消全选"
+          style={{ margin: 0 }}
+        />
         <h3>主题总览（按工作目录）</h3>
         <span className="muted">{overview ? `${topics.length} 个 · 等待中 ${overview.waiting}` : ''}</span>
-        <button
-          className="btn small ghost"
-          onClick={prune}
-          disabled={pruning}
-          style={{ marginLeft: 'auto' }}
-          title="清理旧模型无目录主题与空主题（等待中一律保留）"
-        >
-          {pruning ? '清理中…' : '清理旧数据'}
-        </button>
+        <span style={{ marginLeft: 'auto', display: 'flex', gap: 8 }}>
+          <button
+            className="btn small ghost"
+            onClick={batchDelete}
+            disabled={!selected.size || deleting}
+            title="删除勾选的主题（含其全部任务）"
+          >
+            {deleting ? '删除中…' : `批量删除${selected.size ? ` (${selected.size})` : ''}`}
+          </button>
+          <button
+            className="btn small ghost"
+            onClick={prune}
+            disabled={pruning}
+            title="清理旧模型无目录主题与空主题（等待中一律保留）"
+          >
+            {pruning ? '清理中…' : '清理旧数据'}
+          </button>
+        </span>
       </div>
 
       <div style={{ display: 'flex', gap: 10, flexWrap: 'wrap', marginBottom: 14 }}>
@@ -220,7 +364,7 @@ export default function SessionTaskView() {
           topics.map((t) => {
             const isActive = t.key === activeKey;
             return (
-              <button
+              <div
                 key={t.key}
                 onClick={() => setActiveKey(t.key)}
                 className="card"
@@ -229,21 +373,31 @@ export default function SessionTaskView() {
                   width: 270,
                   padding: '10px 12px',
                   cursor: 'pointer',
-                  font: 'inherit',
-                  color: 'inherit',
                   border: isActive ? '1px solid var(--ink,#14161a)' : '1px solid transparent',
                   boxShadow: isActive
                     ? '0 0 0 2px rgba(20,22,26,.12)'
                     : '0 1px 2px rgba(20,22,26,.06), 0 6px 16px rgba(20,22,26,.05)',
                 }}
               >
-                <div style={{ fontWeight: 700, marginBottom: 2 }}>{t.name || '（未命名）'}</div>
-                <div
-                  className="mono muted"
-                  title={t.cwd}
-                  style={{ fontSize: 11, wordBreak: 'break-all', marginBottom: 6, minHeight: 15 }}
-                >
-                  {t.cwd || '（旧数据，无目录）'}
+                <div style={{ display: 'flex', gap: 8, alignItems: 'flex-start' }}>
+                  <input
+                    type="checkbox"
+                    checked={selected.has(t.key)}
+                    onChange={() => toggleSelect(t.key)}
+                    onClick={(e) => e.stopPropagation()}
+                    title="选择以批量删除"
+                    style={{ margin: '3px 0 0' }}
+                  />
+                  <div style={{ flex: 1, minWidth: 0 }}>
+                    <div style={{ fontWeight: 700, marginBottom: 2 }}>{t.name || '（未命名）'}</div>
+                    <div
+                      className="mono muted"
+                      title={t.cwd}
+                      style={{ fontSize: 11, wordBreak: 'break-all', marginBottom: 6, minHeight: 15 }}
+                    >
+                      {t.cwd || '（旧数据，无目录）'}
+                    </div>
+                  </div>
                 </div>
                 {t.summary && (
                   <div className="muted" style={{ fontSize: 11, whiteSpace: 'pre-wrap', marginBottom: 6 }}>
@@ -260,7 +414,20 @@ export default function SessionTaskView() {
                     待领取 {t.pending}/{t.total}
                   </span>
                 </div>
-              </button>
+                <div
+                  style={{ display: 'flex', justifyContent: 'flex-end', marginTop: 8 }}
+                  onClick={(e) => e.stopPropagation()}
+                >
+                  <button
+                    className="btn small ghost"
+                    onClick={() => deleteTopic(t)}
+                    disabled={deleting}
+                    title="删除整个主题（含全部任务）"
+                  >
+                    删除主题
+                  </button>
+                </div>
+              </div>
             );
           })
         ) : (
@@ -298,23 +465,55 @@ export default function SessionTaskView() {
           <div className="colhead">
             <h3>该主题的任务队列</h3>
             <span className="muted">待领取 {active.pending} · 共 {active.total} 条</span>
+            <span className="muted" style={{ fontSize: 12, marginLeft: 'auto' }}>
+              拖拽待领取行（或用「提前/置后」）调整领取优先级
+            </span>
           </div>
 
           <div className="card" style={{ padding: 4 }}>
             <table>
               <thead>
                 <tr>
+                  <th style={{ width: 34 }}></th>
                   <th style={{ width: 56 }}>#</th>
                   <th>任务</th>
                   <th style={{ width: 80 }}>状态</th>
                   <th style={{ width: 160 }}>时间</th>
-                  <th style={{ width: 76 }}>操作</th>
+                  <th style={{ width: 150 }}>操作</th>
                 </tr>
               </thead>
               <tbody>
                 {tasks.length ? (
-                  tasks.map((t) => (
-                    <tr key={t.id}>
+                  tasks.map((t) => {
+                    const isPending = t.status !== 'consumed';
+                    const isDrag = dragId === t.id;
+                    const isOver = over && over.id === t.id;
+                    return (
+                    <tr
+                      key={t.id}
+                      draggable={isPending && editingId !== t.id}
+                      onDragStart={(e) => {
+                        setDragId(t.id);
+                        e.dataTransfer.effectAllowed = 'move';
+                        try { e.dataTransfer.setData('text/plain', String(t.id)); } catch { /* 某些浏览器需 setData 才能拖拽 */ }
+                      }}
+                      onDragOver={(e) => onRowDragOver(e, t)}
+                      onDrop={(e) => onRowDrop(e, t)}
+                      onDragEnd={() => { setDragId(null); setOver(null); }}
+                      style={{
+                        cursor: isPending && editingId !== t.id ? 'grab' : 'default',
+                        opacity: isDrag ? 0.4 : 1,
+                        boxShadow: isOver
+                          ? over.pos === 'top'
+                            ? 'inset 0 2px 0 var(--ink,#14161a)'
+                            : 'inset 0 -2px 0 var(--ink,#14161a)'
+                          : 'none',
+                        background: isOver ? 'rgba(20,22,26,.04)' : undefined,
+                      }}
+                    >
+                      <td className="mono muted" title="按住拖拽调整优先级" style={{ textAlign: 'center', userSelect: 'none' }}>
+                        {isPending ? '⠿' : ''}
+                      </td>
                       <td className="mono">#{t.id}</td>
                       <td style={{ whiteSpace: 'pre-wrap' }}>
                         {editingId === t.id ? (
@@ -369,16 +568,38 @@ export default function SessionTaskView() {
                       </td>
                       <td className="mono">{t.consumedAt || t.createdAt}</td>
                       <td className="ops">
-                        {t.status !== 'consumed' && editingId !== t.id && (
-                          <button className="btn small ghost" onClick={() => startEdit(t)}>编辑</button>
-                        )}
+                        {isPending && editingId !== t.id && (() => {
+                          const pi = pendingOrder.findIndex((x) => x.id === t.id);
+                          return (
+                            <>
+                              <button className="btn small ghost" onClick={() => startEdit(t)}>编辑</button>
+                              <button
+                                className="btn small ghost"
+                                title="提高优先级（更早被领取）"
+                                disabled={reordering || pi <= 0}
+                                onClick={() => stepPriority(t, 'up')}
+                              >
+                                提前
+                              </button>
+                              <button
+                                className="btn small ghost"
+                                title="降低优先级（更晚被领取）"
+                                disabled={reordering || pi >= pendingOrder.length - 1}
+                                onClick={() => stepPriority(t, 'down')}
+                              >
+                                置后
+                              </button>
+                            </>
+                          );
+                        })()}
                         <button className="btn small ghost" onClick={() => remove(t.id)}>删除</button>
                       </td>
                     </tr>
-                  ))
+                    );
+                  })
                 ) : (
                   <tr>
-                    <td colSpan="5" className="muted" style={{ textAlign: 'center', padding: '22px 0' }}>
+                    <td colSpan="6" className="muted" style={{ textAlign: 'center', padding: '22px 0' }}>
                       （暂无任务，在上方回填第一条）
                     </td>
                   </tr>

package/src/web/public/assets/{CliHints-ChSGOGe2.js → CliHints-BcGuVv3q.js}

@@ -1 +1 @@
-import{o as e,s as t,t as n}from"./index-BRHRrC1Y.js";var r=t();function i({module:t}){let{boot:i}=e(),a=(i?.commands||[]).filter(e=>e.module===t);return a.length?(0,r.jsxs)(`div`,{className:`cli-hint`,children:[(0,r.jsx)(`span`,{className:`cli-hint-label`,children:`CLI 等价（同构命令，加 --json 得机器可读输出）：`}),a.map(e=>(0,r.jsx)(n,{className:`cli-cmd`,text:e.command,title:`点击复制：${e.usage}`,children:e.command},e.id))]}):null}export{i as t};
+import{o as e,s as t,t as n}from"./index-BC4hXOgL.js";var r=t();function i({module:t}){let{boot:i}=e(),a=(i?.commands||[]).filter(e=>e.module===t);return a.length?(0,r.jsxs)(`div`,{className:`cli-hint`,children:[(0,r.jsx)(`span`,{className:`cli-hint-label`,children:`CLI 等价（同构命令，加 --json 得机器可读输出）：`}),a.map(e=>(0,r.jsx)(n,{className:`cli-cmd`,text:e.command,title:`点击复制：${e.usage}`,children:e.command},e.id))]}):null}export{i as t};