deskbuddy 0.2.0-beta.7 → 0.2.0-beta.8

package/dist/launcher.cjs

@@ -0,0 +1,229 @@
+'use strict'
+/**
+ * DeskBuddy 稳定入口（自动升级 spec 2026-10-01 §4.1）。
+ *
+ * 开机自启固定执行 `node ~/.deskbuddy/launcher.cjs daemon`，不再写死某一版 CLI 的路径：
+ * 跑哪一版由 ~/.deskbuddy/versions/current.json 决定。
+ *
+ * 🔴 只能用 Node 内置模块：它随 hook 一起被复制到 ~/.deskbuddy，旁边没有 node_modules。
+ * 🔴 current.json / failed.json / crashes.json 的格式与 src/core/versions.ts 共用，改一边必须改另一边。
+ *
+ * - 正常：spawn `node <cliPath> daemon`，stdio 继承，退出码透传，由系统自启负责重拉
+ *   （Windows 的「启动」文件夹不会重拉：verifying 期间由本进程自己隔 10 秒重拉，见 main）
+ * - state=verifying 时子进程 5 分钟内异常退出累计 3 次 → 切回 previous、把这一版记进 failed.json、写 daemon.log
+ */
+const fs = require('node:fs')
+const os = require('node:os')
+const path = require('node:path')
+const { spawn } = require('node:child_process')
+
+const CRASH_WINDOW_MS = 5 * 60 * 1000
+const CRASH_LIMIT = 3
+const WIN_RESTART_MS = 10 * 1000
+
+function home(env) {
+  return (env || process.env).DESKBUDDY_HOME || path.join(os.homedir(), '.deskbuddy')
+}
+
+function paths(h) {
+  const versions = path.join(h, 'versions')
+  return {
+    versions,
+    current: path.join(versions, 'current.json'),
+    failed: path.join(versions, 'failed.json'),
+    crashes: path.join(versions, 'crashes.json'),
+    log: path.join(h, 'daemon.log'),
+    pid: path.join(h, 'launcher.pid'),
+  }
+}
+
+function readJson(p) {
+  try {
+    return JSON.parse(fs.readFileSync(p, 'utf8'))
+  } catch {
+    return null
+  }
+}
+
+function writeJson(p, v) {
+  fs.mkdirSync(path.dirname(p), { recursive: true })
+  const tmp = p + '.' + process.pid + '.tmp'
+  fs.writeFileSync(tmp, JSON.stringify(v, null, 2), 'utf8')
+  fs.renameSync(tmp, p)
+}
+
+function log(h, line) {
+  try {
+    fs.mkdirSync(h, { recursive: true })
+    fs.appendFileSync(paths(h).log, new Date().toISOString() + ' [launcher] ' + line + '\n', 'utf8')
+  } catch {
+    /* 写不了日志不能挡住启动 */
+  }
+}
+
+function isRef(r) {
+  return !!r && typeof r.version === 'string' && typeof r.cliPath === 'string' && r.cliPath !== ''
+}
+
+function readCurrent(h) {
+  const c = readJson(paths(h).current)
+  if (!isRef(c)) return null
+  return {
+    version: c.version,
+    cliPath: c.cliPath,
+    previous: isRef(c.previous) ? { version: c.previous.version, cliPath: c.previous.cliPath } : null,
+    state: c.state === 'verifying' ? 'verifying' : 'good',
+    switchedAt: typeof c.switchedAt === 'number' ? c.switchedAt : 0,
+  }
+}
+
+/**
+ * 切回 previous。markFailed=true 时把出问题的版本记进 failed.json（之后不再自动升到它）。
+ * 返回切过去的版本；没有可退的返回 null
+ */
+function rollback(h, cur, why, now, markFailed) {
+  const p = paths(h)
+  if (!cur.previous || !fs.existsSync(cur.previous.cliPath)) {
+    log(h, '版本 ' + cur.version + ' ' + why + '，但没有可回退的上一版本，继续用它')
+    return null
+  }
+  writeJson(p.current, {
+    version: cur.previous.version,
+    cliPath: cur.previous.cliPath,
+    // 出问题的那版留作 previous：目录不会被清理，便于排查
+    previous: { version: cur.version, cliPath: cur.cliPath },
+    state: 'good',
+    switchedAt: now,
+  })
+  if (markFailed) {
+    const f = readJson(p.failed) || {}
+    const versions = Array.isArray(f.versions) ? f.versions.filter((v) => typeof v === 'string') : []
+    if (!versions.includes(cur.version)) versions.push(cur.version)
+    writeJson(p.failed, { versions, attempts: f.attempts && typeof f.attempts === 'object' ? f.attempts : {} })
+  }
+  try {
+    fs.rmSync(p.crashes, { force: true })
+  } catch {
+    /* ignore */
+  }
+  log(h, '版本 ' + cur.version + ' ' + why + '，已回滚到 ' + cur.previous.version + (markFailed ? '，之后不再自动升到 ' + cur.version : ''))
+  return cur.previous.version
+}
+
+/**
+ * 选这次要跑的那份：current；它的 cliPath 不在了 → 退回 previous（verifying 时同时记失败）。
+ * 返回 null = 没有可跑的
+ */
+function pickTarget(h, now) {
+  let cur = readCurrent(h)
+  if (!cur) return null
+  if (!fs.existsSync(cur.cliPath)) {
+    // 🔴 只有 verifying（刚切过来、没验证过）才拉黑：good 版本的文件被误删 / 被清理不代表这一版有问题（评审 5）
+    if (rollback(h, cur, '的入口文件不存在', now, cur.state === 'verifying') === null) return null
+    cur = readCurrent(h)
+    if (!cur || !fs.existsSync(cur.cliPath)) return null
+  }
+  return cur
+}
+
+/**
+ * 子进程异常退出一次：verifying 期间记崩溃，5 分钟内满 3 次回滚。返回是否回滚了
+ */
+function recordCrash(h, cur, now) {
+  if (cur.state !== 'verifying') return false
+  const p = paths(h)
+  const prev = readJson(p.crashes)
+  let times = prev && prev.version === cur.version && Array.isArray(prev.times) ? prev.times.filter((t) => typeof t === 'number') : []
+  times = times.filter((t) => now - t < CRASH_WINDOW_MS)
+  times.push(now)
+  writeJson(p.crashes, { version: cur.version, times })
+  log(h, '版本 ' + cur.version + ' 验证期内异常退出（5 分钟内第 ' + times.length + ' 次）')
+  if (times.length < CRASH_LIMIT) return false
+  return rollback(h, cur, '验证期内 5 分钟崩溃 ' + times.length + ' 次', now, true) !== null
+}
+
+/**
+ * 子进程环境：剔除自动切换用的 FROM_* 变量（Windows 上 update --auto 直接拉起 launcher 时会继承它们），
+ * 免得一路传到 daemon 起的智能体子进程里。名字与 src/daemon/autoUpdate.ts 一致
+ */
+const SWITCH_ENV_KEYS = ['DESKBUDDY_UPDATE_FROM_VERSION', 'DESKBUDDY_UPDATE_FROM_CLI']
+function childEnv(env) {
+  const out = Object.assign({}, env)
+  for (const k of SWITCH_ENV_KEYS) delete out[k]
+  return out
+}
+
+function runOnce(h, cur, args) {
+  return new Promise((resolve) => {
+    let stopping = false
+    const child = spawn(process.execPath, [cur.cliPath, ...args], { stdio: 'inherit', windowsHide: true, env: childEnv(process.env) })
+    const forward = (sig) => {
+      stopping = true
+      try {
+        child.kill(sig)
+      } catch {
+        /* 已经退了 */
+      }
+    }
+    const handlers = {}
+    for (const sig of ['SIGTERM', 'SIGINT', 'SIGHUP']) {
+      handlers[sig] = () => forward(sig)
+      process.on(sig, handlers[sig])
+    }
+    const done = (code, signal, err) => {
+      for (const sig of Object.keys(handlers)) process.removeListener(sig, handlers[sig])
+      resolve({ code, signal, stopping, err })
+    }
+    child.on('error', (e) => done(null, null, e))
+    child.on('exit', (code, signal) => done(code, signal, null))
+  })
+}
+
+async function main(argv, deps) {
+  const d = deps || {}
+  const h = home(d.env)
+  const platform = d.platform || process.platform
+  const now = d.now || (() => Date.now())
+  const args = argv.length > 0 ? argv : ['daemon']
+  const run = d.runOnce || ((cur) => runOnce(h, cur, args))
+  const sleep = d.sleep || ((ms) => new Promise((r) => setTimeout(r, ms)))
+  try {
+    fs.mkdirSync(h, { recursive: true })
+    fs.writeFileSync(paths(h).pid, String(process.pid), 'utf8')
+  } catch {
+    /* 记不上 pid：Windows 升级时停不掉本进程，最坏多一个 launcher 在等子进程 */
+  }
+  for (;;) {
+    const cur = pickTarget(h, now())
+    if (!cur) {
+      // 🔴 返回 0：launchd（SuccessfulExit=false）/ systemd（on-failure）都不再重拉 —— 返回非 0 会每 10 秒重拉一次刷满日志（评审 4）
+      log(
+        h,
+        '没有可运行的 CLI（' + paths(h).current + ' 缺失，或它和上一版本指向的文件都不在）。守护进程不再自动重启；' +
+          '恢复办法：在终端执行 npx -y deskbuddy@beta update'
+      )
+      return 0
+    }
+    const r = await run(cur)
+    const abnormal = !r.stopping && (r.err || r.signal || r.code !== 0)
+    if (r.err) log(h, '起不来版本 ' + cur.version + '：' + r.err.message)
+    if (!abnormal) return r.code == null ? 0 : r.code
+    const rolledBack = recordCrash(h, cur, now())
+    // 非 Windows：交给 launchd / systemd 按「非正常退出」重拉（它们会重新执行本 launcher，读到回滚后的 current.json）
+    // Windows：「启动」文件夹只在登录时跑一次，崩了没人拉 —— verifying 期间（或刚回滚）自己重拉，否则保持原来的行为直接退出
+    if (platform !== 'win32' || (cur.state !== 'verifying' && !rolledBack)) return r.code == null ? 1 : r.code || 1
+    await sleep(WIN_RESTART_MS)
+  }
+}
+
+module.exports = { main, childEnv, SWITCH_ENV_KEYS, pickTarget, recordCrash, rollback, readCurrent, paths, CRASH_WINDOW_MS, CRASH_LIMIT }
+
+if (require.main === module) {
+  main(process.argv.slice(2)).then(
+    (code) => process.exit(code),
+    (e) => {
+      log(home(), 'launcher 出错：' + (e && e.stack ? e.stack : String(e)))
+      process.exit(1)
+    }
+  )
+}

package/hook/launcher.cjs

@@ -0,0 +1,229 @@
+'use strict'
+/**
+ * DeskBuddy 稳定入口（自动升级 spec 2026-10-01 §4.1）。
+ *
+ * 开机自启固定执行 `node ~/.deskbuddy/launcher.cjs daemon`，不再写死某一版 CLI 的路径：
+ * 跑哪一版由 ~/.deskbuddy/versions/current.json 决定。
+ *
+ * 🔴 只能用 Node 内置模块：它随 hook 一起被复制到 ~/.deskbuddy，旁边没有 node_modules。
+ * 🔴 current.json / failed.json / crashes.json 的格式与 src/core/versions.ts 共用，改一边必须改另一边。
+ *
+ * - 正常：spawn `node <cliPath> daemon`，stdio 继承，退出码透传，由系统自启负责重拉
+ *   （Windows 的「启动」文件夹不会重拉：verifying 期间由本进程自己隔 10 秒重拉，见 main）
+ * - state=verifying 时子进程 5 分钟内异常退出累计 3 次 → 切回 previous、把这一版记进 failed.json、写 daemon.log
+ */
+const fs = require('node:fs')
+const os = require('node:os')
+const path = require('node:path')
+const { spawn } = require('node:child_process')
+
+const CRASH_WINDOW_MS = 5 * 60 * 1000
+const CRASH_LIMIT = 3
+const WIN_RESTART_MS = 10 * 1000
+
+function home(env) {
+  return (env || process.env).DESKBUDDY_HOME || path.join(os.homedir(), '.deskbuddy')
+}
+
+function paths(h) {
+  const versions = path.join(h, 'versions')
+  return {
+    versions,
+    current: path.join(versions, 'current.json'),
+    failed: path.join(versions, 'failed.json'),
+    crashes: path.join(versions, 'crashes.json'),
+    log: path.join(h, 'daemon.log'),
+    pid: path.join(h, 'launcher.pid'),
+  }
+}
+
+function readJson(p) {
+  try {
+    return JSON.parse(fs.readFileSync(p, 'utf8'))
+  } catch {
+    return null
+  }
+}
+
+function writeJson(p, v) {
+  fs.mkdirSync(path.dirname(p), { recursive: true })
+  const tmp = p + '.' + process.pid + '.tmp'
+  fs.writeFileSync(tmp, JSON.stringify(v, null, 2), 'utf8')
+  fs.renameSync(tmp, p)
+}
+
+function log(h, line) {
+  try {
+    fs.mkdirSync(h, { recursive: true })
+    fs.appendFileSync(paths(h).log, new Date().toISOString() + ' [launcher] ' + line + '\n', 'utf8')
+  } catch {
+    /* 写不了日志不能挡住启动 */
+  }
+}
+
+function isRef(r) {
+  return !!r && typeof r.version === 'string' && typeof r.cliPath === 'string' && r.cliPath !== ''
+}
+
+function readCurrent(h) {
+  const c = readJson(paths(h).current)
+  if (!isRef(c)) return null
+  return {
+    version: c.version,
+    cliPath: c.cliPath,
+    previous: isRef(c.previous) ? { version: c.previous.version, cliPath: c.previous.cliPath } : null,
+    state: c.state === 'verifying' ? 'verifying' : 'good',
+    switchedAt: typeof c.switchedAt === 'number' ? c.switchedAt : 0,
+  }
+}
+
+/**
+ * 切回 previous。markFailed=true 时把出问题的版本记进 failed.json（之后不再自动升到它）。
+ * 返回切过去的版本；没有可退的返回 null
+ */
+function rollback(h, cur, why, now, markFailed) {
+  const p = paths(h)
+  if (!cur.previous || !fs.existsSync(cur.previous.cliPath)) {
+    log(h, '版本 ' + cur.version + ' ' + why + '，但没有可回退的上一版本，继续用它')
+    return null
+  }
+  writeJson(p.current, {
+    version: cur.previous.version,
+    cliPath: cur.previous.cliPath,
+    // 出问题的那版留作 previous：目录不会被清理，便于排查
+    previous: { version: cur.version, cliPath: cur.cliPath },
+    state: 'good',
+    switchedAt: now,
+  })
+  if (markFailed) {
+    const f = readJson(p.failed) || {}
+    const versions = Array.isArray(f.versions) ? f.versions.filter((v) => typeof v === 'string') : []
+    if (!versions.includes(cur.version)) versions.push(cur.version)
+    writeJson(p.failed, { versions, attempts: f.attempts && typeof f.attempts === 'object' ? f.attempts : {} })
+  }
+  try {
+    fs.rmSync(p.crashes, { force: true })
+  } catch {
+    /* ignore */
+  }
+  log(h, '版本 ' + cur.version + ' ' + why + '，已回滚到 ' + cur.previous.version + (markFailed ? '，之后不再自动升到 ' + cur.version : ''))
+  return cur.previous.version
+}
+
+/**
+ * 选这次要跑的那份：current；它的 cliPath 不在了 → 退回 previous（verifying 时同时记失败）。
+ * 返回 null = 没有可跑的
+ */
+function pickTarget(h, now) {
+  let cur = readCurrent(h)
+  if (!cur) return null
+  if (!fs.existsSync(cur.cliPath)) {
+    // 🔴 只有 verifying（刚切过来、没验证过）才拉黑：good 版本的文件被误删 / 被清理不代表这一版有问题（评审 5）
+    if (rollback(h, cur, '的入口文件不存在', now, cur.state === 'verifying') === null) return null
+    cur = readCurrent(h)
+    if (!cur || !fs.existsSync(cur.cliPath)) return null
+  }
+  return cur
+}
+
+/**
+ * 子进程异常退出一次：verifying 期间记崩溃，5 分钟内满 3 次回滚。返回是否回滚了
+ */
+function recordCrash(h, cur, now) {
+  if (cur.state !== 'verifying') return false
+  const p = paths(h)
+  const prev = readJson(p.crashes)
+  let times = prev && prev.version === cur.version && Array.isArray(prev.times) ? prev.times.filter((t) => typeof t === 'number') : []
+  times = times.filter((t) => now - t < CRASH_WINDOW_MS)
+  times.push(now)
+  writeJson(p.crashes, { version: cur.version, times })
+  log(h, '版本 ' + cur.version + ' 验证期内异常退出（5 分钟内第 ' + times.length + ' 次）')
+  if (times.length < CRASH_LIMIT) return false
+  return rollback(h, cur, '验证期内 5 分钟崩溃 ' + times.length + ' 次', now, true) !== null
+}
+
+/**
+ * 子进程环境：剔除自动切换用的 FROM_* 变量（Windows 上 update --auto 直接拉起 launcher 时会继承它们），
+ * 免得一路传到 daemon 起的智能体子进程里。名字与 src/daemon/autoUpdate.ts 一致
+ */
+const SWITCH_ENV_KEYS = ['DESKBUDDY_UPDATE_FROM_VERSION', 'DESKBUDDY_UPDATE_FROM_CLI']
+function childEnv(env) {
+  const out = Object.assign({}, env)
+  for (const k of SWITCH_ENV_KEYS) delete out[k]
+  return out
+}
+
+function runOnce(h, cur, args) {
+  return new Promise((resolve) => {
+    let stopping = false
+    const child = spawn(process.execPath, [cur.cliPath, ...args], { stdio: 'inherit', windowsHide: true, env: childEnv(process.env) })
+    const forward = (sig) => {
+      stopping = true
+      try {
+        child.kill(sig)
+      } catch {
+        /* 已经退了 */
+      }
+    }
+    const handlers = {}
+    for (const sig of ['SIGTERM', 'SIGINT', 'SIGHUP']) {
+      handlers[sig] = () => forward(sig)
+      process.on(sig, handlers[sig])
+    }
+    const done = (code, signal, err) => {
+      for (const sig of Object.keys(handlers)) process.removeListener(sig, handlers[sig])
+      resolve({ code, signal, stopping, err })
+    }
+    child.on('error', (e) => done(null, null, e))
+    child.on('exit', (code, signal) => done(code, signal, null))
+  })
+}
+
+async function main(argv, deps) {
+  const d = deps || {}
+  const h = home(d.env)
+  const platform = d.platform || process.platform
+  const now = d.now || (() => Date.now())
+  const args = argv.length > 0 ? argv : ['daemon']
+  const run = d.runOnce || ((cur) => runOnce(h, cur, args))
+  const sleep = d.sleep || ((ms) => new Promise((r) => setTimeout(r, ms)))
+  try {
+    fs.mkdirSync(h, { recursive: true })
+    fs.writeFileSync(paths(h).pid, String(process.pid), 'utf8')
+  } catch {
+    /* 记不上 pid：Windows 升级时停不掉本进程，最坏多一个 launcher 在等子进程 */
+  }
+  for (;;) {
+    const cur = pickTarget(h, now())
+    if (!cur) {
+      // 🔴 返回 0：launchd（SuccessfulExit=false）/ systemd（on-failure）都不再重拉 —— 返回非 0 会每 10 秒重拉一次刷满日志（评审 4）
+      log(
+        h,
+        '没有可运行的 CLI（' + paths(h).current + ' 缺失，或它和上一版本指向的文件都不在）。守护进程不再自动重启；' +
+          '恢复办法：在终端执行 npx -y deskbuddy@beta update'
+      )
+      return 0
+    }
+    const r = await run(cur)
+    const abnormal = !r.stopping && (r.err || r.signal || r.code !== 0)
+    if (r.err) log(h, '起不来版本 ' + cur.version + '：' + r.err.message)
+    if (!abnormal) return r.code == null ? 0 : r.code
+    const rolledBack = recordCrash(h, cur, now())
+    // 非 Windows：交给 launchd / systemd 按「非正常退出」重拉（它们会重新执行本 launcher，读到回滚后的 current.json）
+    // Windows：「启动」文件夹只在登录时跑一次，崩了没人拉 —— verifying 期间（或刚回滚）自己重拉，否则保持原来的行为直接退出
+    if (platform !== 'win32' || (cur.state !== 'verifying' && !rolledBack)) return r.code == null ? 1 : r.code || 1
+    await sleep(WIN_RESTART_MS)
+  }
+}
+
+module.exports = { main, childEnv, SWITCH_ENV_KEYS, pickTarget, recordCrash, rollback, readCurrent, paths, CRASH_WINDOW_MS, CRASH_LIMIT }
+
+if (require.main === module) {
+  main(process.argv.slice(2)).then(
+    (code) => process.exit(code),
+    (e) => {
+      log(home(), 'launcher 出错：' + (e && e.stack ? e.stack : String(e)))
+      process.exit(1)
+    }
+  )
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deskbuddy",
-  "version": "0.2.0-beta.7",
+  "version": "0.2.0-beta.8",
   "description": "把 Claude Code、Codex 等 AI 编码智能体每个会话窗口的状态，实时同步到桌面硬件屏幕",
   "keywords": [
     "ai",
@@ -23,7 +23,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup && cp hook/hook.cjs dist/hook.cjs && cp hook/gate.cjs dist/gate.cjs && cp hook/wake.cjs dist/wake.cjs && cp hook/opencode.mjs dist/opencode.mjs",
+    "build": "tsup && cp hook/hook.cjs dist/hook.cjs && cp hook/gate.cjs dist/gate.cjs && cp hook/wake.cjs dist/wake.cjs && cp hook/opencode.mjs dist/opencode.mjs && cp hook/launcher.cjs dist/launcher.cjs",
     "prepublishOnly": "npm run typecheck && npm test && npm run build",
     "test": "vitest run",
     "typecheck": "tsc --noEmit"