agentquad 0.4.4 → 0.4.7

package/src/pty.js

@@ -6,6 +6,7 @@ import { readdirSync, statSync, existsSync, unlinkSync, watch as fsWatch, mkdirS
 import { delimiter, dirname, isAbsolute, join } from 'node:path'
 import { homedir } from 'node:os'
 import { createCodexPromptDetector } from './codex-prompt-detector.js'
+import { createClaudePromptDetector } from './claude-prompt-detector.js'
 
 const require = createRequire(import.meta.url)
 
@@ -64,6 +65,7 @@ const TUI_ALERT_COOLDOWN_MS = 30_000
 const CLAUDE_SESSION_RE = /claude\s+--resume\s+([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/
 const CODEX_SESSION_RE = /codex\s+resume\s+([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/
 const CODEX_ROLLOUT_FILE_RE = /^rollout-.*-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/
+const CLAUDE_JSONL_FILE_RE = /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/
 const MAX_LOG_BYTES = 512 * 1024
 const CODEX_SESSIONS_DIR = join(homedir(), '.codex', 'sessions')
 
@@ -143,6 +145,44 @@ function detectCodexSessionFromFs(afterMs) {
   return newest
 }
 
+// Claude 把 JSONL 写到 ~/.claude/projects/<cwd-hash>/<uuid>.jsonl。我们在 spawn
+// 时通过 --session-id <presetClaudeId> 把 UUID 推下去，理想情况下 Claude 会用这个
+// UUID 写文件，session.nativeId 直接对得上。
+//
+// 但部分代理 / wrapper（mira / trae 之类）会再 spawn 一次 claude、丢掉 --session-id，
+// 或自家 fork 不识别这个 flag → Claude 用自己生成的 UUID 写 JSONL → session.nativeId
+// 与磁盘上不一致 → loadTranscript 找不到文件 → 兜底成 PTY raw → Conversation
+// 整段 banner 塌掉。
+//
+// 形态对齐 detectCodexSessionFromFs：扫所有 project 目录里 mtime > spawnTime 的
+// <uuid>.jsonl，挑最新一个的 UUID。命中后由 _setNativeId 去重 + 覆盖。
+function detectClaudeSessionFromFs(afterMs) {
+  if (!existsSync(CLAUDE_PROJECTS_DIR)) return null
+  let dirs
+  try { dirs = readdirSync(CLAUDE_PROJECTS_DIR, { withFileTypes: true }) } catch { return null }
+  let newest = null
+  let newestTime = 0
+  for (const dirent of dirs) {
+    if (!dirent.isDirectory()) continue
+    const projDir = join(CLAUDE_PROJECTS_DIR, dirent.name)
+    let files
+    try { files = readdirSync(projDir) } catch { continue }
+    for (const f of files) {
+      const m = f.match(CLAUDE_JSONL_FILE_RE)
+      if (!m) continue
+      try {
+        const st = statSync(join(projDir, f))
+        const t = st.birthtimeMs || st.ctimeMs
+        if (t > afterMs && t > newestTime) {
+          newest = m[1]
+          newestTime = t
+        }
+      } catch { /* ignore */ }
+    }
+  }
+  return newest
+}
+
 function tryReadCwdFromSessionMeta(filePath) {
   try {
     const head = readFileSync(filePath, 'utf8').split('\n').slice(0, 2)
@@ -286,7 +326,7 @@ function defaultClaudeSessionLocator(nativeSessionId) {
 }
 
 export class PtyManager extends EventEmitter {
-  constructor({ tools, ptyFactory, promptDelayMs = 2000, codexWatcherFactory, claudeSessionLocator, codexSessionLocator, sidecar = null, eventEmitterFactory = null, codexPromptDetectorFactory = null } = {}) {
+  constructor({ tools, ptyFactory, promptDelayMs = 2000, codexWatcherFactory, claudeSessionLocator, codexSessionLocator, sidecar = null, eventEmitterFactory = null, codexPromptDetectorFactory = null, claudePromptDetectorFactory = null } = {}) {
     super()
     if (!tools) throw new Error('PtyManager: tools required')
     this.tools = tools
@@ -298,6 +338,7 @@ export class PtyManager extends EventEmitter {
     this.sidecar = sidecar
     this.eventEmitterFactory = eventEmitterFactory
     this.codexPromptDetectorFactory = codexPromptDetectorFactory || createCodexPromptDetector
+    this.claudePromptDetectorFactory = claudePromptDetectorFactory || createClaudePromptDetector
     this.sessions = new Map()
   }
 
@@ -318,57 +359,62 @@ export class PtyManager extends EventEmitter {
     if (session.detectTimer) { clearInterval(session.detectTimer); session.detectTimer = null }
     if (session.fsWatcher) { try { session.fsWatcher.close() } catch { /* ignore */ } session.fsWatcher = null }
     this.emit('native-session', { sessionId: session.sessionId, nativeId })
-    // codex 专属：拿到 native id 后落 sidecar + 启动 jsonl 增量 emitter，给 IM 推送链路用。
-    if (session.tool === 'codex') {
-      console.log(`[codex-detect] _setNativeId session=${session.sessionId} nativeId=${nativeId}`)
-      if (this.sidecar) {
-        try {
-          const p = this.sidecar.write({
-            nativeId,
-            quadtodoSessionId: session.sessionId,
-            todoId: session.todoId || null,
-            cwd: session.cwd || null,
-          })
-          if (p && typeof p.catch === 'function') p.catch(() => {})
-          console.log(`[codex-detect] sidecar.write OK nativeId=${nativeId}`)
-        } catch (e) {
-          console.warn(`[codex-detect] sidecar.write FAILED:`, e?.message || e)
-        }
-      } else {
-        console.warn(`[codex-detect] this.sidecar is null — server.js didn't wire it`)
+    this._ensureCodexSidecarAndEmitter(session, nativeId)
+    return true
+  }
+
+  // 把 codex sidecar.write + emitter.start 抽出来，方便 codex resume 路径直接调
+  // （resume 时 session.nativeId 在 spawn 阶段就预置好，_setNativeId 里那个
+  // "已经一样了 → return false" 早早短路，emitter 永远起不来 → 状态条卡"运行中"）。
+  _ensureCodexSidecarAndEmitter(session, nativeId) {
+    if (session.tool !== 'codex' || !nativeId) return
+    console.log(`[codex-detect] ensure sidecar+emitter session=${session.sessionId} nativeId=${nativeId}`)
+    if (this.sidecar) {
+      try {
+        const p = this.sidecar.write({
+          nativeId,
+          quadtodoSessionId: session.sessionId,
+          todoId: session.todoId || null,
+          cwd: session.cwd || null,
+        })
+        if (p && typeof p.catch === 'function') p.catch(() => {})
+        console.log(`[codex-detect] sidecar.write OK nativeId=${nativeId}`)
+      } catch (e) {
+        console.warn(`[codex-detect] sidecar.write FAILED:`, e?.message || e)
       }
-      if (this.eventEmitterFactory && !session.eventEmitter) {
-        try {
-          const loc = this.codexSessionLocator(nativeId)
-          if (loc?.filePath) {
-            session.eventEmitter = this.eventEmitterFactory({ filePath: loc.filePath, nativeId })
-            session.eventEmitter.start?.()
-            console.log(`[codex-detect] emitter started filePath=${loc.filePath}`)
-          } else {
-            console.warn(`[codex-detect] codexSessionLocator returned null for nativeId=${nativeId} — emitter NOT started (will retry below)`)
-            // jsonl 文件这一刻可能还没 flush 到 fs；500ms / 1500ms 各重试一次。
-            const retry = (delay) => setTimeout(() => {
-              if (session.eventEmitter || session.stopped) return
-              const loc2 = this.codexSessionLocator(nativeId)
-              if (loc2?.filePath && this.eventEmitterFactory) {
-                session.eventEmitter = this.eventEmitterFactory({ filePath: loc2.filePath, nativeId })
-                session.eventEmitter.start?.()
-                console.log(`[codex-detect] emitter started on retry+${delay}ms filePath=${loc2.filePath}`)
-              } else if (delay < 1500) {
-                console.warn(`[codex-detect] retry+${delay}ms still no jsonl file for ${nativeId}`)
-              }
-            }, delay)
-            retry(500).unref?.()
-            retry(1500).unref?.()
-          }
-        } catch (e) {
-          console.warn(`[codex-detect] emitter start FAILED:`, e?.message || e)
+    } else {
+      console.warn(`[codex-detect] this.sidecar is null — server.js didn't wire it`)
+    }
+    if (this.eventEmitterFactory && !session.eventEmitter) {
+      try {
+        const loc = this.codexSessionLocator(nativeId)
+        if (loc?.filePath) {
+          session.eventEmitter = this.eventEmitterFactory({ filePath: loc.filePath, nativeId })
+          session.eventEmitter.start?.()
+          console.log(`[codex-detect] emitter started filePath=${loc.filePath}`)
+        } else {
+          console.warn(`[codex-detect] codexSessionLocator returned null for nativeId=${nativeId} — emitter NOT started (will retry below)`)
+          // jsonl 文件这一刻可能还没 flush 到 fs；500ms / 1500ms 各重试一次。
+          const retry = (delay) => setTimeout(() => {
+            if (session.eventEmitter || session.stopped) return
+            const loc2 = this.codexSessionLocator(nativeId)
+            if (loc2?.filePath && this.eventEmitterFactory) {
+              session.eventEmitter = this.eventEmitterFactory({ filePath: loc2.filePath, nativeId })
+              session.eventEmitter.start?.()
+              console.log(`[codex-detect] emitter started on retry+${delay}ms filePath=${loc2.filePath}`)
+            } else if (delay < 1500) {
+              console.warn(`[codex-detect] retry+${delay}ms still no jsonl file for ${nativeId}`)
+            }
+          }, delay)
+          retry(500).unref?.()
+          retry(1500).unref?.()
         }
-      } else if (!this.eventEmitterFactory) {
-        console.warn(`[codex-detect] this.eventEmitterFactory is null — server.js didn't wire it`)
+      } catch (e) {
+        console.warn(`[codex-detect] emitter start FAILED:`, e?.message || e)
       }
+    } else if (!this.eventEmitterFactory) {
+      console.warn(`[codex-detect] this.eventEmitterFactory is null — server.js didn't wire it`)
     }
-    return true
   }
 
   has(sessionId) {
@@ -385,6 +431,13 @@ export class PtyManager extends EventEmitter {
   }
 
   /** 返回当前所有活跃 PTY 的 { sessionId, pid, tool }，供 pidusage 采样用 */
+  /** Watcher 写在 PtyManager 自己的 session 上的 usage 副本。route 的 sessions Map
+   *  和这里不是同一份对象，必须显式 cross-read。返回 null 表示还没解析到。 */
+  getUsage(sessionId) {
+    const s = this.sessions.get(sessionId)
+    return s?.usage || null
+  }
+
   getPids() {
     const out = []
     for (const [sessionId, s] of this.sessions) {
@@ -419,7 +472,7 @@ export class PtyManager extends EventEmitter {
    * 会话建立时调 create()、收到前端真实 cols/rows 后再调 startWithSize()，
    * 这样 PTY 永远不会在默认 80×24 上 spawn 一次再 resize。
    */
-  create({ sessionId, tool, prompt, cwd, resumeNativeId, permissionMode, extraEnv, mcpConfigPath = null, codexMcpUrl = null }) {
+  create({ sessionId, tool, prompt, cwd, resumeNativeId, permissionMode, extraEnv, mcpConfigPath = null, codexMcpUrl = null, suppressStaleTurnDetect = false }) {
     const toolCfg = this.tools[tool]
     if (!toolCfg) throw new Error(`unknown tool: ${tool}`)
     const baseArgs = toolCfg.args || []
@@ -449,9 +502,11 @@ export class PtyManager extends EventEmitter {
     // cursor-agent 没有 --session-id 预置，但有 `cursor-agent create-chat` 异步建会话拿 chatId。
     // 新会话先异步跑 create-chat，拿到 chatId 后在 startWithSize() 里用 --resume 进交互模式。
     // create-chat 失败就降级（无 nativeId，直接传 prompt）。
+    // bin 为空时 fallback 到 command 名，让 execFile / spawn 走 PATH 解析。
+    const spawnFile = (toolCfg.bin && String(toolCfg.bin).trim()) || toolCfg.command
     let cursorChatPromise = null
     if (tool === 'cursor' && !resumeNativeId) {
-      cursorChatPromise = createCursorChatAsync(toolCfg.bin)
+      cursorChatPromise = createCursorChatAsync(spawnFile)
     }
     const cursorResumeId = tool === 'cursor' ? resumeNativeId : null
 
@@ -527,12 +582,20 @@ export class PtyManager extends EventEmitter {
       lastTuiAlertAt: 0,
       cursorChatPromise,
       mcpConfigPath: mcpConfigPath || null,
+      // 当 ai-terminal 在"运行中"触发托管模式切换（半托管 ↔ 全托管）时置 true：
+      // 老 PTY 被 kill 时 jsonl 处于 mid-turn 状态（最后一行往往是 user/tool_result
+      // 或 assistant.tool_use），新的 claude --resume 只是接管同一个 jsonl，不会再
+      // 真跑一轮。watcher 默认会把这条残留的"turn-started"当成新输入 emit，把刚被
+      // ai-terminal 翻成 idle 的状态又翻回 running。这里告诉 watcher：吃掉第一帧
+      // stale 状态、只用它来 seed 内部 mtime/kind，下次 jsonl 真正再变才 emit。
+      suppressStaleTurnDetect: !!suppressStaleTurnDetect,
       spawnSpec: {
         args,
         env,
         effectiveCwd,
         toolCfg,
         tool,
+        spawnFile,
         resumeNativeId: resumeNativeId || null,
         _baseArgs: [...baseArgs],
         _permissionArgs: [...permissionArgs],
@@ -572,14 +635,14 @@ export class PtyManager extends EventEmitter {
 
     const spec = session.spawnSpec
     if (!spec) throw new Error(`session ${sessionId} has no spawnSpec (was it created?)`)
-    const { args, env, effectiveCwd, toolCfg, tool } = spec
+    const { args, env, effectiveCwd, toolCfg, tool, spawnFile } = spec
     const { resumeNativeId } = spec
 
-    console.log(`[pty] starting ${tool} bin=${toolCfg.bin} cwd=${effectiveCwd} args=${JSON.stringify(args)} cols=${cols} rows=${rows}`)
+    console.log(`[pty] starting ${tool} spawnFile=${spawnFile} (configured bin=${toolCfg.bin || '<empty>'}) cwd=${effectiveCwd} args=${JSON.stringify(args)} cols=${cols} rows=${rows}`)
 
     let proc
     try {
-      proc = this.ptyFactory(toolCfg.bin, args, {
+      proc = this.ptyFactory(spawnFile, args, {
         name: 'xterm-256color',
         cols,
         rows,
@@ -594,7 +657,7 @@ export class PtyManager extends EventEmitter {
         try { if (existsSync(session.mcpConfigPath)) unlinkSync(session.mcpConfigPath) } catch { /* ignore */ }
       }
       this.sessions.delete(sessionId)
-      error.message = `PTY spawn failed for ${tool} (bin=${toolCfg.bin}, cwd=${effectiveCwd}, args=${JSON.stringify(args)}): ${error.message}`
+      error.message = `PTY spawn failed for ${tool} (spawnFile=${spawnFile}, cwd=${effectiveCwd}, args=${JSON.stringify(args)}): ${error.message}`
       throw error
     }
     session.proc = proc
@@ -624,6 +687,30 @@ export class PtyManager extends EventEmitter {
       }
     }
 
+    // Claude 专属：stdout 提示词检测器，兜底 Notification hook 不 fire 的场景
+    // （settings.json permissions.defaultMode='auto' 时 model classifier 决定弹权限框
+    // 但 Notification hook 实测不 fire；Notification 是 markPendingConfirm 的唯一上游，
+    // 没它就既不翻 pending_confirm 也不推 IM）。
+    if (tool === 'claude') {
+      try {
+        session.detector = this.claudePromptDetectorFactory({
+          pty: proc,
+          onMatch: ({ promptText, options }) => {
+            this.emit('claude-prompt', {
+              sessionId: session.sessionId,
+              nativeId: session.nativeId,
+              promptText,
+              options,
+            })
+          },
+        })
+        session.detector.start?.()
+      } catch (e) {
+        console.warn('[pty] claude prompt detector start failed:', e?.message || e)
+        session.detector = null
+      }
+    }
+
     // 已知 nativeId 立即同步通知 —— 覆盖三种情况：
     //   1) Claude 新会话：presetClaudeId（randomUUID）
     //   2) Claude --resume：resumeNativeId（沿用 native id）
@@ -631,6 +718,11 @@ export class PtyManager extends EventEmitter {
     // Codex 新会话（无 resume 也无 preset）走下面的 fs.watch / 轮询 / regex 三路探测
     if (session.nativeId) {
       this.emit('native-session', { sessionId, nativeId: session.nativeId })
+      // Codex resume 专用：nativeId 早就在 create() 阶段被预置，_setNativeId 里
+      // "已经一样了 → return false" 会短路掉 sidecar.write + emitter.start，导致 codex
+      // 重启 resume 后 jsonl 不被读、task_complete 事件不上报、UI 状态条永远卡"运行中"。
+      // 走 _ensureCodexSidecarAndEmitter 显式补齐（idempotent，emitter 已存在就 no-op）。
+      this._ensureCodexSidecarAndEmitter(session, session.nativeId)
     }
 
     // Codex 新会话：codex CLI 无 --session-id / --rollout-path 预置能力。
@@ -669,6 +761,39 @@ export class PtyManager extends EventEmitter {
       session.detectTimer.unref?.()
     }
 
+    // Claude 新会话：虽然 spawn 时已经传了 --session-id <presetClaudeId> 把 UUID
+    // 推下去（session.nativeId 也立刻设上），但代理/wrapper（mira / trae 等）会
+    // 在转发链路里丢掉 --session-id 或自家 fork claude → Claude 写 JSONL 时用自己
+    // 的 UUID → session.nativeId 对不上磁盘 → loadTranscript 兜底成 PTY raw。
+    //
+    // 这里加一道 FS 轮询治本：扫到 mtime > spawnTime 的真实 UUID，跟 session.nativeId
+    // 比一比；如果一致说明 preset 被 honor，停掉轮询即可；不一致则 _setNativeId 覆盖。
+    if (!resumeNativeId && tool === 'claude') {
+      const spawnTime = Date.now() - 1000
+      let detectAttempts = 0
+      const presetIdShort = session.nativeId?.slice(0, 8)
+      console.log(`[claude-detect] poll started session=${sessionId} preset=${presetIdShort} spawnTime=${spawnTime}`)
+      session.detectTimer = setInterval(() => {
+        detectAttempts++
+        const id = detectClaudeSessionFromFs(spawnTime)
+        if (id) {
+          if (id !== session.nativeId) {
+            console.log(`[claude-detect] poll attempt=${detectAttempts} OVERRIDE ${session.nativeId?.slice(0, 8)} → ${id.slice(0, 8)} (--session-id likely ignored by wrapper)`)
+            this._setNativeId(session, id)
+          } else {
+            console.log(`[claude-detect] poll attempt=${detectAttempts} preset honored, stop`)
+            clearInterval(session.detectTimer)
+            session.detectTimer = null
+          }
+        } else if (detectAttempts >= 30) {
+          console.warn(`[claude-detect] poll GAVE UP after 30 attempts (12s) for session=${sessionId} — no jsonl matching afterMs=${spawnTime} under ${CLAUDE_PROJECTS_DIR}`)
+          clearInterval(session.detectTimer)
+          session.detectTimer = null
+        }
+      }, 400)
+      session.detectTimer.unref?.()
+    }
+
     proc.onData((data) => {
       session.fullLog.push(data)
       session.logBytes += data.length
@@ -727,6 +852,26 @@ export class PtyManager extends EventEmitter {
           // 反向扫，跳过 system / attachment / last-prompt 等元数据行，
           // 找最近一条 type ∈ {user, assistant} 的有效行。
           const lines = content.split('\n')
+          // 每次 mtime 推进都刷新 usage（不能等下面的 kind-变化早 return —— 同一轮
+          // 内追加 assistant 消息时 kind 不变，会 return 跳过 usage 解析）。
+          for (let i = lines.length - 1; i >= 0; i--) {
+            const ln = (lines[i] || '').trim()
+            if (!ln.startsWith('{')) continue
+            let obj
+            try { obj = JSON.parse(ln) } catch { continue }
+            if (obj.type !== 'assistant') continue
+            const u = obj.message?.usage
+            if (!u) continue
+            session.usage = {
+              input: Number(u.input_tokens) || 0,
+              output: Number(u.output_tokens) || 0,
+              cacheRead: Number(u.cache_read_input_tokens) || 0,
+              cacheCreation: Number(u.cache_creation_input_tokens) || 0,
+              model: obj.message?.model || null,
+              ts: obj.timestamp ? Date.parse(obj.timestamp) : Date.now(),
+            }
+            break
+          }
           let kind = null  // 'turn-started' | 'turn-done' | null
           for (let i = lines.length - 1; i >= 0; i--) {
             const line = lines[i].trim()
@@ -778,7 +923,16 @@ export class PtyManager extends EventEmitter {
           }
           session.claudeLastJsonlMtimeMs = st.mtimeMs
           session.claudeLastEmittedKind = kind
+          // 托管模式切换重启场景：第一次扫到的 kind 是 kill 前的残留状态，吞掉这次
+          // emit 但保留 mtime/kind tracking —— 下次 jsonl 真正变动（用户新输入 / 新一轮
+          // 结束）会因为 kind 切换正常 emit。
+          if (session.suppressStaleTurnDetect) {
+            session.suppressStaleTurnDetect = false
+            return
+          }
           if (kind === 'turn-started') {
+            // 新一轮开始 → 让 PTY detector 的 lastEmittedText 失效，下一次权限提示能再次 emit
+            try { session.detector?.reset?.() } catch { /* ignore */ }
             this.emit('claude-turn-started', { sessionId, nativeId })
           } else {
             this.emit('claude-turn-done', { sessionId, nativeId })
@@ -788,6 +942,58 @@ export class PtyManager extends EventEmitter {
       session.claudeWatchTimer.unref?.()
     }
 
+    // codex 专属：mtime-gated 周期扫 rollout-*.jsonl，抽 latest token_count 事件的
+    // total_token_usage（cumulative）给 /sessions API 用。跟 claudeWatchTimer 同步频率。
+    if (tool === 'codex') {
+      session.codexUsageLastMtimeMs = 0
+      session.codexUsageWatchTimer = setInterval(() => {
+        try {
+          const nativeId = session.nativeId
+          if (!nativeId) return
+          if (!session.codexUsageJsonlPath) {
+            const loc = this.codexSessionLocator(nativeId)
+            if (!loc?.filePath) return
+            session.codexUsageJsonlPath = loc.filePath
+          }
+          const jsonlPath = session.codexUsageJsonlPath
+          if (!existsSync(jsonlPath)) return
+          const st = statSync(jsonlPath)
+          if (st.mtimeMs <= session.codexUsageLastMtimeMs) return
+          session.codexUsageLastMtimeMs = st.mtimeMs
+          const lines = readFileSync(jsonlPath, 'utf8').split('\n')
+          let last = null
+          let model = null
+          for (let i = lines.length - 1; i >= 0; i--) {
+            const ln = (lines[i] || '').trim()
+            if (!ln.startsWith('{')) continue
+            let obj
+            try { obj = JSON.parse(ln) } catch { continue }
+            if (obj.type === 'event_msg' && obj.payload?.type === 'token_count') {
+              const info = obj.payload.info
+              if (info?.total_token_usage && !last) last = info.total_token_usage
+            }
+            if (!model && obj.type === 'turn_context') {
+              model = obj.payload?.model || obj.payload?.collaboration_mode?.settings?.model || null
+            }
+            if (!model && obj.type === 'session_meta') {
+              model = obj.payload?.model || obj.payload?.model_provider?.model || null
+            }
+            if (last && model) break
+          }
+          if (!last) return
+          session.usage = {
+            input: Number(last.input_tokens) || 0,
+            output: Number(last.output_tokens) || 0,
+            cacheRead: Number(last.cached_input_tokens || last.cache_read_input_tokens) || 0,
+            cacheCreation: Number(last.cache_creation_input_tokens) || 0,
+            model: model || null,
+            ts: Date.now(),
+          }
+        } catch { /* ignore */ }
+      }, 2000)
+      session.codexUsageWatchTimer.unref?.()
+    }
+
     // cursor 专属：监听 chatId 的 jsonl，末行 role===assistant 且 mtime 推进
     // → 一轮回复结束。这里走轮询而不是依赖 cursor 自家 stop hook，是因为
     // 实测 cursor 的 stop hook 偶发不 fire（同一 cursor 安装，部分 session 完全
@@ -847,6 +1053,7 @@ export class PtyManager extends EventEmitter {
       if (session.promptTimer) clearTimeout(session.promptTimer)
       if (session.cursorWatchTimer) { clearInterval(session.cursorWatchTimer); session.cursorWatchTimer = null }
       if (session.claudeWatchTimer) { clearInterval(session.claudeWatchTimer); session.claudeWatchTimer = null }
+      if (session.codexUsageWatchTimer) { clearInterval(session.codexUsageWatchTimer); session.codexUsageWatchTimer = null }
       if (session.fsWatcher) { try { session.fsWatcher.close() } catch { /* ignore */ } session.fsWatcher = null }
       if (session.detector) { try { session.detector.stop?.() } catch { /* ignore */ } session.detector = null }
       if (session.eventEmitter) {
@@ -1003,6 +1210,8 @@ export class PtyManager extends EventEmitter {
       if (s.promptTimer) { try { clearTimeout(s.promptTimer) } catch { /* ignore */ } s.promptTimer = null }
       if (s.detectTimer) { try { clearInterval(s.detectTimer) } catch { /* ignore */ } s.detectTimer = null }
       if (s.cursorWatchTimer) { try { clearInterval(s.cursorWatchTimer) } catch { /* ignore */ } s.cursorWatchTimer = null }
+      if (s.claudeWatchTimer) { try { clearInterval(s.claudeWatchTimer) } catch { /* ignore */ } s.claudeWatchTimer = null }
+      if (s.codexUsageWatchTimer) { try { clearInterval(s.codexUsageWatchTimer) } catch { /* ignore */ } s.codexUsageWatchTimer = null }
       if (s.fsWatcher) { try { s.fsWatcher.close() } catch { /* ignore */ } s.fsWatcher = null }
       // Cleanup runtime MCP config file (Task 10)
       if (s.mcpConfigPath) {