agentquad 0.4.5 → 0.4.8

package/src/openclaw-hook.js

@@ -83,6 +83,9 @@ const BOX_HORIZONTAL = /[─━┄┅┈┉═]/g
 const BOX_VERTICAL = /[│┃┆┇┊┋║]/g
 const BOX_CORNERS = /[┌┍┎┏┐┑┒┓└┕┖┗┘┙┚┛┌┐└┘╭╮╯╰╓╒╕╖╙╘╛╜╔╗╚╝]/g
 const BOX_TEES = /[├┝┞┟┠┡┢┣┤┥┦┧┨┩┪┫┬┭┮┯┰┱┲┳┴┵┶┷┸┹┺┻┼┽┾┿╀╁╂╃╄╅╆╇╈╉╊╋╠╣╦╩╬]/g
+// Unicode Block Elements (U+2580-259F)：▀▁▂▃▄▅▆▇█ ▉▊▋▌▍▎▏ ▐░▒▓▔▕▖▗▘▙▚▛▜▝▞▟
+// Cursor TUI 用这些画状态栏 / 进度条 / 边框，发到 IM 一串看就是黑条。
+const BOX_BLOCK = /[▀-▟]/g
 
 function cleanBoxDrawing(s) {
   return String(s || '')
@@ -90,6 +93,7 @@ function cleanBoxDrawing(s) {
     .replace(BOX_VERTICAL, '|')     // 竖线 → |
     .replace(BOX_CORNERS, '+')      // 角 → +
     .replace(BOX_TEES, '+')         // 三叉 → +
+    .replace(BOX_BLOCK, '')         // 块元素直接删（连成一片就是黑条，没语义）
 }
 
 function compactBlankLines(s) {
@@ -114,6 +118,15 @@ const PROMPT_LINE = /^\s*(❯|⏵|►|→)/
 const AUTO_MODE_LINE = /(auto mode (on|off)|shift\+tab to cycle|ctrl\+[a-z]\b)/i
 const BORDER_LINE = /^[\s\-=_|+~]+$/
 
+// Cursor TUI 底部状态栏噪声 —— 每次 stop hook 触发时这些行都会出现在 PTY tail，
+// 完全没信息量，发到 IM 是纯刷屏。
+//   "Opus 4.6 (Thinking) 200K High · 23.6%"  → 模型选择器 + context %
+//   "Auto-run" / "Manual"                    → 模式指示
+//   "~/Desktop/code/crazyCombo/quadtodo · main" → cwd · git branch
+const CURSOR_MODEL_LINE = /^\s*(Opus|Sonnet|Haiku|GPT|Claude|Codex|Composer)\s+[\w.-]+.*·\s*[\d.]+%\s*$/i
+const CURSOR_AUTORUN_LINE = /^\s*(Auto-run|Manual|Auto)\s*$/i
+const CURSOR_CWD_BRANCH_LINE = /^\s*~?\/[^\s·]+(?:\/[^\s·]+)*\s+·\s+[\w./-]+\s*$/
+
 function isSpinnerOnly(line) {
   // 全部是 spinner 字符（含空格）
   const trimmed = line.replace(/\s+/g, '')
@@ -130,6 +143,9 @@ function isStatusLine(line) {
   if (PROMPT_LINE.test(line)) return true
   if (AUTO_MODE_LINE.test(line)) return true
   if (BORDER_LINE.test(line)) return true
+  if (CURSOR_MODEL_LINE.test(line)) return true
+  if (CURSOR_AUTORUN_LINE.test(line)) return true
+  if (CURSOR_CWD_BRANCH_LINE.test(line)) return true
   return false
 }
 
@@ -444,6 +460,7 @@ export function createOpenClawHookHandler(deps = {}) {
    * 处理一条 hook 事件 —— 统一入口，按 source/path 分发。
    *  - source=codex,path=jsonl    → handleCodexJsonl（Phase C）
    *  - source=codex,path=detector → handleCodexDetector（Phase E 占位，目前直接拒绝）
+   *  - source=claude,path=detector→ handleClaudeDetector（PTY 兜底 Notification hook 不 fire）
    *  - 其它（默认 claude）        → handleClaude（保留原逻辑，签名不变）
    * 返回 { ok, action: 'sent'|'skipped'|'failed', reason? }
    */
@@ -451,6 +468,7 @@ export function createOpenClawHookHandler(deps = {}) {
     const source = req?.source || 'claude'
     if (source === 'codex' && req?.path === 'jsonl') return handleCodexJsonl(req)
     if (source === 'codex' && req?.path === 'detector') return handleCodexDetector(req)
+    if (source === 'claude' && req?.path === 'detector') return handleClaudeDetector(req)
     return handleClaude(req)
   }
 
@@ -566,12 +584,12 @@ export function createOpenClawHookHandler(deps = {}) {
     // bridge.postText 的形参是 `message`，不是 `text`——早期实现写错字段名，
     // 导致 bridge 收到 message=undefined 直接走 message_required 短路返回。
     try {
-      const r = await codexBridge.postText({ sessionId: quadtodoSessionId, message: fullText })
+      const r = await codexBridge.broadcastText({ sessionId: quadtodoSessionId, message: fullText })
       if (!r?.ok) {
-        logger.warn?.(`[codex-hook] postText returned not-ok: reason=${r?.reason} detail=${r?.detail || ''}`)
+        logger.warn?.(`[codex-hook] broadcastText returned not-ok: reason=${r?.reason} detail=${r?.detail || ''}`)
         return { ok: false, reason: 'post_failed', detail: r?.reason }
       }
-      logger.info?.(`[codex-hook] postText OK sessionId=${quadtodoSessionId} event=${event} len=${fullText.length}`)
+      logger.info?.(`[codex-hook] broadcastText OK sessionId=${quadtodoSessionId} event=${event} len=${fullText.length}`)
     } catch (e) {
       logger.warn?.(`[codex-hook] postText threw: ${e.message}`)
       return { ok: false, reason: 'post_failed', detail: e?.message }
@@ -628,6 +646,61 @@ export function createOpenClawHookHandler(deps = {}) {
     return { ok: true, action: 'sent', source: 'codex', event, nativeId, matchedPattern }
   }
 
+  // ─── Claude PTY-detector 分支 ────────────────────────────────────────────────
+  // Notification hook 不 fire 的兜底（实测 permissions.defaultMode='auto' 时 model
+  // classifier 触发的权限框走不到 hook）。两件事：
+  //   1) 翻 session.status → pending_confirm（web 端 deriveAiState 据此显示"待确认"）
+  //   2) 推 IM 权限卡 / 按钮（跟真 Notification 走同一份 cooldown，避免双推）
+  // 与 handleCodexDetector 同构，但走 broadcastText（保持跟 Claude 真 Notification 一致），
+  // header 标题区别成 "Claude Code 等待你的响应"。
+  async function handleClaudeDetector({ event, sessionId, promptText } = {}) {
+    if (!sessionId) return { ok: false, reason: 'no_sessionId' }
+    const sess = aiTerminal?.sessions?.get(sessionId)
+    if (!sess) return { ok: false, reason: 'session_gone' }
+
+    // 1) 翻状态。markPendingConfirm 默认只接受 running → pending_confirm，但 PTY-detector
+    //    要求 anchor + ≥2 数字选项才 emit，假阳性概率极低；显式 allowIdleFlip=true 让它
+    //    在 status=idle 时也能翻（覆盖 auto 模式权限框在 Stop hook 后才浮出的场景）。
+    try {
+      aiTerminal?.markPendingConfirm?.(sessionId, {
+        source: 'claude-pty-detector',
+        promptText,
+        allowIdleFlip: true,
+      })
+    } catch { /* ignore */ }
+
+    // 2) IM 推送资格 & cooldown 跟真 Notification 共享 → 不会双推
+    if (!isPermissionReminderEligible(sessionId)) {
+      return { ok: true, action: 'skipped', reason: 'im_push_not_eligible' }
+    }
+    const cd = notificationCooldownMs()
+    if (cd > 0 && isOnCooldown(sessionId, 'notification', cd)) {
+      return { ok: true, action: 'skipped', reason: 'notification_cooldown', cooldownMs: cd }
+    }
+
+    // 3) 拼消息：直接用 PTY detector 抽出来的 promptText（已经过 anchor + cleanPtyTail 清洗）
+    const todoId = sess.todoId
+    let todoTitle = todoId
+    try {
+      const todo = await db.getTodo?.(todoId)
+      todoTitle = todo?.title || todoId
+    } catch { /* ignore */ }
+    const idTail = todoId ? String(todoId).slice(-3) : '???'
+    let message = `[#t${idTail}] 任务「${todoTitle}」\n\n${promptText || '(no prompt text)'}`
+    message = buildPermissionNotificationMessage(message)
+    const replyMarkup = buildPermissionReplyMarkup(sessionId)
+
+    let result
+    try {
+      result = await openclaw.broadcastText({ sessionId, message, replyMarkup })
+    } catch (e) {
+      logger.warn?.(`[claude-detector] broadcastText failed: ${e.message}`)
+      return { ok: false, reason: 'post_failed', detail: e?.message }
+    }
+    if (result?.ok !== false) recordSent(sessionId, 'notification')
+    return { ok: true, action: 'sent', source: 'claude', path: 'detector', event }
+  }
+
   // ─── Claude 分支（既有实现，原 handle() 主体不变）─────────────────────────────
   async function handleClaude({ event, sessionId, todoId, todoTitle, hookPayload } = {}) {
     if (!event) return { ok: false, action: 'failed', reason: 'event_required' }
@@ -642,11 +715,56 @@ export function createOpenClawHookHandler(deps = {}) {
       logger.warn?.(`[openclaw-hook] hook fired with no registered route: event=${evt} sid=${sessionId} todoId=${todoId || 'null'}`)
     }
 
+    // 0) user-prompt-submit → echo user's prompt to all IM channels (minus origin)
+    if (evt === 'user-prompt-submit') {
+      if (!sessionId) return { ok: true, action: 'skipped', reason: 'no_session' }
+      const promptRaw =
+        (hookPayload && typeof hookPayload === 'object' && (
+          hookPayload.user_prompt ||
+          hookPayload.prompt ||
+          hookPayload.user_message ||
+          hookPayload.message
+        )) || ''
+      const prompt = String(promptRaw).trim()
+      if (!prompt) return { ok: true, action: 'skipped', reason: 'empty_prompt' }
+
+      // 截断：>2000 字符 → 取前 2000 + 末尾标注总字数
+      const MAX = 2000
+      const truncated = prompt.length > MAX
+        ? `${prompt.slice(0, MAX)}\n… [共 ${prompt.length} 字]`
+        : prompt
+      const message = `👤 ${truncated}`
+
+      let originChannel = null
+      try {
+        originChannel = sessionInputDispatcher?.consumeOrigin?.(sessionId, prompt) || null
+      } catch (e) {
+        logger.warn?.(`[openclaw-hook] consumeOrigin threw: ${e.message}`)
+      }
+
+      try {
+        await openclaw?.broadcastEcho?.({ sessionId, message, excludeChannel: originChannel })
+      } catch (e) {
+        logger.warn?.(`[openclaw-hook] broadcastEcho threw: ${e.message}`)
+      }
+      return { ok: true, action: 'echoed', origin: originChannel, length: prompt.length }
+    }
+
     // 1) ask_user pending 时 Stop 静默
     if (evt === 'stop' && hasPendingAskUser(sessionId)) {
       return { ok: true, action: 'skipped', reason: 'ask_user_pending' }
     }
 
+    // 1a) Cursor 的 stop hook 每轮 fire 3 次（实测 13ms 内连发，cursor 内部架构使然）。
+    //     给 cursor session 加 5 秒短 cooldown 去重 —— 5s 足够吞掉同一轮内的连发，
+    //     又远小于用户两轮对话的最小间隔。Claude/Codex 不受影响（它们 stop 一轮一发）。
+    if (evt === 'stop' && sessionId) {
+      const sess = aiTerminal?.sessions?.get?.(sessionId)
+      if (sess?.tool === 'cursor' && isOnCooldown(sessionId, 'stop', 5_000)) {
+        return { ok: true, action: 'skipped', reason: 'cursor_stop_dedup' }
+      }
+    }
+
     const permissionReminderEligible = evt === 'notification' && isPermissionReminderEligible(sessionId)
 
     // 注：原来这里会立即 notifyWebTurnDone。已经挪到 ③ 读完 JSONL 之后，
@@ -833,8 +951,8 @@ export function createOpenClawHookHandler(deps = {}) {
     // footer 永远附在最末尾（即使消息被截短到附件也要保留，让用户能看到费用）
     if (usageFooter) message = `${message}\n\n${usageFooter}`
 
-    // 4) 推送（postText 接受可选 attachment）
-    const result = await openclaw.postText({
+    // 4) 推送（broadcastText 扇出到 session 所有绑定 channel；接受可选 attachment）
+    const result = await openclaw.broadcastText({
       sessionId,
       message,
       attachment: attachmentPath,    // bridge 转给 telegramBot.sendDocument
@@ -843,7 +961,7 @@ export function createOpenClawHookHandler(deps = {}) {
 
     // 5) SessionEnd 后处理：close topic + 改名 ✅ + 清状态
     if (evt === 'session-end') {
-      const route = openclaw.resolveRoute?.(sessionId)
+      const route = openclaw.resolveRoute?.(sessionId, 'telegram')
       if (route?.threadId && telegramBot) {
         try {
           await telegramBot.closeForumTopic({ chatId: route.targetUserId, threadId: route.threadId })
@@ -904,14 +1022,14 @@ export function createOpenClawHookHandler(deps = {}) {
       }
       // Stop / session-end → 清掉 lark "在思考" reaction（如果是 lark route）
       if ((evt === 'stop' || evt === 'session-end') && sessionId && larkBot?.clearReactionsForSession) {
-        const route = openclaw.resolveRoute?.(sessionId)
+        const route = openclaw.resolveRoute?.(sessionId, 'lark')
         if (route?.channel === 'lark') {
           larkBot.clearReactionsForSession(sessionId).catch((e) => logger.warn?.(`[openclaw-hook] clearReactionsForSession failed: ${e.message}`))
         }
       }
       // Stop / session-end → 清掉 telegram "✍" reaction（如果是 telegram route）
       if ((evt === 'stop' || evt === 'session-end') && sessionId && reactionTracker?.clearReactionsForSession) {
-        const route = openclaw.resolveRoute?.(sessionId)
+        const route = openclaw.resolveRoute?.(sessionId, 'telegram')
         if (route?.channel === 'telegram') {
           reactionTracker.clearReactionsForSession(sessionId).catch((e) => logger.warn?.(`[openclaw-hook] tg clearReactionsForSession failed: ${e.message}`))
         }
@@ -938,4 +1056,4 @@ export function createOpenClawHookHandler(deps = {}) {
   }
 }
 
-export const __test__ = { buildMessage, shortTodoId }
+export const __test__ = { buildMessage, shortTodoId, extractTailSnippet }