agentquad 0.4.5 → 0.4.8

package/src/openclaw-wizard.js

@@ -5,7 +5,7 @@
  * 设计目标：
  *   - 一条 inbound 消息 → 一个完整的判断 → 一个 reply 字符串
  *   - 状态机存内存（重启丢失也无所谓，向导本来就是短生命周期）
- *   - 一句话直说能跳过任意向导步骤（"目录 X" / "象限 N" / "模板 Y"）
+ *   - 一句话直说能跳过任意向导步骤（"目录 X" / "Agent Y"）
  *   - 与 ask_user pending 共存：wizard 优先，wizard 完成后再吃 ask_user 答复
  *
  * 路由优先级（handleInbound 内）：
@@ -49,17 +49,9 @@ import { resolveTool } from './dispatch.js'
 const WIZARD_TIMEOUT_MS = 10 * 60 * 1000
 
 const STEP_WORKDIR = 'workdir'
-const STEP_QUADRANT = 'quadrant'
-const STEP_TEMPLATE = 'template'
+const STEP_TEMPLATE = 'template'   // 用户面叫 "Agent"；代码内部沿用 template key
 const STEP_DONE = 'done'
 
-const QUADRANTS = [
-  { id: 1, label: '重要紧急' },
-  { id: 2, label: '重要不紧急' },
-  { id: 3, label: '紧急不重要' },
-  { id: 4, label: '不重要不紧急' },
-]
-
 function telegramPermissionMode(cfg = {}) {
   const mode = cfg.telegram?.defaultPermissionMode
   return ['default', 'acceptEdits', 'bypass'].includes(mode) ? mode : 'bypass'
@@ -99,18 +91,12 @@ function tryExtractWorkdir(text) {
   return null
 }
 
-/** 解析"象限 N" / "quadrant N" / "Q1" 等；返回 1-4 或 null */
-function tryExtractQuadrant(text) {
-  const m1 = text.match(/(?:象限|quadrant|q)[:：=\s]*([1-4])\b/i)
-  if (m1) return Number(m1[1])
-  return null
-}
-
-/** 解析"模板 Bug" / "用 X 模板" 等；返回模板名 (string) 或 null */
+/** 解析"agent Bug" / "用 X agent" / "员工 X" 等；返回 agent 名 (string) 或 null。
+ * 也兼容历史的"模板 X"写法以免老用户失忆。 */
 function tryExtractTemplateHint(text) {
-  const m = text.match(/(?:用|使用)?\s*[「『"]?([^」』"\s,，；;]+)[」』"]?\s*模板/)
+  const m = text.match(/(?:用|使用)?\s*[「『"]?([^」』"\s,，；;]+)[」』"]?\s*(?:agent|员工|模板)/i)
   if (m) return m[1].trim()
-  const m2 = text.match(/模板[:：=\s]+([^\s,，；;]+)/)
+  const m2 = text.match(/(?:agent|员工|模板)[:：=\s]+([^\s,，；;]+)/i)
   if (m2) return m2[1].trim()
   return null
 }
@@ -143,11 +129,11 @@ function extractTitle(text) {
   s = s.replace(/^(新建|开个|开一?个|创建)\s*(任务|todo)?[:：\s]*/i, '')
   s = s.replace(/^任务[:：]\s*/, '')
   s = s.replace(/^(帮我|帮忙)\s*(做|搞|修|搞定|实现|写一?个|做一?个|修复|重构|调试|debug|加|开发)\s*[:：]?\s*/i, '')
-  // 剥后缀（目录 / 象限 / 模板）
+  // 剥后缀（目录 / agent / 兼容老用户的"象限 N"残余字符）
   s = s.replace(/[,，;；]?\s*(目录|路径|workdir|cwd|文件夹)[:：=\s]+[^\s,，；;]+/gi, '')
-  s = s.replace(/[,，;；]?\s*(象限|quadrant|q)[:：=\s]*[1-4]\b/gi, '')
-  s = s.replace(/[,，;；]?\s*(?:用|使用)?\s*[「『"]?[^」』"\s,，；;]+[」』"]?\s*模板/gi, '')
-  s = s.replace(/[,，;；]?\s*模板[:：=\s]+[^\s,，；;]+/gi, '')
+  s = s.replace(/[,，;；]?\s*(象限|quadrant|q)[:：=\s]*[1-4]\b/gi, '')   // 象限概念已移除，但清掉残留写法
+  s = s.replace(/[,，;；]?\s*(?:用|使用)?\s*[「『"]?[^」』"\s,，；;]+[」』"]?\s*(?:agent|员工|模板)/gi, '')
+  s = s.replace(/[,，;；]?\s*(?:agent|员工|模板)[:：=\s]+[^\s,，；;]+/gi, '')
   return s.trim()
 }
 
@@ -165,20 +151,12 @@ function buildWorkdirMessage(options) {
   return lines.join('\n')
 }
 
-function buildQuadrantMessage() {
-  const lines = ['🎯 选象限：']
-  QUADRANTS.forEach((q) => {
-    lines.push(`${q.id}. ${q.label}${q.id === 2 ? ' ✓ 默认' : ''}`)
-  })
-  return lines.join('\n')
-}
-
 function buildTemplateMessage(templates) {
-  const lines = ['📋 选模板：']
+  const lines = ['👤 派哪个 Agent 干？']
   templates.forEach((t, i) => {
     lines.push(`${i + 1}. ${t.name}${t.description ? ' — ' + t.description : ''}`)
   })
-  lines.push(`${templates.length + 1}. 自由模式（不套模板）`)
+  lines.push(`${templates.length + 1}. 自由模式（不指派 agent）`)
   return lines.join('\n')
 }
 
@@ -186,8 +164,7 @@ function buildTemplateMessage(templates) {
 //
 // callback_data 编码（≤ 64 字节硬限）：
 //   workdir:    qt:wd:<idx>  / qt:wd:custom
-//   quadrant:   qt:q:<1..4>
-//   template:   qt:t:<idx>   / qt:t:none
+//   template:   qt:t:<idx>   / qt:t:none   （用户面叫 "agent"）
 //
 // 数字按钮 label 沿用 "1. xxx" 序号 —— 跟纯文本 prompt 保持一致，
 // 所以双轨用户（按按钮的 / 回数字的）看到的是同一个心智模型。
@@ -224,25 +201,8 @@ function buildWorkdirReplyMarkup(options) {
   return { inline_keyboard: rows }
 }
 
-function buildQuadrantReplyMarkup() {
-  // 2×2，Q2 默认勾上
-  const label = (q) => `Q${q.id} ${q.label}${q.id === 2 ? ' ✓' : ''}`
-  return {
-    inline_keyboard: [
-      [
-        { text: label(QUADRANTS[0]), callback_data: `${CALLBACK_PREFIX}:q:1` },
-        { text: label(QUADRANTS[1]), callback_data: `${CALLBACK_PREFIX}:q:2` },
-      ],
-      [
-        { text: label(QUADRANTS[2]), callback_data: `${CALLBACK_PREFIX}:q:3` },
-        { text: label(QUADRANTS[3]), callback_data: `${CALLBACK_PREFIX}:q:4` },
-      ],
-    ],
-  }
-}
-
 function buildTemplateReplyMarkup(templates) {
-  // 模板名也可能带描述 → 每行 1 个稳妥
+  // 名称可能带描述 → 每行 1 个稳妥
   const rows = templates.map((t, i) => [{
     text: `${i + 1}. ${ellipsisLabel(t.name, 48)}`,
     callback_data: `${CALLBACK_PREFIX}:t:${i}`,
@@ -258,10 +218,6 @@ function buildWorkdirPrompt(options) {
   return { text: buildWorkdirMessage(options), replyMarkup: buildWorkdirReplyMarkup(options) }
 }
 
-function buildQuadrantPrompt() {
-  return { text: buildQuadrantMessage(), replyMarkup: buildQuadrantReplyMarkup() }
-}
-
 function buildTemplatePrompt(templates) {
   return { text: buildTemplateMessage(templates), replyMarkup: buildTemplateReplyMarkup(templates) }
 }
@@ -419,7 +375,6 @@ export function createOpenClawWizard({
     const routeKey = makeRouteKey(channel, chatId, threadId)
     const title = extractTitle(text) || '(未命名任务)'
     const workdirHint = tryExtractWorkdir(text)
-    const quadrantHint = tryExtractQuadrant(text)
     const templateHint = tryExtractTemplateHint(text)
 
     const w = {
@@ -435,23 +390,21 @@ export function createOpenClawWizard({
       title,
       workdirOptions: listWorkdirOptions(),
       chosenWorkdir: workdirHint || null,
-      chosenQuadrant: quadrantHint || null,
       chosenTemplate: null,
       step: STEP_WORKDIR,
       startedAt: Date.now(),
       updatedAt: Date.now(),
     }
 
-    // 模板 hint 解析
+    // agent (template) hint 解析
     if (templateHint) {
       const tpl = findTemplateByHint(db.listTemplates(), templateHint)
       if (tpl) w.chosenTemplate = { id: tpl.id, name: tpl.name }
     }
 
-    // 自动跳过已填字段
-    if (w.chosenWorkdir) w.step = STEP_QUADRANT
-    if (w.chosenWorkdir && w.chosenQuadrant) w.step = STEP_TEMPLATE
-    if (w.chosenWorkdir && w.chosenQuadrant && w.chosenTemplate) w.step = STEP_DONE
+    // 自动跳过已填字段（不再有 quadrant 步骤）
+    if (w.chosenWorkdir) w.step = STEP_TEMPLATE
+    if (w.chosenWorkdir && w.chosenTemplate) w.step = STEP_DONE
 
     wizards.set(routeKey, w)
     return w
@@ -480,8 +433,10 @@ export function createOpenClawWizard({
         if (!path) return { reply: '🖋 路径为空，请重发' }
         w.chosenWorkdir = path
         w.awaitingCustomWorkdir = false
-        w.step = STEP_QUADRANT
-        const prompt = buildQuadrantPrompt()
+        w.step = STEP_TEMPLATE
+        const templates = db.listTemplates()
+        w.cachedTemplates = templates
+        const prompt = buildTemplatePrompt(templates)
         return { reply: prompt.text, replyMarkup: prompt.replyMarkup }
       }
       // 数字选项？
@@ -489,8 +444,10 @@ export function createOpenClawWizard({
       if (idx !== null) {
         if (idx < w.workdirOptions.length) {
           w.chosenWorkdir = w.workdirOptions[idx].path
-          w.step = STEP_QUADRANT
-          const prompt = buildQuadrantPrompt()
+          w.step = STEP_TEMPLATE
+          const templates = db.listTemplates()
+          w.cachedTemplates = templates
+          const prompt = buildTemplatePrompt(templates)
           return { reply: prompt.text, replyMarkup: prompt.replyMarkup }
         } else {
           // 选了"自定义"
@@ -500,8 +457,10 @@ export function createOpenClawWizard({
       // 自定义路径（文本路径下的隐式触发，老行为）
       if (text.startsWith('/') || text.startsWith('~')) {
         w.chosenWorkdir = text.trim()
-        w.step = STEP_QUADRANT
-        const prompt = buildQuadrantPrompt()
+        w.step = STEP_TEMPLATE
+        const templates = db.listTemplates()
+        w.cachedTemplates = templates
+        const prompt = buildTemplatePrompt(templates)
         return { reply: prompt.text, replyMarkup: prompt.replyMarkup }
       }
       // 看不懂 → 重发提示（保留按钮）
@@ -512,28 +471,7 @@ export function createOpenClawWizard({
       }
     }
 
-    // ─── quadrant 步 ───
-    if (w.step === STEP_QUADRANT) {
-      const num = String(text).trim().match(/^([1-4])$/)
-      if (num) {
-        w.chosenQuadrant = Number(num[1])
-      } else if (/默认|default|^$/i.test(text.trim())) {
-        w.chosenQuadrant = 2
-      } else {
-        const prompt = buildQuadrantPrompt()
-        return {
-          reply: `🤔 请点按钮或回 1-4 选象限，回 "默认" 用 Q2。\n\n${prompt.text}`,
-          replyMarkup: prompt.replyMarkup,
-        }
-      }
-      w.step = STEP_TEMPLATE
-      const templates = db.listTemplates()
-      w.cachedTemplates = templates
-      const prompt = buildTemplatePrompt(templates)
-      return { reply: prompt.text, replyMarkup: prompt.replyMarkup }
-    }
-
-    // ─── template 步 ───
+    // ─── template (agent) 步 ───
     if (w.step === STEP_TEMPLATE) {
       const templates = w.cachedTemplates || db.listTemplates()
       const idx = parseNumericChoice(text, templates.length + 1)
@@ -554,7 +492,7 @@ export function createOpenClawWizard({
         } else {
           const prompt = buildTemplatePrompt(templates)
           return {
-            reply: `🤔 请点按钮 / 回数字 1-${templates.length + 1}，或模板名（自由/无）。\n\n${prompt.text}`,
+            reply: `🤔 请点按钮 / 回数字 1-${templates.length + 1}，或 agent 名字（自由/无）。\n\n${prompt.text}`,
             replyMarkup: prompt.replyMarkup,
           }
         }
@@ -568,10 +506,9 @@ export function createOpenClawWizard({
 
   async function finalizeWizard(w) {
     try {
-      // 创建 todo
+      // 创建 todo（quadrant 字段保留在 DB 里只是为了向后兼容；UI 不再展示）
       const todo = db.createTodo({
         title: w.title,
-        quadrant: w.chosenQuadrant || 2,
         description: '',
         workDir: w.chosenWorkdir || null,
         brainstorm: false,
@@ -621,7 +558,7 @@ export function createOpenClawWizard({
           `${topicName}`,
           `AI 已启动，后续输出会回复在这个话题里。`,
           ``,
-          `象限 Q${w.chosenQuadrant || 2} · 目录 ${w.chosenWorkdir || '默认'} · 模板 ${w.chosenTemplate?.name || '自由模式'}`,
+          `Agent ${w.chosenTemplate?.name || '自由模式'} · 目录 ${w.chosenWorkdir || '默认'}`,
         ].join('\n')
         // 复用用户当前所在话题 thread：把 intro 作为 thread reply 发进去，PTY 后续输出
         // 也用同一个 anchor 进同一话题，不再开新 thread。
@@ -770,7 +707,7 @@ export function createOpenClawWizard({
         const welcome = [
           `🤖 任务「${w.title}」AI 已启动 (${sessionInfo?.tool || 'claude'})`,
           ``,
-          `象限 Q${w.chosenQuadrant || 2} · 目录 ${w.chosenWorkdir || '默认'} · 模板 ${w.chosenTemplate?.name || '自由模式'}`,
+          `Agent ${w.chosenTemplate?.name || '自由模式'} · 目录 ${w.chosenWorkdir || '默认'}`,
           ``,
           `AI 一轮回话/卡住/结束会推到这里。直接回任意文本会写进 PTY stdin。`,
         ].join('\n')
@@ -787,13 +724,12 @@ export function createOpenClawWizard({
       const lines = []
       if (createdThreadId) {
         lines.push(`✅ todo #${shortCode} 已建 → 去 topic 「${topicName}」 看进度`)
-        lines.push(`   Q${w.chosenQuadrant || 2} · ${w.chosenWorkdir || '默认目录'} · ${w.chosenTemplate?.name || '自由模式'}`)
+        lines.push(`   Agent ${w.chosenTemplate?.name || '自由模式'} · ${w.chosenWorkdir || '默认目录'}`)
       } else {
         lines.push(`✅ todo #${shortCode} 已建`)
         lines.push(`   标题: ${w.title}`)
-        lines.push(`   象限: Q${w.chosenQuadrant || 2}`)
+        lines.push(`   Agent: ${w.chosenTemplate?.name || '自由模式'}`)
         lines.push(`   目录: ${w.chosenWorkdir || '默认'}`)
-        lines.push(`   模板: ${w.chosenTemplate?.name || '自由模式'}`)
         if (sessionInfo) {
           lines.push(`🤖 ${sessionInfo.tool} 终端已启动 (sessionId: ${sessionInfo.sessionId.slice(-8)})`)
         }
@@ -821,9 +757,9 @@ export function createOpenClawWizard({
     if (!sessionId || !todoId) return { ok: false, reason: 'missing_args' }
     if (!telegramBot?.createForumTopic) return { ok: false, reason: 'no_telegram_bot' }
 
-    // 已有路由 → 跳过
-    const existing = openclaw?.resolveRoute?.(sessionId)
-    if (existing && existing.threadId) return { ok: true, action: 'already_bound' }
+    // 已有 telegram 路由 → 跳过（per-channel resolveRoute；避免被 lark 路由误判）
+    const existing = openclaw?.resolveRoute?.(sessionId, 'telegram')
+    if (existing?.threadId) return { ok: true, action: 'already_bound' }
 
     // DB 里已持久化（rehydrate 时常见）→ 重注路由就行
     const todo = db.getTodo(todoId)
@@ -896,8 +832,9 @@ export function createOpenClawWizard({
     if (!sessionId || !todoId) return { ok: false, reason: 'missing_args' }
     if (!larkBot?.sendMessage) return { ok: false, reason: 'no_lark_bot' }
 
-    const existing = openclaw?.resolveRoute?.(sessionId)
-    if (existing?.channel === 'lark' && existing?.rootMessageId) {
+    // 显式取 lark 路由，避免被 telegram 路由误判
+    const existing = openclaw?.resolveRoute?.(sessionId, 'lark')
+    if (existing?.rootMessageId) {
       return { ok: true, action: 'already_bound' }
     }
 
@@ -916,7 +853,7 @@ export function createOpenClawWizard({
 
     const shortCode = String(todoId).replace(/[^a-zA-Z0-9]/g, '').slice(-4).toLowerCase() || 'auto'
     const title = (todo.title || `todo-${shortCode}`).slice(0, 96)
-    const topicName = `#t${shortCode} ${title}`.slice(0, 128)
+    const topicName = title.slice(0, 128)
     const intro = [
       `${topicName}`,
       `AI 已启动（自动镜像 from web/CLI），后续输出会回复在这条消息的 thread 里。`,
@@ -1015,7 +952,7 @@ export function createOpenClawWizard({
           const todo = db.getTodo(sess.todoId)
           if (todo) {
             // 构造一个假 aiSession（DB 里没持久化，能跑就行）
-            const route = openclaw.resolveRoute?.(sid) || {}
+            const route = openclaw.resolveRoute?.(sid, 'telegram') || {}
             const fakeAi = {
               sessionId: sid,
               tool: sess.tool,
@@ -1168,7 +1105,7 @@ export function createOpenClawWizard({
         if (sess?.todoId) {
           const todo = db.getTodo(sess.todoId)
           if (todo) {
-            const route = openclaw.resolveRoute?.(sid) || {}
+            const route = openclaw.resolveRoute?.(sid, 'lark') || {}
             const fakeAi = {
               sessionId: sid,
               tool: sess.tool,
@@ -1272,6 +1209,16 @@ export function createOpenClawWizard({
     const routeKey = makeRouteKey(channel, chatId, threadId)
     const isLarkThreadReply = channel === 'lark' && (threadId || rootMessageId)
 
+    // 飞书无前缀建任务守门：channel + 配置 + 文本 + slash 守门
+    // 调用方需自行加 newTaskGateOpen + targetSid 缺失等额外条件。
+    function shouldLarkAutoCreate() {
+      if (channel !== 'lark') return false
+      if (getConfig?.()?.lark?.autoCreateTodo === false) return false
+      if (!trimmed) return false
+      if (/^\/[a-z][a-z0-9_]*\b/i.test(trimmed)) return false
+      return true
+    }
+
     // Lark 任务话题/root 回复必须严格隔离到原始路由：不允许被全局 ask_user、新任务触发词、
     // lastPush 或单活跃 session 等模糊 fallback 消费，避免把群内任务线程回复送到不相关会话。
     //
@@ -1455,15 +1402,11 @@ export function createOpenClawWizard({
         wizards.delete(routeKey)
         const w = startWizard({ channel, chatId, threadId, text: trimmed, messageId, rootMessageId, imagePaths, userId: fromUserId })
         if (w.step === STEP_DONE) return await finalizeWizard(w)
-        if (w.step === STEP_QUADRANT) {
-          const p = buildQuadrantPrompt()
-          return { reply: `（已重启向导，跳过目录步）\n${p.text}`, replyMarkup: p.replyMarkup }
-        }
         if (w.step === STEP_TEMPLATE) {
           const tpls = db.listTemplates()
           w.cachedTemplates = tpls
           const p = buildTemplatePrompt(tpls)
-          return { reply: `（已重启向导，跳过目录+象限步）\n${p.text}`, replyMarkup: p.replyMarkup }
+          return { reply: `（已重启向导，跳过目录步）\n${p.text}`, replyMarkup: p.replyMarkup }
         }
         const p = buildWorkdirPrompt(w.workdirOptions)
         return { reply: `（已重启向导）\n${p.text}`, replyMarkup: p.replyMarkup, action: 'wizard_started' }
@@ -1478,20 +1421,12 @@ export function createOpenClawWizard({
     if (newTaskGateOpen && NEW_TASK_TRIGGERS.some((re) => re.test(trimmed))) {
       const w = startWizard({ channel, chatId, threadId, text: trimmed, messageId, rootMessageId, imagePaths, userId: fromUserId })
       if (w.step === STEP_DONE) return await finalizeWizard(w)
-      if (w.step === STEP_QUADRANT) {
-        const p = buildQuadrantPrompt()
-        return {
-          reply: `任务: ${w.title}\n（目录已识别为 ${w.chosenWorkdir}）\n\n${p.text}`,
-          replyMarkup: p.replyMarkup,
-          action: 'wizard_started',
-        }
-      }
       if (w.step === STEP_TEMPLATE) {
         const tpls = db.listTemplates()
         w.cachedTemplates = tpls
         const p = buildTemplatePrompt(tpls)
         return {
-          reply: `任务: ${w.title}\n（目录+象限已识别）\n\n${p.text}`,
+          reply: `任务: ${w.title}\n（目录已识别为 ${w.chosenWorkdir || '默认'}）\n\n${p.text}`,
           replyMarkup: p.replyMarkup,
           action: 'wizard_started',
         }
@@ -1565,6 +1500,28 @@ export function createOpenClawWizard({
         }
       }
       if (targetSid && typeof targetSid === 'object' && targetSid.notFound) {
+        // 未绑定 lark thread 的首条消息：默认起新建任务向导（受 autoCreateTodo 控制）
+        if (newTaskGateOpen && shouldLarkAutoCreate()) {
+          logger.info?.(`[wizard] lark auto-create from non-prefix text (unbound thread): chatId=${chatId} thread=${threadId || '-'} title="${trimmed.slice(0, 80)}"`)
+          const w = startWizard({ channel, chatId, threadId, text: trimmed, messageId, rootMessageId, imagePaths, userId: fromUserId })
+          if (w.step === STEP_DONE) return await finalizeWizard(w)
+          if (w.step === STEP_TEMPLATE) {
+            const tpls = db.listTemplates()
+            w.cachedTemplates = tpls
+            const p = buildTemplatePrompt(tpls)
+            return {
+              reply: `任务: ${w.title}\n（目录已识别为 ${w.chosenWorkdir || '默认'}）\n\n${p.text}`,
+              replyMarkup: p.replyMarkup,
+              action: 'wizard_started',
+            }
+          }
+          const p = buildWorkdirPrompt(w.workdirOptions)
+          return {
+            reply: `任务: ${w.title}\n\n${p.text}`,
+            replyMarkup: p.replyMarkup,
+            action: 'wizard_started',
+          }
+        }
         return {
           reply: '没有找到对应运行中的任务',
           action: 'session_not_found',
@@ -1718,6 +1675,30 @@ export function createOpenClawWizard({
       }
     }
 
+    // 5.5 飞书无前缀建任务兜底：lark + autoCreateTodo + step 5 没匹配任何 PTY target →
+    // 把消息原文当 title 起 wizard。Telegram/微信/openclaw 不受影响（channel 守门）。
+    if (newTaskGateOpen && shouldLarkAutoCreate()) {
+      logger.info?.(`[wizard] lark auto-create from non-prefix text: chatId=${chatId} thread=${threadId || '-'} title="${trimmed.slice(0, 80)}"`)
+      const w = startWizard({ channel, chatId, threadId, text: trimmed, messageId, rootMessageId, imagePaths, userId: fromUserId })
+      if (w.step === STEP_DONE) return await finalizeWizard(w)
+      if (w.step === STEP_TEMPLATE) {
+        const tpls = db.listTemplates()
+        w.cachedTemplates = tpls
+        const p = buildTemplatePrompt(tpls)
+        return {
+          reply: `任务: ${w.title}\n（目录已识别为 ${w.chosenWorkdir || '默认'}）\n\n${p.text}`,
+          replyMarkup: p.replyMarkup,
+          action: 'wizard_started',
+        }
+      }
+      const p = buildWorkdirPrompt(w.workdirOptions)
+      return {
+        reply: `任务: ${w.title}\n\n${p.text}`,
+        replyMarkup: p.replyMarkup,
+        action: 'wizard_started',
+      }
+    }
+
     // 6. fallback
     // General 频道里专门提示：保护 PTY 上下文不被污染
     if (isInGeneralOfSupergroup) {
@@ -1757,9 +1738,8 @@ export function createOpenClawWizard({
    * callback_data 协议：
    *   qt:wd:<idx>     工作目录（按 listWorkdirOptions 顺序）
    *   qt:wd:custom    自定义路径 → 进入 awaitingCustomWorkdir 子态，等下一条文本
-   *   qt:q:<1..4>     象限
-   *   qt:t:<idx>      模板
-   *   qt:t:none       自由模式（不套模板）
+   *   qt:t:<idx>      agent（template；保留 t 前缀以避免破坏老的飞书卡片）
+   *   qt:t:none       自由模式（不指派 agent）
    *
    * 安全：所有未知 / 不匹配当前 step 的 callback 都返回 toast，从不 throw —— 让
    * telegram-bot 始终能 answerCallbackQuery 关 loading。
@@ -1782,7 +1762,7 @@ export function createOpenClawWizard({
     // ── 权限按钮路径（qt:perm:<short>:allow|deny）──────────────────
     const permCb = parsePermissionCallback(callbackData)
     if (permCb) {
-      return handlePermissionCallback(permCb, { chatId, threadId })
+      return handlePermissionCallback(permCb, { chatId, threadId, channel: args.channel || null })
     }
     if (callbackData.startsWith(`${CALLBACK_PREFIX}:${PERMISSION_CALLBACK_KIND}:`)) {
       return { toast: '无效的权限按钮', action: 'invalid', editOriginal: true }
@@ -1835,8 +1815,10 @@ export function createOpenClawWizard({
         return { toast: '选项无效', action: 'invalid' }
       }
       w.chosenWorkdir = w.workdirOptions[idx].path
-      w.step = STEP_QUADRANT
-      const prompt = buildQuadrantPrompt()
+      w.step = STEP_TEMPLATE
+      const templates = db.listTemplates()
+      w.cachedTemplates = templates
+      const prompt = buildTemplatePrompt(templates)
       return {
         chosenLabel: w.chosenWorkdir,
         reply: prompt.text,
@@ -1845,31 +1827,19 @@ export function createOpenClawWizard({
       }
     }
 
-    // ── quadrant step ─────────────────────────────
+    // ── 已退役：qt:q (quadrant) callback。老飞书/Telegram 卡片仍可能携带 → 友好提示 ──
     if (kind === 'q') {
-      if (w.step !== STEP_QUADRANT) {
-        return { toast: '当前步骤不接受象限选择', action: 'invalid' }
-      }
-      const q = Number(value)
-      if (![1, 2, 3, 4].includes(q)) return { toast: '象限无效', action: 'invalid' }
-      w.chosenQuadrant = q
-      w.step = STEP_TEMPLATE
-      const templates = db.listTemplates()
-      w.cachedTemplates = templates
-      const prompt = buildTemplatePrompt(templates)
-      const qLabel = QUADRANTS.find((x) => x.id === q)?.label || ''
       return {
-        chosenLabel: `Q${q} ${qLabel}`.trim(),
-        reply: prompt.text,
-        replyMarkup: prompt.replyMarkup,
-        action: 'wizard_step',
+        toast: '象限步骤已移除，直接选 agent 即可',
+        action: 'deprecated_quadrant',
+        editOriginal: true,
       }
     }
 
-    // ── template step ─────────────────────────────
+    // ── template step (用户面叫 agent) ─────────────────────────────
     if (kind === 't') {
       if (w.step !== STEP_TEMPLATE) {
-        return { toast: '当前步骤不接受模板选择', action: 'invalid' }
+        return { toast: '当前步骤不接受 agent 选择', action: 'invalid' }
       }
       const templates = w.cachedTemplates || db.listTemplates()
       let label
@@ -1879,7 +1849,7 @@ export function createOpenClawWizard({
       } else {
         const idx = Number(value)
         if (!Number.isInteger(idx) || idx < 0 || idx >= templates.length) {
-          return { toast: '模板无效', action: 'invalid' }
+          return { toast: 'agent 无效', action: 'invalid' }
         }
         w.chosenTemplate = { id: templates[idx].id, name: templates[idx].name }
         label = templates[idx].name
@@ -1899,30 +1869,51 @@ export function createOpenClawWizard({
   }
 
   // ─── 权限按钮回调 ───────────────────────────────────────────────
-  async function handlePermissionCallback({ short, action } = {}, { chatId, threadId } = {}) {
-    const stale = () => ({
-      toast: '会话已结束',
-      reply: `⚠️ 会话已结束（#${short}），无法发送权限选择。`,
-      action: 'permission_session_stale',
-      editOriginal: true,
-    })
+  async function handlePermissionCallback({ short, action } = {}, { chatId, threadId, channel = null } = {}) {
+    const stale = (why) => {
+      logger.warn?.(`[wizard/perm] stale short=${short} action=${action} channel=${channel || 'null'} chatId=${chatId || 'null'} threadId=${threadId || 'null'} reason=${why}`)
+      return {
+        toast: '会话已结束',
+        reply: `⚠️ 会话已结束（#${short}），无法发送权限选择。`,
+        action: 'permission_session_stale',
+        editOriginal: true,
+      }
+    }
 
     const sid = openclaw?.findSessionByShortId?.(short) || null
-    if (!sid || !pty?.has?.(sid)) return stale()
-    const route = openclaw?.resolveRoute?.(sid) || null
-    const sameChat = route && String(route.targetUserId) === String(chatId)
-    const sameThread = (route?.threadId || null) === (threadId || null)
+    if (!sid) return stale('no_sid_for_short')
+    if (!pty?.has?.(sid)) return stale(`pty_no_session sid=${sid}`)
+    // channel hint 关键：同一 session 经常同时绑 telegram + lark，resolveRoute(sid)
+    // 不带 channel 时返回最后注册的 route（通常是 telegram），导致 lark 点击的 sameChat
+    // 校验失败被误判为 stale。caller 已经知道点击来自哪个渠道，必须传过来。
+    const route = openclaw?.resolveRoute?.(sid, channel) || null
+    if (!route) return stale(`no_route sid=${sid} channel=${channel || 'null'}`)
+    const sameChat = String(route.targetUserId) === String(chatId)
+    // 飞书 card.action.trigger 事件实测经常不带 open_thread_id（即使卡片是在 thread
+    // 里发的）；用 sameThread 硬校验会把所有 lark click 卡成 stale。lark 渠道下
+    // 信任 sameChat + shortid（已经锁到具体 session）就够了，threadId 只在 telegram
+    // 渠道生效（topic 隔离才有意义）。
+    const sameThread = route.channel === 'lark'
+      ? true
+      : (route.threadId || null) === (threadId || null)
     // 允许 telegram / lark 渠道的权限回调；老的"threadId 非空就算"留作 legacy 兜底。
-    const isRoutedChannel = route?.channel === 'telegram' || route?.channel === 'lark' || route?.threadId != null
-    if (!sameChat || !sameThread || !isRoutedChannel) return stale()
+    const isRoutedChannel = route.channel === 'telegram' || route.channel === 'lark' || route.threadId != null
+    if (!sameChat || !sameThread || !isRoutedChannel) {
+      return stale(`route_mismatch sid=${sid} route=${JSON.stringify({channel: route.channel, targetUserId: route.targetUserId, threadId: route.threadId})} sameChat=${sameChat} sameThread=${sameThread} isRoutedChannel=${isRoutedChannel}`)
+    }
 
     if (action === PERMISSION_ACTION_ALLOW) {
       try {
         pty.write(sid, '\r')
       } catch (e) {
         logger.warn?.(`[wizard] permission allow write failed: ${e.message}`)
-        return stale()
+        return stale('write_failed_allow')
       }
+      // Lark click 直写 PTY 绕过了 /api/ai-terminal/input 路径，web 端的
+      // permissionPrompt + 卡片不会自动消失。手工调一下 awaitingReply(false) 让
+      // ai-terminal 走 markSessionRunningAfterInput → 翻 running、清 permissionPrompt、
+      // 广播 pending_cleared，前端 webview 那张"AI 等待授权"卡随之消失。
+      try { aiTerminal?.markSessionAwaitingReply?.(sid, false) } catch { /* ignore */ }
       return {
         toast: '已发送 Enter',
         chosenLabel: '允许（Enter）',
@@ -1936,8 +1927,9 @@ export function createOpenClawWizard({
         pty.write(sid, '\x1b')
       } catch (e) {
         logger.warn?.(`[wizard] permission deny write failed: ${e.message}`)
-        return stale()
+        return stale('write_failed_deny')
       }
+      try { aiTerminal?.markSessionAwaitingReply?.(sid, false) } catch { /* ignore */ }
       return {
         toast: '已发送 Esc',
         chosenLabel: '拒绝/退出（Esc）',
@@ -2114,7 +2106,7 @@ export function createOpenClawWizard({
 
   /**
    * 找到所有活跃 AI session（status=running / idle / pending_confirm），返回带 todo 上下文的列表：
-   *   [{ sid, short, status, lastOutputAt, todo: {id, title, workDir, quadrant} | null }]
+   *   [{ sid, short, status, lastOutputAt, todo: {id, title, workDir} | null }]
    *
    * 数据源：
    *  - aiTerminal.sessions (in-memory PTY session map) —— 状态最准
@@ -2152,7 +2144,6 @@ export function createOpenClawWizard({
           id: t.id,
           title: t.title || '(未命名)',
           workDir: t.workDir || '',
-          quadrant: t.quadrant || 2,
         }
       }
     }
@@ -2205,7 +2196,7 @@ export function createOpenClawWizard({
   }
 
   /**
-   * /list 或 /pending —— 列未完成 todos，按象限分组。
+   * /list 或 /pending —— 列未完成 todos（扁平显示，按 updated_at 倒序）。
    *
    * 输出限制：30 条；超出加"去 web 看"提示。
    * 状态显示：把 todo.aiSessions 里 running 的标 🟢，便于一眼看哪些任务在跑。
@@ -2225,29 +2216,18 @@ export function createOpenClawWizard({
     const activeSids = new Set(findActiveSessions().map((s) => s.sid))
     // dispatcher 排队信息：sid → queueSize（busy 期间累积的用户输入）
     const dispatcherDesc = sessionInputDispatcher?.describe?.() || { byId: {} }
-    const groups = new Map()
-    for (const q of QUADRANTS) groups.set(q.id, [])
-    for (const t of visible) {
-      const arr = groups.get(t.quadrant) || groups.get(2)
-      arr.push(t)
-    }
     const lines = [`📋 待办 (${todos.length}${todos.length > PAGE ? `, 仅显示前 ${PAGE}` : ''})`]
-    for (const q of QUADRANTS) {
-      const arr = groups.get(q.id)
-      if (!arr || arr.length === 0) continue
-      lines.push('')
-      lines.push(`Q${q.id} ${q.label}`)
-      for (const t of arr) {
-        const short = String(t.id).slice(0, 4)
-        const dirTag = t.workDir ? `· ${basename(t.workDir)}` : ''
-        const aiSessions = t.aiSessions || (t.aiSession ? [t.aiSession] : [])
-        const runningSid = aiSessions.find((s) => s?.sessionId && activeSids.has(s.sessionId))?.sessionId
-        const isRunning = !!runningSid
-        const statusTag = isRunning ? '🟢' : '·'
-        const queueSize = runningSid ? (dispatcherDesc.byId?.[runningSid]?.queueSize || 0) : 0
-        const queueTag = queueSize > 0 ? ` 📥${queueSize}` : ''
-        lines.push(`  ${statusTag} ${short}  ${t.title} ${dirTag}${queueTag}`)
-      }
+    lines.push('')
+    for (const t of visible) {
+      const short = String(t.id).slice(0, 4)
+      const dirTag = t.workDir ? `· ${basename(t.workDir)}` : ''
+      const aiSessions = t.aiSessions || (t.aiSession ? [t.aiSession] : [])
+      const runningSid = aiSessions.find((s) => s?.sessionId && activeSids.has(s.sessionId))?.sessionId
+      const isRunning = !!runningSid
+      const statusTag = isRunning ? '🟢' : '·'
+      const queueSize = runningSid ? (dispatcherDesc.byId?.[runningSid]?.queueSize || 0) : 0
+      const queueTag = queueSize > 0 ? ` 📥${queueSize}` : ''
+      lines.push(`  ${statusTag} ${short}  ${t.title} ${dirTag}${queueTag}`)
     }
     if (todos.length > PAGE) {
       const port = (getConfig?.()?.port) || 5677
@@ -2424,15 +2404,12 @@ export function createOpenClawWizard({
 export const __test__ = {
   extractTitle,
   tryExtractWorkdir,
-  tryExtractQuadrant,
   tryExtractTemplateHint,
   parseNumericChoice,
   findTemplateByHint,
   buildWorkdirMessage,
-  buildQuadrantMessage,
   buildTemplateMessage,
   buildWorkdirReplyMarkup,
-  buildQuadrantReplyMarkup,
   buildTemplateReplyMarkup,
   CALLBACK_PREFIX,
   isGeneralChannel,