coxpit 5.18.0 → 5.21.0

package/README.md

@@ -72,6 +72,23 @@ Your keys and login never touch coxpit's config or database.
 
 > **New here?** The **[full guide](docs/GUIDE.md)** ([한국어](docs/GUIDE.ko.md)) walks through starting a new project, your first fleet, comparing and merging, doc mode, the terminal, remote access, and every feature — task by task, with GIFs.
 
+## Dispatch from the terminal
+
+The daemon isn't only a web board — you can throw work at a project straight from a shell. Handy when your main workspace session is a terminal and you just want to fan agents at a repo without leaving it. You name the target project each time (no sticky default — the target stays visible in the command you typed):
+
+```console
+$ coxpit ls                              # projects + active runs
+  triforge   2 running
+  keeping    idle
+$ coxpit fan triforge "add retry to the uploader" -n 2
+  ▶ triforge · 2 runs (dry) · r58 r59
+$ coxpit ps                              # what's running
+$ coxpit steer r58 "log the retries too"
+$ coxpit add /path/to/repo               # register a repo as a project
+```
+
+Runs land in the project like any board-launched run (isolated worktree + branch, reviewable in the board/cockpit Review). Default is a **dry rehearsal** — add `--real` to spend credits (`-n` sets parallelism 1–8, `--agent`/`--model` override). The CLI finds the daemon via its lock file; if auth is on, set `COXPIT_KEY` (or `COXPIT_AUTH_PASS`) to your access key.
+
 ## Configuration
 
 | env | default | what |

package/bin/coxpit.js

@@ -7,6 +7,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import { dirname, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { readFileSync, existsSync, rmSync } from 'node:fs';
+import http from 'node:http';
 
 const root = dirname(dirname(fileURLToPath(import.meta.url)));
 const entry = join(root, 'src', 'index.ts');
@@ -28,6 +29,18 @@ Usage:
   coxpit --version, -v   print version
   coxpit --help, -h      show this help
 
+Dispatch orchestration to a project (from your workspace terminal):
+  coxpit ls                             list projects + active runs
+  coxpit fan <project> "<goal>" [opts]  launch agent runs on <project>
+       -n N          number of parallel runs (1-8, default 1)
+       --real        run the real agent (spends credits; default is dry rehearsal)
+       --agent X     claude-code | codex     --model M   model override
+  coxpit ps                             list active runs
+  coxpit steer <run> "<message>"        send follow-up to a running agent
+  coxpit add <path>                     register a git repo as a project
+  The target is always named per command (no sticky default). Talks to the local
+  daemon via its lock file; set COXPIT_KEY (or COXPIT_AUTH_PASS) if auth is on.
+
 Access-key auth:
   On first boot with no key, open the board to set an access key (a one-time
   setup token is printed to the log — needed unless you visit http://127.0.0.1
@@ -65,13 +78,129 @@ if (args[0] === 'reset-key') {
   process.exit(0);
 }
 
-// --import 의 bare 'tsx' 는 사용자 cwd 기준으로 해석돼 npx 실행에서 깨진다 —
-// 패키지 루트 기준으로 절대경로 해석해 넘긴다.
-const require_ = createRequire(join(root, 'package.json'));
-const tsxEntry = pathToFileURL(require_.resolve('tsx')).href;
+// ── Orchestration from the terminal — dispatch to the local daemon ──────────
+// The session is your workspace command post; you name the target project per
+// command (no sticky default — the target is always visible in what you typed).
+// Reuses the same API the board uses; loopback is still key-gated, so we auth
+// with COXPIT_KEY / COXPIT_AUTH_PASS when the daemon requires it.
+const SUBCMDS = new Set(['ls', 'projects', 'fan', 'run', 'ps', 'steer', 'add']);
+if (SUBCMDS.has(args[0])) {
+  const dbEnv = process.env.COXPIT_DB;
+  const dir = dbEnv ? dirname(resolve(dbEnv)) : join(homedir(), '.coxpit');
+  const lockPath = join(dir, 'daemon.lock.json');
+
+  const die = (msg) => { console.error('coxpit: ' + msg); process.exit(1); };
+  let port;
+  try {
+    const lk = JSON.parse(readFileSync(lockPath, 'utf8'));
+    if (!Number.isInteger(lk?.port)) throw new Error('no port');
+    port = lk.port;
+  } catch {
+    die('no running daemon (lock not found at ' + lockPath + ') — start it with "coxpit".');
+  }
+  const key = process.env.COXPIT_KEY || process.env.COXPIT_AUTH_PASS || '';
+  const authHeaders = key ? { authorization: 'Basic ' + Buffer.from('coxpit:' + key).toString('base64') } : {};
+
+  const api = (method, path, body) => new Promise((res, rej) => {
+    const data = body != null ? JSON.stringify(body) : null;
+    const req = http.request(
+      { host: '127.0.0.1', port, path, method, headers: { 'content-type': 'application/json', ...authHeaders, ...(data ? { 'content-length': Buffer.byteLength(data) } : {}) } },
+      (r) => { let b = ''; r.on('data', (d) => b += d); r.on('end', () => { let j = null; try { j = b ? JSON.parse(b) : null; } catch { /* non-json */ } res({ status: r.statusCode, json: j, raw: b }); }); },
+    );
+    req.on('error', rej); if (data) req.write(data); req.end();
+  });
+  const guard = (r) => {
+    if (r.status === 401) die('daemon requires an access key — set COXPIT_KEY (or COXPIT_AUTH_PASS) to your key.');
+    if (r.status >= 400) die((r.json && r.json.error) || ('HTTP ' + r.status));
+    return r;
+  };
+  const num = (flag, def) => { const i = args.indexOf(flag); return i >= 0 && args[i + 1] != null ? Number(args[i + 1]) : def; };
+  const str = (flag, def) => { const i = args.indexOf(flag); return i >= 0 && args[i + 1] != null ? args[i + 1] : def; };
+  const has = (flag) => args.includes(flag);
+  // positional args = everything that isn't a flag or a flag's value
+  const positionals = () => {
+    const flagsWithVal = new Set(['-n', '--count', '--agent', '--model']);
+    const out = []; for (let i = 1; i < args.length; i++) { const a = args[i]; if (a.startsWith('-')) { if (flagsWithVal.has(a)) i++; continue; } out.push(a); }
+    return out;
+  };
+  const realRepos = async () => (guard(await api('GET', '/api/fleet?view=all')).json.repos || []).filter((r) => r.kind !== 'sessions');
+  const matchRepo = (repos, name) => {
+    const n = String(name || '').toLowerCase();
+    let hit = repos.filter((r) => r.name.toLowerCase() === n);
+    if (!hit.length) hit = repos.filter((r) => r.name.toLowerCase().startsWith(n));
+    if (!hit.length) hit = repos.filter((r) => r.name.toLowerCase().includes(n));
+    return hit;
+  };
+
+  (async () => {
+    const cmd = args[0];
+    if (cmd === 'ls' || cmd === 'projects') {
+      const fleet = guard(await api('GET', '/api/fleet?view=all')).json;
+      const repos = (fleet.repos || []).filter((r) => r.kind !== 'sessions');
+      const runs = fleet.runs || [];
+      if (!repos.length) { console.log('no projects registered — "coxpit add <path>" or register one in the board.'); process.exit(0); }
+      const active = (repoId) => runs.filter((r) => { const t = (fleet.tasks || []).find((x) => x.id === r.taskId); return t && t.repoId === repoId && (r.status === 'running' || r.status === 'pending'); }).length;
+      const w = Math.max(...repos.map((r) => r.name.length), 7);
+      for (const r of repos) { const a = active(r.id); console.log('  ' + r.name.padEnd(w) + '  ' + (a ? a + ' running' : 'idle')); }
+      process.exit(0);
+    }
+    if (cmd === 'ps') {
+      const fleet = guard(await api('GET', '/api/fleet?view=all')).json;
+      const repoName = Object.fromEntries((fleet.repos || []).map((r) => [r.id, r.name]));
+      const taskById = Object.fromEntries((fleet.tasks || []).map((t) => [t.id, t]));
+      const live = (fleet.runs || []).filter((r) => r.status === 'running' || r.status === 'pending');
+      if (!live.length) { console.log('no active runs.'); process.exit(0); }
+      for (const r of live) { const t = taskById[r.taskId]; const rn = t ? repoName[t.repoId] : '?'; console.log('  r' + r.id + '  ' + r.status.padEnd(8) + '  ' + (rn || '?') + '  ' + (t ? t.title : '').slice(0, 50)); }
+      process.exit(0);
+    }
+    if (cmd === 'add') {
+      const p = positionals()[0]; if (!p) die('usage: coxpit add <path>');
+      const abs = resolve(p);
+      const r = guard(await api('POST', '/api/repos', { machineSlug: 'local', path: abs }));
+      console.log('registered ' + (r.json.repo ? r.json.repo.name : abs));
+      process.exit(0);
+    }
+    if (cmd === 'steer') {
+      const pos = positionals(); const rid = String(pos[0] || '').replace(/^r/, ''); const msg = pos.slice(1).join(' ');
+      if (!rid || !msg) die('usage: coxpit steer <run> "<message>"');
+      guard(await api('POST', '/api/runs/' + Number(rid) + '/steer', { message: msg }));
+      console.log('steered r' + rid);
+      process.exit(0);
+    }
+    if (cmd === 'fan' || cmd === 'run') {
+      const pos = positionals();
+      const project = pos[0]; const goal = pos.slice(1).join(' ');
+      if (!project || !goal) die('usage: coxpit fan <project> "<goal>" [-n N] [--real] [--agent claude-code|codex] [--model M]');
+      const repos = await realRepos();
+      const hit = matchRepo(repos, project);
+      if (!hit.length) die('no project matches "' + project + '" — try "coxpit ls".');
+      if (hit.length > 1) die('"' + project + '" is ambiguous: ' + hit.map((r) => r.name).join(', '));
+      const repo = hit[0];
+      const count = Math.max(1, Math.min(8, num('-n', num('--count', 1)) || 1));
+      const real = has('--real');
+      const agent = str('--agent', undefined);
+      const model = str('--model', undefined);
+      const task = guard(await api('POST', '/api/tasks', { repoId: repo.id, title: goal.slice(0, 140), prompt: goal })).json.task;
+      const body = { count, real }; if (agent) body.agent = agent; if (model) body.model = model;
+      const runs = guard(await api('POST', '/api/tasks/' + task.id + '/run', body)).json.runs || [];
+      console.log('▶ ' + repo.name + ' · ' + count + (count === 1 ? ' run' : ' runs') + (real ? ' (real)' : ' (dry)') + ' · ' + runs.map((r) => 'r' + r.id).join(' '));
+      console.log('  watch: coxpit ps  ·  compare/merge in the board/cockpit Review');
+      process.exit(0);
+    }
+  })().catch((e) => die(String(e && e.message || e)));
+}
+
+// 서브커맨드는 위 async IIFE 가 처리하고 스스로 exit 한다 — 데몬 기동으로 fall through 하면 안 됨
+// (async 라 동기 흐름이 여기까지 내려오므로 명시 가드).
+if (!SUBCMDS.has(args[0])) {
+  // --import 의 bare 'tsx' 는 사용자 cwd 기준으로 해석돼 npx 실행에서 깨진다 —
+  // 패키지 루트 기준으로 절대경로 해석해 넘긴다.
+  const require_ = createRequire(join(root, 'package.json'));
+  const tsxEntry = pathToFileURL(require_.resolve('tsx')).href;
 
-const child = spawn(process.execPath, ['--import', tsxEntry, entry, ...process.argv.slice(2)], {
-  stdio: 'inherit',
-  env: process.env,
-});
-child.on('exit', (code, sig) => process.exit(code ?? (sig ? 1 : 0)));
+  const child = spawn(process.execPath, ['--import', tsxEntry, entry, ...process.argv.slice(2)], {
+    stdio: 'inherit',
+    env: process.env,
+  });
+  child.on('exit', (code, sig) => process.exit(code ?? (sig ? 1 : 0)));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coxpit",
-  "version": "5.18.0",
+  "version": "5.21.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": "SEE LICENSE IN LICENSE.md",

package/src/cockpit.ts

@@ -61,7 +61,7 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
   .lbl{font-size:10px;letter-spacing:.14em;text-transform:uppercase;color:var(--faint);padding:6px 8px 10px;display:flex;justify-content:space-between}
   .tnode{display:flex;align-items:center;gap:8px;padding:6px 8px;border-radius:7px;color:var(--muted);white-space:nowrap;cursor:default}
   .tnode .car{color:var(--faint);width:9px;display:inline-block;text-align:center;cursor:pointer}
-  .tnode .n{overflow:hidden;text-overflow:ellipsis;flex:1}
+  .tnode .n{overflow:hidden;text-overflow:ellipsis;flex:1;min-width:0}
   .tnode .meta{color:var(--faint);font-size:11px}
   .tnode.repo{color:var(--ink)}
   .tnode.goal{padding-left:20px} .tnode.goal .gi{color:var(--brand)}
@@ -144,7 +144,8 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
   .view-bar button:hover{border-color:var(--brand)}
   .view-bar .prim{color:var(--brand-ink);background:var(--brand);border-color:var(--brand)}
   .view-body{flex:1;min-height:0;overflow:auto;background:var(--bg);position:relative}
-  .view-body iframe{width:100%;height:100%;border:0;background:#fff}
+  .view-body:has(iframe){overflow:hidden}   /* iframe 이 자체 스크롤 — 바깥 view-body 는 스크롤 금지(이중 스크롤바 방지) */
+  .view-body iframe{display:block;width:100%;height:100%;border:0;background:#fff}
   .view-body img{max-width:100%;display:block;margin:0 auto;padding:12px}
   .view-body pre.vtext{margin:0;padding:12px 14px;font-family:var(--mono);font-size:12px;line-height:1.55;color:var(--ink);white-space:pre-wrap;word-break:break-word}
   .view-body textarea.vedit{width:100%;height:100%;box-sizing:border-box;border:0;outline:none;resize:none;padding:12px 14px;font-family:var(--mono);font-size:12.5px;line-height:1.55;color:var(--ink);background:var(--bg)}
@@ -189,7 +190,11 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
   .pick-h .x{margin-left:auto;background:none;border:none;color:var(--faint);font-size:16px;cursor:pointer}
   .pick-h .x:hover{color:var(--ink)}
   .pick-path{padding:8px 15px;font-size:11.5px;color:var(--brand);border-bottom:1px solid var(--line);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;direction:rtl;text-align:left}
+  .fp-search{padding:8px 12px;border-bottom:1px solid var(--line)}
+  .fp-search input{width:100%;box-sizing:border-box;font-family:var(--mono);font-size:12px;color:var(--ink);background:var(--panel);border:1px solid var(--line-hi);border-radius:7px;padding:7px 10px;outline:none}
+  .fp-search input:focus{border-color:var(--brand)}
   .pick-list{flex:1;overflow:auto;padding:6px}
+  .pick-row .rel{margin-left:auto;font-size:10px;color:var(--faint);overflow:hidden;text-overflow:ellipsis;white-space:nowrap;direction:rtl;max-width:60%}
   .pick-row{display:flex;align-items:center;gap:9px;padding:7px 10px;border-radius:7px;cursor:pointer;font-size:12.5px;color:var(--muted)}
   .pick-row:hover{background:var(--surface2);color:var(--ink)}
   .pick-row .ic{width:14px;text-align:center;color:var(--faint)}
@@ -215,7 +220,12 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
   .lbl .lnk{color:var(--brand);cursor:pointer;font-size:10px;letter-spacing:0;text-transform:none}
   .tnode.session{padding-left:20px;cursor:pointer} .tnode.session:hover{background:var(--surface)}
   .tnode.session.open{background:var(--brand-dim);color:var(--ink);box-shadow:inset 0 0 0 1px rgba(78,201,176,.22)}
-  .tnode.session .p{color:var(--faint);font-size:10.5px;overflow:hidden;text-overflow:ellipsis}
+  /* 이름 우선: .n(flex:1) 이 공간을 갖고, 경로는 끝만 짧게(고정 폭) — hover 시 title 로 전체 표시 */
+  .tnode.session .p{flex:0 1 auto;max-width:64px;color:var(--faint);font-size:10.5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;direction:rtl;text-align:left}
+  .tnode.session:hover .p{color:var(--muted)}
+  .tnode.session .del{margin-left:auto;color:var(--faint);border:none;background:none;cursor:pointer;font-size:13px;line-height:1;padding:0 3px;opacity:0;flex:none}
+  .tnode.session:hover .del{opacity:1} .tnode.session .del:hover{color:var(--failed)}
+  body.touch .tnode.session .del{opacity:.65}
 
   .toast{position:fixed;bottom:64px;left:50%;transform:translateX(-50%);background:var(--surface2);border:1px solid var(--line-hi);color:var(--ink);
     font-family:var(--mono);font-size:12px;padding:8px 14px;border-radius:9px;opacity:0;transition:opacity .2s;pointer-events:none;z-index:40;max-width:80vw}
@@ -432,10 +442,11 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
   <div class="pick">
     <div class="pick-h"><span class="t">파일 보기</span><button class="x" id="fpClose" title="닫기">×</button></div>
     <div class="pick-path" id="fpPath">…</div>
+    <div class="fp-search"><input id="fpSearch" placeholder="이 폴더 아래에서 이름으로 검색 (2자 이상)" autocomplete="off" spellcheck="false" /></div>
     <div class="pick-list" id="fpList"></div>
     <div class="pick-f">
       <button class="home" id="fpHome" title="홈으로">⌂ home</button>
-      <span style="flex:1;font-size:11px;color:var(--faint)">폴더=이동 · 파일=뷰어로 열기</span>
+      <span id="fpHint" style="flex:1;font-size:11px;color:var(--faint)">폴더=이동 · 파일=뷰어로 열기</span>
     </div>
   </div>
 </div>
@@ -543,8 +554,12 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
     if (sessRuns.length){
       sessRuns.forEach(function(s){
         var r=s.run; var open = tabs[r.id] ? ' open' : '';
-        html += '<div class="tnode session'+open+'" data-run="'+r.id+'"><span class="st '+esc(r.status)+'"></span>'
-          + '<span class="n">'+esc(s.title||'session')+'</span><span class="p">'+esc((r.worktreePath||'').replace(/^.*\\/([^/]+\\/[^/]+)$/,'…/$1'))+'</span></div>';
+        var sPath=(r.worktreePath||'');
+        var sTail=sPath.replace(/^.*\\/([^/]+)$/,'$1');   // 마지막 폴더명만(끝 조금)
+        html += '<div class="tnode session'+open+'" data-run="'+r.id+'" title="'+esc(sPath)+'"><span class="st '+esc(r.status)+'"></span>'
+          + '<span class="n" title="'+esc(s.title||'session')+'">'+esc(s.title||'session')+'</span>'
+          + '<span class="p" title="'+esc(sPath)+'">'+esc(sTail)+'</span>'
+          + '<button class="del" data-delsession="'+r.id+'" title="세션 삭제 — 터미널만 종료, 폴더·파일은 보존">×</button></div>';
       });
     } else {
       html += '<div class="tnode empty" style="padding-left:14px">열린 세션 없음 — ＋ Session 으로 폴더 지정</div>';
@@ -586,6 +601,8 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
   }
   $('tree').addEventListener('click', function(e){
     if (e.target.closest('[data-newsession]')){ openSession(); return; }
+    var del = e.target.closest('[data-delsession]');
+    if (del){ e.stopPropagation(); deleteSession(+del.dataset.delsession); return; }
     var run = e.target.closest('[data-run]');
     if (run){ openRunPane(+run.dataset.run); if (isMobile()) setDrawer(false); return; }
     var fn = e.target.closest('[data-fold]');
@@ -644,6 +661,26 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
     try{ term.loadAddon(new window.Unicode11Addon.Unicode11Addon()); term.unicode.activeVersion='11'; }catch(e){}
     // URL 링크 클릭 가능(웹=새 탭, 데스크톱 앱=시스템 브라우저 — setWindowOpenHandler 가 external 로).
     try{ term.loadAddon(new window.WebLinksAddon.WebLinksAddon(function(ev, uri){ window.open(uri, '_blank', 'noopener'); })); }catch(e){}
+    // 파일 경로 링크: 에이전트가 찍는 경로(src/x.ts:12 · /Users/…/README.md 등)를 클릭하면 뷰어 페인으로.
+    try{ term.registerLinkProvider({ provideLinks: function(y, cb){
+      var ln; try{ ln=term.buffer.active.getLine(y-1); }catch(e){ cb(undefined); return; }
+      if(!ln){ cb(undefined); return; }
+      var s=ln.translateToString(true);
+      var re=/(?:~\\/|\\.{0,2}\\/)?[\\w.\\-\\/]*\\.[A-Za-z0-9]{1,8}(?::\\d+(?::\\d+)?)?/g;
+      var links=[], m;
+      while((m=re.exec(s))){
+        var raw=m[0]; if(!raw || raw.indexOf('://')>=0 || raw.slice(0,2)==='//') continue;   // URL 은 WebLinksAddon 담당
+        var before = m.index>0 ? s.charAt(m.index-1) : ' ';
+        if(before===':' || before==='/' || /[A-Za-z0-9]/.test(before)) continue;   // URL 조각·토큰 중간 배제
+        var pathPart=raw.replace(/:\\d+(?::\\d+)?$/,'');
+        var ext=(pathPart.split('.').pop()||'').toLowerCase();
+        if(!(VIEW_EXT[ext] || pathPart.indexOf('/')>=0)) continue;  // 오탐 축소: 알려진 확장자거나 경로형
+        var sx=m.index+1, ex=m.index+raw.length;
+        links.push({ text:raw, range:{ start:{x:sx,y:y}, end:{x:ex,y:y} },
+          activate:function(ev, txt){ openPathFromTerm(runId, txt); } });
+      }
+      cb(links.length?links:undefined);
+    }}); }catch(e){}
     // 복사 배선: xterm 은 user-select:none 이라 네이티브 선택이 없다 → term.getSelection() 을 직접 클립보드로.
     // ① 드래그 놓으면 자동 복사(select-to-copy) ② Cmd/Ctrl+C 로도 복사(선택 없으면 통과 → SIGINT).
     var copySel=function(){ var s=''; try{ s=term.getSelection(); }catch(e){} if(!s) return false;
@@ -675,8 +712,21 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
     return t;
   }
   function openViewer(path, name){ var t=ensureViewer(path, name); openTab(t.runId); }
+  // 뷰어 대상 확장자(터미널 경로 링크 오탐 축소용)
+  var VIEW_EXT = (function(){ var o={}; ('md markdown mdx html htm pdf png jpg jpeg gif webp svg bmp ico avif txt env json jsonc yaml yml toml ini conf cfg log csv tsv xml sql sh bash zsh js cjs mjs ts tsx jsx css scss less py rb php go rs java c h cpp hpp swift kt lua pl r dart vue svelte').split(' ').forEach(function(e){o[e]=1;}); return o; })();
+  var fsHome = '';
+  try{ fetch('/api/fs/list').then(function(r){return r.json();}).then(function(d){ fsHome=d.home||''; }).catch(function(){}); }catch(e){}
+  // 터미널에서 클릭한 경로 → 절대경로로 해석 후 뷰어 페인. 상대경로는 그 run 의 작업폴더(cwd) 기준.
+  function openPathFromTerm(runId, raw){
+    var p=(raw||'').replace(/:\\d+(?::\\d+)?$/,'');   // :line:col 제거
+    var abs;
+    if(p.charAt(0)==='/') abs=p;
+    else if(p.slice(0,2)==='~/') abs=(fsHome||'').replace(/\\/$/,'')+p.slice(1);
+    else { var r=runById[runId]; var cwd=r&&r.worktreePath; if(!cwd){ toast('작업 폴더를 몰라 경로를 열 수 없습니다'); return; } abs=cwd.replace(/\\/$/,'')+'/'+p; }
+    openViewer(abs);
+  }
   function fmtSize(n){ return n<1024?(n+' B'):n<1048576?((n/1024).toFixed(1)+' KB'):((n/1048576).toFixed(1)+' MB'); }
-  var MD_FRAME_CSS = 'body{margin:0;padding:18px 22px;background:#0b0d12;color:#dee4ec;font:14px/1.7 -apple-system,BlinkMacSystemFont,\\'Apple SD Gothic Neo\\',\\'Noto Sans KR\\',sans-serif;max-width:800px}'
+  var MD_FRAME_CSS = 'body{margin:0 auto;padding:40px 28px 80px;background:#0b0d12;color:#dee4ec;font:14px/1.7 -apple-system,BlinkMacSystemFont,\\'Apple SD Gothic Neo\\',\\'Noto Sans KR\\',sans-serif;max-width:740px}'
     + 'a{color:#4ec9b0}h1,h2,h3{color:#fff;line-height:1.3}h1{border-bottom:1px solid #2c3444;padding-bottom:.3em}h2{border-bottom:1px solid #232a36;padding-bottom:.25em}'
     + 'code{background:#1c212c;padding:.15em .4em;border-radius:4px;font-family:ui-monospace,Menlo,monospace;font-size:.9em}'
     + 'pre{background:#12161d;padding:12px 14px;border-radius:8px;overflow:auto}pre code{background:none;padding:0}'
@@ -1055,6 +1105,15 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
   // ── 자유 세션 — 폴더를 지정해 tmux 셸(프로젝트 비소속). ──
   var pickPathCur = '';
   function machineSlug(){ return (fleet.machines && fleet.machines[0] && fleet.machines[0].slug) || 'local'; }
+  async function deleteSession(runId){
+    if(!confirm('이 세션을 삭제할까요?\\n터미널만 종료됩니다 · 폴더와 파일은 그대로 보존됩니다.')) return;
+    try{
+      var res=await fetch('/api/runs/'+runId,{method:'DELETE'});
+      var j=await res.json().catch(function(){return{};});
+      if(res.ok){ if(tabs[runId]) closeTab(runId); toast('세션 삭제됨 (폴더 보존)'); await hydrate(); }
+      else toast('삭제 실패: '+(j.error||res.status));
+    }catch(e){ toast('삭제 실패: '+e); }
+  }
   function openSession(){ $('pickModal').classList.add('on'); $('pickName').value=''; browseTo(''); }
   function closePicker(){ $('pickModal').classList.remove('on'); }
   async function browseTo(p){
@@ -1095,13 +1154,13 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
 
   // ── 파일 피커(뷰어로 열기) — 폴더=이동, 파일=뷰어 ──
   var fpDirCur = '';
-  function openFilePicker(){ $('fpickModal').classList.add('on'); fpTo(fpDirCur||''); }
+  function openFilePicker(){ $('fpickModal').classList.add('on'); $('fpSearch').value=''; fpTo(fpDirCur||''); setTimeout(function(){ try{ $('fpSearch').focus(); }catch(e){} },30); }
   function closeFilePicker(){ $('fpickModal').classList.remove('on'); }
   function fpIcon(kind){ return kind==='md'?'M':kind==='html'?'H':kind==='pdf'?'P':kind==='image'?'I':kind==='binary'?'·':'T'; }
   async function fpTo(p){
     try{
       var d = await (await fetch('/api/fs/list'+(p?('?path='+encodeURIComponent(p)):''))).json();
-      fpDirCur = d.path; $('fpPath').textContent = d.path;
+      fpDirCur = d.path; $('fpPath').textContent = d.path; if($('fpHint')) $('fpHint').textContent='폴더=이동 · 파일=뷰어로 열기';
       var html='';
       if (d.parent && d.parent!==d.path) html += '<div class="pick-row up" data-dir="'+esc(d.parent)+'"><span class="ic">↑</span><span>..</span></div>';
       (d.entries||[]).forEach(function(e){
@@ -1113,12 +1172,32 @@ export const COCKPIT_HTML = /* html */ `<!doctype html>
       $('fpList').innerHTML = html;
     }catch(e){ $('fpList').innerHTML = '<div class="pick-row" style="color:var(--failed)">읽을 수 없습니다</div>'; }
   }
+  var fpFindT=null, fpFindSeq=0;
+  async function fpFind(q){
+    var seq=++fpFindSeq;
+    try{
+      var d = await (await fetch('/api/fs/find?path='+encodeURIComponent(fpDirCur||'')+'&q='+encodeURIComponent(q))).json();
+      if(seq!==fpFindSeq) return;   // 뒤늦게 도착한 오래된 응답 무시
+      if($('fpHint')) $('fpHint').textContent = d.error ? d.error : (d.results.length+'개'+(d.truncated?'+':'')+' · '+ (fpDirCur||'') +' 아래');
+      if(d.error){ $('fpList').innerHTML='<div class="pick-row" style="cursor:default;color:var(--faint)">'+esc(d.error)+'</div>'; return; }
+      if(!d.results.length){ $('fpList').innerHTML='<div class="pick-row" style="cursor:default;color:var(--faint)">일치하는 파일 없음</div>'; return; }
+      $('fpList').innerHTML = d.results.map(function(e){
+        return '<div class="pick-row" data-file="'+esc(e.path)+'"><span class="ic">'+fpIcon(e.kind)+'</span><span>'+esc(e.name)+'</span><span class="rel">'+esc(e.rel)+'</span></div>';
+      }).join('');
+    }catch(e){ if(seq===fpFindSeq) $('fpList').innerHTML='<div class="pick-row" style="color:var(--failed)">검색 실패</div>'; }
+  }
+  $('fpSearch').addEventListener('input', function(){
+    var q=this.value.trim();
+    if(fpFindT){ clearTimeout(fpFindT); fpFindT=null; }
+    if(q.length<2){ fpTo(fpDirCur); return; }   // 비우면 현재 폴더 목록으로 복귀
+    fpFindT=setTimeout(function(){ fpFindT=null; fpFind(q); }, 220);
+  });
   $('fpList').addEventListener('click', function(e){
-    var dir=e.target.closest('[data-dir]'); if(dir){ fpTo(dir.dataset.dir); return; }
+    var dir=e.target.closest('[data-dir]'); if(dir){ $('fpSearch').value=''; fpTo(dir.dataset.dir); return; }
     var file=e.target.closest('[data-file]'); if(file){ closeFilePicker(); openViewer(file.dataset.file); if(isMobile()) setDrawer(false); }
   });
   $('fpClose').addEventListener('click', closeFilePicker);
-  $('fpHome').addEventListener('click', function(){ fpTo(''); });
+  $('fpHome').addEventListener('click', function(){ $('fpSearch').value=''; fpTo(''); });
   $('fpickModal').addEventListener('click', function(e){ if(e.target===this) closeFilePicker(); });
   $('fileBtn').addEventListener('click', openFilePicker);
   $('sessionCta').addEventListener('click', openSession);

package/src/files.ts

@@ -87,9 +87,50 @@ export async function listDir(input?: string) {
   return { path, parent: pdirname(path), home: HOME, entries, error };
 }
 
+// Recursive filename search under a folder (bounded). For the picker's search box.
+const FIND_SKIP = new Set(['node_modules', '.git', 'dist', 'build', '.next', '.cache', 'venv', '.venv', '__pycache__', '.turbo', 'coverage', '.gradle', 'target']);
+export async function findFiles(input: string | undefined, q: string, limit = 300) {
+  const root = await jail(input);
+  const needle = (q || '').trim().toLowerCase();
+  if (needle.length < 2) return { root, q: needle, results: [] as any[], error: 'query too short (min 2 chars)' };
+  const out: Array<{ path: string; rel: string; name: string; size: number; kind: FileKind }> = [];
+  async function walk(dir: string, depth: number): Promise<void> {
+    if (out.length >= limit || depth > 6) return;
+    let items;
+    try { items = await readdir(dir, { withFileTypes: true }); } catch { return; }
+    for (const it of items) {
+      if (out.length >= limit) return;
+      if (it.name.startsWith('.') && !it.name.startsWith('.env')) continue;
+      const full = pjoin(dir, it.name);
+      if (it.isDirectory()) { if (!FIND_SKIP.has(it.name)) await walk(full, depth + 1); continue; }
+      if (it.name.toLowerCase().includes(needle)) {
+        let size = 0; try { size = (await stat(full)).size; } catch { /* skip */ }
+        out.push({ path: full, rel: full.slice(root.length + 1), name: it.name, size, kind: classify(it.name) });
+      }
+    }
+  }
+  await walk(root, 0);
+  const truncated = out.length >= limit;
+  out.sort((a, b) => a.rel.length - b.rel.length || a.rel.localeCompare(b.rel));
+  return { root, q: needle, results: out, truncated };
+}
+
+// Node fs errors are ugly ("ENOENT: no such file or directory, stat '/…'"). Map to a
+// short, human message (the viewer shows this verbatim). The path is echoed in the bar.
+function friendly(e: any): Error {
+  const code = e && e.code;
+  if (code === 'ENOENT') return new Error('파일을 찾을 수 없습니다');
+  if (code === 'EISDIR') return new Error('폴더입니다');
+  if (code === 'EACCES' || code === 'EPERM') return new Error('열 권한이 없습니다');
+  if (e && e.message === 'outside home') return new Error('홈 폴더 밖이라 열 수 없습니다');
+  return new Error(String((e && e.message) || e));
+}
+
 export async function readForView(input?: string) {
-  const path = await jail(input);
-  const st = await stat(path);
+  let path: string;
+  try { path = await jail(input); } catch (e) { throw friendly(e); }
+  let st;
+  try { st = await stat(path); } catch (e) { throw friendly(e); }
   if (st.isDirectory()) throw new Error('is a directory');
   const name = pbasename(path);
   let kind = classify(path);
@@ -112,14 +153,17 @@ export async function readForView(input?: string) {
 
 // Raw bytes with correct content-type — this is what makes PDFs/images/html render.
 export async function readRaw(input?: string) {
-  const path = await jail(input);
-  const st = await stat(path);
-  if (st.isDirectory()) throw new Error('is a directory');
+  let path: string;
+  try { path = await jail(input); } catch (e) { throw friendly(e); }
+  let st;
+  try { st = await stat(path); } catch (e) { throw friendly(e); }
+  if (st.isDirectory()) throw new Error('폴더입니다');
   return { path, name: pbasename(path), mime: mimeFor(path), buf: await readFile(path) };
 }
 
 export async function writeText(input: string, content: string) {
-  const path = await jail(input);
+  let path: string;
+  try { path = await jail(input); } catch (e) { throw friendly(e); }
   const st = await stat(path).catch(() => null);
   if (st && st.isDirectory()) throw new Error('is a directory');
   if (st && st.size > MAX_WRITE) throw new Error('file too large to edit here');

package/src/orchestrator.ts

@@ -1158,6 +1158,28 @@ export async function openSessionAt(machineSlug: string, path: string, title: st
   return { ok: true, detail: 'session open', taskId: task.id, runId };
 }
 
+/**
+ * 세션 삭제 — tmux 종료 + run/task 레코드 제거(폴더는 보존). sessions 버킷 run 에만 허용.
+ * (일반 task run 은 cleanup/reclaim 을 쓴다 — 삭제로 이력이 사라지면 안 되므로.)
+ */
+export async function deleteSession(runId: number): Promise<{ ok: boolean; detail: string }> {
+  const rr = await db.select().from(agentRuns).where(eq(agentRuns.id, runId)).limit(1);
+  const run = rr[0];
+  if (!run) return { ok: false, detail: 'not found' };
+  const tr = await db.select().from(tasks).where(eq(tasks.id, run.taskId)).limit(1);
+  const task = tr[0];
+  const rp = task ? (await db.select().from(repos).where(eq(repos.id, task.repoId)).limit(1))[0] : undefined;
+  if (!rp || rp.kind !== 'sessions') return { ok: false, detail: 'not a session (use cleanup/reclaim for task runs)' };
+  await cleanupRun(runId).catch(() => { /* tmux kill + 포인터 비움; 실패해도 레코드는 지운다 */ });
+  await db.delete(agentEvents).where(eq(agentEvents.runId, runId));
+  await db.delete(agentRuns).where(eq(agentRuns.id, runId));
+  // 세션 task 는 run 과 1:1 — 남은 run 이 없으면 task 도 제거해 트리에서 사라지게.
+  const siblings = await db.select().from(agentRuns).where(eq(agentRuns.taskId, run.taskId));
+  if (task && siblings.length === 0) await db.delete(tasks).where(eq(tasks.id, task.id));
+  broadcast({ type: 'run', runId, deleted: true });   // 모든 콘솔이 재하이드레이트 → 행 제거
+  return { ok: true, detail: 'session deleted (folder preserved)' };
+}
+
 /**
  * 그룹에 속한 태스크 1개를 만들고 run 1개를 발사한다(공용 helper).
  * planFanout(plan 형제) 과 /api/groups/:id/spawn(＋New attempt) 이 공유하는

package/src/remote.ts

@@ -48,6 +48,21 @@ function jsonTargetsPort(raw: string, port: number): boolean {
   return textTargetsPort(raw, port);
 }
 
+/**
+ * Funnel is active only if `AllowFunnel` has a truthy entry AND our port is targeted.
+ * serve and funnel read the SAME ServeConfig, so `funnel status` prints the Serve
+ * config verbatim when Funnel is off — port-matching alone false-positives Funnel
+ * (issue #7). `AllowFunnel` is the only field that differs; it is absent when off.
+ */
+function funnelActiveForPort(raw: string, port: number): boolean {
+  let cfg: { AllowFunnel?: Record<string, unknown> };
+  try { cfg = JSON.parse(raw) as { AllowFunnel?: Record<string, unknown> }; } catch { throw new Error('not json'); }
+  const allow = cfg?.AllowFunnel;
+  if (!allow || typeof allow !== 'object') return false;
+  if (!Object.values(allow).some(Boolean)) return false;
+  return textTargetsPort(raw, port);   // still confirm it is *our* port
+}
+
 /** Plain-text fallback: any `:<port>` upstream mention (defensive across versions). */
 function textTargetsPort(raw: string, port: number): boolean {
   const p = String(port);
@@ -63,10 +78,12 @@ async function subStateForPort(bin: string, sub: 'serve' | 'funnel', port: numbe
   const jout = j.stdout.trim();
   if (jout) {
     try {
-      return jsonTargetsPort(jout, port);
+      return sub === 'funnel' ? funnelActiveForPort(jout, port) : jsonTargetsPort(jout, port);
     } catch { /* not json — fall through to text grep */ }
   }
   const t = await runShellOn(LOCAL, `${shq(bin)} ${sub} status 2>/dev/null || true`, 8000);
+  // `funnel status` prints "(tailnet only)" when Funnel is off — a cheap, version-tolerant guard.
+  if (sub === 'funnel' && /\(tailnet only\)/i.test(t.stdout)) return false;
   return textTargetsPort(t.stdout, port);
 }
 

package/src/server.ts

@@ -19,14 +19,14 @@ import { db } from './db';
 import { machines, repos, tasks, agentRuns, agentEvents, designCaptures, shareLinks, taskGroups, secrets } from './db/schema';
 import { BOOKMARKLET_JS } from './design';
 import { runShellOn, shq } from './exec';
-import { launchRun, cleanupRun, stopRun, getRunDiff, loadRunDocs, mergeRun, getRunTermInfo, steerRun, exportRun, prRun, integrateRuns, planFanout, reviewTask, syncRun, openWorkbench, spawnSubtasks, listSubtasks, resolveAgentToken, taskCloseRisk, launchGroupTask, isRunLive, askGroupCoordinator, computeRunOutputs, normalizeOutputs, listReclaimableWorktrees, pruneWorktrees, noopSignal, groupOverlap, landTarget, mergePreview, startLandResolve, listDocuments, verifyRun, openSessionAt, getScrollback, getSessionChat } from './orchestrator';
+import { launchRun, cleanupRun, stopRun, getRunDiff, loadRunDocs, mergeRun, getRunTermInfo, steerRun, exportRun, prRun, integrateRuns, planFanout, reviewTask, syncRun, openWorkbench, spawnSubtasks, listSubtasks, resolveAgentToken, taskCloseRisk, launchGroupTask, isRunLive, askGroupCoordinator, computeRunOutputs, normalizeOutputs, listReclaimableWorktrees, pruneWorktrees, noopSignal, groupOverlap, landTarget, mergePreview, startLandResolve, listDocuments, verifyRun, openSessionAt, deleteSession, getScrollback, getSessionChat } from './orchestrator';
 import { openTerm } from './term';
 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';
-import { listDir as fsListDir, readForView as fsReadForView, readRaw as fsReadRaw, writeText as fsWriteText } from './files';
+import { listDir as fsListDir, readForView as fsReadForView, readRaw as fsReadRaw, writeText as fsWriteText, findFiles as fsFindFiles } from './files';
 
 const require_ = createRequire(import.meta.url);
 
@@ -752,6 +752,11 @@ export async function buildServer(): Promise<FastifyInstance> {
     try { return await fsListDir(q.path); }
     catch { return { path: q.path ?? '', parent: '', home: homedir(), entries: [], error: 'outside home or unreadable' }; }
   });
+  app.get('/api/fs/find', async (req) => {
+    const q = (req.query ?? {}) as { path?: string; q?: string };
+    try { return await fsFindFiles(q.path, q.q ?? ''); }
+    catch { return { root: q.path ?? '', q: q.q ?? '', results: [], error: 'outside home or unreadable' }; }
+  });
   app.get('/api/fs/read', async (req, reply) => {
     const q = (req.query ?? {}) as { path?: string };
     if (!q.path) return reply.code(400).send({ error: 'path required' });
@@ -998,6 +1003,15 @@ export async function buildServer(): Promise<FastifyInstance> {
     return res;
   });
 
+  // 세션 삭제(tmux 종료 + 레코드 제거, 폴더 보존). sessions 버킷 run 에만 허용.
+  app.delete('/api/runs/:id', async (req, reply) => {
+    const id = Number((req.params as { id: string }).id);
+    if (!Number.isInteger(id)) return reply.code(400).send({ error: 'bad id' });
+    const res = await deleteSession(id);
+    if (!res.ok) return reply.code(res.detail === 'not found' ? 404 : 400).send({ error: res.detail });
+    return res;
+  });
+
   // v5.1 Part C foundation — resolve the land target + base drift for a run.
   // ?fetch=1 refreshes the remote first (network) so ahead/behind are current.
   app.get('/api/runs/:id/land-target', async (req, reply) => {