deskbuddy 0.2.0-beta.0 → 0.2.0-beta.2

package/hook/gate.cjs

@@ -106,6 +106,7 @@ function argTool(argv) {
  * - Claude Code：见 isInteractiveClaude
  */
 function isInteractiveAgent(tool) {
+  if (process.platform === 'win32') return isInteractiveAgentWin(tool)
   if (tool === 'qoder') return hasAncestor((comm) => comm.includes('/Qoder CN.app/'))
   if (tool === 'claude_code') return isInteractiveClaude()
   // opencode 的窗口确认由插件发起，插件已排除 `opencode run`（hook/opencode.mjs isHeadless）
@@ -113,6 +114,43 @@ function isInteractiveAgent(tool) {
   return false
 }
 
+/** 窗口里 claude 的参数不带 -p / --print / stream-json：与 isInteractiveClaude 同一判据 */
+function claudeArgsInteractive(argsAfterArgv0) {
+  return !argsAfterArgv0.some(
+    (t) => t === '--print' || /^-[a-zA-Z]*p[a-zA-Z]*$/.test(t) || t === 'stream-json' || t.startsWith('--output-format=stream')
+  )
+}
+
+/**
+ * Windows 版（没有 ps）：进程表借 hook.cjs 的实现（同目录，随它一起装），判据同上。
+ * - Qoder CN 桌面端：祖先里有 `Qoder CN.exe`
+ * - Claude Code：原生版是 `claude.exe`，npm 版是 node 跑 `claude-code/cli.js`
+ * 取不到进程表 = 判不出来 = 不表态（窗口模式的兜底方向）
+ */
+function isInteractiveAgentWin(tool) {
+  if (tool === 'opencode') return true
+  if (tool !== 'qoder' && tool !== 'claude_code') return false
+  let winProc
+  try {
+    winProc = require(path.join(__dirname, 'hook.cjs')).winProc
+  } catch (_) {
+    return false
+  }
+  let pid = process.ppid
+  const seen = new Set()
+  for (let i = 0; i < 8 && pid > 4 && !seen.has(pid); i++) {
+    seen.add(pid)
+    const p = winProc(pid)
+    if (!p) return false
+    if (tool === 'qoder' && /qoder cn/i.test(p.name)) return true
+    if (tool === 'claude_code' && (/^claude(\.exe)?$/i.test(p.name) || p.name === 'claude-code/cli.js')) {
+      return claudeArgsInteractive(p.args.split(' ').slice(1))
+    }
+    pid = p.ppid
+  }
+  return false
+}
+
 function hasAncestor(match) {
   let pid = process.ppid
   for (let i = 0; i < 8 && pid > 1; i++) {

package/hook/hook.cjs

@@ -22,6 +22,11 @@ const { execFileSync } = require('node:child_process')
 const DEFAULT_API_BASE = process.env.DESKBUDDY_API_BASE || 'https://api.shifengintelli.com'
 const KEEPALIVE_MS = 2 * 60 * 1000
 const MAX_SESSIONS = 20
+/**
+ * 快照整包带的能力声明（前置 spec 2026-09-29 §4.4，服务端写 deskbuddy:caps:{clientId}）。
+ * 与 src/core/snapshot.ts 的 CAPS 一致
+ */
+const CAPS = ['cmd_result', 'window_inject']
 /** 状态文件里保留的最近事件条数，与 src/core/state.ts 的 RECENT_MAX 一致 */
 const RECENT_MAX = 8
 const REPORT_TIMEOUT_MS = 2000
@@ -331,11 +336,141 @@ function resolveTitle(sources, ctx) {
   return ''
 }
 
+// ---------- Windows 进程表 ----------
+// 🔴 与 src/core/winproc.ts 逐行同构：这里记下的 pidName 要由 daemon 拿同一个算法复核，改一边必须改另一边。
+// Windows 没有 ps，用 PowerShell 一次取全表在内存里走（一次 300ms 起，不能按 pid 一个个查）。
+
+const IS_WIN = process.platform === 'win32'
+const SCRIPT_HOSTS = ['node', 'bun', 'deno']
+const WIN_PS_SCRIPT =
+  '[Console]::OutputEncoding=[Text.Encoding]::UTF8;' +
+  'Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress'
+
+function winSplitArgs(cmdline) {
+  const out = []
+  let cur = ''
+  let inQ = false
+  let has = false
+  const s = cmdline || ''
+  for (let i = 0; i < s.length; i++) {
+    const c = s[i]
+    if (c === '\\') {
+      let n = 0
+      while (s[i + n] === '\\') n++
+      if (s[i + n] === '"') {
+        cur += '\\'.repeat(Math.floor(n / 2))
+        if (n % 2 === 1) cur += '"'
+        else inQ = !inQ
+        i += n
+        has = true
+      } else {
+        cur += '\\'.repeat(n)
+        i += n - 1
+        has = true
+      }
+    } else if (c === '"') {
+      inQ = !inQ
+      has = true
+    } else if (!inQ && (c === ' ' || c === '\t')) {
+      if (has) out.push(cur)
+      cur = ''
+      has = false
+    } else {
+      cur += c
+      has = true
+    }
+  }
+  if (has) out.push(cur)
+  return out
+}
+
+function isScriptHost(name) {
+  return SCRIPT_HOSTS.indexOf(String(name).replace(/\.exe$/i, '').toLowerCase()) !== -1
+}
+
+function hostedScript(argv) {
+  for (const a of argv.slice(1)) if (!a.startsWith('-')) return a
+  return ''
+}
+
+/** 原生程序取映像名；node / bun 跑的取脚本路径最后两段（再往上是用户目录，用户名可能撞智能体名） */
+function winEffectiveName(name, cmdline) {
+  if (!isScriptHost(name)) return name
+  const script = hostedScript(winSplitArgs(cmdline))
+  return script ? script.split(/[\\/]+/).filter(Boolean).slice(-2).join('/') : name
+}
+
+function winNormalizedArgs(name, cmdline) {
+  let argv = winSplitArgs(cmdline)
+  if (argv.length === 0) return ''
+  if (isScriptHost(name)) {
+    const script = hostedScript(argv)
+    if (script) argv = argv.slice(argv.indexOf(script))
+  }
+  return argv.map((a) => a.replace(/\s+/g, '_').replace(/\\/g, '/')).join(' ')
+}
+
+function parseWinProcJson(json) {
+  let d
+  try {
+    d = JSON.parse(String(json).replace(/^/, ''))
+  } catch (e) {
+    return []
+  }
+  const list = Array.isArray(d) ? d : d ? [d] : []
+  const out = []
+  for (const r of list) {
+    const pid = Number(r && r.ProcessId)
+    if (!Number.isInteger(pid) || pid <= 0) continue
+    const rawName = typeof r.Name === 'string' ? r.Name : ''
+    const cmdline = typeof r.CommandLine === 'string' ? r.CommandLine.replace(/[\r\n]+/g, ' ') : ''
+    out.push({
+      pid: pid,
+      ppid: Number(r.ParentProcessId) || 0,
+      name: winEffectiveName(rawName, cmdline),
+      args: winNormalizedArgs(rawName, cmdline),
+      cmdline: cmdline,
+    })
+  }
+  return out
+}
+
+let winProcCache
+/** 全表，本进程内只取一次。取不到返回 null —— 🔴 调用方必须当"不知道"，不能当"进程不在" */
+function winProcs() {
+  if (winProcCache !== undefined) return winProcCache
+  try {
+    const out = execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', WIN_PS_SCRIPT], {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+      maxBuffer: 32 * 1024 * 1024,
+      windowsHide: true,
+      timeout: 15000,
+    })
+    const procs = parseWinProcJson(out)
+    winProcCache = procs.length > 0 ? procs : null
+  } catch (e) {
+    winProcCache = null
+  }
+  return winProcCache
+}
+
+function winProc(pid) {
+  const procs = winProcs()
+  if (!procs) return null
+  for (const p of procs) if (p.pid === pid) return p
+  return null
+}
+
 // ---------- 进程探测 ----------
 
 function processName(pid) {
+  if (IS_WIN) {
+    const p = winProc(pid)
+    return p ? p.name : null
+  }
   try {
-    // macOS / Linux 通用。Windows 需要 tasklist，首期不支持
+    // macOS / Linux 通用
     const out = execFileSync('ps', ['-p', String(pid), '-o', 'comm='], {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'ignore'],
@@ -348,6 +483,10 @@ function processName(pid) {
 }
 
 function parentPid(pid) {
+  if (IS_WIN) {
+    const p = winProc(pid)
+    return p && p.ppid > 4 && p.ppid !== pid ? p.ppid : null
+  }
   try {
     const out = execFileSync('ps', ['-p', String(pid), '-o', 'ppid='], {
       encoding: 'utf8',
@@ -369,6 +508,8 @@ function isAlive(pid, expectName) {
     return false
   }
   if (!expectName) return true
+  // 🔴 Windows 进程表取不到时只能信 pid：当成"不在"会把所有窗口会话清掉
+  if (IS_WIN && !winProcs()) return true
   const name = processName(pid)
   return name != null && name.toLowerCase().includes(String(expectName).toLowerCase())
 }
@@ -467,7 +608,26 @@ function shouldReport(prev, next, nowMs) {
   return nowMs - (prev.lastReportAt || 0) > KEEPALIVE_MS
 }
 
-function buildSnapshot(states, tool, cfg, nowMs) {
+/**
+ * daemon 连着的 Codex app-server 里已加载的会话（切片 B，与 src/core/codexRemote.ts 一致）。
+ * daemon 进程不在了就不认；读不到返回 null
+ */
+/** daemon 每 30 秒重写一次；两个保活周期（2 分钟）没更新就当 daemon 卡住了，不认 */
+const CODEX_REMOTE_TTL_MS = 2 * 60 * 1000
+
+function readCodexRemote(now) {
+  try {
+    const r = JSON.parse(fs.readFileSync(path.join(deskbuddyHome(), 'codex-remote.json'), 'utf8'))
+    if (!r || typeof r.pid !== 'number' || !Array.isArray(r.threads) || !pidExists(r.pid)) return null
+    if (typeof r.at !== 'number' || Math.abs((now || Date.now()) - r.at) > CODEX_REMOTE_TTL_MS) return null
+    return new Set(r.threads.filter((x) => typeof x === 'string'))
+  } catch (e) {
+    return null
+  }
+}
+
+/** remote：给了就以它判 remoteWindow（Codex，切片 B），否则看状态文件（与 src/core/snapshot.ts 一致） */
+function buildSnapshot(states, tool, cfg, nowMs, remote) {
   const sessions = states
     .filter((s) => s.tool === tool) // 替换粒度是 (clientId, tool)，混进别的工具会冲掉对方
     .sort((a, b) => b.updatedAt - a.updatedAt)
@@ -481,8 +641,9 @@ function buildSnapshot(states, tool, cfg, nowMs) {
       startedAt: s.startedAt,
       updatedAt: s.updatedAt,
       interactive: s.interactive === true,
+      remoteWindow: remote ? remote.has(s.sessionId) : s.remoteWindow === true,
     }))
-  return { clientId: cfg.clientId, hostName: cfg.hostName, tool: tool, snapshotAt: nowMs, sessions: sessions }
+  return { clientId: cfg.clientId, hostName: cfg.hostName, tool: tool, snapshotAt: nowMs, sessions: sessions, caps: CAPS.slice() }
 }
 
 // ---------- 上报 ----------
@@ -603,7 +764,8 @@ async function reportIfAuthorized(tool, nowMs) {
   // clientId 为空说明还没 setup 过（服务端靠 clientId ↔ userId 绑定关系认人）：
   // 绝不能在这里现编一个，那等于凭空造出一台没人认领的机器
   if (!cfg.clientId || cfg.enabledTools.indexOf(tool) === -1) return
-  await postReport(cfg, buildSnapshot(readAliveStates(tool), tool, cfg, nowMs))
+  const remote = tool === 'codex' ? readCodexRemote() || new Set() : null
+  await postReport(cfg, buildSnapshot(readAliveStates(tool), tool, cfg, nowMs, remote))
 }
 
 /**
@@ -654,6 +816,10 @@ function pidExists(pid) {
 
 function detectInteractive(pid) {
   if (!pid) return false
+  if (IS_WIN) {
+    const p = winProc(pid)
+    return !!p && p.args !== '' && isInteractiveArgs(p.args)
+  }
   try {
     const args = execFileSync('ps', ['-ww', '-o', 'args=', '-p', String(pid)], {
       encoding: 'utf8',
@@ -772,6 +938,84 @@ function takeNotice(sessionId) {
   }
 }
 
+// ---------- 窗口接管（spec 2026-09-30 §3.2，与 src/core/wrapWindows.ts 同构） ----------
+
+const WINDOW_ID_RE = /^[a-f0-9]{32}$/
+/** 记进 .last 的事件。Notification 不记：闲置 60 秒的「等你输入」通知会把空闲窗口判成忙 */
+const WINDOW_EVENTS = {
+  SessionStart: 1,
+  UserPromptSubmit: 1,
+  PreToolUse: 1,
+  PostToolUse: 1,
+  PostToolUseFailure: 1,
+  PermissionRequest: 1,
+  Stop: 1,
+  SessionEnd: 1,
+}
+
+function windowsDir() {
+  return path.join(deskbuddyHome(), 'windows')
+}
+
+function readWindow(windowId) {
+  if (!WINDOW_ID_RE.test(windowId)) return null
+  try {
+    const r = JSON.parse(fs.readFileSync(path.join(windowsDir(), windowId + '.json'), 'utf8'))
+    return r && typeof r.pid === 'number' ? r : null
+  } catch (e) {
+    return null
+  }
+}
+
+/**
+ * 环境变量里的窗口是不是这个智能体进程的窗口。
+ * 🔴 窗口里的 claude 用 Bash 工具再起 claude 时 DESKBUDDY_WINDOW 会被继承：只认包装层直接起的那个进程（childPid）；
+ *    判不出 pid 时按是
+ */
+function windowOwns(rec, agentPid) {
+  if (!rec) return false
+  if (rec.childPid && agentPid && rec.childPid !== agentPid) return false
+  return true
+}
+
+function atomicWrite(file, text) {
+  const tmp = file + '.' + process.pid + '.tmp'
+  fs.writeFileSync(tmp, text, { encoding: 'utf8', mode: 0o600 })
+  fs.renameSync(tmp, file)
+}
+
+/** 写 by-session 映射（内容没变不重写）+ 本窗口最近一个状态型事件，供包装层判空闲 */
+function noteWindow(windowId, sessionId, event, now) {
+  const safe = String(sessionId).replace(/[^A-Za-z0-9_-]/g, '')
+  if (!safe || !WINDOW_ID_RE.test(windowId)) return
+  try {
+    const dir = path.join(windowsDir(), 'by-session')
+    let cur = ''
+    try {
+      cur = fs.readFileSync(path.join(dir, safe), 'utf8').trim()
+    } catch (e) {
+      cur = ''
+    }
+    if (cur !== windowId) {
+      fs.mkdirSync(dir, { recursive: true, mode: 0o700 })
+      atomicWrite(path.join(dir, safe), windowId)
+    }
+  } catch (e) {
+    /* 映射写不了：设备指令退回后台路径 */
+  }
+  if (!WINDOW_EVENTS[event]) return
+  try {
+    atomicWrite(path.join(windowsDir(), windowId + '.last'), JSON.stringify({ ev: event, sid: sessionId, at: now }))
+  } catch (e) {
+    /* 同上：写不了就一直判不空闲，设备指令排队到过期 */
+  }
+}
+
+function codexRemoteHas(sessionId) {
+  const r = readCodexRemote()
+  return !!r && r.has(sessionId)
+}
+
 async function main(argv) {
   // 同一份 hook 被 Claude Code 与 Codex 复用，靠命令行参数区分是哪个工具
   const tool = (argv && argv[2]) || 'claude_code'
@@ -794,6 +1038,19 @@ async function main(argv) {
 
   const registry = loadRegistry()
 
+  // 窗口接管（spec 2026-09-30 §3.2）：包装层起的窗口带 DESKBUDDY_WINDOW。只在有这个变量时才多做一点事
+  let windowId = ''
+  const envWin = process.env.DESKBUDDY_WINDOW || ''
+  if (WINDOW_ID_RE.test(envWin)) {
+    const rec = readWindow(envWin)
+    if (rec) {
+      const p0 = readState(sessionId)
+      const agentPid = p0 && p0.pid && pidExists(p0.pid) ? p0.pid : resolveAgentPid(process.pid, agentNames(registry, tool))
+      if (windowOwns(rec, agentPid || undefined)) windowId = envWin
+    }
+    if (windowId) noteWindow(windowId, sessionId, event, Date.now())
+  }
+
   // /clear 改绑（二期 P2）：SessionStart 在映射表里是 ignore，要在那之前处理
   if (event === 'SessionStart' && payload.source === 'clear') {
     const pid = resolveAgentPid(process.pid, agentNames(registry, tool))
@@ -840,7 +1097,10 @@ async function main(argv) {
     pid: pid,
     pidName: pid ? (prevAlive && prev.pidName) || processName(pid) || undefined : undefined,
     // 二期 P1：窗口开着的会话，设备不能再往里下指令（两个进程会互相吞掉对话）。每个会话只判一次
-    interactive: prevAlive && typeof prev.interactive === 'boolean' ? prev.interactive : detectInteractive(pid),
+    interactive: windowId ? true : prevAlive && typeof prev.interactive === 'boolean' ? prev.interactive : detectInteractive(pid),
+    // 会话开在 DeskBuddy 窗口里（spec 2026-09-30 §3.2）：服务端据此放行 8348，指令由包装层写进窗口
+    // Codex（切片 B）：会话加载在 daemon 连着的 app-server 里 = 窗口开着且能往里发
+    remoteWindow: windowId || (tool === 'codex' && codexRemoteHas(sessionId)) ? true : undefined,
     lastReportAt: prev ? prev.lastReportAt : undefined,
     // daemon 靠它给窗口待批准撤卡（S10），与 src/core/state.ts 的 recent 同构
     recent: ((prev && Array.isArray(prev.recent) ? prev.recent : []).concat([
@@ -853,7 +1113,9 @@ async function main(argv) {
     ])).slice(-RECENT_MAX),
   }
 
-  if (!shouldReport(prev, next, now)) {
+  // 进 / 出 DeskBuddy 窗口不一定伴随状态跃迁（窗口里 --resume 一个已完成的会话），要立刻报，否则设备最长 2 分钟仍被 8348 挡
+  const windowChanged = !!(prev && prev.remoteWindow) !== !!next.remoteWindow
+  if (!windowChanged && !shouldReport(prev, next, now)) {
     writeState(next)
     return
   }
@@ -896,6 +1158,7 @@ module.exports = {
   buildGatewayBody,
   buildHeaders,
   buildSnapshot,
+  readCodexRemote,
   isAlive,
   loadConfig,
   loadRegistry,
@@ -919,4 +1182,14 @@ module.exports = {
   sign,
   titleSources,
   writeState,
+  winEffectiveName,
+  winNormalizedArgs,
+  winProc,
+  winSplitArgs,
+  parseWinProcJson,
+  CAPS,
+  WINDOW_EVENTS,
+  noteWindow,
+  readWindow,
+  windowOwns,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deskbuddy",
-  "version": "0.2.0-beta.0",
+  "version": "0.2.0-beta.2",
   "description": "把 Claude Code、Codex 等 AI 编码智能体每个会话窗口的状态，实时同步到桌面硬件屏幕",
   "keywords": [
     "ai",
@@ -46,5 +46,9 @@
   "dependencies": {
     "qrcode-terminal": "^0.12.0",
     "ws": "^8.21.3"
+  },
+  "optionalDependencies": {
+    "@xterm/headless": "^6.0.0",
+    "node-pty": "1.1.0"
   }
 }