@k1e1n04/mav 0.1.23 → 0.1.25

package/src/hook-injector.ts

@@ -0,0 +1,131 @@
+import { writeFileSync, readFileSync, existsSync, unlinkSync, mkdirSync } from 'node:fs'
+import { join } from 'node:path'
+import { homedir } from 'node:os'
+import { randomUUID } from 'node:crypto'
+
+export interface HookInjectionResult {
+  /** Injected startup args */
+  args: string[]
+  /** Temp file paths to delete on agent exit */
+  hookFiles: string[]
+}
+
+interface BuildHookArgsOptions {
+  /** Agent working directory (for gemini-cli) */
+  cwd?: string
+}
+
+/**
+ * Injects a hook into the startup args for the given agent type and returns the result.
+ * Generated temp files are listed in hookFiles.
+ * Call cleanupHookFiles() after the agent exits.
+ */
+export function buildHookArgs(
+  agentType: string,
+  baseArgs: string[],
+  hookCommand: string,
+  options: BuildHookArgsOptions = {},
+): HookInjectionResult {
+  switch (agentType) {
+    case 'claude-code':
+      return buildClaudeCodeHook(baseArgs, hookCommand)
+    case 'gemini-cli':
+      return buildGeminiHook(baseArgs, hookCommand, options.cwd)
+    case 'codex':
+      return buildCodexHook(baseArgs, hookCommand)
+    default:
+      return { args: baseArgs, hookFiles: [] }
+  }
+}
+
+function buildClaudeCodeHook(baseArgs: string[], hookCommand: string): HookInjectionResult {
+  const settings = {
+    hooks: {
+      PostToolUse: [
+        {
+          matcher: '',
+          hooks: [{ type: 'command', command: hookCommand }],
+        },
+      ],
+    },
+  }
+  return {
+    args: [...baseArgs, '--settings', JSON.stringify(settings)],
+    hookFiles: [],
+  }
+}
+
+const MAV_MARKER = '_mavGenerated'
+
+function buildGeminiHook(
+  baseArgs: string[],
+  hookCommand: string,
+  cwd?: string,
+): HookInjectionResult {
+  const projectDir = cwd ?? process.cwd()
+  const geminiDir = join(projectDir, '.gemini')
+  const settingsPath = join(geminiDir, 'settings.local.json')
+
+  // If the file exists and was NOT written by mav, skip to protect user's config
+  if (existsSync(settingsPath)) {
+    try {
+      const existing = JSON.parse(readFileSync(settingsPath, 'utf-8')) as Record<string, unknown>
+      if (!existing[MAV_MARKER]) {
+        // User-owned file — do not overwrite
+        return { args: baseArgs, hookFiles: [] }
+      }
+    } catch {
+      // Unreadable/invalid JSON — treat as user-owned and skip
+      return { args: baseArgs, hookFiles: [] }
+    }
+    // File was written by mav (stale from crash) — overwrite below
+  }
+
+  const settings = {
+    [MAV_MARKER]: true,
+    hooks: {
+      AfterTool: [
+        { matcher: '', hooks: [{ type: 'command', command: hookCommand }] },
+      ],
+    },
+  }
+
+  mkdirSync(geminiDir, { recursive: true })
+  writeFileSync(settingsPath, JSON.stringify(settings, null, 2))
+
+  return { args: baseArgs, hookFiles: [settingsPath] }
+}
+
+function buildCodexHook(baseArgs: string[], hookCommand: string): HookInjectionResult {
+  const codexHome = process.env.CODEX_HOME ?? join(homedir(), '.codex')
+  mkdirSync(codexHome, { recursive: true })
+  const profileName = `mav-hook-${randomUUID()}`
+  const tomlPath = join(codexHome, `${profileName}.config.toml`)
+
+  const tomlContent = [
+    '[hooks.post_tool_use]',
+    `cmd = ${JSON.stringify(hookCommand)}`,
+    'timeout_seconds = 10',
+  ].join('\n')
+
+  writeFileSync(tomlPath, tomlContent)
+
+  return {
+    args: [...baseArgs, '--profile-v2', profileName],
+    hookFiles: [tomlPath],
+  }
+}
+
+/**
+ * Deletes temp files generated by buildHookArgs.
+ * Call this when the agent process exits.
+ */
+export function cleanupHookFiles(hookFiles: string[]): void {
+  for (const f of hookFiles) {
+    try {
+      if (existsSync(f)) unlinkSync(f)
+    } catch {
+      // Ignore deletion failures (file may already be gone)
+    }
+  }
+}

package/src/index.ts

@@ -1,4 +1,4 @@
-import { homedir } from 'node:os'
+import { homedir, tmpdir } from 'node:os'
 import { join, dirname } from 'node:path'
 import { loadConfig } from './config.js'
 import { clearCurrentSessionState, saveCurrentSessionState } from './current-session.js'
@@ -7,6 +7,8 @@ import { SessionManager } from './session-manager.js'
 import { App } from './ui/app.js'
 import type { AgentSession } from './agent.js'
 import { resolveSessionArgs } from './agent-launch.js'
+import { createServer } from './ipc-server.js'
+import { buildHookArgs } from './hook-injector.js'
 
 export interface StartOptions {
   configPath?: string
@@ -31,8 +33,16 @@ export function start(options: StartOptions = {}): SessionManager {
 
   const savedState = loadState(statePath)
 
+  // Start IPC server for cwd tracking (non-blocking)
+  const socketPath = join(tmpdir(), `mav-${process.pid}.sock`)
+  const ipcServer = createServer(socketPath)
+  ipcServer.listen().catch((err: unknown) => {
+    const msg = err instanceof Error ? err.message : String(err)
+    process.stderr.write(`mav: IPC server failed to start (${msg}), cwd tracking disabled\n`)
+  })
+
   const manager = new SessionManager()
-  const app = new App(manager, statePath, undefined, config.agents)
+  const app = new App(manager, statePath, undefined, config.agents, socketPath)
   const publishSelectedSession = () => {
     const session = manager.selectedSession
     if (!session) {
@@ -64,11 +74,20 @@ export function start(options: StartOptions = {}): SessionManager {
     )
 
     const restoredCwd = savedSession?.cwd
-    const session = manager.addSession({
-      ...agentConfig,
-      args,
-      ...(restoredCwd != null && { cwd: restoredCwd }),
-    }) as AgentSession & { sessionId?: string }
+    const hookCmd = `mav report cwd "$(pwd)"`
+    let hookedArgs = args
+    let hookFiles: string[] = []
+    try {
+      const hookResult = buildHookArgs(agentConfig.type, args, hookCmd, { cwd: restoredCwd })
+      hookedArgs = hookResult.args
+      hookFiles = hookResult.hookFiles
+    } catch {
+      // hook file I/O failed — start agent without hooks
+    }
+    const session = manager.addSession(
+      { ...agentConfig, args: hookedArgs, ...(restoredCwd != null && { cwd: restoredCwd }) },
+      { socketPath, hookFiles },
+    ) as AgentSession & { sessionId?: string }
     session.baseArgs = agentConfig.args
     configSessionIds.add(session.id)
 
@@ -89,12 +108,20 @@ export function start(options: StartOptions = {}): SessionManager {
         savedSession.sessionId,
         true,
       )
-      const session = manager.addSession({
-        type: rc.type,
-        cmd: rc.cmd,
-        args,
-        ...(savedSession.cwd != null && { cwd: savedSession.cwd }),
-      }) as AgentSession & { sessionId?: string }
+      const hookCmd = `mav report cwd "$(pwd)"`
+      let hookedArgs = args
+      let hookFiles: string[] = []
+      try {
+        const hookResult = buildHookArgs(rc.type, args, hookCmd, { cwd: savedSession.cwd })
+        hookedArgs = hookResult.args
+        hookFiles = hookResult.hookFiles
+      } catch {
+        // hook file I/O failed — start agent without hooks
+      }
+      const session = manager.addSession(
+        { type: rc.type, cmd: rc.cmd, args: hookedArgs, ...(savedSession.cwd != null && { cwd: savedSession.cwd }) },
+        { socketPath, hookFiles },
+      ) as AgentSession & { sessionId?: string }
       session.baseArgs = rc.args
       if (newSessionId != null) {
         session.sessionId = newSessionId
@@ -126,14 +153,28 @@ export function start(options: StartOptions = {}): SessionManager {
     publishSelectedSession()
   })
 
+  manager.on('name', (sessionId: string) => {
+    if (manager.selectedSession?.id !== sessionId) {
+      return
+    }
+    publishSelectedSession()
+  })
+
   publishSelectedSession()
 
+  ipcServer.onMessage((msg) => {
+    if (msg.type === 'cwd') {
+      const session = manager.sessions.find((s) => s.id === msg.sessionId)
+      session?.notifyCwd(msg.path)
+    }
+  })
+
   // q/Ctrl+C 以外の終了（ウィンドウ閉じ等）でも state を保存する
   const saveOnExit = () => {
     try { saveState(statePath, manager) } catch { /* ignore */ }
   }
-  process.once('SIGTERM', () => { saveOnExit(); process.exit(0) })
-  process.once('SIGHUP', () => { saveOnExit(); process.exit(0) })
+  process.once('SIGTERM', () => { ipcServer.close(); saveOnExit(); process.exit(0) })
+  process.once('SIGHUP', () => { ipcServer.close(); saveOnExit(); process.exit(0) })
 
   app.start()
   return manager

package/src/ipc-server.ts

@@ -0,0 +1,72 @@
+import { createServer as netCreateServer, Server, Socket } from 'node:net'
+import { existsSync, unlinkSync } from 'node:fs'
+
+export interface IpcMessage {
+  type: string
+  sessionId: string
+  path: string
+}
+
+type MessageHandler = (msg: IpcMessage) => void
+
+export interface IpcServer {
+  listen(): Promise<void>
+  onMessage(handler: MessageHandler): void
+  close(): void
+}
+
+export function createServer(socketPath: string): IpcServer {
+  const handlers: MessageHandler[] = []
+  let server: Server | null = null
+
+  return {
+    onMessage(handler) {
+      handlers.push(handler)
+    },
+
+    listen() {
+      return new Promise((resolve, reject) => {
+        if (existsSync(socketPath)) {
+          unlinkSync(socketPath)
+        }
+
+        server = netCreateServer((socket: Socket) => {
+          let buf = ''
+          socket.on('error', () => {}) // absorb socket errors (e.g. ECONNRESET)
+          socket.on('data', (chunk) => {
+            buf += chunk.toString()
+            const lines = buf.split('\n')
+            buf = lines.pop() ?? ''
+            for (const line of lines) {
+              if (!line.trim()) continue
+              try {
+                const msg = JSON.parse(line) as IpcMessage
+                if (msg.type && msg.sessionId && typeof msg.path === 'string') {
+                  handlers.forEach((h) => h(msg))
+                }
+              } catch {
+                // ignore
+              }
+            }
+          })
+        })
+
+        server.once('error', reject)
+        server.listen(socketPath, () => {
+          server!.removeListener('error', reject)
+          server!.on('error', () => {}) // absorb post-bind server errors
+          resolve()
+        })
+      })
+    },
+
+    close() {
+      const closingServer = server
+      server = null
+      if (existsSync(socketPath)) {
+        try { unlinkSync(socketPath) } catch { /* ignore */ }
+      }
+      closingServer?.close()
+    },
+  }
+}

package/src/session-manager.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'node:events'
 import { AgentSession } from './agent.js'
 import type { AgentConfig } from './config.js'
+import type { IpcContext } from './agent.js'
 import type { MavState } from './state.js'
 
 type SessionListeners = {
@@ -20,8 +21,8 @@ export class SessionManager extends EventEmitter {
     this.emit('selection', this.selectedSession)
   }
 
-  addSession(config: AgentConfig, cols = 80, rows = 24): AgentSession {
-    const session = new AgentSession(config, cols, rows)
+  addSession(config: AgentConfig, ipcContext?: IpcContext, cols = 80, rows = 24): AgentSession {
+    const session = new AgentSession(config, cols, rows, ipcContext)
 
     const onData = (chunk: string) => { this.emit('data', session.id, chunk) }
     const onExit = (code: number) => { this.emit('exit', session.id, code) }

package/src/ui/app.ts

@@ -22,6 +22,7 @@ export class App {
     statePath: string,
     terminal = new TerminalUI(),
     agentConfigs: AgentConfig[] = [],
+    socketPath?: string,
   ) {
     this.manager = manager
     this.statePath = statePath
@@ -31,7 +32,7 @@ export class App {
       if (session) {
         this.switchToDetail(session)
       }
-    }, agentConfigs)
+    }, agentConfigs, socketPath)
     this.detailUI = new DetailUI(terminal, () => {
       if (this.mode === 'detail') {
         this.switchToOverview()

package/src/ui/overview.ts

@@ -2,12 +2,14 @@ import type { SessionManager } from '../session-manager.js'
 import type { AgentSession } from '../agent.js'
 import type { AgentConfig } from '../config.js'
 import { getAgentDefaults, resolveSessionArgs } from '../agent-launch.js'
+import { buildHookArgs } from '../hook-injector.js'
 import { completePath } from './path-completion.js'
 import type { KeyInfo, TerminalUI } from './terminal.js'
 
 type PromptState =
   | { mode: 'agent'; selectedIndex: number }
   | { mode: 'cwd'; agentType: string; value: string; candidates: string[] }
+  | { mode: 'rename'; sessionId: string; value: string }
   | { mode: 'error'; message: string }
   | null
 
@@ -32,12 +34,13 @@ export class OverviewUI {
     { status: 'error', label: 'Failed' },
   ] as const
 
-  private static readonly AGENT_TYPES = ['claude-code', 'codex', 'gemini-cli', 'copilot'] as const
+  private static readonly AGENT_TYPES = ['claude-code', 'codex', 'gemini-cli', 'copilot', 'cursor', 'opencode', 'antigravity-cli'] as const
 
   private terminal: TerminalUI
   private manager: SessionManager
   private onSessionCreated?: (session: SessionManager['selectedSession']) => void
   private agentConfigs: AgentConfig[]
+  private socketPath: string | undefined
   private promptState: PromptState = null
   private displaySessionIds: string[] = []
   private visible = false
@@ -47,11 +50,13 @@ export class OverviewUI {
     manager: SessionManager,
     onSessionCreated?: (session: SessionManager['selectedSession']) => void,
     agentConfigs: AgentConfig[] = [],
+    socketPath?: string,
   ) {
     this.terminal = terminal
     this.manager = manager
     this.onSessionCreated = onSessionCreated
     this.agentConfigs = agentConfigs
+    this.socketPath = socketPath
 
     this.syncList()
 
@@ -93,6 +98,10 @@ export class OverviewUI {
       this.handleCwdPromptKeypress(key)
       return
     }
+    if (this.promptState?.mode === 'rename') {
+      this.handleRenamePromptKeypress(key)
+      return
+    }
     if (this.promptState?.mode === 'error') {
       if (key.name === 'enter' || key.name === 'return' || key.name === 'escape' || str === 'q') {
         this.promptState = null
@@ -116,6 +125,11 @@ export class OverviewUI {
       return
     }
 
+    if (str === 'e') {
+      this.showRenamePrompt()
+      return
+    }
+
     if (str === 'd' || (key.ctrl && key.name === 'x')) {
       const session = this.manager.selectedSession
       if (session) {
@@ -202,12 +216,62 @@ export class OverviewUI {
     }
   }
 
+  private handleRenamePromptKeypress(key: KeyInfo): void {
+    const state = this.promptState
+    if (!state || state.mode !== 'rename') return
+
+    if (key.name === 'escape') {
+      this.promptState = null
+      this.render()
+      return
+    }
+
+    if (key.name === 'enter' || key.name === 'return') {
+      const session = this.manager.sessions.find((candidate) => candidate.id === state.sessionId)
+      const value = state.value.trim()
+      this.promptState = null
+      if (session && value.length >= 3) {
+        if ('setDisplayName' in session && typeof session.setDisplayName === 'function') {
+          session.setDisplayName(value)
+        } else {
+          session.displayName = value
+        }
+      }
+      this.syncList()
+      this.render()
+      return
+    }
+
+    if (key.name === 'backspace') {
+      state.value = state.value.slice(0, -1)
+      this.render()
+      return
+    }
+
+    if (!key.ctrl && !key.meta && key.sequence?.length === 1) {
+      state.value += key.sequence
+      this.render()
+    }
+  }
+
   private showAddPrompt(): void {
     if (this.promptState) return
     this.promptState = { mode: 'agent', selectedIndex: 0 }
     this.render()
   }
 
+  private showRenamePrompt(): void {
+    if (this.promptState) return
+    const session = this.manager.selectedSession
+    if (!session) return
+    this.promptState = {
+      mode: 'rename',
+      sessionId: session.id,
+      value: session.displayName ?? session.id,
+    }
+    this.render()
+  }
+
   private spawnAgent(agentType: string, cwd: string): void {
     const config = this.agentConfigs.find((candidate) => candidate.type === agentType)
     const defaults = config ?? {
@@ -215,12 +279,27 @@ export class OverviewUI {
       ...getAgentDefaults(agentType),
     }
     const { args, newSessionId } = resolveSessionArgs(agentType, defaults.args, undefined, false)
+
+    let hookedArgs = args
+    let hookFiles: string[] = []
+    if (this.socketPath) {
+      try {
+        const hookCmd = `mav report cwd "$(pwd)"`
+        const hookResult = buildHookArgs(agentType, args, hookCmd, { cwd })
+        hookedArgs = hookResult.args
+        hookFiles = hookResult.hookFiles
+      } catch {
+        // hook injection failed — start agent without hooks
+      }
+    }
+
+    const ipcContext = this.socketPath ? { socketPath: this.socketPath, hookFiles } : undefined
     const session = this.manager.addSession({
       type: agentType,
       cmd: defaults.cmd,
-      args,
+      args: hookedArgs,
       cwd,
-    }) as AgentSession & { sessionId?: string }
+    }, ipcContext) as AgentSession & { sessionId?: string }
     session.baseArgs = defaults.args
     if (newSessionId != null) {
       session.sessionId = newSessionId
@@ -550,7 +629,7 @@ export class OverviewUI {
     }
 
     lines.push(this.color(this.makeRule('controls', width), OverviewUI.ANSI.dim))
-    lines.push(...this.wrapPlainText('↑/↓ or j/k move   Enter detail   Ctrl+] back   n new   d delete   q quit', width))
+    lines.push(...this.wrapPlainText('↑/↓ or j/k move   Enter detail   Ctrl+] back   n new   e rename   d delete   q quit', width))
     return this.finalizeLines(lines)
   }
 
@@ -586,6 +665,14 @@ export class OverviewUI {
       return this.finalizeLines(lines)
     }
 
+    if (state.mode === 'rename') {
+      lines.push(this.fitPlain('rename session', width))
+      lines.push(...this.wrapPlainText(state.value, width))
+      lines.push('')
+      lines.push(...this.wrapPlainText('Enter: confirm  Esc: cancel', width))
+      return this.finalizeLines(lines)
+    }
+
     lines.push(this.fitPlain('Error', width))
     for (const line of state.message.split('\n')) {
       lines.push(this.fitPlain(line, width))