@elyun/bylane 1.19.0 → 1.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elyun/bylane",
-  "version": "1.19.0",
+  "version": "1.21.0",
   "description": "Frontend development harness for Claude Code",
   "type": "module",
   "bin": {

package/src/monitor/index.js

@@ -5,6 +5,7 @@ import { createPoller } from './poller.js'
 import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync } from 'fs'
 import { join } from 'path'
 import { runCleanup, formatCleanupResult } from '../cleanup.js'
+import { writeState } from '../state.js'
 
 const { screen, header, pipeline, log, queue, status, onCleanup } = createLayout()
 const poller = createPoller()
@@ -38,15 +39,24 @@ poller.onChange((states) => {
   status.update()
 })
 
-// 's' — 실행 중인 루프 선택 종료
+// 's' — 실행 중인 루프/에이전트 선택 종료
 screen.key('s', () => {
-  const runningLoops = Object.entries(lastStates)
+  // 루프: running + pid 있는 것
+  const loops = Object.entries(lastStates)
     .filter(([name, s]) => name.endsWith('-loop') && s?.status === 'running' && s?.pid)
-    .map(([name, s]) => ({ name, pid: s.pid }))
+    .map(([name, s]) => ({ name, type: 'loop', pid: s.pid }))
 
-  if (runningLoops.length === 0) {
+  // 에이전트: in_progress 상태인 것
+  const agents = Object.entries(lastStates)
+    .filter(([name, s]) => !name.endsWith('-loop') && !name.endsWith('-queue')
+      && s?.status === 'in_progress')
+    .map(([name, s]) => ({ name, type: 'agent', task: s.currentTask ?? '' }))
+
+  const items = [...loops, ...agents]
+
+  if (items.length === 0) {
     header.update({
-      workflowTitle: '실행 중인 루프 없음',
+      workflowTitle: '종료할 실행 중 항목 없음',
       time: new Date().toLocaleTimeString('ko-KR', { hour12: false }),
       elapsed: `${Math.floor((Date.now() - startTime) / 1000)}s`
     })
@@ -54,13 +64,18 @@ screen.key('s', () => {
     return
   }
 
-  // blessed list 오버레이
+  const listItems = items.map(item =>
+    item.type === 'loop'
+      ? ` [루프]  ${item.name.padEnd(18)} PID: ${item.pid}`
+      : ` [에이전트] ${item.name.padEnd(15)} ${item.task.slice(0, 20)}`
+  )
+
   const list = blessed.list({
     top: 'center',
     left: 'center',
-    width: 40,
-    height: runningLoops.length + 4,
-    label: ' 종료할 루프 선택 (Enter/Esc) ',
+    width: 54,
+    height: items.length + 6,
+    label: ' 종료할 항목 선택 ',
     tags: true,
     border: { type: 'line' },
     style: {
@@ -69,7 +84,13 @@ screen.key('s', () => {
       item: { fg: 'white' }
     },
     keys: true,
-    items: runningLoops.map(l => ` ${l.name}  (PID: ${l.pid})`)
+    vi: true,
+    mouse: true,
+    items: [
+      ...listItems,
+      '',
+      ' {grey-fg}↑↓/jk 이동   Enter 종료   Esc 취소{/}'
+    ]
   })
 
   screen.append(list)
@@ -77,26 +98,42 @@ screen.key('s', () => {
   screen.render()
 
   list.on('select', (item, idx) => {
-    const loop = runningLoops[idx]
-    try {
-      process.kill(loop.pid, 'SIGTERM')
-      header.update({
-        workflowTitle: `${loop.name} 종료 요청됨 (PID: ${loop.pid})`,
-        time: new Date().toLocaleTimeString('ko-KR', { hour12: false }),
-        elapsed: `${Math.floor((Date.now() - startTime) / 1000)}s`
-      })
-    } catch {
-      header.update({
-        workflowTitle: `${loop.name} 종료 실패 (이미 종료됨?)`,
-        time: new Date().toLocaleTimeString('ko-KR', { hour12: false }),
-        elapsed: `${Math.floor((Date.now() - startTime) / 1000)}s`
-      })
+    const target = items[idx]
+    if (!target) { screen.remove(list); screen.render(); return }
+    let msg
+
+    if (target.type === 'loop') {
+      // 루프: SIGTERM
+      try {
+        process.kill(Number(target.pid), 'SIGTERM')
+        msg = `${target.name} 종료 요청됨 (PID: ${target.pid})`
+      } catch {
+        msg = `${target.name} 종료 실패 (이미 종료됨?)`
+      }
+    } else {
+      // 에이전트: 상태를 cancelled로 기록 + cancel.json 생성
+      try {
+        const cur = lastStates[target.name] ?? {}
+        writeState(target.name, { ...cur, status: 'cancelled', cancelledAt: new Date().toISOString() }, STATE_DIR)
+      } catch {}
+      // cancel.json 생성 (훅에서 새 Agent 호출 차단)
+      if (!existsSync(CANCEL_FILE)) {
+        mkdirSync(STATE_DIR, { recursive: true })
+        writeFileSync(CANCEL_FILE, JSON.stringify({ cancelledAt: new Date().toISOString() }))
+      }
+      msg = `${target.name} 취소 요청됨 (Claude 세션에서 완전 종료 필요)`
     }
+
+    header.update({
+      workflowTitle: msg,
+      time: new Date().toLocaleTimeString('ko-KR', { hour12: false }),
+      elapsed: `${Math.floor((Date.now() - startTime) / 1000)}s`
+    })
     screen.remove(list)
     screen.render()
   })
 
-  list.key(['escape', 'q'], () => {
+  list.key(['escape'], () => {
     screen.remove(list)
     screen.render()
   })

package/src/monitor/layout.js

@@ -62,7 +62,7 @@ export function createLayout() {
     left: 0,
     width: '100%',
     height: 1,
-    content: ' [q]종료  [r]상태정리  [c]에이전트취소토글  [s]루프종료  [Tab]포커스  [j/k]로그스크롤',
+    content: ' [q]종료  [r]상태정리  [c]전체취소토글  [s]선택종료(루프/에이전트)  [Tab]포커스  [j/k]로그스크롤',
     style: { fg: 'black', bg: 'cyan' }
   })
   screen.append(footer)

package/src/monitor/panels/pipeline.js

@@ -18,6 +18,21 @@ const STATUS_ICON = {
   escalated:   '[!]'
 }
 
+const STATUS_COLOR = {
+  idle:        '',
+  in_progress: '{yellow-fg}',
+  running:     '{green-fg}',
+  completed:   '{green-fg}',
+  stopped:     '{grey-fg}',
+  failed:      '{red-fg}',
+  escalated:   '{red-fg}'
+}
+
+function colorize(text, status) {
+  const c = STATUS_COLOR[status] ?? ''
+  return c ? `${c}${text}{/}` : text
+}
+
 export function createPipelinePanel(screen) {
   const box = blessed.box({
     top: 3,
@@ -35,7 +50,7 @@ export function createPipelinePanel(screen) {
     update(states, subagents = { active: [], recent: [] }) {
       const lines = AGENTS.map(name => {
         const s = states[name]
-        if (!s) return ` ${STATUS_ICON.idle} ${name.padEnd(16)} 대기`
+        if (!s) return ` {grey-fg}${STATUS_ICON.idle} ${name.padEnd(16)} 대기{/}`
         const icon = STATUS_ICON[s.status] ?? STATUS_ICON.idle
         const elapsed = s.startedAt
           ? `${Math.floor((Date.now() - new Date(s.startedAt)) / 1000)}s`
@@ -43,7 +58,7 @@ export function createPipelinePanel(screen) {
         const bar = s.progress > 0
           ? `${'#'.repeat(Math.floor(s.progress / 10))}${'-'.repeat(10 - Math.floor(s.progress / 10))} ${s.progress}%`
           : ''
-        return ` ${icon} ${name.padEnd(16)} ${elapsed.padEnd(6)} ${bar}`
+        return ` ${colorize(`${icon} ${name.padEnd(16)}`, s.status)} ${elapsed.padEnd(6)} ${bar}`
       })
 
       const retries = states['orchestrator']?.retries ?? 0
@@ -57,13 +72,13 @@ export function createPipelinePanel(screen) {
       for (const name of allLoops) {
         const s = states[name]
         if (!s) {
-          lines.push(` [-] ${name.padEnd(16)} 미실행`)
+          lines.push(` {grey-fg}[-] ${name.padEnd(16)} 미실행{/}`)
         } else {
           const icon = STATUS_ICON[s.status] ?? '[-]'
           const elapsed = s.startedAt
             ? `${Math.floor((Date.now() - new Date(s.startedAt)) / 1000)}s`
             : ''
-          lines.push(` ${icon} ${name.padEnd(16)} ${elapsed}`)
+          lines.push(` ${colorize(`${icon} ${name.padEnd(16)}`, s.status)} ${elapsed}`)
         }
       }