npm - coxpit - Versions diffs - 2.9.0 → 3.0.0 - Mend

coxpit 2.9.0 → 3.0.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 (6) hide show

package/README.md CHANGED Viewed

@@ -71,6 +71,7 @@ Your keys and login never touch coxpit's config or database.
 | `COXPIT_AGENT_REAL` | — | `1` = real agent CLI by default (credits!) |
 | `COXPIT_AGENT_BIN` | `claude` | agent command |
 | `COXPIT_AGENT_PERM` | `acceptEdits` | headless permission mode passed to the agent |
+| `COXPIT_WEBHOOK_URL` | — | POSTs `{event:"run.settled",run:{...}}` when a run finishes — wire it to Telegram, Slack, anything |
 Running on the open internet? Put it behind your own front door (Tailscale, Cloudflare Access, a reverse proxy with TLS) and keep basic auth on — it exposes shells.
@@ -88,7 +89,7 @@ One daemon, one SQLite file, zero external services. Machines are reached over S
 ## Status
-`v2.0` — agent fleet (P1), compare/review + terminal (P2), and Design Mode (P3) are implemented and tested. Roadmap: richer review tooling, more agent providers, packaging (Docker/npm).
+`v3.0` — fleet, compare/merge, terminal, Design Mode, run destinations (merge · export · PR), swarm (plan fan-out + integrate with conflict-resolving agents), AI review, and sessions (work/ask + notifications) — all shipped and e2e-tested. Roadmap: ROADMAP.md.
 ## License

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "coxpit",
-  "version": "2.9.0",
+  "version": "3.0.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

@@ -292,6 +292,7 @@ export const BOARD_HTML = /* html */ `<!doctype html>
 <header>
   <div class="brand"><span class="mark">coxpit</span><span class="sub">fleet console</span></div>
   <div class="ws"><span class="dot" id="wsdot"></span><span id="wstext">connecting</span></div>
+  <button class="btn-ghost sm" id="bell" title="notify when a run settles">🔕</button>
   <div class="machines" id="machines"></div>
 </header>
 <div class="layout">
@@ -382,14 +383,19 @@ export const BOARD_HTML = /* html */ `<!doctype html>
       </div>
     </div>
     <div class="modal-f" id="steerRow" style="border-top:1px solid var(--line)">
-      <input id="steerInput" placeholder="Send follow-up instructions — continues in the same session &amp; worktree…" style="flex:1" />
-      <button class="btn sm" id="steerSend">Steer</button>
+      <div class="seg" style="flex:0 0 132px" id="steerModeSeg">
+        <button type="button" class="seg-opt on" data-mode="work">Work</button>
+        <button type="button" class="seg-opt" data-mode="ask">Ask</button>
+      </div>
+      <input id="steerInput" placeholder="Next instruction — same session &amp; worktree…" style="flex:1" />
+      <button class="btn sm" id="steerSend">Send</button>
     </div>
     <div class="modal-f">
       <button class="btn-ghost sm" id="mTerm">Terminal</button>
       <button class="btn-ghost sm" id="mRefreshDiff">Refresh diff</button>
       <button class="btn-ghost sm" id="mCompare">Compare runs</button>
       <button class="btn-ghost sm" id="mExport">Export files…</button>
+      <button class="btn-ghost sm" id="mSync">Sync base</button>
       <span class="spacer"></span>
       <button class="btn-danger sm" id="mStop">Stop</button>
       <button class="btn-ghost sm" id="mCleanup">Cleanup</button>
@@ -597,6 +603,8 @@ function humanize(e){
   const kind = e.kind, payload = e.payload;
   if (kind === 'rate_limit_event') return null;
   if (kind === 'steer') return { k:'steer', t:'→ '+payload };
+  if (kind === 'ask') return { k:'ask', t:'? '+payload };
+  if (kind === 'sync') return { k:'sync', t:payload };
   if (kind === 'export'){ try{ const o=JSON.parse(payload); return { k:'export', t:o.copied+' file(s) → '+o.dest }; }catch{ return { k:'export', t:payload }; } }
   if (kind === 'pr') return { k:'pr', t:payload };
   if (kind === 'stderr') return { k:'stderr', t:payload };
@@ -786,6 +794,33 @@ $('repos').addEventListener('click', async (e)=>{
   else toast('remove: '+(j.detail||res.status), 'error');
 });
+/* ── 완료 알림(브라우저) — 벨 토글, run 정착 시 통지 ── */
+let notifyOn = false;
+try { notifyOn = localStorage.getItem('coxpit.notify') === '1' && Notification.permission === 'granted'; } catch {}
+function paintBell(){ $('bell').textContent = notifyOn ? '🔔' : '🔕'; }
+$('bell').addEventListener('click', async ()=>{
+  if (!('Notification' in window)){ toast('this browser has no notification support', 'error'); return; }
+  if (!notifyOn){
+    const perm = await Notification.requestPermission();
+    if (perm !== 'granted'){ toast('notification permission denied', 'error'); return; }
+    notifyOn = true;
+  } else notifyOn = false;
+  try { localStorage.setItem('coxpit.notify', notifyOn ? '1' : '0'); } catch {}
+  paintBell();
+  toast(notifyOn ? 'will notify when runs settle' : 'notifications off', 'ok');
+});
+paintBell();
+function notifySettleUI(ev){
+  if (!notifyOn) return;
+  const t = tasks.get(ev.taskId ?? (runs.get(ev.runId)||{}).taskId);
+  try {
+    new Notification('coxpit · r'+ev.runId+' '+ev.status, {
+      body: (t ? t.title+' — ' : '') + (ev.filesChanged??0)+' file(s) changed',
+      tag: 'coxpit-r'+ev.runId,
+    });
+  } catch {}
+}
 function connectWS(){
   const proto = location.protocol==='https:'?'wss':'ws';
   const ws = new WebSocket(proto+'://'+location.host+'/ws');
@@ -801,6 +836,7 @@ function connectWS(){
       render(); flash(ev.runId ?? ev.id); paintModal();
       if (openRunId===(ev.runId??ev.id) && ['done','failed','error','stopped'].includes(ev.status)) loadDiff();
       if (cmpTaskId!=null && ['done','failed','error','stopped','merged'].includes(ev.status)) paintCompare();
+      if (['done','failed','error','stopped'].includes(ev.status)) notifySettleUI(ev);
     } else if (ev.type==='event'){
       const r = runs.get(ev.runId); if(!r){ hydrate(); return; }
       r.events = r.events||[]; r.events.push({ kind:ev.kind, payload:ev.payload });
@@ -913,14 +949,34 @@ $('expOk').addEventListener('click', doExport);
 $('expDest').addEventListener('keydown',(e)=>{ if(e.key==='Enter'){ e.preventDefault(); doExport(); } });
 $('expCancel').addEventListener('click', ()=>$('expOverlay').classList.remove('open'));
 $('expOverlay').addEventListener('click',(e)=>{ if(e.target===$('expOverlay')) $('expOverlay').classList.remove('open'); });
+let steerMode = 'work';
+document.querySelectorAll('#steerModeSeg .seg-opt').forEach(b=>{
+  b.addEventListener('click', ()=>{
+    steerMode = b.dataset.mode;
+    document.querySelectorAll('#steerModeSeg .seg-opt').forEach(x=>x.classList.toggle('on', x===b));
+    $('steerInput').placeholder = steerMode==='ask'
+      ? 'Ask the session — status, decisions, anything (no file changes)…'
+      : 'Next instruction — same session & worktree…';
+  });
+});
 async function sendSteer(){
   if (openRunId==null) return;
   const msg = $('steerInput').value.trim(); if(!msg) return;
   const res = await fetch('/api/runs/'+openRunId+'/steer',{method:'POST',
-    headers:{'content-type':'application/json'}, body:JSON.stringify({message:msg})});
-  if (res.ok){ $('steerInput').value=''; toast('steering — the agent resumes in its worktree', 'ok'); }
+    headers:{'content-type':'application/json'}, body:JSON.stringify({message:msg, mode:steerMode})});
+  if (res.ok){
+    $('steerInput').value='';
+    toast(steerMode==='ask' ? 'asking — answer lands in the timeline' : 'working — same session & worktree', 'ok');
+  }
   else { const j = await res.json().catch(()=>({})); toast('steer: '+(j.detail||res.status), 'error'); }
 }
+$('mSync').addEventListener('click', async ()=>{
+  if (openRunId==null) return;
+  const res = await fetch('/api/runs/'+openRunId+'/sync',{method:'POST'});
+  const j = await res.json().catch(()=>({}));
+  if (res.ok){ toast('base merged into session worktree', 'ok'); loadDiff(); }
+  else toast('sync: '+(j.detail||res.status), 'error');
+});
 $('steerSend').addEventListener('click', sendSteer);
 $('steerInput').addEventListener('keydown',(e)=>{ if(e.key==='Enter') sendSteer(); });
 $('mStop').addEventListener('click', async ()=>{

package/src/config.ts CHANGED Viewed

@@ -21,6 +21,8 @@ export const config = {
   dbPath: process.env.COXPIT_DB ?? './coxpit.db',
   // 원격 머신 SSH 개인키 경로(선택). 없으면 ssh 기본 키/에이전트 사용.
   sshKey: process.env.COXPIT_SSH_KEY ?? '',
+  // run 정착 시 POST 할 웹훅(선택) — 텔레그램 브릿지 등 사용자 연결용.
+  webhookUrl: process.env.COXPIT_WEBHOOK_URL ?? '',
   agent: {
     // 기본 드라이런(모의 에이전트). 실제 CLI 실행은 켤 때만(크레딧 소모).
     real: process.env.COXPIT_AGENT_REAL === '1',

package/src/orchestrator.ts CHANGED Viewed

@@ -186,19 +186,35 @@ async function runAgentChild(runId: number, machine: MachineTarget, wtPath: stri
   const filesChanged = stat.ok ? parseInt(stat.stdout.trim(), 10) || 0 : 0;
   const wasStopped = stoppedRuns.delete(runId);
-  await setRun(runId, {
-    status: wasStopped ? 'stopped' : code === 0 ? 'done' : 'failed',
-    endedAt: new Date(),
-    filesChanged,
-    exitSummary: wasStopped ? 'stopped by user' : lastResult ? lastResult.slice(0, 500) : `exit ${code}`,
-  });
+  const status = wasStopped ? 'stopped' : code === 0 ? 'done' : 'failed';
+  const exitSummary = wasStopped ? 'stopped by user' : lastResult ? lastResult.slice(0, 500) : `exit ${code}`;
+  await setRun(runId, { status, endedAt: new Date(), filesChanged, exitSummary });
+  void notifySettle(runId, status, filesChanged, exitSummary);
+}
+/** run 정착 웹훅(선택) — COXPIT_WEBHOOK_URL 로 JSON POST. 실패는 무해. */
+async function notifySettle(runId: number, status: string, filesChanged: number, exitSummary: string): Promise<void> {
+  if (!config.webhookUrl) return;
+  try {
+    const rr = await db.select().from(agentRuns).where(eq(agentRuns.id, runId)).limit(1);
+    const tr = rr[0] ? await db.select().from(tasks).where(eq(tasks.id, rr[0].taskId)).limit(1) : [];
+    await fetch(config.webhookUrl, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        event: 'run.settled',
+        run: { id: runId, status, filesChanged, exitSummary: exitSummary.slice(0, 300), task: tr[0]?.title ?? '' },
+      }),
+      signal: AbortSignal.timeout(8000),
+    });
+  } catch { /* 웹훅 실패는 조용히 */ }
 }
 /**
  * 후속 지시(steer) — 정착한 run 의 세션을 --resume 으로 이어 같은 worktree 에서 계속.
  * fire-and-forget. 진행 중 run 은 거부(개입은 터미널로).
  */
-export async function steerRun(runId: number, message: string): Promise<{ ok: boolean; detail: string }> {
+export async function steerRun(runId: number, message: string, mode: 'work' | 'ask' = 'work'): Promise<{ ok: boolean; detail: string }> {
   const ctx = await loadContext(runId);
   const rr = await db.select().from(agentRuns).where(eq(agentRuns.id, runId)).limit(1);
   const run = rr[0];
@@ -213,11 +229,16 @@ export async function steerRun(runId: number, message: string): Promise<{ ok: bo
   if (!exists.stdout.includes('yes')) return { ok: false, detail: 'worktree missing on machine' };
   await setRun(runId, { status: 'running', endedAt: null });
-  await recordEvent(runId, 'steer', message.slice(0, 2000));
+  await recordEvent(runId, mode === 'ask' ? 'ask' : 'steer', message.slice(0, 2000));
+  // Ask 모드 — 세션에 질문만: 파일 수정 없이 답변만 하도록 래핑
+  const finalMessage = mode === 'ask'
+    ? `Question about your work in this session (do NOT modify any files, do NOT run write commands — answer concisely):\n${message}`
+    : message;
   const isRemote = ctx.machine.kind !== 'local' && ctx.machine.address !== '';
   const pidPrefix = isRemote ? `printf '%s' "$$" > .coxpit-agent.pid && ` : '';
-  const resume = `${config.agent.bin} -p --resume ${shq(run.sessionId)} ${shq(message)}` +
+  const resume = `${config.agent.bin} -p --resume ${shq(run.sessionId)} ${shq(finalMessage)}` +
     ` --output-format stream-json --verbose --permission-mode ${config.agent.perm}`;
   const cmd = `cd ${shq(wt)} && ${pidPrefix}{ ${resume}; }`;
   void runAgentChild(runId, ctx.machine, wt, cmd);
@@ -285,6 +306,31 @@ export async function getRunDiff(runId: number): Promise<{ ok: boolean; diff: st
   return { ok: true, stat: stat.trim(), diff: diff.slice(0, 200_000) };
 }
+/**
+ * base 동기화 — 오래 사는 세션의 worktree 에 base 브랜치 최신을 머지한다.
+ * 충돌 시 자동 abort — 그땐 steer 로 에이전트에게 머지를 맡기라고 안내.
+ */
+export async function syncRun(runId: number): Promise<{ ok: boolean; detail: string; conflict?: boolean }> {
+  const ctx = await loadContext(runId);
+  const rr = await db.select().from(agentRuns).where(eq(agentRuns.id, runId)).limit(1);
+  const run = rr[0];
+  if (!ctx || !run || !run.worktreePath) return { ok: false, detail: 'no worktree' };
+  if (liveChildren.has(runId)) return { ok: false, detail: 'still running — wait for it to settle' };
+  const wt = shq(run.worktreePath);
+  const ident = `-c user.name='coxpit' -c user.email='coxpit@local'`;
+  // 미커밋 변경 먼저 커밋(머지 가능 상태로)
+  const c1 = await runShellOn(ctx.machine,
+    `cd ${wt} && git add -A && (git diff --cached --quiet || git ${ident} -c commit.gpgsign=false commit -m ${shq(`coxpit r${runId}: checkpoint before base sync`)})`, 20000);
+  if (!c1.ok) return { ok: false, detail: 'checkpoint commit failed' };
+  const mg = await runShellOn(ctx.machine,
+    `cd ${wt} && git ${ident} -c commit.gpgsign=false merge --no-edit ${shq(ctx.baseBranch)} 2>&1 || (git merge --abort 2>/dev/null; echo COXPIT_SYNC_CONFLICT)`, 30000);
+  if (mg.stdout.includes('COXPIT_SYNC_CONFLICT')) {
+    return { ok: false, conflict: true, detail: `conflict with ${ctx.baseBranch} — steer the agent: "merge ${ctx.baseBranch} and resolve conflicts"` };
+  }
+  await recordEvent(runId, 'sync', `merged ${ctx.baseBranch} into session worktree`);
+  return { ok: true, detail: mg.stdout.trim().split('\n').slice(-1)[0] ?? 'synced' };
+}
 /**
  * 승자 run 머지 — worktree 미커밋 변경을 자동 커밋 후 run 브랜치를
  * repo 기본 브랜치에 merge. 본 repo 가 기본 브랜치+클린일 때만, 충돌 시 abort.

package/src/server.ts CHANGED Viewed

@@ -12,7 +12,7 @@ import { db } from './db';
 import { machines, repos, tasks, agentRuns, agentEvents, designCaptures } from './db/schema';
 import { BOOKMARKLET_JS } from './design';
 import { runShellOn, shq } from './exec';
-import { launchRun, cleanupRun, stopRun, getRunDiff, mergeRun, getRunTermInfo, steerRun, exportRun, prRun, integrateRuns, planFanout, reviewTask } from './orchestrator';
+import { launchRun, cleanupRun, stopRun, getRunDiff, mergeRun, getRunTermInfo, steerRun, exportRun, prRun, integrateRuns, planFanout, reviewTask, syncRun } from './orchestrator';
 import { openTerm } from './term';
 import { addSink, removeSink, broadcast } from './hub';
 import { BOARD_HTML } from './board';
@@ -32,7 +32,7 @@ export async function buildServer(): Promise<FastifyInstance> {
   app.addHook('onRequest', authGate);
   // 무인증 헬스(외부 감시용)
-  app.get('/api/health', async () => ({ ok: true, name: 'coxpit', version: '2.9.0' }));
+  app.get('/api/health', async () => ({ ok: true, name: 'coxpit', version: '3.0.0' }));
   // 플릿 보드(단일 페이지). 인증 게이트 적용됨.
   app.get('/', async (_req, reply) => reply.type('text/html').send(BOARD_HTML));
@@ -402,16 +402,26 @@ export async function buildServer(): Promise<FastifyInstance> {
   // 후속 지시(steer) — 정착한 run 을 같은 세션(--resume)·같은 worktree 로 계속.
   app.post('/api/runs/:id/steer', async (req, reply) => {
     const id = Number((req.params as { id: string }).id);
-    const b = (req.body ?? {}) as { message?: string };
+    const b = (req.body ?? {}) as { message?: string; mode?: string };
     const message = (b.message ?? '').trim();
     if (!message) return reply.code(400).send({ error: 'message required' });
     const rr = await db.select().from(agentRuns).where(eq(agentRuns.id, id)).limit(1);
     if (!rr[0]) return reply.code(404).send({ error: 'not found' });
-    const res = await steerRun(id, message);
+    const res = await steerRun(id, message, b.mode === 'ask' ? 'ask' : 'work');
     if (!res.ok) return reply.code(409).send(res);
     return reply.code(202).send(res);
   });
+  // base 동기화 — 오래 사는 세션 worktree 에 base 최신 머지.
+  app.post('/api/runs/:id/sync', async (req, reply) => {
+    const id = Number((req.params as { id: string }).id);
+    const rr = await db.select().from(agentRuns).where(eq(agentRuns.id, id)).limit(1);
+    if (!rr[0]) return reply.code(404).send({ error: 'not found' });
+    const res = await syncRun(id);
+    if (!res.ok) return reply.code(409).send(res);
+    return res;
+  });
   // Plan fan-out — 목표 하나 → 플래너가 태스크 분해 → 전부 자동 발사.
   // (real 플래너는 repo 를 읽고 계획하느라 1~3분 걸릴 수 있음 — 클라이언트는 대기)
   app.post('/api/plan', async (req, reply) => {
@@ -481,7 +491,7 @@ export async function buildServer(): Promise<FastifyInstance> {
   // 라이브 스트림 좌석 — 오케스트레이터가 run/event 를 여기로 broadcast.
   app.get('/ws', { websocket: true }, (socket) => {
     addSink(socket);
-    socket.send(JSON.stringify({ type: 'hello', name: 'coxpit-fleet', version: '2.9.0' }));
+    socket.send(JSON.stringify({ type: 'hello', name: 'coxpit-fleet', version: '3.0.0' }));
     socket.on('close', () => removeSink(socket));
   });