npm - coxpit - Versions diffs - 4.1.0 → 4.2.0 - Mend

coxpit 4.1.0 → 4.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md CHANGED Viewed

@@ -110,7 +110,7 @@ One daemon, one SQLite file, zero external services. Machines are reached over S
 ## Status
-`v4.1` — fleet, two providers (Claude Code · Codex) with per-launch model choice, compare/merge + AI review + doc mode with settle-time snapshots, terminal (full-screen, session tabs, mobile input bar), swarm (plan fan-out · integrate · agent self-orchestration), sessions (steer/ask · resume), mobile board with deep links, GitHub import, read-only share links that render documents, a close guard, and per-repo base branch override — all shipped and e2e-tested (35 checks). Roadmap: ROADMAP.md.
+`v4.2` — everything in v4.1 plus **run grouping**: goal fan-outs and agent swarms cluster into bands on the board (title · N tasks · M settled, with fold, group Select runs, and Close group), and multi-run tasks get `run i/n` attempt counters so same-title cards read as attempts, not duplicates. All shipped and e2e-tested (36 checks). Roadmap: ROADMAP.md.
 ## License

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "coxpit",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Self-hosted cockpit for running a fleet of AI coding agents across your own machines — parallel worktree runs, live board, compare & merge, web terminal, design capture.",
   "type": "module",
   "license": "MIT",

package/src/board.ts CHANGED Viewed

@@ -141,6 +141,17 @@ export const BOARD_HTML = /* html */ `<!doctype html>
   /* ── run cards ──────────────────────────── */
   .grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(360px,1fr));gap:14px}
+  /* ── group bands (goal/swarm 형제 묶음) — 점선 클러스터, 좌측 액센트 바·채움 금지 ── */
+  .gband{grid-column:1/-1;border:1px dashed var(--line-hi);border-radius:14px;padding:12px;margin-bottom:0}
+  .gband-h{display:flex;align-items:center;gap:10px;margin-bottom:10px;font-family:var(--mono)}
+  .gband-glyph{color:var(--brand);font-size:13px}
+  .gband-t{color:var(--ink);font-size:12.5px;font-weight:600;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:40%}
+  .gband-n{color:var(--faint);font-size:11px}
+  .gband-sp{flex:1}
+  .gband-fold{background:none;border:none;color:var(--muted);cursor:pointer;font-size:12px}
+  .gband.folded .gband-grid{display:none}
+  .gband-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(360px,1fr));gap:14px}
+  .attempt{color:var(--brand);opacity:.8}
   .card{border:1px solid var(--line);border-radius:var(--r-card);background:var(--surface);
     overflow:hidden;display:flex;flex-direction:column;cursor:pointer;
     transition:border-color .18s,transform .18s,box-shadow .18s}
@@ -625,6 +636,7 @@ export const BOARD_HTML = /* html */ `<!doctype html>
 <script>
 const runs = new Map();      // runId -> run object
 const tasks = new Map();     // taskId -> task
+const groups = new Map();    // groupId -> {id, kind, title}
 let repos = [], machines = [], captures = [];
 const $ = (id) => document.getElementById(id);
@@ -828,12 +840,56 @@ function chipHTML(status){
   return '<span class="chip '+(s==='running'?'running':'')+'" style="color:'+statusColor(s)+';border-color:'+statusColor(s)+'">'
     + '<i></i>'+esc(s)+'</span>';
 }
+/* 같은 태스크에 run 이 여럿이면 "run i/n" — 같은 제목 카드가 중복이 아니라 시도로 읽히게 */
+function attemptHTML(r){
+  const sib = [...runs.values()].filter(x=>x.taskId===r.taskId).sort((a,b)=>a.id-b.id);
+  if (sib.length<2) return '';
+  const i = sib.findIndex(x=>x.id===r.id)+1;
+  return '<span class="attempt" title="attempt within this task">run '+i+'/'+sib.length+'</span>';
+}
+/* ── group fold 상태(기기별, WS 재렌더에도 유지) ── */
+let gfold = new Set();
+try{ gfold = new Set(JSON.parse(localStorage.getItem('coxpit.gfold')||'[]')); }catch{}
+function saveGfold(){ try{ localStorage.setItem('coxpit.gfold', JSON.stringify([...gfold])); }catch{} }
+/* 태스크의 모든 run 이 정착했는가 */
+function taskSettled(taskId){
+  const rs = [...runs.values()].filter(r=>r.taskId===taskId);
+  return rs.length>0 && rs.every(r=>['done','failed','stopped','merged'].includes(r.status));
+}
+function bandHTML(g, grpRuns){
+  const glyph = g.kind==='swarm' ? '↳' : '⌁';
+  const title = g.kind==='swarm' ? 'swarm of: '+esc(g.title) : esc(g.title);
+  const taskIds = [...new Set(grpRuns.map(r=>r.taskId))];
+  const settled = taskIds.filter(taskSettled).length;
+  const folded = gfold.has(g.id);
+  const cards = grpRuns.slice().sort((a,b)=>a.id-b.id).map(cardHTML).join('');
+  return '<div class="gband'+(folded?' folded':'')+'" data-g="'+g.id+'">'
+    + '<div class="gband-h"><span class="gband-glyph">'+glyph+'</span>'
+    + '<span class="gband-t">'+title+'</span>'
+    + '<span class="gband-n">'+taskIds.length+' task'+(taskIds.length>1?'s':'')+' · '+settled+' settled</span>'
+    + '<span class="gband-sp"></span>'
+    + '<button class="btn-ghost sm" data-gsel="'+g.id+'">Select runs</button>'
+    + '<button class="btn-ghost sm" data-gclose="'+g.id+'">Close group</button>'
+    + '<button class="gband-fold" data-gfold="'+g.id+'" title="fold">'+(folded?'▸':'▾')+'</button></div>'
+    + '<div class="gband-grid">'+cards+'</div></div>';
+}
 function render(){
   const list = [...runs.values()].sort((a,b)=>b.id-a.id);
   $('empty').style.display = list.length ? 'none' : 'flex';
-  if (!list.length) paintOnboarding();
-  $('grid').innerHTML = list.map(cardHTML).join('');
+  if (!list.length){ paintOnboarding(); $('grid').innerHTML=''; return; }
+  // 그룹 파티션 — grouped run 은 밴드로 클러스터, ungrouped 는 뒤에 flat.
+  const byGroup = new Map(); const flat = [];
+  for (const r of list){
+    const t = tasks.get(r.taskId);
+    const gid = t && t.groupId!=null && groups.has(t.groupId) ? t.groupId : null;
+    if (gid==null) flat.push(r);
+    else { if(!byGroup.has(gid)) byGroup.set(gid, []); byGroup.get(gid).push(r); }
+  }
+  let html = '';
+  for (const gid of [...byGroup.keys()].sort((a,b)=>b-a)) html += bandHTML(groups.get(gid), byGroup.get(gid));
+  html += flat.map(cardHTML).join('');
+  $('grid').innerHTML = html;
   if (termRunId!=null) termTabsRender();   // 터미널 열려있으면 세션 탭도 동기화
 }
@@ -898,6 +954,7 @@ function cardHTML(r){
     + '<div class="meta"><span>branch <b>'+esc(r.branch||'—')+'</b></span>'
     + '<span>files <b>'+(r.filesChanged??0)+'</b></span>'
     + '<span>'+esc(r.agent||'')+'</span>'
+    + attemptHTML(r)
     + (r.model ? '<span title="model">⚙ '+esc(r.model)+'</span>' : '')
     + (task && task.parentRunId ? '<span title="spawned by agent r'+task.parentRunId+'">↳ by r'+task.parentRunId+'</span>' : '')
     + (r.sessionId && ['done','failed','stopped'].includes(r.status)
@@ -920,6 +977,8 @@ async function hydrate(){
   machines = r.machines||[]; repos = r.repos||[]; captures = r.captures||[];
   tasks.clear();
   (r.tasks||[]).forEach(t => tasks.set(t.id, t));
+  groups.clear();
+  (r.groups||[]).forEach(g => groups.set(g.id, g));
   runs.clear();
   (r.runs||[]).forEach(rn => runs.set(rn.id, { ...rn, events: rn.events||[] }));
   if (r.daemon) {
@@ -1048,7 +1107,7 @@ function connectWS(){
       render(); flash(ev.runId); paintModal();
     } else if (ev.type==='task'){
       const t = tasks.get(ev.taskId);
-      if (t){ t.status = ev.status; render(); paintModal(); } else { hydrate(); }
+      if (t){ if (ev.status!=null) t.status = ev.status; if (ev.groupId!=null) t.groupId = ev.groupId; render(); paintModal(); } else { hydrate(); }
     } else if (ev.type==='capture'){
       captures.push(ev.capture); paintSidebar();
     }
@@ -1174,6 +1233,51 @@ $('selGo').addEventListener('click', async ()=>{
   } else toast('integrate: '+(j.error||res.status), 'error');
 });
+/* ── 그룹 밴드 액션 (fold / Select runs / Close group) ── */
+$('grid').addEventListener('click', async (e)=>{
+  const fold = e.target.closest('[data-gfold]');
+  if (fold){ const g=Number(fold.dataset.gfold); if(gfold.has(g)) gfold.delete(g); else gfold.add(g); saveGfold(); render(); return; }
+  const gsel = e.target.closest('[data-gsel]');
+  if (gsel){
+    const g=Number(gsel.dataset.gsel);
+    if (!selectMode) setSelectMode(true);
+    const tids = new Set([...tasks.values()].filter(t=>t.groupId===g).map(t=>t.id));
+    for (const r of [...runs.values()].sort((a,b)=>a.id-b.id)){
+      if (!tids.has(r.taskId)) continue;
+      const ok = ['done','failed','stopped'].includes(r.status) && (r.filesChanged||0)>0 && r.status!=='merged';
+      if (ok && !selected.has(r.id)){ selected.add(r.id); selOrder.push(r.id); }
+    }
+    $('selCnt').textContent = selected.size + ' selected';
+    render();
+    if (!selected.size) toast('no settled runs with changes in this group yet', 'error');
+    return;
+  }
+  const gclose = e.target.closest('[data-gclose]');
+  if (gclose){ await closeGroup(Number(gclose.dataset.gclose)); return; }
+});
+async function closeGroup(g){
+  const tids = [...tasks.values()].filter(t=>t.groupId===g && t.status!=='closed').map(t=>t.id);
+  if (!tids.length){ toast('nothing open in this group', 'ok'); return; }
+  const grp = groups.get(g)||{};
+  const yes = await confirmUI('Close this whole group?',
+    { sub: (grp.title||'group')+' — stops and cleans every worktree/branch of '+tids.length+' task(s).', danger:true, okLabel:'Close group' });
+  if (!yes) return;
+  const closeOne = (id,force)=>fetch('/api/tasks/'+id+'/close',{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({force})});
+  const risky = [];
+  for (const id of tids){
+    const res = await closeOne(id,false);
+    if (res.status===409){ const j=await res.json().catch(()=>({})); (j.atRisk||[]).forEach(a=>risky.push(a)); }
+  }
+  if (risky.length){
+    const list = risky.map(a=>'r'+a.runId+' · '+a.filesChanged+' file'+(a.filesChanged>1?'s':'')).join(' · ');
+    const ok = await confirmUI('Close and delete unmerged output?',
+      { danger:true, sub: list+' — not merged, not exported. Worktrees are deleted on close.', okLabel:'Close anyway' });
+    if (!ok){ await hydrate(); return; }
+    for (const id of tids) await closeOne(id,true);
+  }
+  toast('closed '+tids.length+' task'+(tids.length>1?'s':'')+' in the group', 'ok');
+  await hydrate();
+}
 $('grid').addEventListener('click',(e)=>{
   const card = e.target.closest('.card'); if(!card) return;
   const id = Number(card.id.replace('card-',''));

package/src/db/index.ts CHANGED Viewed

@@ -83,6 +83,12 @@ export async function ensureSchema(): Promise<void> {
       content TEXT NOT NULL DEFAULT '',
       created_at INTEGER DEFAULT (unixepoch())
     );
+    CREATE TABLE IF NOT EXISTS task_groups (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      kind TEXT NOT NULL DEFAULT 'goal',
+      title TEXT NOT NULL,
+      created_at INTEGER DEFAULT (unixepoch())
+    );
   `);
   // 기존 DB 마이그레이션(멱등)
   try { await client.execute('ALTER TABLE tasks ADD COLUMN design_capture_id INTEGER'); } catch { /* exists */ }
@@ -90,4 +96,5 @@ export async function ensureSchema(): Promise<void> {
   try { await client.execute("ALTER TABLE agent_runs ADD COLUMN pr_url TEXT NOT NULL DEFAULT ''"); } catch { /* exists */ }
   try { await client.execute('ALTER TABLE tasks ADD COLUMN parent_run_id INTEGER'); } catch { /* exists */ }
   try { await client.execute("ALTER TABLE agent_runs ADD COLUMN model TEXT NOT NULL DEFAULT ''"); } catch { /* exists */ }
+  try { await client.execute('ALTER TABLE tasks ADD COLUMN group_id INTEGER'); } catch { /* exists */ }
 }

package/src/db/schema.ts CHANGED Viewed

@@ -32,6 +32,14 @@ export const designCaptures = sqliteTable('design_captures', {
   createdAt: integer('created_at', { mode: 'timestamp' }),
 });
+/** 태스크 그룹 — 한 goal(plan fan-out)·한 swarm(에이전트 서브태스크)에서 난 형제들. */
+export const taskGroups = sqliteTable('task_groups', {
+  id: integer('id').primaryKey({ autoIncrement: true }),
+  kind: text('kind').notNull().default('goal'), // 'goal' | 'swarm'
+  title: text('title').notNull(),
+  createdAt: integer('created_at', { mode: 'timestamp' }),
+});
 /** 하나의 요청. 여러 AgentRun 으로 병렬 시도됨. */
 export const tasks = sqliteTable('tasks', {
   id: integer('id').primaryKey({ autoIncrement: true }),
@@ -41,6 +49,7 @@ export const tasks = sqliteTable('tasks', {
   status: text('status').notNull().default('open'), // open | done
   designCaptureId: integer('design_capture_id'), // 선택 — 프롬프트에 DESIGN CONTEXT 주입
   parentRunId: integer('parent_run_id'), // 에이전트 셀프 오케스트레이션 — 이 태스크를 발사한 run
+  groupId: integer('group_id'), // task_groups — goal/swarm 형제 묶음(수동 태스크는 NULL)
   createdAt: integer('created_at', { mode: 'timestamp' }),
 });

package/src/orchestrator.ts CHANGED Viewed

@@ -8,7 +8,7 @@ import type { ChildProcess } from 'node:child_process';
 import { eq } from 'drizzle-orm';
 import { config } from './config';
 import { db } from './db';
-import { agentRuns, agentEvents, tasks, repos, machines, designCaptures, docSnapshots } from './db/schema';
+import { agentRuns, agentEvents, tasks, repos, machines, designCaptures, docSnapshots, taskGroups } from './db/schema';
 import { runShellOn, spawnShellOn, shq, type MachineTarget } from './exec';
 import { broadcast } from './hub';
 import { getProvider, type Provider } from './providers';
@@ -134,9 +134,17 @@ export async function spawnSubtasks(parentRunId: number, title: string, prompt:
   // 폭주 가드 — 한 부모가 만들 수 있는 하위 태스크 상한
   const siblings = await db.select().from(tasks).where(eq(tasks.parentRunId, parentRunId));
   if (siblings.length >= 8) return { ok: false, detail: 'subtask limit reached (8 per run)' };
+  // 그룹 — 부모가 이미 그룹에 속하면 그 그룹, 아니면 swarm 그룹 생성 후 부모까지 백필.
+  let groupId = pt.groupId ?? null;
+  if (groupId == null) {
+    const gIns = await db.insert(taskGroups).values({ kind: 'swarm', title: pt.title.slice(0, 140) }).returning();
+    groupId = gIns[0]!.id;
+    await db.update(tasks).set({ groupId }).where(eq(tasks.id, pt.id));
+    broadcast({ type: 'task', taskId: pt.id, groupId });
+  }
   const n = Math.max(1, Math.min(4, count || 1));
   const tIns = await db.insert(tasks).values({
-    repoId: pt.repoId, title: title.slice(0, 140), prompt, parentRunId,
+    repoId: pt.repoId, title: title.slice(0, 140), prompt, parentRunId, groupId,
   }).returning();
   const task = tIns[0]!;
   const runIds: number[] = [];
@@ -714,9 +722,13 @@ export async function planFanout(repoId: number, goal: string, real: boolean): P
     if (plan.length < 1) return { ok: false, detail: 'planner returned no tasks' };
   }
+  // 이 goal 의 형제들을 한 그룹으로 묶는다(보드 밴드). 드라이 리허설도 동일.
+  const gIns = await db.insert(taskGroups).values({ kind: 'goal', title: goal.slice(0, 140) }).returning();
+  const groupId = gIns[0]!.id;
   const created: Array<{ id: number; title: string; runId: number }> = [];
   for (const t of plan) {
-    const tIns = await db.insert(tasks).values({ repoId, title: t.title, prompt: t.prompt }).returning();
+    const tIns = await db.insert(tasks).values({ repoId, title: t.title, prompt: t.prompt, groupId }).returning();
     const task = tIns[0]!;
     const rIns = await db.insert(agentRuns).values({ taskId: task.id, machineId: m.id, agent: 'claude-code', status: 'pending' }).returning();
     const run = rIns[0]!;

package/src/server.ts CHANGED Viewed

@@ -10,7 +10,7 @@ import { eq } from 'drizzle-orm';
 import { authGate } from './auth';
 import { config } from './config';
 import { db } from './db';
-import { machines, repos, tasks, agentRuns, agentEvents, designCaptures, shareLinks } from './db/schema';
+import { machines, repos, tasks, agentRuns, agentEvents, designCaptures, shareLinks, taskGroups } from './db/schema';
 import { BOOKMARKLET_JS } from './design';
 import { runShellOn, shq } from './exec';
 import { launchRun, cleanupRun, stopRun, getRunDiff, loadRunDocs, mergeRun, getRunTermInfo, steerRun, exportRun, prRun, integrateRuns, planFanout, reviewTask, syncRun, openWorkbench, spawnSubtasks, listSubtasks, resolveAgentToken, taskCloseRisk } from './orchestrator';
@@ -171,13 +171,14 @@ export async function buildServer(): Promise<FastifyInstance> {
   // 보드 하이드레이션 — machines/repos/tasks/runs(+events)/captures 한 방에.
   app.get('/api/fleet', async () => {
-    const [ms, rs, ts, rns, evs, dcs] = await Promise.all([
+    const [ms, rs, ts, rns, evs, dcs, gs] = await Promise.all([
       db.select().from(machines),
       db.select().from(repos),
       db.select().from(tasks),
       db.select().from(agentRuns),
       db.select().from(agentEvents),
       db.select().from(designCaptures),
+      db.select().from(taskGroups),
     ]);
     const byRun = new Map<number, Array<{ kind: string; payload: string }>>();
     for (const e of evs) {
@@ -186,7 +187,7 @@ export async function buildServer(): Promise<FastifyInstance> {
       byRun.set(e.runId, arr);
     }
     return {
-      machines: ms, repos: rs, tasks: ts, captures: dcs,
+      machines: ms, repos: rs, tasks: ts, captures: dcs, groups: gs,
       runs: rns.map((r) => ({ ...r, events: byRun.get(r.id) ?? [] })),
       // 보드 헤더 "어느 데몬에 붙어 있나" 표시용 (인증 뒤라 dbPath 노출 가능)
       daemon: { version: config.version, pid: process.pid, port: config.port, dbPath: config.dbPath },