npm - coxpit - Versions diffs - 2.5.0 → 2.7.0 - Mend

coxpit 2.5.0 → 2.7.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/package.json CHANGED Viewed

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

@@ -159,6 +159,21 @@ export const BOARD_HTML = /* html */ `<!doctype html>
   .ev{display:flex;gap:9px;align-items:baseline;min-width:0}
   .ev .k{color:var(--brand);min-width:78px;flex:none;opacity:.85}
   .ev .t{color:var(--muted);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;flex:1}
+  /* ── select mode (integrate) ── */
+  .toolbar{display:flex;justify-content:flex-end;gap:8px;margin-bottom:12px}
+  .card.selmode{cursor:copy}
+  .card .selbox{display:none;width:20px;height:20px;border-radius:50%;border:1px solid var(--line-hi);
+    align-items:center;justify-content:center;font-size:11px;color:transparent;flex:none}
+  .card.selmode .selbox{display:flex}
+  .card.selected{border-color:var(--brand)}
+  .card.selected .selbox{background:var(--brand);border-color:var(--brand);color:var(--brand-ink)}
+  .selbar{position:fixed;bottom:20px;left:50%;transform:translateX(-50%);z-index:45;display:none;
+    align-items:center;gap:12px;background:var(--surface);border:1px solid var(--line-hi);border-radius:12px;
+    padding:10px 16px;box-shadow:var(--shadow)}
+  .selbar.on{display:flex}
+  .selbar .cnt{font-family:var(--mono);font-size:12px;color:var(--brand)}
+  .selbar .note{font-family:var(--mono);font-size:11px;color:var(--faint)}
   .empty{color:var(--faint);font-family:var(--mono);font-size:12px;padding:64px 24px;text-align:center;
     display:flex;flex-direction:column;gap:10px;align-items:center}
   .empty .glyph{font-size:22px;color:#2c3444;letter-spacing:4px}
@@ -300,7 +315,7 @@ export const BOARD_HTML = /* html */ `<!doctype html>
         </div>
         <input type="checkbox" id="taskReal" hidden />
         <div class="row">
-          <input id="taskCount" class="narrow" type="number" min="1" max="8" value="2" title="number of agents" />
+          <input id="taskCount" class="narrow" type="number" min="1" max="8" value="1" title="number of agents — 1 for a job, N to explore variants" />
           <button class="btn" type="submit" id="runFleetBtn">Run fleet</button>
         </div>
       </form>
@@ -315,6 +330,7 @@ export const BOARD_HTML = /* html */ `<!doctype html>
     </div>
   </aside>
   <main>
+    <div class="toolbar"><button class="btn-ghost sm" id="selToggle">Select runs</button></div>
     <div class="grid" id="grid"></div>
     <div class="empty" id="empty">
       <span class="glyph">▚▞▚</span>
@@ -350,6 +366,7 @@ export const BOARD_HTML = /* html */ `<!doctype html>
       <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>
       <span class="spacer"></span>
       <button class="btn-danger sm" id="mStop">Stop</button>
       <button class="btn-ghost sm" id="mCleanup">Cleanup</button>
@@ -399,6 +416,28 @@ export const BOARD_HTML = /* html */ `<!doctype html>
 <div class="toasts" id="toasts"></div>
+<div class="selbar" id="selbar">
+  <span class="cnt" id="selCnt">0 selected</span>
+  <span class="note">merges in selection order · conflicts spawn an integration agent</span>
+  <button class="btn sm" id="selGo">Integrate → base</button>
+  <button class="btn-ghost sm" id="selCancel">Cancel</button>
+</div>
+<div class="overlay" id="expOverlay">
+  <div class="cfm">
+    <div class="cfm-b">
+      <div class="m">Export this run's changed files</div>
+      <div class="s">Copies changed &amp; new files (with their folder structure) out of the worktree — no merge. Good for reports and one-off artifacts.</div>
+      <p class="flabel" style="margin-top:12px">destination folder</p>
+      <input id="expDest" placeholder="empty = ~/coxpit-exports/r<id>" />
+    </div>
+    <div class="cfm-f">
+      <button class="btn-ghost sm" id="expCancel">Cancel</button>
+      <button class="btn sm" id="expOk">Export</button>
+    </div>
+  </div>
+</div>
 <div class="overlay" id="cfmOverlay">
   <div class="cfm">
     <div class="cfm-b"><div class="m" id="cfmMsg"></div><div class="s" id="cfmSub"></div></div>
@@ -620,11 +659,15 @@ function cardHTML(r){
   const evs = (r.events||[]).slice(-8).map(e =>
     '<div class="ev"><span class="k">'+esc(e.kind)+'</span><span class="t">'+esc(summarize(e.kind,e.payload)).slice(0,140)+'</span></div>'
   ).join('') || '<div class="ev"><span class="t" style="color:var(--faint)">waiting…</span></div>';
-  return '<div class="card" id="card-'+r.id+'">'
-    + '<div class="card-h"><span class="rid">r'+r.id+'</span><span class="title">'+title+'</span>'+chipHTML(r.status)+'</div>'
+  const selCls = (selectMode?' selmode':'') + (selected.has(r.id)?' selected':'');
+  return '<div class="card'+selCls+'" id="card-'+r.id+'">'
+    + '<div class="card-h"><span class="rid">r'+r.id+'</span><span class="title">'+title+'</span>'
+    + '<span class="selbox">✓</span>'+chipHTML(r.status)+'</div>'
     + '<div class="meta"><span>branch <b>'+esc(r.branch||'—')+'</b></span>'
     + '<span>files <b>'+(r.filesChanged??0)+'</b></span>'
-    + '<span>'+esc(r.agent||'')+'</span></div>'
+    + '<span>'+esc(r.agent||'')+'</span>'
+    + (r.prUrl ? '<a href="'+esc(r.prUrl)+'" target="_blank" rel="noopener" style="margin-left:auto">PR ↗</a>' : '')
+    + '</div>'
     + '<div class="log">'+evs+'</div></div>';
 }
 function flash(id){ const el=$('card-'+id); if(el){ el.classList.remove('flash'); void el.offsetWidth; el.classList.add('flash'); } }
@@ -650,6 +693,7 @@ function paintSidebar(){
     '<span class="mchip"><span class="mdot '+(m.online?'on':'')+'"></span><b>'+esc(m.slug)+'</b></span>').join('');
   $('repos').innerHTML = repos.map(r =>
     '<div class="repo"><span class="nm">'+esc(r.name)+'</span><span class="br">'+esc(r.defaultBranch)+'</span>'
+    + '<button class="x" data-delrepo="'+r.id+'" title="remove repo" style="float:right;background:none;border:none;color:var(--faint);cursor:pointer">×</button>'
     + '<div class="path">'+esc(r.path)+'</div></div>').join('')
     || '<div class="repo" style="color:var(--faint)">none registered</div>';
   $('repoMachine').innerHTML = machines.map(m=>'<option value="'+esc(m.slug)+'">'+esc(m.slug)+'</option>').join('');
@@ -676,6 +720,16 @@ $('captures').addEventListener('click', async (e)=>{
   await fetch('/api/design/'+b.dataset.delcap,{method:'DELETE'});
   hydrate();
 });
+$('repos').addEventListener('click', async (e)=>{
+  const b = e.target.closest('button[data-delrepo]'); if(!b) return;
+  const yes = await confirmUI('Remove this repository from coxpit?',
+    { sub: 'The repo itself is untouched — only the registration is removed. Refused while it has open tasks.', danger: true, okLabel: 'Remove' });
+  if (!yes) return;
+  const res = await fetch('/api/repos/'+b.dataset.delrepo,{method:'DELETE'});
+  const j = await res.json().catch(()=>({}));
+  if (res.ok){ toast('repo removed', 'ok'); hydrate(); }
+  else toast('remove: '+(j.detail||res.status), 'error');
+});
 function connectWS(){
   const proto = location.protocol==='https:'?'wss':'ws';
@@ -688,6 +742,7 @@ function connectWS(){
       const known = runs.has(ev.runId ?? ev.id);
       upsertRun(ev);
       if (!known && ev.taskId==null){ hydrate(); return; }
+      if (ev.taskId!=null && !tasks.has(ev.taskId)) hydrate(); // 통합 태스크 등 신규 태스크 동기화
       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();
@@ -737,14 +792,72 @@ async function loadDiff(){
 }
 function openModal(id){ openRunId = id; paintModal(); $('overlay').classList.add('open'); loadDiff(); }
 function closeModal(){ openRunId=null; $('overlay').classList.remove('open'); }
+/* ── select mode (integrate) ── */
+let selectMode = false;
+const selected = new Set();
+const selOrder = [];
+function setSelectMode(on){
+  selectMode = on;
+  if (!on){ selected.clear(); selOrder.length = 0; }
+  $('selToggle').textContent = on ? 'Exit select' : 'Select runs';
+  $('selbar').classList.toggle('on', on);
+  $('selCnt').textContent = selected.size + ' selected';
+  render();
+}
+$('selToggle').addEventListener('click', ()=>setSelectMode(!selectMode));
+$('selCancel').addEventListener('click', ()=>setSelectMode(false));
+$('selGo').addEventListener('click', async ()=>{
+  if (!selOrder.length){ toast('select settled runs with changes first', 'error'); return; }
+  const yes = await confirmUI('Integrate '+selOrder.length+' run(s) into the base branch?',
+    { sub: 'Merged one by one in selection order. A run that conflicts spawns an integration agent (real, spends credits) to resolve it.', okLabel: 'Integrate' });
+  if (!yes) return;
+  const res = await fetch('/api/integrate',{method:'POST',headers:{'content-type':'application/json'},
+    body:JSON.stringify({runIds:selOrder})});
+  const j = await res.json().catch(()=>({}));
+  if (res.ok){
+    toast('integrate: '+j.merged+' merged · '+j.conflicts+' conflict→agent · '+j.skipped+' skipped', j.conflicts||j.skipped ? undefined : 'ok');
+    setSelectMode(false); hydrate();
+  } else toast('integrate: '+(j.error||res.status), 'error');
+});
 $('grid').addEventListener('click',(e)=>{
   const card = e.target.closest('.card'); if(!card) return;
-  openModal(Number(card.id.replace('card-','')));
+  const id = Number(card.id.replace('card-',''));
+  if (selectMode){
+    const r = runs.get(id);
+    const eligible = r && ['done','failed','stopped'].includes(r.status) && (r.filesChanged||0) > 0 && r.status!=='merged';
+    if (!eligible){ toast('r'+id+': only settled runs with changes can be integrated', 'error'); return; }
+    if (selected.has(id)){ selected.delete(id); selOrder.splice(selOrder.indexOf(id),1); }
+    else { selected.add(id); selOrder.push(id); }
+    $('selCnt').textContent = selected.size + ' selected';
+    render();
+    return;
+  }
+  openModal(id);
 });
 $('mClose').addEventListener('click', closeModal);
 $('overlay').addEventListener('click',(e)=>{ if(e.target===$('overlay')) closeModal(); });
-document.addEventListener('keydown',(e)=>{ if(e.key==='Escape'){ closeDropdowns(); cfmClose(false); $('brwOverlay').classList.remove('open'); closeTerm(); closeModal(); cmpTaskId=null; $('cmpOverlay').classList.remove('open'); } });
+document.addEventListener('keydown',(e)=>{ if(e.key==='Escape'){ closeDropdowns(); cfmClose(false); $('brwOverlay').classList.remove('open'); $('expOverlay').classList.remove('open'); closeTerm(); closeModal(); cmpTaskId=null; $('cmpOverlay').classList.remove('open'); } });
 $('mRefreshDiff').addEventListener('click', loadDiff);
+$('mExport').addEventListener('click', ()=>{
+  if (openRunId==null) return;
+  $('expDest').value='';
+  $('expDest').placeholder='empty = ~/coxpit-exports/r'+openRunId;
+  $('expOverlay').classList.add('open');
+});
+async function doExport(){
+  if (openRunId==null) return;
+  const res = await fetch('/api/runs/'+openRunId+'/export',{method:'POST',
+    headers:{'content-type':'application/json'}, body:JSON.stringify({dest:$('expDest').value.trim()})});
+  const j = await res.json().catch(()=>({}));
+  $('expOverlay').classList.remove('open');
+  if (res.ok) toast(j.copied+' file(s) → '+j.dest, 'ok');
+  else toast('export: '+(j.detail||res.status), 'error');
+}
+$('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'); });
 async function sendSteer(){
   if (openRunId==null) return;
   const msg = $('steerInput').value.trim(); if(!msg) return;
@@ -804,14 +917,30 @@ async function paintCompare(){
       + '<span class="files">'+files+' file'+(files===1?'':'s')+'</span></div>'
       + '<div class="cmp-meta" title="'+esc(summary)+'">'+(summary?esc(summary):'—')+'</div>'
       + '<div class="cmp-diff"><pre class="diff">'+diffHTML(r.diff||'')+'</pre></div>'
-      + '<div class="cmp-f"><span class="msg" id="cmpMsg-'+r.id+'"></span>'
+      + '<div class="cmp-f"><span class="msg" id="cmpMsg-'+r.id+'">'
+      + (r.prUrl ? '<a href="'+esc(r.prUrl)+'" target="_blank" rel="noopener">PR ↗ '+esc(r.prUrl.split('/').slice(-1)[0])+'</a>' : '')
+      + '</span>'
       + (merged
         ? chipHTML('merged')
-        : '<button class="btn sm" data-merge="'+r.id+'"'+(mergeable?'':' disabled')+'>Merge this</button>')
+        : (r.prUrl ? '' : '<button class="btn-ghost sm" data-pr="'+r.id+'"'+(mergeable?'':' disabled')+'>Open PR</button>')
+          + '<button class="btn sm" data-merge="'+r.id+'"'+(mergeable?'':' disabled')+'>Merge this</button>')
       + '</div></div>';
   }).join('');
 }
 $('cmpBody').addEventListener('click', async (e)=>{
+  const prBtn = e.target.closest('button[data-pr]');
+  if (prBtn){
+    const rid = Number(prBtn.dataset.pr);
+    const yes = await confirmUI('Open a pull request from r'+rid+'?',
+      { sub: 'Commits the worktree, pushes the branch to origin, and opens a PR against the base branch (needs gh CLI signed in).', okLabel: 'Open PR' });
+    if (!yes) return;
+    prBtn.disabled = true;
+    const res = await fetch('/api/runs/'+rid+'/pr',{method:'POST'});
+    const j = await res.json().catch(()=>({}));
+    if (res.ok){ toast('PR opened: '+j.url, 'ok'); await paintCompare(); hydrate(); }
+    else { toast('PR: '+(j.detail||res.status), 'error'); prBtn.disabled = false; }
+    return;
+  }
   const btn = e.target.closest('button[data-merge]'); if(!btn) return;
   const rid = Number(btn.dataset.merge);
   const yes = await confirmUI('Merge r'+rid+' into the base branch?',

package/src/db/index.ts CHANGED Viewed

@@ -56,6 +56,7 @@ export async function ensureSchema(): Promise<void> {
       tmux_window TEXT NOT NULL DEFAULT '',
       status TEXT NOT NULL DEFAULT 'pending',
       session_id TEXT NOT NULL DEFAULT '',
+      pr_url TEXT NOT NULL DEFAULT '',
       files_changed INTEGER NOT NULL DEFAULT 0,
       started_at INTEGER,
       ended_at INTEGER,
@@ -72,4 +73,5 @@ export async function ensureSchema(): Promise<void> {
   // 기존 DB 마이그레이션(멱등)
   try { await client.execute('ALTER TABLE tasks ADD COLUMN design_capture_id INTEGER'); } catch { /* exists */ }
   try { await client.execute("ALTER TABLE agent_runs ADD COLUMN session_id TEXT NOT NULL DEFAULT ''"); } catch { /* exists */ }
+  try { await client.execute("ALTER TABLE agent_runs ADD COLUMN pr_url TEXT NOT NULL DEFAULT ''"); } catch { /* exists */ }
 }

package/src/db/schema.ts CHANGED Viewed

@@ -54,6 +54,7 @@ export const agentRuns = sqliteTable('agent_runs', {
   tmuxWindow: text('tmux_window').notNull().default(''),
   status: text('status').notNull().default('pending'), // pending | running | waiting | done | error
   sessionId: text('session_id').notNull().default(''), // 에이전트 세션(steer 용 --resume 키)
+  prUrl: text('pr_url').notNull().default(''), // PR 모드로 올린 pull request URL
   filesChanged: integer('files_changed').notNull().default(0),
   startedAt: integer('started_at', { mode: 'timestamp' }),
   endedAt: integer('ended_at', { mode: 'timestamp' }),

package/src/orchestrator.ts CHANGED Viewed

@@ -1,5 +1,8 @@
 import { posix as ppath } from 'node:path';
 import { createInterface } from 'node:readline';
+import { existsSync } from 'node:fs';
+import { mkdir, copyFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
 import type { ChildProcess } from 'node:child_process';
 import { eq } from 'drizzle-orm';
 import { config } from './config';
@@ -42,6 +45,8 @@ const stoppedRuns = new Set<number>();
 interface RunContext {
   runId: number;
   machine: MachineTarget;
+  machineId: number;
+  repoId: number;
   repoPath: string;
   baseBranch: string;
   prompt: string;
@@ -78,6 +83,8 @@ async function loadContext(runId: number): Promise<RunContext | null> {
   return {
     runId,
     machine: { slug: m.slug, kind: m.kind, address: m.address, sshUser: m.sshUser },
+    machineId: m.id,
+    repoId: repo.id,
     repoPath: repo.path,
     baseBranch: repo.defaultBranch,
     prompt,
@@ -282,7 +289,7 @@ export async function getRunDiff(runId: number): Promise<{ ok: boolean; diff: st
  * 승자 run 머지 — worktree 미커밋 변경을 자동 커밋 후 run 브랜치를
  * repo 기본 브랜치에 merge. 본 repo 가 기본 브랜치+클린일 때만, 충돌 시 abort.
  */
-export async function mergeRun(runId: number): Promise<{ ok: boolean; detail: string }> {
+export async function mergeRun(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];
@@ -320,12 +327,144 @@ export async function mergeRun(runId: number): Promise<{ ok: boolean; detail: st
     30000,
   );
   if (mg.stdout.includes('COXPIT_MERGE_FAILED')) {
-    return { ok: false, detail: 'merge conflict — aborted: ' + mg.stdout.replace('COXPIT_MERGE_FAILED', '').trim().slice(0, 300) };
+    return { ok: false, conflict: true, detail: 'merge conflict — aborted: ' + mg.stdout.replace('COXPIT_MERGE_FAILED', '').trim().slice(0, 300) };
   }
   await setRun(runId, { status: 'merged' });
   return { ok: true, detail: mg.stdout.trim().slice(0, 300) };
 }
+export interface IntegrateResult {
+  runId: number;
+  status: 'merged' | 'conflict' | 'skipped';
+  detail?: string;
+  integrationTaskId?: number;
+  integrationRunId?: number;
+}
+/**
+ * 통합(Integrate) — 여러 run(태스크 무관)을 base 에 순차 머지한다.
+ * 충돌 나는 run 은 멈추지 않고 "통합 태스크"를 자동 발사 — 에이전트가
+ * base 에서 분기한 새 worktree 에서 해당 브랜치를 머지·충돌 해소한다.
+ * (스웜의 수렴 단계: 분업한 결과를 다시 하나로.)
+ */
+export async function integrateRuns(runIds: number[], real?: boolean): Promise<IntegrateResult[]> {
+  const results: IntegrateResult[] = [];
+  for (const id of runIds) {
+    const rr = await db.select().from(agentRuns).where(eq(agentRuns.id, id)).limit(1);
+    const run = rr[0];
+    if (!run) { results.push({ runId: id, status: 'skipped', detail: 'not found' }); continue; }
+    if (run.status === 'merged') { results.push({ runId: id, status: 'skipped', detail: 'already merged' }); continue; }
+    const m = await mergeRun(id);
+    if (m.ok) { results.push({ runId: id, status: 'merged' }); continue; }
+    if (!m.conflict) { results.push({ runId: id, status: 'skipped', detail: m.detail }); continue; }
+    // 충돌 → 통합 태스크 자동 발사 (에이전트가 머지를 대신 푼다)
+    const ctx = await loadContext(id);
+    if (!ctx) { results.push({ runId: id, status: 'skipped', detail: 'context missing for integration' }); continue; }
+    const title = `Integrate r${id} into ${ctx.baseBranch}`;
+    const prompt =
+      `This worktree is branched from '${ctx.baseBranch}'. Merge the branch '${run.branch}' into it:\n` +
+      `1. Run: git merge ${run.branch}\n` +
+      `2. Resolve every conflict by preserving the intent of BOTH sides — do not simply pick one side.\n` +
+      `3. Make sure the result is consistent (typecheck/tests if available), then commit the merge.\n` +
+      `Do not modify files unrelated to the conflicts.`;
+    const tIns = await db.insert(tasks).values({ repoId: ctx.repoId, title, prompt }).returning();
+    const newTask = tIns[0]!;
+    const rIns = await db.insert(agentRuns).values({ taskId: newTask.id, machineId: ctx.machineId, agent: 'claude-code', status: 'pending' }).returning();
+    const newRun = rIns[0]!;
+    broadcast({ type: 'run', runId: newRun.id, taskId: newTask.id, status: 'pending', agent: newRun.agent, branch: '', filesChanged: 0 });
+    void launchRun(newRun.id, real ?? true);
+    results.push({ runId: id, status: 'conflict', detail: m.detail, integrationTaskId: newTask.id, integrationRunId: newRun.id });
+  }
+  return results;
+}
+/**
+ * 결과 파일 회수(export) — 조회성 태스크용: worktree 의 변경·신규 파일을
+ * 지정 폴더로 복사한다. 머지 없이 산출물만 가져오는 길. (v1: 로컬 머신 전용)
+ */
+export async function exportRun(runId: number, destIn?: string): Promise<{ ok: boolean; detail: string; dest?: string; copied?: number; skipped?: number }> {
+  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' };
+  if (ctx.machine.kind !== 'local' && ctx.machine.address !== '') {
+    return { ok: false, detail: 'remote export not yet supported — files are on the remote machine' };
+  }
+  const wt = run.worktreePath;
+  if (!existsSync(wt)) return { ok: false, detail: 'worktree missing (cleaned up)' };
+  // 회수 대상 = 분기점 이후 커밋된 변경(머지 시도가 auto-commit 했을 수 있음) ∪ 미커밋·신규
+  const list = await runShellOn(
+    ctx.machine,
+    `cd ${shq(wt)} && { git diff --name-only ${shq(ctx.baseBranch)}...HEAD -z 2>/dev/null; git ls-files -mo --exclude-standard -z; }`,
+    15000,
+  );
+  if (!list.ok) return { ok: false, detail: 'could not list changed files' };
+  const files = [...new Set(list.stdout.split('\0').filter(Boolean))];
+  if (!files.length) return { ok: false, detail: 'no changed files in this run' };
+  const dest = (destIn ?? '').trim() || ppath.join(homedir(), 'coxpit-exports', `r${runId}`);
+  if (!dest.startsWith('/')) return { ok: false, detail: 'destination must be an absolute path' };
+  let copied = 0, skipped = 0;
+  for (const f of files) {
+    const src = ppath.join(wt, f);
+    if (!existsSync(src)) { skipped++; continue; } // 삭제된 파일 등
+    const out = ppath.join(dest, f);
+    await mkdir(ppath.dirname(out), { recursive: true });
+    await copyFile(src, out);
+    copied++;
+  }
+  await recordEvent(runId, 'export', JSON.stringify({ dest, copied, skipped }));
+  return { ok: true, detail: `${copied} file(s) exported`, dest, copied, skipped };
+}
+/**
+ * PR 모드 — run 브랜치를 origin 에 push 하고 gh 로 pull request 를 연다.
+ * 팀 repo·리뷰 흐름용: 로컬 merge 대신 PR 로 결과를 보낸다.
+ */
+export async function prRun(runId: number): Promise<{ ok: boolean; detail: string; url?: string }> {
+  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 || !run.branch) return { ok: false, detail: 'no worktree/branch' };
+  if (liveChildren.has(runId)) return { ok: false, detail: 'still running — stop it first' };
+  if (!['done', 'failed', 'stopped'].includes(run.status)) return { ok: false, detail: `cannot open a PR from a '${run.status}' run` };
+  const wt = shq(run.worktreePath);
+  // 0) 사전 조건: origin 리모트 + gh CLI
+  const pre = await runShellOn(ctx.machine,
+    `cd ${wt} && { git remote get-url origin >/dev/null 2>&1 && echo R1 || echo R0; } && { command -v gh >/dev/null 2>&1 && echo G1 || echo G0; }`, 10000);
+  if (!pre.stdout.includes('R1')) return { ok: false, detail: 'no origin remote on this repo' };
+  if (!pre.stdout.includes('G1')) return { ok: false, detail: 'GitHub CLI (gh) not found on the machine' };
+  // 1) worktree 미커밋 변경 자동 커밋
+  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}: agent changes`)})`, 20000);
+  if (!c1.ok) return { ok: false, detail: 'worktree commit failed: ' + (c1.stderr || c1.stdout).trim().slice(0, 300) };
+  // 2) push
+  const push = await runShellOn(ctx.machine, `cd ${wt} && git push -u origin ${shq(run.branch)} 2>&1`, 60000);
+  if (!push.ok) return { ok: false, detail: 'push failed: ' + (push.stderr || push.stdout).trim().slice(0, 300) };
+  // 3) PR 생성 (동일 브랜치 PR 이 이미 있으면 그 URL 재사용)
+  const tr = await db.select().from(tasks).where(eq(tasks.id, run.taskId)).limit(1);
+  const title = `${tr[0]?.title ?? 'coxpit run'} (r${runId})`;
+  const body = (run.exitSummary ? run.exitSummary + '\n\n' : '') + '🤖 Opened from a coxpit agent run';
+  const pr = await runShellOn(ctx.machine,
+    `cd ${wt} && gh pr create -B ${shq(ctx.baseBranch)} -H ${shq(run.branch)} -t ${shq(title)} -b ${shq(body)} 2>&1 || true`, 60000);
+  const m = (pr.stdout + pr.stderr).match(/https:\/\/github\.com\/\S+\/pull\/\d+/);
+  if (!m) return { ok: false, detail: 'gh pr create failed: ' + (pr.stdout || pr.stderr).trim().slice(0, 300) };
+  await setRun(runId, { prUrl: m[0] });
+  await recordEvent(runId, 'pr', m[0]);
+  return { ok: true, detail: 'pull request opened', url: m[0] };
+}
 /**
  * worktree/브랜치/tmux 정리(태스크 종료·run 폐기 시).
  */

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 } from './orchestrator';
+import { launchRun, cleanupRun, stopRun, getRunDiff, mergeRun, getRunTermInfo, steerRun, exportRun, prRun, integrateRuns } 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.5.0' }));
+  app.get('/api/health', async () => ({ ok: true, name: 'coxpit', version: '2.7.0' }));
   // 플릿 보드(단일 페이지). 인증 게이트 적용됨.
   app.get('/', async (_req, reply) => reply.type('text/html').send(BOARD_HTML));
@@ -155,10 +155,17 @@ export async function buildServer(): Promise<FastifyInstance> {
     const m = mr[0];
     if (!m) return reply.code(404).send({ error: 'machine not found' });
+    // 기본 브랜치는 "지금 체크아웃된 브랜치"가 아니라 repo 의 진짜 기본값:
+    // origin/HEAD → 로컬 main/master → 현재 HEAD 순으로 감지.
+    const g = `git -C ${shq(path)}`;
     const cmd =
-      `git -C ${shq(path)} rev-parse --is-inside-work-tree 2>&1` +
+      `${g} rev-parse --is-inside-work-tree 2>&1` +
       ` && echo '---B---'` +
-      ` && git -C ${shq(path)} rev-parse --abbrev-ref HEAD 2>&1`;
+      ` && { ${g} symbolic-ref --short refs/remotes/origin/HEAD 2>/dev/null || true; }` +
+      ` && echo '---C---'` +
+      ` && { ${g} show-ref --verify -q refs/heads/main && echo main || { ${g} show-ref --verify -q refs/heads/master && echo master; } || true; }` +
+      ` && echo '---D---'` +
+      ` && ${g} rev-parse --abbrev-ref HEAD 2>&1`;
     const r = await runShellOn(m, cmd);
     const isRepo = r.ok && /(^|\n)true(\n|$)/.test(r.stdout);
     if (!isRepo) {
@@ -167,7 +174,12 @@ export async function buildServer(): Promise<FastifyInstance> {
         detail: (r.stdout || r.stderr).trim().slice(0, 400),
       });
     }
-    const branch = (r.stdout.split('---B---')[1] ?? '').trim() || 'main';
+    const seg = (a: string, b: string): string =>
+      ((r.stdout.split(a)[1] ?? '').split(b)[0] ?? '').trim();
+    const originHead = seg('---B---', '---C---').replace(/^origin\//, '');
+    const localMain = seg('---C---', '---D---');
+    const headNow = (r.stdout.split('---D---')[1] ?? '').trim();
+    const branch = originHead || localMain || headNow || 'main';
     const name = (b.name ?? '').trim() || path.split('/').filter(Boolean).pop() || path;
     const ins = await db.insert(repos).values({
@@ -177,6 +189,17 @@ export async function buildServer(): Promise<FastifyInstance> {
     return reply.code(201).send({ ok: true, repo: ins[0] });
   });
+  // repo 삭제 — 열린 태스크가 있으면 거부(이력 보호).
+  app.delete('/api/repos/:id', async (req, reply) => {
+    const id = Number((req.params as { id: string }).id);
+    const rp = await db.select().from(repos).where(eq(repos.id, id)).limit(1);
+    if (!rp[0]) return reply.code(404).send({ error: 'not found' });
+    const open = (await db.select().from(tasks).where(eq(tasks.repoId, id))).filter((t) => t.status !== 'closed');
+    if (open.length) return reply.code(409).send({ ok: false, detail: `close ${open.length} open task(s) on this repo first` });
+    await db.delete(repos).where(eq(repos.id, id));
+    return { ok: true };
+  });
   // 디렉토리 브라우저 — repo 등록용 파일 피커(로컬 머신 전용, 인증 게이트 뒤).
   app.get('/api/browse', async (req) => {
     const q = (req.query ?? {}) as { path?: string };
@@ -378,6 +401,43 @@ export async function buildServer(): Promise<FastifyInstance> {
     return reply.code(202).send(res);
   });
+  // 통합 — 여러 run(태스크 무관)을 base 에 순차 머지, 충돌은 통합 에이전트 자동 발사.
+  app.post('/api/integrate', async (req, reply) => {
+    const b = (req.body ?? {}) as { runIds?: number[]; real?: boolean };
+    const ids = (b.runIds ?? []).map(Number).filter((n) => Number.isInteger(n) && n > 0);
+    if (!ids.length) return reply.code(400).send({ error: 'runIds required' });
+    if (ids.length > 20) return reply.code(400).send({ error: 'too many runs (max 20)' });
+    const results = await integrateRuns(ids, b.real);
+    return {
+      ok: true,
+      merged: results.filter((r) => r.status === 'merged').length,
+      conflicts: results.filter((r) => r.status === 'conflict').length,
+      skipped: results.filter((r) => r.status === 'skipped').length,
+      results,
+    };
+  });
+  // 결과 파일 회수 — 머지 없이 worktree 산출물만 지정 폴더로 복사(조회성 태스크).
+  app.post('/api/runs/:id/export', async (req, reply) => {
+    const id = Number((req.params as { id: string }).id);
+    const b = (req.body ?? {}) as { dest?: string };
+    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 exportRun(id, b.dest);
+    if (!res.ok) return reply.code(409).send(res);
+    return res;
+  });
+  // PR 모드 — run 브랜치 push + gh pr create.
+  app.post('/api/runs/:id/pr', 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 prRun(id);
+    if (!res.ok) return reply.code(409).send(res);
+    return res;
+  });
   // 실행 중 run 중지(SIGTERM) — close 핸들러가 stopped 로 봉인.
   app.post('/api/runs/:id/stop', async (req, reply) => {
     const id = Number((req.params as { id: string }).id);
@@ -397,7 +457,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.5.0' }));
+    socket.send(JSON.stringify({ type: 'hello', name: 'coxpit-fleet', version: '2.7.0' }));
     socket.on('close', () => removeSink(socket));
   });