npm - coxpit - Versions diffs - 5.3.1 → 5.4.0 - Mend

coxpit 5.3.1 → 5.4.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 (8) hide show

package/README.md CHANGED Viewed

@@ -1,5 +1,7 @@
 <p align="center"><img src="docs/brand/og-lockup.png" alt="coxpit — the cockpit for your agent fleet" width="640"></p>
+> 📓 **Build log** · how this was built, on the [AIP Lab blog](https://aiplab.kr/blog/coxpit-fleet.html).
 # Coxpit
 **Own your agent fleet. Run parallel AI coding agents across your own machines — steer them from any browser.**

package/package.json CHANGED Viewed

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

@@ -57,6 +57,9 @@ export const BOARD_HTML = /* html */ `<!doctype html>
   .daemon-badge{font-family:var(--mono);font-size:10.5px;color:var(--faint);padding:3px 9px;
     border:1px solid var(--line);border-radius:999px;background:var(--surface);cursor:default}
   .daemon-badge b{color:var(--muted);font-weight:500}
+  .cockpit-link{text-decoration:none;color:var(--muted);font-family:var(--mono);font-size:11.5px;
+    border:1px solid var(--line);border-radius:7px;padding:5px 10px;display:inline-flex;align-items:center;gap:4px}
+  .cockpit-link:hover{color:var(--brand);border-color:var(--line-hi)}
   .ws{display:flex;align-items:center;gap:7px;font-family:var(--mono);font-size:11px;color:var(--muted);
     padding:4px 10px;border:1px solid var(--line);border-radius:999px;background:var(--surface)}
   .dot{width:7px;height:7px;border-radius:50%;background:var(--s-failed);transition:background .3s}
@@ -842,7 +845,7 @@ export const BOARD_HTML = /* html */ `<!doctype html>
     .fab{display:inline-flex}
     #newBtn,.newnote{display:none}
     header{padding:0 12px;gap:9px}
-    .brand .sub,.daemon-badge,.machines{display:none}
+    .brand .sub,.daemon-badge,.machines,.cockpit-link{display:none}
     main{padding:14px}
     .grid{grid-template-columns:1fr}
     /* 모달 = 풀블리드 */
@@ -879,6 +882,7 @@ ${ICON_SPRITE}
   <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"><svg class="ic"><use href="#i-bell-off"/></svg></button>
   <button class="btn-ghost sm" id="remoteBtn" title="reach this daemon from elsewhere (Tailscale · recipes)"><svg class="ic"><use href="#i-external-link"/></svg></button>
+  <a class="cockpit-link" href="/cockpit" title="터미널 우선 셸 (preview)">◨ Cockpit</a>
   <div class="machines" id="machines"></div>
 </header>
 <div class="scrim" id="scrim"></div>
@@ -1801,6 +1805,10 @@ async function renderSettings(){
       + '<label class="set-row"><span class="set-lbl">Public URL '+lockNote(L.publicUrl,'COXPIT_PUBLIC_URL')+'</span>'
         + '<input id="setPublic" value="'+escA(ef.publicUrl||'')+'" placeholder="https://… (deep-link base in notifications)"'+dis(L.publicUrl)+'></label>'
     + '</div>'
+    + '<div class="set-sec"><div class="set-h">Remote access</div>'
+      + '<div class="set-state">Reach this daemon from your other devices — coxpit detects your Tailscale and drives it, or hands a copy-paste recipe. It never hosts a relay.</div>'
+      + '<div id="rmtSettings" class="rmt">checking…</div>'
+    + '</div>'
     + '<div class="set-sec"><div class="set-h">About</div>'
       + '<div class="set-kv"><span>version</span><b>'+esc(s.version)+'</b></div>'
       + '<div class="set-kv"><span>data folder</span><b>'+esc(s.dataDir)+'</b></div>'
@@ -1808,6 +1816,7 @@ async function renderSettings(){
     + '<div class="set-save"><button type="button" class="btn" id="setSave">Save settings</button>'
       + '<span class="set-saved" id="setSaved"></span></div>';
   wireSettings();
+  loadRemote();   // Remote access 섹션(#rmtSettings) 채우기 + 토글 배선
 }
 function wireSettings(){
   const save = $('setSave'); if (!save) return;
@@ -1989,10 +1998,9 @@ function paintOnboarding(goalsOnly){
     + '<li><b>Write a task</b> — title + a prompt that names the target files</li>'
     + '<li><b>Run fleet</b> — try <b>Dry run</b> first (free rehearsal), then <b>Real agent</b></li>'
     + '</ol></div>'
-    + '<div class="setup-sec"><p class="setup-label">Remote access</p>'
-    + '<div id="rmtOnboard" class="rmt">checking Tailscale…</div></div>'
     + '</div>';
-  loadRemote();
+  // Remote access(Serve/Funnel)는 대다수 사용자에겐 불필요 → 온보딩에서 제거하고 Settings 에서 상세히 다룬다.
+  // (헤더 ⤢ 버튼으로도 여전히 접근 가능)
 }
 function cardHTML(r){
   const task = tasks.get(r.taskId);
@@ -3764,9 +3772,9 @@ async function loadRemote(){
 function paintRemote(){
   const html = remoteCardHTML(remoteData);
   const ov = $('remoteBody'); if (ov) ov.innerHTML = html;
-  const ob = $('rmtOnboard'); if (ob) ob.innerHTML = html;
+  const st = $('rmtSettings'); if (st) st.innerHTML = html;   // Settings 페이지 인라인
   wireRemote($('remoteOverlay'));
-  wireRemote(document.getElementById('empty'));
+  wireRemote(document.getElementById('setbox'));
 }
 function wireRemote(scope){

package/src/cockpit.ts ADDED Viewed

@@ -0,0 +1,125 @@
+// Cockpit — 터미널 우선 셸 (병행 개발용, /cockpit). board.ts 처럼 자가완결 단일 HTML(빌드 0).
+// 백엔드(server 라우트·term.ts·orchestrator)는 보드와 전부 공유. Phase 5에서 데스크톱 기본을 여기로 플립.
+// Phase 0 = 스캐폴드(레이아웃 골격 + Board 토글 + 모바일 보드 리다이렉트). 트리·페인 그리드·요청바는 Phase 2~3.
+export const COCKPIT_HTML = /* html */ `<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
+<title>coxpit · cockpit</title>
+<link rel="icon" href="/brand/favicon.ico" sizes="any" />
+<link rel="icon" type="image/png" sizes="32x32" href="/brand/favicon-32.png" />
+<link rel="apple-touch-icon" href="/brand/apple-touch-icon.png" />
+<style>
+  @font-face{font-family:'Pixelify';src:url('/brand/pixelify.woff2') format('woff2');font-weight:400 700;font-display:swap}
+  :root{
+    --bg:#0b0d12; --surface:#12151c; --surface2:#171b24; --panel:#0e1118;
+    --line:#222835; --line-hi:#2f3648;
+    --ink:#dee4ec; --muted:#8792a2; --faint:#5c6675;
+    --brand:#4ec9b0; --brand-ink:#062822; --brand-dim:rgba(78,201,176,.13);
+    --running:#55a7e0; --done:#58b368; --blocked:#d6a249; --failed:#e25b67;
+    --mono:ui-monospace,'SF Mono',SFMono-Regular,Menlo,Consolas,monospace;
+    --sans:-apple-system,BlinkMacSystemFont,'Segoe UI',system-ui,Roboto,sans-serif;
+  }
+  *{box-sizing:border-box}
+  html,body{height:100%}
+  body{margin:0;background:var(--bg);color:var(--ink);font-family:var(--sans);font-size:14px;line-height:1.5;
+    -webkit-font-smoothing:antialiased;overflow:hidden}
+  /* ── topbar ── */
+  header{display:flex;align-items:center;gap:13px;height:46px;padding:0 14px;
+    border-bottom:1px solid var(--line);background:rgba(18,21,28,.92);font-family:var(--mono)}
+  .brand{display:inline-flex;align-items:center;gap:8px;text-decoration:none}
+  .brand img{height:22px;width:auto;display:block}
+  .brand .wm{font-family:'Pixelify';font-weight:600;font-size:19px;color:var(--ink);letter-spacing:.01em;margin-left:-2px}
+  .mach{display:inline-flex;align-items:center;gap:7px;font-size:12px;color:var(--muted);border:1px solid var(--line);border-radius:7px;padding:4px 10px}
+  .mach .dot{width:6px;height:6px;border-radius:50%;background:var(--done)}
+  .vtabs{display:flex;gap:4px;margin-left:4px}
+  .vtab{font-size:12px;color:var(--muted);padding:6px 11px;border-radius:7px;display:inline-flex;align-items:center;gap:7px;cursor:pointer;background:none;border:none;font-family:var(--mono)}
+  .vtab.on{background:var(--brand-dim);color:var(--ink);box-shadow:inset 0 0 0 1px rgba(78,201,176,.28)}
+  .vtab .g{color:var(--brand)}
+  .right{margin-left:auto;display:flex;align-items:center;gap:9px}
+  .wip{font-size:10.5px;color:var(--blocked);border:1px solid rgba(214,162,73,.4);border-radius:999px;padding:2px 9px}
+  .toggle{font-size:12px;color:var(--muted);text-decoration:none;border:1px solid var(--line);border-radius:7px;padding:5px 11px}
+  .toggle:hover{color:var(--ink);border-color:var(--line-hi)}
+  /* ── body: tree | main ── */
+  .layout{display:grid;grid-template-columns:264px 1fr;height:calc(100vh - 46px)}
+  .rail{border-right:1px solid var(--line);overflow:auto;padding:12px 10px}
+  .lbl{font-family:var(--mono);font-size:10px;letter-spacing:.14em;text-transform:uppercase;color:var(--faint);padding:5px 8px 10px}
+  .skel{height:11px;border-radius:5px;background:linear-gradient(90deg,var(--surface) 0%,var(--surface2) 50%,var(--surface) 100%);
+    background-size:200% 100%;animation:sh 1.4s linear infinite;margin:9px 8px}
+  @keyframes sh{to{background-position:-200% 0}}
+  @media (prefers-reduced-motion:reduce){.skel{animation:none}}
+  .main{display:flex;flex-direction:column;min-width:0;background:var(--bg)}
+  .stage{flex:1;display:flex;align-items:center;justify-content:center;text-align:center;padding:24px}
+  .stage .card{max-width:460px}
+  .stage .glyph{font-family:var(--mono);font-size:26px;color:#2c3444;letter-spacing:5px;margin-bottom:14px}
+  .stage h1{font-family:var(--mono);font-size:17px;margin:0 0 8px;color:var(--ink);font-weight:700}
+  .stage p{color:var(--muted);font-size:13.5px;margin:0 0 6px;line-height:1.6}
+  .stage .steps{font-family:var(--mono);font-size:12px;color:var(--faint);margin-top:16px;text-align:left;
+    border:1px solid var(--line);border-radius:10px;background:var(--surface);padding:14px 16px;line-height:1.9}
+  .stage .steps b{color:var(--brand)}
+  .reqbar{display:flex;align-items:center;gap:10px;border-top:1px solid var(--line);background:var(--surface);padding:11px 14px;font-family:var(--mono)}
+  .reqbar .ctx{font-size:11px;color:var(--brand-ink);background:var(--brand);border-radius:6px;padding:3px 9px;font-weight:600}
+  .reqbar .caret{color:var(--brand)}
+  .reqbar .ph{color:var(--faint);font-size:13px;flex:1}
+  .reqbar .kbd{border:1px solid var(--line-hi);border-radius:5px;padding:1px 6px;color:var(--faint);font-size:11px}
+</style>
+</head>
+<body>
+<header>
+  <a class="brand" href="/"><img src="/brand/mark.png" alt="" /><span class="wm">coxpit</span></a>
+  <span class="mach"><span class="dot"></span><span id="mach">local</span></span>
+  <div class="vtabs">
+    <button type="button" class="vtab on"><span class="g">⌗</span>Terminal</button>
+    <button type="button" class="vtab"><span class="g">⧉</span>Review</button>
+    <button type="button" class="vtab"><span class="g">▤</span>Docs</button>
+  </div>
+  <div class="right">
+    <span class="wip">preview · Phase 0</span>
+    <a class="toggle" href="/">← Board</a>
+  </div>
+</header>
+<div class="layout">
+  <aside class="rail">
+    <div class="lbl">Workspace</div>
+    <div class="skel" style="width:70%"></div>
+    <div class="skel" style="width:52%"></div>
+    <div class="skel" style="width:60%"></div>
+    <div class="skel" style="width:44%"></div>
+  </aside>
+  <main class="main">
+    <div class="stage">
+      <div class="card">
+        <div class="glyph">⌗ ⌗ ⌗</div>
+        <h1>Cockpit — 터미널 우선 셸</h1>
+        <p>이 화면은 새 셸의 골격입니다. 백엔드는 보드와 공유하고, 여기에 트리·페인 그리드 터미널·요청바를 단계로 얹습니다.</p>
+        <div class="steps">
+          <div><b>Phase 1</b> · tmux 재-adopt (재시작 내성 토대)</div>
+          <div><b>Phase 2</b> · 워크스페이스 트리 + 페인 그리드 터미널</div>
+          <div><b>Phase 3</b> · 요청바 · 팬아웃 타일 · Review · 브로드캐스트</div>
+          <div><b>Phase 4</b> · verify in-loop</div>
+        </div>
+      </div>
+    </div>
+    <div class="reqbar">
+      <span class="ctx">cockpit</span><span class="caret">›</span>
+      <span class="ph">요청바 — Phase 3</span>
+      <span class="kbd">⏎</span>
+    </div>
+  </main>
+</div>
+<script>
+  // 모바일은 터미널 우선 대신 보드(모니터)로 — Cockpit 은 데스크톱 우선.
+  // (뷰포트 폭 + 터치 힌트로 판정 — screen.width 는 헤드리스/멀티모니터서 부정확)
+  if (window.innerWidth <= 860 && matchMedia('(pointer:coarse)').matches) location.replace('/');
+  // health 로 머신명 정도만 채운다(스캐폴드).
+  fetch('/api/health').then(function(r){return r.json()}).then(function(){}).catch(function(){});
+</script>
+</body>
+</html>`;

package/src/db/index.ts CHANGED Viewed

@@ -101,4 +101,6 @@ export async function ensureSchema(): Promise<void> {
   try { await client.execute('ALTER TABLE tasks ADD COLUMN closed_at INTEGER'); } catch { /* exists */ }
   try { await client.execute("ALTER TABLE task_groups ADD COLUMN coord_session_id TEXT NOT NULL DEFAULT ''"); } catch { /* exists */ }
   try { await client.execute("ALTER TABLE tasks ADD COLUMN outputs TEXT NOT NULL DEFAULT '[]'"); } catch { /* exists */ }
+  try { await client.execute('ALTER TABLE agent_runs ADD COLUMN agent_pid INTEGER NOT NULL DEFAULT 0'); } catch { /* exists */ }
+  try { await client.execute('ALTER TABLE agent_runs ADD COLUMN log_offset INTEGER NOT NULL DEFAULT 0'); } catch { /* exists */ }
 }

package/src/db/schema.ts CHANGED Viewed

@@ -88,6 +88,8 @@ export const agentRuns = sqliteTable('agent_runs', {
   prUrl: text('pr_url').notNull().default(''), // PR 모드로 올린 pull request URL
   model: text('model').notNull().default(''), // 런치별 모델 지정(빈값 = CLI 기본)
   filesChanged: integer('files_changed').notNull().default(0),
+  agentPid: integer('agent_pid').notNull().default(0),   // detached sh pgid — 재시작 후 생존 판정/stop
+  logOffset: integer('log_offset').notNull().default(0), // 내구 로그에서 tail 이 소비한 바이트(재-adopt 시 여기부터)
   startedAt: integer('started_at', { mode: 'timestamp' }),
   endedAt: integer('ended_at', { mode: 'timestamp' }),
   exitSummary: text('exit_summary').notNull().default(''),

package/src/orchestrator.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { randomBytes } from 'node:crypto';
 import { posix as ppath } from 'node:path';
 import { createInterface } from 'node:readline';
-import { existsSync } from 'node:fs';
-import { mkdir, copyFile, readFile, writeFile, rm } from 'node:fs/promises';
+import { existsSync, statSync, openSync, readSync, closeSync, mkdirSync } from 'node:fs';
+import { mkdir, copyFile, readFile, writeFile, rm, unlink } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import type { ChildProcess } from 'node:child_process';
 import { eq, inArray } from 'drizzle-orm';
@@ -111,6 +111,80 @@ async function setRun(runId: number, patch: Partial<typeof agentRuns.$inferInser
 // 실행 중 run 의 자식 프로세스(stop 용). stoppedRuns = 사용자가 멈춘 run 표식.
 const liveChildren = new Map<number, ChildProcess>();
 const stoppedRuns = new Set<number>();
+// 재시작 후 재-adopt 되어 로그를 tail 중인 run(자식 객체는 없지만 살아있음).
+const adoptedRuns = new Set<number>();
+const sleep = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
+function pidAlive(pid: number): boolean {
+  if (!pid) return false;
+  try { process.kill(pid, 0); return true; } catch { return false; }
+}
+// ── 내구 실행 로그(재시작 내성 토대) ──────────────────────────
+// 에이전트 출력은 데몬 파이프가 아니라 이 파일로 리다이렉트된다 → 데몬이 죽어도
+// detached 에이전트가 계속 파일에 쓰고, 데몬은 부팅 후 offset 부터 재-tail 한다.
+function runsDir(): string {
+  const d = ppath.join(ppath.dirname(config.dbPath), 'runs');
+  try { mkdirSync(d, { recursive: true }); } catch { /* best effort */ }
+  return d;
+}
+function runLogPath(runId: number): string { return ppath.join(runsDir(), `r${runId}.log`); }
+const DONE_RE = /^__COXPIT_DONE__:(-?\d+)\s*$/;
+/** 로그 파일 tail — offset 부터 새 바이트를 읽어 라인 파싱→이벤트, 종료 센티넬(__COXPIT_DONE__) 감지.
+ *  aliveCheck 가 false 면(센티넬 없이 프로세스 사망) code=-1 로 종료. offset 은 주기적으로 영속. */
+async function tailRunLog(
+  runId: number, provider: Provider, fromOffset: number,
+  aliveCheck?: () => boolean,
+): Promise<{ code: number; lastResult: string; offset: number }> {
+  const log = runLogPath(runId);
+  let offset = Math.max(0, fromOffset);
+  let buf = '';
+  let lastResult = '';
+  let code = 0;
+  let done = false;
+  let sincePersist = 0;
+  const consume = () => {
+    if (!existsSync(log)) return;
+    const size = statSync(log).size;
+    if (size <= offset) return;
+    const fd = openSync(log, 'r');
+    try {
+      const b = Buffer.alloc(size - offset);
+      readSync(fd, b, 0, b.length, offset);
+      offset = size; buf += b.toString('utf8');
+    } finally { closeSync(fd); }
+    let nl: number;
+    while ((nl = buf.indexOf('\n')) >= 0) {
+      const line = buf.slice(0, nl); buf = buf.slice(nl + 1);
+      const m = DONE_RE.exec(line);
+      if (m) { code = parseInt(m[1] ?? '0', 10) || 0; done = true; continue; }
+      const p = provider.parseLine(line);
+      if (p) {
+        if (p.sessionId) void setRun(runId, { sessionId: p.sessionId });
+        if (p.resultText != null) lastResult = p.resultText;
+        void recordEvent(runId, p.kind, p.stored.slice(0, 2000));
+        continue;
+      }
+      // stdout+stderr 를 한 로그로 합쳤으므로(2>&1), stream-json 이 아닌 non-json 라인 = stderr 로 살린다.
+      const t = line.trim();
+      if (t && t[0] !== '{') void recordEvent(runId, 'stderr', t.slice(0, 2000));
+    }
+  };
+  while (!done) {
+    consume();
+    if (done) break;
+    if (aliveCheck && !aliveCheck()) { consume(); if (!done) { code = -1; } break; }
+    if (++sincePersist >= 8) { sincePersist = 0; void persistLogOffset(runId, offset); }
+    await sleep(250);
+  }
+  consume();
+  void persistLogOffset(runId, offset);
+  return { code, lastResult, offset };
+}
+/** offset 만 가볍게 영속(broadcast 없이 — setRun 은 매번 broadcast 라 부적합). */
+async function persistLogOffset(runId: number, offset: number): Promise<void> {
+  try { await db.update(agentRuns).set({ logOffset: offset }).where(eq(agentRuns.id, runId)); } catch { /* best effort */ }
+}
 // ── 에이전트 셀프 오케스트레이션 ──────────────────────────────
 // run 마다 1회용 토큰을 발급해 에이전트 env 로 준다. 에이전트는 그 토큰으로
@@ -130,9 +204,9 @@ export function resolveAgentToken(token: string): number | null {
   return agentTokens.get(token) ?? null;
 }
-/** run 이 지금 살아 있는가(자식 프로세스 보유). aggregate 뷰의 live/steerable 판정용. */
+/** run 이 지금 살아 있는가(자식 프로세스 보유 or 재-adopt tail 중). aggregate 뷰의 live/steerable 판정용. */
 export function isRunLive(runId: number): boolean {
-  return liveChildren.has(runId);
+  return liveChildren.has(runId) || adoptedRuns.has(runId);
 }
 /** 에이전트 프롬프트에 붙는 능력 고지 — 독립 하위작업을 병렬 서브런으로 뺄 수 있다.
@@ -408,34 +482,48 @@ export async function launchRun(runId: number, real?: boolean): Promise<void> {
  * 에이전트 자식 프로세스 배선(공용) — 프로바이더가 stdout 라인을 정규화 이벤트로
  * 파싱, session 캡처, 종료 시 files_changed 집계 + 상태 전이. launchRun/steerRun 공유.
  */
-async function runAgentChild(runId: number, machine: MachineTarget, wtPath: string, cmd: string, provider: Provider): Promise<void> {
-  const child = spawnShellOn(machine, cmd);
-  liveChildren.set(runId, child);
+async function runAgentChild(runId: number, machine: MachineTarget, wtPath: string, cmd: string, provider: Provider, opts?: { fresh?: boolean }): Promise<void> {
+  const isRemote = machine.kind !== 'local' && machine.address !== '';
+  let code: number;
   let lastResult = '';
-  if (child.stdout) {
-    const rl = createInterface({ input: child.stdout });
-    rl.on('line', (line: string) => {
-      const p = provider.parseLine(line);
-      if (!p) return;
-      if (p.sessionId) void setRun(runId, { sessionId: p.sessionId }); // steer(resume)용 세션 키
-      if (p.resultText != null) lastResult = p.resultText;
-      void recordEvent(runId, p.kind, p.stored.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);
+  if (isRemote) {
+    // 원격: ssh stdout 파이프를 실시간 파싱(기존 동작). 로그 파일/재-adopt 는 로컬 전용.
+    const child = spawnShellOn(machine, cmd);
+    liveChildren.set(runId, child);
+    if (child.stdout) {
+      const rl = createInterface({ input: child.stdout });
+      rl.on('line', (line: string) => {
+        const p = provider.parseLine(line);
+        if (!p) return;
+        if (p.sessionId) void setRun(runId, { sessionId: p.sessionId });
+        if (p.resultText != null) lastResult = p.resultText;
+        void recordEvent(runId, p.kind, p.stored.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)); });
+    }
+    code = await new Promise((resolve) => { child.on('close', (c) => resolve(c ?? 0)); child.on('error', () => resolve(-1)); });
+    liveChildren.delete(runId);
+  } else {
+    // 로컬: 에이전트 출력을 내구 로그로 리다이렉트 + 파일 tail(재시작 내성). 종료는 __COXPIT_DONE__ 센티넬.
+    const fresh = opts?.fresh !== false;   // launch=새 로그 / steer=이어쓰기
+    const log = runLogPath(runId);
+    const wrapped = `{ ${cmd} ; } ${fresh ? '>' : '>>'} ${shq(log)} 2>&1; printf '\\n__COXPIT_DONE__:%s\\n' "$?" >> ${shq(log)}`;
+    let fromOffset = 0;
+    if (fresh) { await setRun(runId, { logOffset: 0, agentPid: 0 }); }
+    else { const r = (await db.select({ o: agentRuns.logOffset }).from(agentRuns).where(eq(agentRuns.id, runId)).limit(1))[0]; fromOffset = r?.o ?? 0; }
+    const child = spawnShellOn(machine, wrapped);
+    liveChildren.set(runId, child);
+    child.on('error', () => { /* 파이프 미사용 — 로그 tail 이 진실 */ });
+    const pid = child.pid ?? 0;
+    if (pid) await setRun(runId, { agentPid: pid });
+    const r = await tailRunLog(runId, provider, fromOffset, () => pidAlive(pid));
+    code = r.code; lastResult = r.lastResult;
+    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;
@@ -443,7 +531,7 @@ async function runAgentChild(runId: number, machine: MachineTarget, wtPath: stri
   const wasStopped = stoppedRuns.delete(runId);
   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 });
+  await setRun(runId, { status, endedAt: new Date(), filesChanged, exitSummary, agentPid: 0 });
   // 문서 산출물을 정착 시점에 스냅샷 — worktree 소멸(머지·Close) 후에도 렌더 뷰 유지. best-effort.
   if (filesChanged > 0) void snapshotRunDocs(runId);
   void notifySettle(runId, status, filesChanged, exitSummary);
@@ -528,9 +616,9 @@ export async function steerRun(runId: number, message: string, mode: 'work' | 'a
   const cmd = `cd ${shq(wt)} && ${envPrefix}${pidPrefix}{ ${resume}; }`;
   if (!isRemote && config.agentOrch) {
     const orchTimer = startOrchWatch(runId, wt, true);
-    void runAgentChild(runId, ctx.machine, wt, cmd, provider).finally(() => clearInterval(orchTimer));
+    void runAgentChild(runId, ctx.machine, wt, cmd, provider, { fresh: false }).finally(() => clearInterval(orchTimer));
   } else {
-    void runAgentChild(runId, ctx.machine, wt, cmd, provider);
+    void runAgentChild(runId, ctx.machine, wt, cmd, provider, { fresh: false });
   }
   return { ok: true, detail: 'steering' };
 }
@@ -554,6 +642,12 @@ export async function stopRun(runId: number): Promise<{ ok: boolean; detail: str
     // stop 요청을 정산으로 처리해 카드가 영원히 '진행 중'으로 남지 않게 한다.
     const zr = (await db.select().from(agentRuns).where(eq(agentRuns.id, runId)).limit(1))[0];
     if (zr && (zr.status === 'running' || zr.status === 'starting')) {
+      // 재-adopt 되어 tail 중인 살아있는 로컬 에이전트 — 프로세스 그룹 종료. tailer 가 stopped 로 정산.
+      if (zr.agentPid && pidAlive(zr.agentPid)) {
+        stoppedRuns.add(runId);
+        try { process.kill(-zr.agentPid, 'SIGTERM'); } catch { try { process.kill(zr.agentPid, 'SIGTERM'); } catch { /* gone */ } }
+        return { ok: true, detail: 'stopping (re-adopted agent)' };
+      }
       await setRun(runId, { status: 'stopped', endedAt: new Date(), exitSummary: 'orphaned (daemon restarted) — settled by stop' });
       await recordEvent(runId, 'meta', JSON.stringify({ orphanSettled: true }));
       return { ok: true, detail: 'no live process — settled as stopped' };
@@ -1446,15 +1540,67 @@ export async function listDocuments(): Promise<{ runs: Array<{
  * 부팅 정산 — 데몬 재시작 후 살아있는 자식이 있을 수 없는데 DB 가 running/starting 인
  * run(고아)을 failed 로 정리한다. workbench('open')는 에이전트가 없으므로 대상 아님.
  */
+/** 재-adopt: 살아있는 로컬 run 의 로그를 offset 부터 이어 tail → 완료 시 정산. status 는 running 유지. */
+async function reAdoptRun(run: typeof agentRuns.$inferSelect): Promise<void> {
+  adoptedRuns.add(run.id);
+  await recordEvent(run.id, 'meta', JSON.stringify({ reAdopted: true }));
+  const ctx = await loadContext(run.id);
+  const provider = getProvider(run.agent || 'claude-code');
+  const machine: MachineTarget = ctx?.machine ?? { slug: 'local', kind: 'local', address: '', sshUser: '' };
+  const wasStopped0 = stoppedRuns.has(run.id);
+  const { code, lastResult } = await tailRunLog(run.id, provider, run.logOffset ?? 0, () => pidAlive(run.agentPid));
+  adoptedRuns.delete(run.id);
+  const stat = await runShellOn(machine, `git -C ${shq(run.worktreePath)} status --porcelain | wc -l`, 10000);
+  const filesChanged = stat.ok ? parseInt(stat.stdout.trim(), 10) || 0 : 0;
+  const wasStopped = stoppedRuns.delete(run.id) || wasStopped0;
+  const status = wasStopped ? 'stopped' : code === 0 ? 'done' : 'failed';
+  const exitSummary = wasStopped ? 'stopped by user' : lastResult ? lastResult.slice(0, 500) : `exit ${code}`;
+  await setRun(run.id, { status, endedAt: new Date(), filesChanged, exitSummary, agentPid: 0 });
+  if (filesChanged > 0) void snapshotRunDocs(run.id);
+  void notifySettle(run.id, status, filesChanged, exitSummary);
+}
+/**
+ * 부팅 시 이전 인스턴스의 라이브 run 정산 — 이제 무조건 failed 가 아니라:
+ *  ① 에이전트 프로세스(agentPid)가 살아있으면 로그를 이어 tail(재-adopt) → running 유지
+ *  ② 이미 로그에 __COXPIT_DONE__ 이 있거나 프로세스 죽음 → 그 결과로 정산
+ *  ③ 그 외(원격·pid 없음) → orphaned failed (기존 동작, worktree/diff 보존)
+ * 반환 = 재-adopt 된 run 수(정산된 고아는 미포함).
+ */
 export async function reconcileOrphanRuns(): Promise<number> {
   const stale = (await db.select().from(agentRuns)).filter(
     (r) => r.status === 'running' || r.status === 'starting',
   );
+  let adopted = 0;
   for (const r of stale) {
-    await setRun(r.id, { status: 'failed', endedAt: new Date(), exitSummary: 'orphaned by daemon restart' });
+    if (r.agentPid && pidAlive(r.agentPid)) {
+      // 아직 살아있는 로컬 에이전트 — 이어받는다(백그라운드 tail).
+      void reAdoptRun(r);
+      adopted++;
+      continue;
+    }
+    // 죽었지만 로그에 완료 센티넬이 있으면 그 결과로 정산(다운타임 중 끝난 경우).
+    const log = runLogPath(r.id);
+    let doneCode: number | null = null;
+    try {
+      if (existsSync(log)) {
+        const tail = (await readFile(log, 'utf8')).slice(-4000);
+        const m = /__COXPIT_DONE__:(-?\d+)/.exec(tail);
+        if (m) doneCode = parseInt(m[1] ?? '0', 10) || 0;
+      }
+    } catch { /* ignore */ }
+    if (doneCode !== null) {
+      const stat = await runShellOn({ slug: 'local', kind: 'local', address: '', sshUser: '' }, `git -C ${shq(r.worktreePath)} status --porcelain | wc -l`, 10000);
+      const filesChanged = stat.ok ? parseInt(stat.stdout.trim(), 10) || 0 : 0;
+      const status = doneCode === 0 ? 'done' : 'failed';
+      await setRun(r.id, { status, endedAt: new Date(), filesChanged, exitSummary: `settled on restart (exit ${doneCode})`, agentPid: 0 });
+      if (filesChanged > 0) void snapshotRunDocs(r.id);
+      continue;
+    }
+    await setRun(r.id, { status: 'failed', endedAt: new Date(), exitSummary: 'orphaned by daemon restart', agentPid: 0 });
     await recordEvent(r.id, 'error', 'daemon restarted while this run was live — settled as failed (worktree/branch preserved; diff still reviewable)');
   }
-  return stale.length;
+  return adopted;
 }
 /**
@@ -1614,6 +1760,8 @@ export async function cleanupRun(runId: number): Promise<{ ok: boolean; detail:
   if (!ctx || !run || !run.worktreePath) return { ok: false, detail: 'no worktree' };
   // worktree 를 지우기 전에 문서 스냅샷(정착 안 하는 워크벤치·수정편집도 포착). best-effort.
   await snapshotRunDocs(runId).catch(() => { /* 스냅샷 실패는 정리를 막지 않음 */ });
+  // 내구 실행 로그도 정리(무한 증가 방지). best-effort. (아래 지역변수 rm 과 이름 충돌 회피로 unlink 사용)
+  try { await unlink(runLogPath(runId)); } catch { /* gone */ }
   // 원격에 잔존 에이전트가 있으면 worktree 제거 전에 죽인다(파일 잠금·좀비 방지).
   if (ctx.machine.kind !== 'local' && ctx.machine.address !== '') {
     await runShellOn(ctx.machine, remoteKillScript(run.worktreePath), 15000);

package/src/server.ts CHANGED Viewed

@@ -25,6 +25,7 @@ import { addSink, removeSink, broadcast } from './hub';
 import { getProvider, listProviders } from './providers';
 import { remoteState, setServe, setFunnel } from './remote';
 import { BOARD_HTML } from './board';
+import { COCKPIT_HTML } from './cockpit';
 const require_ = createRequire(import.meta.url);
@@ -203,6 +204,8 @@ export async function buildServer(): Promise<FastifyInstance> {
   // 플릿 보드(단일 페이지). 인증 게이트 적용됨(무인증 요청은 게이트가 login/setup 페이지로 응답).
   app.get('/', async (_req, reply) => reply.type('text/html').send(BOARD_HTML));
+  // 터미널 우선 셸(병행 개발) — 백엔드는 보드와 공유. Phase 5에서 데스크톱 기본을 여기로 플립 예정.
+  app.get('/cockpit', async (_req, reply) => reply.type('text/html').send(COCKPIT_HTML));
   // ─── 접근키 인증(access-key) ────────────────────────────────────
   // 요청이 tunnel/https 를 탔나 — Secure 쿠키 여부 결정용.