@k1e1n04/mav 0.1.18 → 0.1.19

package/dist/src/ui/terminal.d.ts

@@ -0,0 +1,28 @@
+export interface KeyInfo {
+    name?: string;
+    ctrl?: boolean;
+    meta?: boolean;
+    shift?: boolean;
+    sequence?: string;
+}
+type KeypressHandler = (str: string, key: KeyInfo) => void;
+type DataHandler = (chunk: string | Buffer) => void;
+type ResizeHandler = () => void;
+export declare class TerminalUI {
+    readonly input: NodeJS.ReadStream;
+    readonly output: NodeJS.WriteStream;
+    private resizeEmitter;
+    constructor(input?: NodeJS.ReadStream, output?: NodeJS.WriteStream);
+    get cols(): number;
+    get rows(): number;
+    onKeypress(handler: KeypressHandler): () => void;
+    onData(handler: DataHandler): () => void;
+    onResize(handler: ResizeHandler): () => void;
+    write(data: string): void;
+    clearScreen(): void;
+    render(content: string): void;
+    enterAlternateScreen(): void;
+    exitAlternateScreen(): void;
+    destroy(): void;
+}
+export {};

package/dist/src/ui/terminal.js

@@ -0,0 +1,74 @@
+import { EventEmitter } from 'node:events';
+import { emitKeypressEvents } from 'node:readline';
+export class TerminalUI {
+    input;
+    output;
+    resizeEmitter = new EventEmitter();
+    constructor(input = process.stdin, output = process.stdout) {
+        this.input = input;
+        this.output = output;
+        emitKeypressEvents(this.input);
+        if (this.input.isTTY && typeof this.input.setRawMode === 'function') {
+            this.input.setRawMode(true);
+        }
+        this.input.resume();
+        if ('on' in this.output) {
+            this.output.on('resize', () => {
+                this.resizeEmitter.emit('resize');
+            });
+        }
+        this.write('\x1b]0;mav\x07');
+    }
+    get cols() {
+        return ('columns' in this.output && typeof this.output.columns === 'number')
+            ? this.output.columns
+            : 80;
+    }
+    get rows() {
+        return ('rows' in this.output && typeof this.output.rows === 'number')
+            ? this.output.rows
+            : 24;
+    }
+    onKeypress(handler) {
+        const wrapped = (str, key) => handler(str, key);
+        this.input.on('keypress', wrapped);
+        return () => {
+            this.input.off('keypress', wrapped);
+        };
+    }
+    onData(handler) {
+        this.input.on('data', handler);
+        return () => {
+            this.input.off('data', handler);
+        };
+    }
+    onResize(handler) {
+        this.resizeEmitter.on('resize', handler);
+        return () => {
+            this.resizeEmitter.off('resize', handler);
+        };
+    }
+    write(data) {
+        this.output.write(data);
+    }
+    clearScreen() {
+        this.write('\x1b[H\x1b[2J');
+    }
+    render(content) {
+        this.clearScreen();
+        this.write(content);
+    }
+    enterAlternateScreen() {
+        this.write('\x1b[?1049h');
+    }
+    exitAlternateScreen() {
+        this.write('\x1b[?1049l');
+    }
+    destroy() {
+        this.exitAlternateScreen();
+        if (this.input.isTTY && typeof this.input.setRawMode === 'function') {
+            this.input.setRawMode(false);
+        }
+    }
+}
+//# sourceMappingURL=terminal.js.map

package/dist/src/ui/terminal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../src/ui/terminal.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k1e1n04/mav",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "Multi-agent view — manage multiple AI CLI sessions in one terminal",
   "type": "module",
   "bin": {
@@ -35,9 +35,7 @@
   "dependencies": {
     "commander": "13.1.0",
     "js-yaml": "4.1.0",
-    "neo-blessed": "0.2.0",
-    "node-pty": "1.0.0",
-    "term.js": "^0.0.7"
+    "node-pty": "1.0.0"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
@@ -46,7 +44,6 @@
     ]
   },
   "devDependencies": {
-    "@types/blessed": "^0.1.27",
     "@types/js-yaml": "4.0.9",
     "@types/node": "22.15.21",
     "tsx": "4.19.3",

package/src/ui/app.ts

@@ -1,95 +1,87 @@
-import blessed from 'neo-blessed'
-import type { Widgets } from 'neo-blessed'
 import type { AgentSession } from '../agent.js'
 import type { SessionManager } from '../session-manager.js'
 import { saveState } from '../state.js'
-import { OverviewUI } from './overview.js'
 import { DetailUI } from './detail.js'
+import { OverviewUI } from './overview.js'
+import type { KeyInfo } from './terminal.js'
+import { TerminalUI } from './terminal.js'
 
 type Mode = 'overview' | 'detail'
 
 export class App {
-  private screen: Widgets.Screen
   private manager: SessionManager
   private statePath: string
+  private terminal: TerminalUI
   private overviewUI: OverviewUI
   private detailUI: DetailUI
   private mode: Mode = 'overview'
 
-  constructor(manager: SessionManager, statePath: string) {
+  constructor(manager: SessionManager, statePath: string, terminal = new TerminalUI()) {
     this.manager = manager
     this.statePath = statePath
+    this.terminal = terminal
 
-    this.screen = blessed.screen({
-      smartCSR: true,
-      title: 'mav',
-      fullUnicode: true,
-    })
-
-    this.overviewUI = new OverviewUI(this.screen, manager, (session) => {
+    this.overviewUI = new OverviewUI(terminal, manager, (session) => {
       if (session) {
         this.switchToDetail(session)
       }
     })
-    this.detailUI = new DetailUI(this.screen, () => {
+    this.detailUI = new DetailUI(terminal, () => {
       if (this.mode === 'detail') {
         this.switchToOverview()
       }
     })
 
-    const proto = Object.getPrototypeOf(this.screen) as { render?: () => void }
-    const baseRender = proto.render ?? this.screen.render
-    const protoRender = baseRender.bind(this.screen)
-    ;(this.screen as unknown as { render: () => void }).render = () => {
-      if (this.mode === 'detail') return
-      protoRender()
-    }
-
     this.bindGlobalKeys()
 
-    this.screen.on('resize', () => {
-      const cols = this.screen.width as number
-      const rows = this.screen.height as number
+    this.terminal.onResize(() => {
+      const cols = this.terminal.cols
+      const rows = this.terminal.rows
       if (this.mode === 'detail') {
         this.detailUI.resize(cols, rows)
         return
       }
 
       this.overviewUI.resizeSelectedSession()
-      this.screen.render()
     })
   }
 
   private bindGlobalKeys(): void {
-    this.screen.key('q', () => {
-      if (this.mode === 'detail') return
-      this.shutdown()
-    })
-
-    this.screen.key('C-c', () => {
+    this.terminal.onKeypress((str, key) => {
       if (this.mode === 'overview') {
-        this.shutdown()
+        this.handleOverviewKeypress(str, key)
       }
     })
+  }
 
-    this.screen.key(['right', 'enter'], () => {
-      if (this.mode !== 'overview') return
-      if (this.overviewUI.isPromptOpen()) return
+  private handleOverviewKeypress(str: string, key: KeyInfo): void {
+    if (key.ctrl && key.name === 'c') {
+      this.shutdown()
+      return
+    }
+
+    if (str === 'q') {
+      this.shutdown()
+      return
+    }
+
+    if (!this.overviewUI.isPromptOpen() && (key.name === 'right' || key.name === 'enter' || key.name === 'return')) {
       const session = this.manager.selectedSession
       if (!session) return
-      this.switchToDetail()
-    })
+      this.switchToDetail(session)
+      return
+    }
+
+    this.overviewUI.handleKeypress(str, key)
   }
 
   private switchToDetail(session: AgentSession | null = this.manager.selectedSession): void {
     if (!session) return
     this.mode = 'detail'
     this.overviewUI.hide()
-    this.screen.program.normalBuffer()
-    this.screen.program.disableMouse()
-    this.screen.realloc()
+    this.terminal.exitAlternateScreen()
     this.detailUI.attach(session)
-    this.detailUI.resize(this.screen.width as number, this.screen.height as number)
+    this.detailUI.resize(this.terminal.cols, this.terminal.rows)
     this.detailUI.show()
   }
 
@@ -97,9 +89,7 @@ export class App {
     this.mode = 'overview'
     this.detailUI.detach()
     this.detailUI.hide()
-    this.screen.program.alternateBuffer()
-    this.screen.program.enableMouse()
-    this.screen.realloc()
+    this.terminal.enterAlternateScreen()
     this.overviewUI.show()
   }
 
@@ -110,13 +100,13 @@ export class App {
       // 終了シーケンスは継続する
     }
     this.manager.killAll()
-    this.screen.destroy()
+    this.terminal.destroy()
     process.exit(0)
   }
 
   start(): void {
+    this.terminal.enterAlternateScreen()
     this.overviewUI.show()
     this.overviewUI.resizeSelectedSession()
-    this.screen.render()
   }
 }

package/src/ui/detail.ts

@@ -1,10 +1,12 @@
 import { appendFileSync } from 'node:fs'
-import type { Widgets } from 'neo-blessed'
 import type { AgentSession } from '../agent.js'
+import type { TerminalUI } from './terminal.js'
 
 export class DetailUI {
   private static readonly KEYBOARD_FLAGS_RESPONSE_PATTERN = /\x1b\[\?(\d+)u/g
   private static readonly PENDING_INPUT_FLUSH_DELAY_MS = 25
+  private static readonly EXIT_HINT =
+    '\x1b[7m mav detail  \x1b[27m Press Ctrl+] to return to Overview\r\n\r\n'
 
   private static readonly EXIT_SEQUENCES = [
     '\x1d',
@@ -16,24 +18,24 @@ export class DetailUI {
     /^\x1b\[99;5u$/,
   ] as const
 
-  private screen: Widgets.Screen
+  private terminal: TerminalUI
   private onExitDetail: () => void
   private currentSession: AgentSession | null = null
   private dataListener: ((data: string) => void) | null = null
-  private rawInputListener: ((chunk: unknown) => void) | null = null
+  private rawInputDisposer: (() => void) | null = null
   private pendingInput = ''
   private pendingInputTimer: ReturnType<typeof setTimeout> | null = null
   private keyboardEnhancementFlags: string | null = null
 
-  constructor(screen: Widgets.Screen, onExitDetail: () => void) {
-    this.screen = screen
+  constructor(terminal: TerminalUI, onExitDetail: () => void) {
+    this.terminal = terminal
     this.onExitDetail = onExitDetail
   }
 
   private isExitShortcut(input: string): boolean {
     return (
       DetailUI.EXIT_SEQUENCES.includes(
-      input as (typeof DetailUI.EXIT_SEQUENCES)[number]
+        input as (typeof DetailUI.EXIT_SEQUENCES)[number]
       ) ||
       DetailUI.EXIT_SEQUENCE_PATTERNS.some((pattern) => pattern.test(input))
     )
@@ -84,25 +86,24 @@ export class DetailUI {
     this.currentSession = session
     this.pendingInput = ''
 
-    const { input, output } = this.screen.program
-
     const safeLog = session.logBuffer
       .join('')
       .replace(/\x1b\[\?104[79][hl]|\x1b\[\?47[hl]/g, '')
       .replace(/\x1b\[(?:>?\d*c|\?u|>q|\?\d+\$p)/g, '')
     if (this.keyboardEnhancementFlags) {
-      output.write(`\x1b[=${this.keyboardEnhancementFlags}u`)
+      this.terminal.write(`\x1b[=${this.keyboardEnhancementFlags}u`)
     }
-    output.write('\x1b[?1l')
-    output.write('\x1b[H\x1b[2J')
-    output.write(safeLog)
+    this.terminal.write('\x1b[?1l')
+    this.terminal.clearScreen()
+    this.terminal.write(DetailUI.EXIT_HINT)
+    this.terminal.write(safeLog)
 
     this.dataListener = (data: string) => {
-      output.write(data)
+      this.terminal.write(data)
     }
     session.on('data', this.dataListener)
 
-    this.rawInputListener = (chunk: unknown) => {
+    this.rawInputDisposer = this.terminal.onData((chunk: string | Buffer) => {
       const str = Buffer.isBuffer(chunk)
         ? chunk.toString('utf8')
         : typeof chunk === 'string'
@@ -134,8 +135,7 @@ export class DetailUI {
       }
 
       this.flushPendingInput()
-    }
-    input.on('data', this.rawInputListener)
+    })
   }
 
   detach(): void {
@@ -143,12 +143,10 @@ export class DetailUI {
       this.currentSession.off('data', this.dataListener)
       this.dataListener = null
     }
-    if (this.rawInputListener) {
-      this.screen.program.input.removeListener('data', this.rawInputListener)
-      this.rawInputListener = null
-    }
+    this.rawInputDisposer?.()
+    this.rawInputDisposer = null
     if (this.keyboardEnhancementFlags) {
-      this.screen.program.output.write('\x1b[=0u')
+      this.terminal.write('\x1b[=0u')
     }
     this.clearPendingInputTimer()
     this.pendingInput = ''