npm - coxpit - Versions diffs - 2.1.2 → 2.2.1 - Mend

coxpit 2.1.2 → 2.2.1

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.1.2",
+  "version": "2.2.1",
   "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

@@ -71,6 +71,14 @@ export const BOARD_HTML = /* html */ `<!doctype html>
   .row .narrow{flex:0 0 64px}
   .check{display:flex;align-items:center;gap:8px;font-size:12px;color:var(--muted);cursor:pointer;user-select:none}
   .check input{width:auto;accent-color:var(--brand)}
+  .seg{display:flex;gap:3px;padding:3px;border:1px solid var(--line);border-radius:var(--r-ctl);background:#0e1118}
+  .seg-opt{flex:1;display:flex;flex-direction:column;align-items:center;gap:1px;padding:6px 8px;border:none;
+    background:transparent;color:var(--muted);font-size:12px;font-weight:600;cursor:pointer;
+    border-radius:calc(var(--r-ctl) - 3px);transition:background .15s,color .15s}
+  .seg-opt:hover{color:var(--ink)}
+  .seg-opt.on{background:var(--surface2);color:var(--ink)}
+  .seg-opt[data-real="1"].on{background:var(--brand);color:var(--brand-ink)}
+  .seg-hint{font-family:var(--mono);font-size:9.5px;font-weight:500;text-transform:uppercase;letter-spacing:.06em;opacity:.7}
   /* ── buttons ────────────────────────────── */
   .btn{display:inline-flex;align-items:center;justify-content:center;gap:6px;border:none;cursor:pointer;
@@ -195,11 +203,15 @@ export const BOARD_HTML = /* html */ `<!doctype html>
         <input id="taskTitle" placeholder="Task title" />
         <textarea id="taskPrompt" placeholder="Prompt for the agents…"></textarea>
         <select id="taskCapture"><option value="">no design capture</option></select>
+        <div class="seg" id="modeSeg" role="group" aria-label="agent mode">
+          <button type="button" class="seg-opt" data-real="0">Dry run</button>
+          <button type="button" class="seg-opt" data-real="1">Real agent<span class="seg-hint">spends credits</span></button>
+        </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" />
           <button class="btn" type="submit">Run fleet</button>
         </div>
-        <label class="check"><input type="checkbox" id="taskReal" /> real agent · spends credits</label>
       </form>
     </div>
     <div class="sect">
@@ -239,6 +251,10 @@ export const BOARD_HTML = /* html */ `<!doctype html>
         <div class="pane-c"><pre class="diff" id="mDiff">loading…</pre></div>
       </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>
     <div class="modal-f">
       <button class="btn-ghost sm" id="mTerm">Terminal</button>
       <button class="btn-ghost sm" id="mRefreshDiff">Refresh diff</button>
@@ -424,6 +440,8 @@ function paintModal(){
   chip.style.borderColor = statusColor(r.status);
   $('mChipTxt').textContent = r.status||'pending';
   $('mStop').style.display = (r.status==='running'||r.status==='preparing'||r.status==='pending') ? '' : 'none';
+  // steer 는 정착한 real run 에서만 의미(드라이런은 세션 없음 — 서버가 사유와 함께 거절)
+  $('steerRow').style.display = ['done','failed','stopped'].includes(r.status) ? '' : 'none';
   $('mTimeline').innerHTML = (r.events||[]).map(e =>
     '<div class="ev"><span class="k">'+esc(e.kind)+'</span><span class="t">'+esc(summarize(e.kind,e.payload))+'</span></div>'
   ).join('') || '<span style="color:var(--faint)">no events yet</span>';
@@ -449,6 +467,16 @@ $('mClose').addEventListener('click', closeModal);
 $('overlay').addEventListener('click',(e)=>{ if(e.target===$('overlay')) closeModal(); });
 document.addEventListener('keydown',(e)=>{ if(e.key==='Escape'){ closeTerm(); closeModal(); cmpTaskId=null; $('cmpOverlay').classList.remove('open'); } });
 $('mRefreshDiff').addEventListener('click', loadDiff);
+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=''; }
+  else { const j = await res.json().catch(()=>({})); alert('steer: '+(j.detail||res.status)); }
+}
+$('steerSend').addEventListener('click', sendSteer);
+$('steerInput').addEventListener('keydown',(e)=>{ if(e.key==='Enter') sendSteer(); });
 $('mStop').addEventListener('click', async ()=>{
   if (openRunId==null) return;
   await fetch('/api/runs/'+openRunId+'/stop',{method:'POST'});
@@ -596,6 +624,22 @@ $('taskForm').addEventListener('submit', async (e)=>{
   $('taskTitle').value=''; $('taskPrompt').value='';
 });
+/* ── agent mode segmented control (mirrors hidden #taskReal) ── */
+const segOpts = Array.from(document.querySelectorAll('#modeSeg .seg-opt'));
+function setMode(real, persist){
+  $('taskReal').checked = real;
+  for (const b of segOpts){
+    const on = (b.dataset.real === '1') === real;
+    b.classList.toggle('on', on);
+    b.setAttribute('aria-pressed', on ? 'true' : 'false');
+  }
+  if (persist) try { localStorage.setItem('coxpit.real', real ? '1' : '0'); } catch {}
+}
+for (const b of segOpts) b.addEventListener('click', ()=>setMode(b.dataset.real === '1', true));
+let savedMode = null;
+try { savedMode = localStorage.getItem('coxpit.real'); } catch {}
+setMode(savedMode === '1', false);
 hydrate().then(connectWS);
 </script>
 </body>

package/src/db/index.ts CHANGED Viewed

@@ -55,6 +55,7 @@ export async function ensureSchema(): Promise<void> {
       branch TEXT NOT NULL DEFAULT '',
       tmux_window TEXT NOT NULL DEFAULT '',
       status TEXT NOT NULL DEFAULT 'pending',
+      session_id TEXT NOT NULL DEFAULT '',
       files_changed INTEGER NOT NULL DEFAULT 0,
       started_at INTEGER,
       ended_at INTEGER,
@@ -68,6 +69,7 @@ export async function ensureSchema(): Promise<void> {
       ts INTEGER DEFAULT (unixepoch())
     );
   `);
-  // 기존 DB 마이그레이션(멱등) — tasks.design_capture_id
+  // 기존 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 */ }
 }

package/src/db/schema.ts CHANGED Viewed

@@ -53,6 +53,7 @@ export const agentRuns = sqliteTable('agent_runs', {
   branch: text('branch').notNull().default(''),
   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 키)
   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

@@ -126,56 +126,97 @@ export async function launchRun(runId: number, real?: boolean): Promise<void> {
     const isRemote = ctx.machine.kind !== 'local' && ctx.machine.address !== '';
     const pidPrefix = isRemote ? `printf '%s' "$$" > .coxpit-agent.pid && ` : '';
     const cmd = `cd ${shq(wtPath)} && ${pidPrefix}{ ${agentCommand(ctx.prompt, useReal)}; }`;
-    const child = spawnShellOn(ctx.machine, cmd);
-    liveChildren.set(runId, child);
-    let lastResult = '';
-    if (child.stdout) {
-      const rl = createInterface({ input: child.stdout });
-      rl.on('line', (line: string) => {
-        const s = line.trim();
-        if (!s) return;
-        let kind = 'log';
-        try {
-          const obj = JSON.parse(s) as { type?: string; result?: string };
-          if (obj.type) kind = obj.type;
-          // result 이벤트의 사람이 읽는 요약만 뽑아 둔다(없으면 원본 라인).
-          if (obj.type === 'result') lastResult = typeof obj.result === 'string' ? obj.result : s;
-        } catch { /* 비-JSON 로그 라인 */ }
-        void recordEvent(runId, kind, s.slice(0, 2000));
-      });
-    }
-    if (child.stderr) {
-      const rle = createInterface({ input: child.stderr });
-      rle.on('line', (line: string) => {
-        const s = line.trim();
-        if (s) void recordEvent(runId, 'stderr', s.slice(0, 2000));
-      });
-    }
-    const code: number = await new Promise((resolve) => {
-      child.on('close', (c) => resolve(c ?? 0));
-      child.on('error', () => resolve(-1));
-    });
-    liveChildren.delete(runId);
-    // 4) 변경 파일 수 집계
-    const stat = await runShellOn(ctx.machine, `git -C ${shq(wtPath)} status --porcelain | wc -l`, 10000);
-    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}`,
-    });
+    await runAgentChild(runId, ctx.machine, wtPath, cmd);
   } catch (e) {
     await recordEvent(runId, 'error', String(e).slice(0, 500));
     await setRun(runId, { status: 'error', endedAt: new Date(), exitSummary: 'orchestrator error' });
   }
 }
+/**
+ * 에이전트 자식 프로세스 배선(공용) — stream-json 파싱→이벤트, session 캡처,
+ * 종료 시 files_changed 집계 + 상태 전이. launchRun/steerRun 이 공유.
+ */
+async function runAgentChild(runId: number, machine: MachineTarget, wtPath: string, cmd: string): Promise<void> {
+  const child = spawnShellOn(machine, cmd);
+  liveChildren.set(runId, child);
+  let lastResult = '';
+  if (child.stdout) {
+    const rl = createInterface({ input: child.stdout });
+    rl.on('line', (line: string) => {
+      const s = line.trim();
+      if (!s) return;
+      let kind = 'log';
+      try {
+        const obj = JSON.parse(s) as { type?: string; result?: string; session_id?: string };
+        if (obj.type) kind = obj.type;
+        // steer(--resume) 용 세션 키 캡처
+        if (obj.type === 'system' && typeof obj.session_id === 'string') {
+          void setRun(runId, { sessionId: obj.session_id });
+        }
+        // result 이벤트의 사람이 읽는 요약만 뽑아 둔다(없으면 원본 라인).
+        if (obj.type === 'result') lastResult = typeof obj.result === 'string' ? obj.result : s;
+      } catch { /* 비-JSON 로그 라인 */ }
+      void recordEvent(runId, kind, s.slice(0, 2000));
+    });
+  }
+  if (child.stderr) {
+    const rle = createInterface({ input: child.stderr });
+    rle.on('line', (line: string) => {
+      const s = line.trim();
+      if (s) void recordEvent(runId, 'stderr', s.slice(0, 2000));
+    });
+  }
+  const code: number = await new Promise((resolve) => {
+    child.on('close', (c) => resolve(c ?? 0));
+    child.on('error', () => resolve(-1));
+  });
+  liveChildren.delete(runId);
+  const stat = await runShellOn(machine, `git -C ${shq(wtPath)} status --porcelain | wc -l`, 10000);
+  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}`,
+  });
+}
+/**
+ * 후속 지시(steer) — 정착한 run 의 세션을 --resume 으로 이어 같은 worktree 에서 계속.
+ * fire-and-forget. 진행 중 run 은 거부(개입은 터미널로).
+ */
+export async function steerRun(runId: number, message: string): 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];
+  if (!ctx || !run) return { ok: false, detail: 'run not found' };
+  if (liveChildren.has(runId)) return { ok: false, detail: 'still running — attach the terminal to intervene' };
+  if (!['done', 'failed', 'stopped'].includes(run.status)) return { ok: false, detail: `cannot steer a '${run.status}' run` };
+  if (!run.worktreePath) return { ok: false, detail: 'worktree gone (cleaned up)' };
+  if (!run.sessionId) return { ok: false, detail: 'no agent session on this run (dry-run runs cannot be steered)' };
+  const wt = run.worktreePath;
+  const exists = await runShellOn(ctx.machine, `test -d ${shq(wt)} && echo yes`, 8000);
+  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));
+  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)}` +
+    ` --output-format stream-json --verbose --permission-mode ${config.agent.perm}`;
+  const cmd = `cd ${shq(wt)} && ${pidPrefix}{ ${resume}; }`;
+  void runAgentChild(runId, ctx.machine, wt, cmd);
+  return { ok: true, detail: 'steering' };
+}
 /** 터미널 attach 용 — run 의 머신 타깃 + tmux 세션명. */
 export async function getRunTermInfo(runId: number): Promise<{ machine: MachineTarget; session: string } | null> {
   const ctx = await loadContext(runId);

package/src/server.ts CHANGED Viewed

@@ -9,7 +9,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 } from './orchestrator';
+import { launchRun, cleanupRun, stopRun, getRunDiff, mergeRun, getRunTermInfo, steerRun } from './orchestrator';
 import { openTerm } from './term';
 import { addSink, removeSink, broadcast } from './hub';
 import { BOARD_HTML } from './board';
@@ -29,7 +29,7 @@ export async function buildServer(): Promise<FastifyInstance> {
   app.addHook('onRequest', authGate);
   // 무인증 헬스(외부 감시용)
-  app.get('/api/health', async () => ({ ok: true, name: 'coxpit', version: '2.1.2' }));
+  app.get('/api/health', async () => ({ ok: true, name: 'coxpit', version: '2.2.1' }));
   // 플릿 보드(단일 페이지). 인증 게이트 적용됨.
   app.get('/', async (_req, reply) => reply.type('text/html').send(BOARD_HTML));
@@ -335,6 +335,19 @@ export async function buildServer(): Promise<FastifyInstance> {
     return res;
   });
+  // 후속 지시(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 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);
+    if (!res.ok) return reply.code(409).send(res);
+    return reply.code(202).send(res);
+  });
   // 실행 중 run 중지(SIGTERM) — close 핸들러가 stopped 로 봉인.
   app.post('/api/runs/:id/stop', async (req, reply) => {
     const id = Number((req.params as { id: string }).id);
@@ -354,7 +367,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.1.2' }));
+    socket.send(JSON.stringify({ type: 'hello', name: 'coxpit-fleet', version: '2.2.1' }));
     socket.on('close', () => removeSink(socket));
   });