deskbuddy 0.2.0-beta.13 → 0.2.0-beta.15

package/dist/ocTranslate.mjs

@@ -0,0 +1,106 @@
+// opencode 系事件 → cc-hook 同构输入的翻译（spec 2026-10-03 §3.2「共用翻译」）。
+// opencode 插件（opencode.mjs，跑在 opencode 自带的 bun 里）与 daemon 的 DumateWatch（百度搭子 = 改名的 opencode）共用这一份：
+// 插件 import 同目录的本文件（随 hook.cjs 一起同步到 ~/.deskbuddy/），daemon 经 src/core/ocTranslate.ts 打包进去。
+// 🔴 零依赖纯函数：不能 import 任何东西（插件那边同目录只有我们自己的文件）
+
+/** opencode 工具 → cc-hook 同构的 tool_name / tool_input（daemon 的 classify 按 Claude Code 的工具名判断） */
+export function toCcTool(tool, args) {
+  const a = args && typeof args === 'object' ? args : {}
+  const s = (v) => (typeof v === 'string' ? v : '')
+  switch (tool) {
+    case 'bash':
+      return { tool_name: 'Bash', tool_input: { command: s(a.command) } }
+    case 'read':
+      return { tool_name: 'Read', tool_input: { file_path: s(a.filePath) } }
+    case 'edit':
+      return { tool_name: 'Edit', tool_input: { file_path: s(a.filePath) } }
+    case 'write':
+      return { tool_name: 'Write', tool_input: { file_path: s(a.filePath) } }
+    case 'glob':
+      return { tool_name: 'Glob', tool_input: { pattern: s(a.pattern), path: s(a.path) } }
+    case 'grep':
+      return { tool_name: 'Grep', tool_input: { pattern: s(a.pattern), path: s(a.path) } }
+    case 'list':
+      return { tool_name: 'LS', tool_input: { path: s(a.path) } }
+    case 'webfetch':
+      return { tool_name: 'WebFetch', tool_input: { url: s(a.url) } }
+    case 'task':
+      return { tool_name: 'Task', tool_input: {} }
+    case 'todowrite':
+    case 'todoread':
+      return { tool_name: 'TodoWrite', tool_input: {} }
+    case 'patch':
+    case 'apply_patch':
+      return { tool_name: 'apply_patch', tool_input: { patch: s(a.patchText) || s(a.patch) || s(a.input) } }
+    default:
+      // 不认识的工具（MCP 等）原名原参数交出去：classify 对不认识的一律推设备
+      return { tool_name: String(tool || ''), tool_input: a }
+  }
+}
+
+/** permission.asked → PermissionRequest 的 tool_name / tool_input，给设备卡片生成摘要 */
+export function askToCc(props) {
+  const md = (props && props.metadata) || {}
+  if (typeof md.command === 'string' && md.command) return { tool_name: 'Bash', tool_input: { command: md.command } }
+  const file = md.filepath || md.filePath
+  if (typeof file === 'string' && file) return { tool_name: 'Edit', tool_input: { file_path: file } }
+  const patterns = Array.isArray(props && props.patterns) ? props.patterns.join(' ') : ''
+  return { tool_name: String((props && props.permission) || 'permission'), tool_input: { path: patterns } }
+}
+
+/**
+ * 授权请求里 opencode 自己给的「以后都允许」模式（permission.asked 的 always，如 bash 的 `npm *`、edit 的 `*`）
+ * → 一条 session 级 addRules 建议（与 Claude Code 的 permission_suggestions 同形），daemon 据此在设备上给「允许并记住」。
+ * 设备选了记住，gate 输出带 updatedPermissions，插件回 always（opencode 在本次运行期间记住这些模式）。没有 always 返回 undefined
+ */
+export function alwaysSuggestions(props) {
+  const perm = String((props && props.permission) || '').trim()
+  const always = props && Array.isArray(props.always) ? props.always.filter((x) => typeof x === 'string' && x.trim() !== '') : []
+  if (!perm || always.length === 0) return undefined
+  return [{ type: 'addRules', rules: always.map((x) => ({ toolName: perm, ruleContent: `${perm} ${x.trim()}` })), behavior: 'allow', destination: 'session' }]
+}
+
+/**
+ * 这次提问来自哪个工具：question.asked 只带 tool.callID，工具名要从 tool.execute.before 记下的调用里查。
+ * 🔴 只推 question 工具本身的提问：plan_exit 也走 question.asked（「计划完成，是否切到 build」Yes/No），
+ *    推到设备 = 盲批计划，违背 ExitPlanMode 不推的原则（设备答选择题 spec §3.7）。认不出来源的一律不推
+ */
+export function isPlainQuestion(props, callTool) {
+  if (callTool !== 'question') return false
+  const qs = props && Array.isArray(props.questions) ? props.questions : []
+  // 兜底：plan_exit 的固定题面 / header
+  return !qs.some((q) => q && (q.header === 'Build Agent' || (typeof q.question === 'string' && /^Plan at .* is complete\./.test(q.question))))
+}
+
+/**
+ * question.asked（opencode 的 question 工具 / plan_exit 等向用户提问）→ AskUserQuestion 形状的 tool_input，
+ * 统一走 daemon 的选择题链路（设备答选择题 spec §3.4）。`multiple` → multiSelect；`custom:false` 原样带上（不许自己填）
+ */
+export function questionToCc(props) {
+  const qs = props && Array.isArray(props.questions) ? props.questions : null
+  if (!qs || qs.length === 0) return null
+  return {
+    tool_name: 'AskUserQuestion',
+    tool_input: {
+      questions: qs.map((q) => ({
+        question: q && q.question,
+        header: (q && q.header) || '',
+        multiSelect: !!(q && q.multiple),
+        options: q && Array.isArray(q.options) ? q.options.map((o) => ({ label: o && o.label, description: (o && o.description) || '' })) : [],
+        ...(q && q.custom === false ? { custom: false } : {}),
+      })),
+    },
+  }
+}
+
+/** opencode 起标题前的占位名（1.18.32 isDefaultTitle：`New session - ` / `Child session - ` + ISO 时间），不当标题 */
+const OC_DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
+
+/** session.updated 的 info → 记下自动标题。子会话（subagent，带 parentID）、占位名不记 */
+export function rememberTitle(titles, info) {
+  if (!info || typeof info.id !== 'string' || !info.id || info.parentID) return
+  const t = typeof info.title === 'string' ? info.title.trim() : ''
+  if (!t || OC_DEFAULT_TITLE_RE.test(t)) return
+  titles.set(info.id, t.slice(0, 100))
+}
+

package/dist/opencode.mjs

@@ -21,8 +21,13 @@
 // 🔴 窗口模式反过来：任何失败都不表态，授权框照常由人处理。
 
 import { spawn } from 'node:child_process'
+import { appendFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { alwaysSuggestions, askToCc, isPlainQuestion, questionToCc, rememberTitle, toCcTool } from './ocTranslate.mjs'
+
+// 翻译函数搬到了 ocTranslate.mjs（与 DumateWatch 共用），这里转出去保持原来的导出
+export { alwaysSuggestions, askToCc, isPlainQuestion, questionToCc, rememberTitle, toCcTool }
 
 const HERE = dirname(fileURLToPath(import.meta.url))
 const HOOK = join(HERE, 'hook.cjs')
@@ -62,63 +67,6 @@ export function isHeadless(argv = process.argv) {
   return (end >= 0 ? args.slice(0, end) : args).includes('run')
 }
 
-/** opencode 工具 → cc-hook 同构的 tool_name / tool_input（daemon 的 classify 按 Claude Code 的工具名判断） */
-export function toCcTool(tool, args) {
-  const a = args && typeof args === 'object' ? args : {}
-  const s = (v) => (typeof v === 'string' ? v : '')
-  switch (tool) {
-    case 'bash':
-      return { tool_name: 'Bash', tool_input: { command: s(a.command) } }
-    case 'read':
-      return { tool_name: 'Read', tool_input: { file_path: s(a.filePath) } }
-    case 'edit':
-      return { tool_name: 'Edit', tool_input: { file_path: s(a.filePath) } }
-    case 'write':
-      return { tool_name: 'Write', tool_input: { file_path: s(a.filePath) } }
-    case 'glob':
-      return { tool_name: 'Glob', tool_input: { pattern: s(a.pattern), path: s(a.path) } }
-    case 'grep':
-      return { tool_name: 'Grep', tool_input: { pattern: s(a.pattern), path: s(a.path) } }
-    case 'list':
-      return { tool_name: 'LS', tool_input: { path: s(a.path) } }
-    case 'webfetch':
-      return { tool_name: 'WebFetch', tool_input: { url: s(a.url) } }
-    case 'task':
-      return { tool_name: 'Task', tool_input: {} }
-    case 'todowrite':
-    case 'todoread':
-      return { tool_name: 'TodoWrite', tool_input: {} }
-    case 'patch':
-    case 'apply_patch':
-      return { tool_name: 'apply_patch', tool_input: { patch: s(a.patchText) || s(a.patch) || s(a.input) } }
-    default:
-      // 不认识的工具（MCP 等）原名原参数交出去：classify 对不认识的一律推设备
-      return { tool_name: String(tool || ''), tool_input: a }
-  }
-}
-
-/** permission.asked → PermissionRequest 的 tool_name / tool_input，给设备卡片生成摘要 */
-export function askToCc(props) {
-  const md = (props && props.metadata) || {}
-  if (typeof md.command === 'string' && md.command) return { tool_name: 'Bash', tool_input: { command: md.command } }
-  const file = md.filepath || md.filePath
-  if (typeof file === 'string' && file) return { tool_name: 'Edit', tool_input: { file_path: file } }
-  const patterns = Array.isArray(props && props.patterns) ? props.patterns.join(' ') : ''
-  return { tool_name: String((props && props.permission) || 'permission'), tool_input: { path: patterns } }
-}
-
-/**
- * 授权请求里 opencode 自己给的「以后都允许」模式（permission.asked 的 always，如 bash 的 `npm *`、edit 的 `*`）
- * → 一条 session 级 addRules 建议（与 Claude Code 的 permission_suggestions 同形），daemon 据此在设备上给「允许并记住」。
- * 设备选了记住，gate 输出带 updatedPermissions，插件回 always（opencode 在本次运行期间记住这些模式）。没有 always 返回 undefined
- */
-export function alwaysSuggestions(props) {
-  const perm = String((props && props.permission) || '').trim()
-  const always = props && Array.isArray(props.always) ? props.always.filter((x) => typeof x === 'string' && x.trim() !== '') : []
-  if (!perm || always.length === 0) return undefined
-  return [{ type: 'addRules', rules: always.map((x) => ({ toolName: perm, ruleContent: `${perm} ${x.trim()}` })), behavior: 'allow', destination: 'session' }]
-}
-
 /**
  * 远程模式：关卡改由 tool.execute.before 把，放开权限。🔴 必须原地改（整对象替换不生效，O8）。
  * - OC_GATED_KEYS 是 daemon 压成 deny 的，放成 allow（用户原来在这些键上写的值已被覆盖，找不回来 —— 每一步都要过设备）
@@ -184,17 +132,6 @@ export function injectAppended(output, raw) {
   return o && typeof o.systemMessage === 'string' ? o.systemMessage : ''
 }
 
-/** opencode 起标题前的占位名（1.18.32 isDefaultTitle：`New session - ` / `Child session - ` + ISO 时间），不当标题 */
-const OC_DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
-
-/** session.updated 的 info → 记下自动标题。子会话（subagent，带 parentID）、占位名不记 */
-export function rememberTitle(titles, info) {
-  if (!info || typeof info.id !== 'string' || !info.id || info.parentID) return
-  const t = typeof info.title === 'string' ? info.title.trim() : ''
-  if (!t || OC_DEFAULT_TITLE_RE.test(t)) return
-  titles.set(info.id, t.slice(0, 100))
-}
-
 /** 活着的子进程；opencode 退出时一并结束，不留孤儿 gate 挂着设备卡片（评审） */
 const LIVE = new Set()
 process.on('exit', () => {
@@ -238,7 +175,18 @@ function startChild(node, script, args, input, killMs = 0) {
 
 const runChild = (node, script, args, input, killMs) => startChild(node, script, args, input, killMs).done
 
+/**
+ * 跑在百度搭子（DuMate，内核是改名的 opencode：dumate-opencode）里。那边的会话由 daemon 的 DumateWatch 直连 HTTP 上报和推卡，
+ * 插件再报一遍就是 tool=opencode 的第二份会话 + 双卡（spec 2026-10-03 §3.2「防双卡」）
+ */
+export function isDumateHost(env = process.env, execPath = process.execPath) {
+  return !!(env && env.DUMATE_INAPP_KEY) || /dumate-opencode/i.test(String(execPath || ''))
+}
+
 export function make(opts = {}) {
+  if (isDumateHost(opts.env, opts.execPath)) return async function DeskBuddyOff() {
+    return {}
+  }
   return async function DeskBuddy(ctx) {
     const node = process.env.DESKBUDDY_NODE || opts.node || 'node'
     const client = ctx && ctx.client
@@ -325,6 +273,82 @@ export function make(opts = {}) {
       if (typeof out.systemMessage === 'string' && out.systemMessage) await toast(out.systemMessage)
     }
 
+    // ---- 选择题（question.asked）：推设备作答，答案经 /question/{id}/reply 回填；设备跳过 → reject ----
+    const pendingQ = new Map() // requestID → gate 子进程
+    const debugLog = (line) => {
+      try {
+        appendFileSync(join(HERE, 'hook-debug.log'), `${new Date().toISOString()} [opencode] ${line}\n`, 'utf8')
+      } catch (_) {
+        /* 记不下不影响 */
+      }
+    }
+    /** 返回是否成功（hey-api 客户端不抛错，失败在返回值的 error / response.status 里） */
+    const postRaw = async (url, path, body) => {
+      // 插件拿到的是 v1 SDK 客户端，没有 question 的方法：用它底下的 HTTP 客户端直接打（路径参数由客户端填）
+      const http = client && (client._client || client.client)
+      if (!http || typeof http.post !== 'function') {
+        debugLog(`回填选择题失败：客户端没有 post（${url}）`)
+        return false
+      }
+      try {
+        const r = await http.post({ url, path, ...(body ? { body, headers: { 'Content-Type': 'application/json' } } : {}) })
+        const status = r && r.response && typeof r.response.status === 'number' ? r.response.status : 0
+        if ((r && r.error) || status >= 400) {
+          debugLog(`回填选择题失败：${url} status=${status || '?'}`)
+          return false
+        }
+        return true
+      } catch (e) {
+        debugLog(`回填选择题出错：${url} ${(e && e.message) || e}`)
+        return false
+      }
+    }
+    const onQuestion = async (p) => {
+      const { id, sessionID } = p || {}
+      if (!id || !sessionID || runId || headless || !client) return
+      const call = p.tool && p.tool.callID ? calls.get(p.tool.callID) : null
+      if (!isPlainQuestion(p, call && call.tool)) return
+      const cc = questionToCc(p)
+      if (!cc) return
+      const input = { hook_event_name: 'PermissionRequest', session_id: sessionID, cwd, ...cc }
+      const { child, done } = startChild(node, GATE, ['--window', '--tool', TOOL], input)
+      if (child) pendingQ.set(id, child)
+      const r = await done
+      pendingQ.delete(id)
+      if (r.code !== 0 || !r.out) return
+      let out
+      try {
+        out = JSON.parse(r.out)
+      } catch (_) {
+        return
+      }
+      const d = out && out.hookSpecificOutput && out.hookSpecificOutput.decision
+      if (!d) return
+      let ok
+      if (d.behavior === 'allow' && Array.isArray(out.deskbuddyAnswers)) {
+        ok = await postRaw('/question/{requestID}/reply', { requestID: id }, { answers: out.deskbuddyAnswers })
+      } else if (d.behavior === 'deny') {
+        ok = await postRaw('/question/{requestID}/reject', { requestID: id })
+      } else return
+      if (!ok) {
+        await toast('设备答案未能回填，请在窗口作答')
+        return
+      }
+      if (typeof out.systemMessage === 'string' && out.systemMessage) await toast(out.systemMessage)
+    }
+    const onQuestionDone = (p) => {
+      // 人先在窗口里答了 / 拒了：结束 gate 子进程，daemon 随之撤掉设备上的卡片
+      const child = p && pendingQ.get(p.requestID)
+      if (child) {
+        pendingQ.delete(p.requestID)
+        try {
+          child.kill('SIGTERM')
+        } catch (_) {
+          /* 已经退了 */
+        }
+      }
+    }
+
     const onReplied = (p) => {
       // 人先在窗口里答了：结束 gate 子进程，daemon 随之撤掉设备上的卡片
       const child = p && pending.get(p.requestID)
@@ -362,7 +386,7 @@ export function make(opts = {}) {
 
       'tool.execute.before': async (input, output) => {
         const cc = toCcTool(input && input.tool, output && output.args)
-        if (input && input.callID) calls.set(input.callID, { cc, at: Date.now() })
+        if (input && input.callID) calls.set(input.callID, { cc, tool: input && input.tool, at: Date.now() })
         report('PreToolUse', input && input.sessionID, cc)
         if (!runId) return
         // 远程关卡：等设备。任何失败都拒（见顶部）
@@ -398,6 +422,13 @@ export function make(opts = {}) {
           case 'permission.replied':
             onReplied(p)
             break
+          case 'question.asked':
+            onQuestion(p).catch(() => {})
+            break
+          case 'question.replied':
+          case 'question.rejected':
+            onQuestionDone(p)
+            break
           case 'session.idle':
             report('Stop', p.sessionID)
             break

package/hook/deskbuddy-dsh.d.mts

@@ -0,0 +1,24 @@
+// hook/deskbuddy-dsh.mjs 的类型声明（只给测试用；插件本体是零依赖 JS，跑在 dsh 进程里）
+type Cc = { tool_name: string; tool_input: Record<string, unknown> }
+export const TOOL: string
+export const SUPPORTED_VERSION_RE: RegExp
+export function toCcTool(tool: unknown, args: unknown): Cc
+export function parseArgs(raw: unknown): Record<string, unknown>
+export function questionsToCc(questions: unknown): { tool_name: string; tool_input: { questions: Array<Record<string, unknown>> } } | null
+export function answersFromLists(questions: unknown, lists: unknown): { answers: Array<{ id: string; selected: string[]; custom?: string }> } | null
+export function skippedAnswers(questions: unknown): { answers: Array<{ id: string; selected: string[] }> } | null
+export function profileName(ctxProfile: unknown, argv?: string[]): string
+export function isWindowProfile(name: unknown): boolean
+export function gatingAllowed(version: string): boolean
+export function dshVersion(argv?: string[]): string
+export function parseGateOut(r: unknown): { decision: 'allow' | 'deny'; answers: string[][] | null } | null
+export function race<T>(next: () => Promise<T> | T, device: Promise<T | null>, cancelDevice: () => void, abortNative: () => void): Promise<T>
+export function spliceSignal(req: { signal?: AbortSignal }, ac: AbortController): boolean
+export const name: string
+export function apply(ctx: unknown, config?: { node?: string }): void
+export function runIdFromEnv(env?: Record<string, string | undefined>): string
+export function mailboxHome(env?: Record<string, string | undefined>): string
+export function runGateAllowed(r: unknown): boolean
+export function rootSession(parents: Map<string, string>, sid: string): string
+export const STALE_LETTER_MS: number
+export const LETTER_RE: RegExp