sintbot 1.4.11 → 1.4.13

package/src/ui/liveactivity.js

@@ -0,0 +1,194 @@
+'use strict'
+
+// An observational read model, never an execution/recovery authority. All
+// terminal labels are supplied by the existing acknowledged engine paths.
+const fs = require('node:fs')
+const path = require('node:path')
+const { randomUUID } = require('node:crypto')
+const { redact } = require('../core/redact')
+const LIMIT = 256, TEXT = 16384, FILE_LIMIT = 12 * 1024 * 1024
+const CLOSED = new Set(['answered', 'silent', 'stopped', 'recalled', 'timeout', 'error', 'not-started', 'unknown'])
+const clean = (s, n = TEXT) => redact(String(s || ''), { pii: false }).slice(0, n)
+const finite = n => Number.isFinite(n) && n >= 0
+
+function createLiveActivity({ file, now = Date.now, log = () => {}, canWrite = () => true } = {}) {
+  const epoch = randomUUID(), rows = new Map(), aliases = new Map(), contexts = new Map(), listeners = new Set()
+  let revision = 0, timer, saveTimer, saving = Promise.resolve(), writing = false, dirty = false, storageError = false
+  const key = (chatId, id) => chatId + ':' + id
+  const locate = (chatId, id) => rows.get(aliases.get(key(chatId, id)) || key(chatId, id))
+  function changed(urgent = false) {
+    revision++; dirty = true
+    if (!timer) timer = setTimeout(() => {
+      timer = null
+      for (const fn of listeners) { try { fn() } catch {} }
+    }, urgent ? 0 : 150).unref()
+    if (!saveTimer && file) saveTimer = setTimeout(() => { saveTimer = null; void flush() }, 1000).unref()
+  }
+  function touch(row, urgent = false, details = true) {
+    row.updatedAt = now(); row.revision = revision + 1
+    if (details) row.detailRevision = row.revision
+    changed(urgent)
+    while (rows.size > LIMIT) {
+      const oldest = [...rows.values()].sort((a, b) => Number(!CLOSED.has(a.status)) - Number(!CLOSED.has(b.status)) || a.updatedAt - b.updatedAt)[0]
+      rows.delete(key(oldest.chatId, oldest.id))
+      for (const id of oldest.receiptIds) aliases.delete(key(oldest.chatId, id))
+    }
+  }
+  function receive({ chatId, receiptId, sourceMessageId, text, sender, acceptedAt }) {
+    if (locate(chatId, receiptId)) return
+    const row = { id: receiptId, chatId, receiptIds: [receiptId], ts: acceptedAt || now(),
+      status: 'queued', text: clean(text, 160), sender: clean(sender, 120),
+      messages: [{ id: receiptId, sourceMessageId: typeof sourceMessageId === 'string' ? sourceMessageId : null,
+        text: clean(text), sender: clean(sender, 120), state: 'accepted' }],
+      truncated: String(text || '').length > TEXT, reply: '', tools: [], milestones: [] }
+    rows.set(key(chatId, receiptId), row); touch(row, true)
+  }
+  function merge(chatId, parentId, ids, state) {
+    const row = locate(chatId, parentId)
+    if (!row) return
+    for (const id of ids) {
+      const child = locate(chatId, id)
+      if (child && child !== row) {
+        row.messages.push(...child.messages)
+        row.receiptIds.push(...child.receiptIds)
+        rows.delete(key(chatId, child.id))
+      }
+      if (!row.receiptIds.includes(id)) row.receiptIds.push(id)
+      aliases.set(key(chatId, id), key(chatId, row.id))
+      const msg = row.messages.find(m => m.id === id)
+      if (msg) msg.state = state
+    }
+    // Bound the entire message body, not only each message, and disclose loss.
+    let budget = TEXT
+    if (row.messages.length > 64) row.truncated = true
+    row.messages = row.messages.slice(0, 64).map(m => {
+      const text = m.text.slice(0, budget); budget -= text.length
+      if (text !== m.text) row.truncated = true
+      return { ...m, text }
+    })
+    touch(row, true)
+    return row
+  }
+  function start({ chatId, receiptId, receiptIds, generation, sessionId, model, runner, project }) {
+    const row = merge(chatId, receiptId, receiptIds || [receiptId], 'landed')
+    if (!row) return
+    row.status = 'running'; row.generation = generation
+    row.startedAt ||= now(); row.sessionId = sessionId || null
+    Object.assign(row, { model: clean(model, 120), runner, project: clean(project, 120) })
+    const prior = contexts.get(chatId)
+    if (!prior || prior.sessionId !== sessionId) contexts.delete(chatId)
+    else contexts.set(chatId, { ...prior, generation, quality: 'previous' })
+    touch(row, true)
+  }
+  function observe({ chatId, receiptId, generation, event, doing, milestones }) {
+    const row = locate(chatId, receiptId)
+    if (!row || row.generation !== generation || CLOSED.has(row.status)) return
+    if (event.sessionId) row.sessionId = event.sessionId
+    const compact = event.type === 'system' && event.subtype === 'compact' || event.contextCompacted && !event.contextTokens
+    const measured = finite(event.contextTokens) && event.contextSampled !== false
+    if (compact || measured) {
+      const prior = contexts.get(chatId)
+      contexts.set(chatId, { sessionId: row.sessionId, generation,
+        usedTokens: compact ? null : event.contextTokens,
+        windowTokens: finite(event.contextWindowTokens) && event.contextWindowTokens > 0 ? event.contextWindowTokens : prior?.generation === generation ? prior.windowTokens : null,
+        measuredAt: now(), quality: compact ? 'compacted' : 'reported', source: row.runner })
+    }
+    if (event.tools) {
+      for (const tool of event.tools) {
+        const name = clean(tool.name, 100), found = row.tools.find(t => t.name === name)
+        if (found) found.count++
+        else if (row.tools.length < 50) row.tools.push({ name, count: 1 })
+      }
+    }
+    if (doing) row.doing = doing.map(x => clean(x, 160)).slice(-3)
+    if (milestones) row.milestones = milestones.map(x => clean(x, 200)).slice(-12)
+    // No model text deltas: only user-facing milestones and tool descriptions.
+    if (compact || measured || event.tools?.length || milestones)
+      touch(row, compact, !!event.tools?.length || !!milestones)
+  }
+  function finish({ chatId, receiptId, status, reply, err, tokens, sessionId }) {
+    const row = locate(chatId, receiptId)
+    if (!row || CLOSED.has(row.status)) return
+    row.status = status; row.endedAt = now(); row.ms = row.startedAt ? row.endedAt - row.startedAt : 0
+    row.reply = clean(reply); row.err = clean(err, 1000); row.tokens = tokens || null
+    row.truncated ||= String(reply || '').length > TEXT
+    if (sessionId) row.sessionId = sessionId
+    const ctx = contexts.get(chatId)
+    if (ctx && ctx.generation === row.generation) {
+      ctx.sessionId = row.sessionId; ctx.quality = ctx.quality === 'compacted' ? 'compacted' : 'previous'
+    }
+    touch(row, true)
+  }
+  function sending({ chatId, receiptId }) {
+    const row = locate(chatId, receiptId)
+    if (row && !CLOSED.has(row.status)) { row.status = 'sending'; touch(row, true) }
+  }
+  function unknown({ chatId }) {
+    for (const row of rows.values()) if (row.chatId === chatId && !CLOSED.has(row.status)) {
+      finish({ chatId, receiptId: row.id, status: 'unknown', err: '结果尚未确认，请查看群状态' })
+    }
+  }
+  const summary = row => {
+    const { messages, reply, tools, milestones, receiptIds, generation, sessionId, ...rest } = row
+    return { ...rest, preview: (row.err || reply || '').slice(0, 160), messageCount: messages.length,
+      kind: CLOSED.has(row.status) ? 'done' : 'start', details: true }
+  }
+  function list({ chatId, status, offset = 0, limit = 30 } = {}) {
+    const all = [...rows.values()].filter(r => (!chatId || r.chatId === chatId) && (!status || r.status === status))
+      .sort((a, b) => Number(CLOSED.has(a.status)) - Number(CLOSED.has(b.status)) || b.ts - a.ts)
+    offset = Math.max(0, Math.min(LIMIT, Number(offset) || 0)); limit = Math.max(1, Math.min(100, Number(limit) || 30))
+    return { epoch, revision, storageError, total: all.length, activity: all.slice(offset, offset + limit).map(summary) }
+  }
+  function detail(chatId, id) {
+    const row = locate(chatId, id)
+    return row ? { epoch, revision: row.revision, ...structuredClone(row) } : null
+  }
+  function context(chatId, sessionId, busy = false, generation = null) {
+    const c = contexts.get(chatId)
+    if (!c || !(busy && generation && c.generation === generation) && (!sessionId || c.sessionId !== sessionId)) return null
+    return { ...c, quality: busy ? c.quality : c.quality === 'reported' ? 'previous' : c.quality }
+  }
+  function flush() {
+    clearTimeout(saveTimer); saveTimer = null
+    if (writing) return saving
+    if (!file || !dirty || !canWrite()) return saving
+    dirty = false
+    const data = JSON.stringify({ version: 1, rows: [...rows.values()], contexts: [...contexts] })
+    writing = true
+    saving = saving.then(async () => {
+      if (!canWrite()) return
+      if (Buffer.byteLength(data) > FILE_LIMIT) throw new Error('activity size limit')
+      await fs.promises.mkdir(path.dirname(file), { recursive: true })
+      const tmp = file + '.tmp'
+      await fs.promises.writeFile(tmp, data, { mode: 0o600 })
+      if (canWrite()) await fs.promises.rename(tmp, file)
+      storageError = false
+    }).catch(() => { storageError = true; log('Activity history could not be saved') })
+      .finally(() => {
+        writing = false
+        if (dirty && !saveTimer) saveTimer = setTimeout(() => { saveTimer = null; void flush() }, 1000).unref()
+      })
+    return saving
+  }
+  if (file) {
+    try {
+      if (fs.statSync(file).size > FILE_LIMIT) throw new Error('activity size limit')
+      const data = JSON.parse(fs.readFileSync(file, 'utf8'))
+      if (data.version !== 1 || !Array.isArray(data.rows) || data.rows.length > LIMIT) throw new Error('activity format')
+      for (const row of data.rows) {
+        if (!row || typeof row.id !== 'string' || typeof row.chatId !== 'string' || !Array.isArray(row.receiptIds) || !Array.isArray(row.messages)) continue
+        if (!CLOSED.has(row.status)) { row.status = 'unknown'; row.err = '服务重启，结果需要核实' }
+        rows.set(key(row.chatId, row.id), row)
+        revision = Math.max(revision, Number(row.revision) || 0)
+        for (const id of row.receiptIds) aliases.set(key(row.chatId, id), key(row.chatId, row.id))
+      }
+      for (const [id, value] of (data.contexts || []).slice(0, 32)) contexts.set(id, { ...value, quality: value.quality === 'compacted' ? 'compacted' : 'historical' })
+    } catch (error) { if (error.code !== 'ENOENT') { storageError = true; log('Activity history could not be loaded') } }
+  }
+  return { receive, start, observe, finish, sending, unknown, merge, list, detail, context, flush,
+    has: (chatId, id) => !!locate(chatId, id),
+    subscribe(fn) { listeners.add(fn); return () => listeners.delete(fn) },
+    async close() { clearTimeout(timer); listeners.clear(); await flush(); await flush(); clearTimeout(saveTimer) } }
+}
+
+module.exports = { createLiveActivity }

package/src/ui/serverbase.js

@@ -18,7 +18,7 @@ const { createLedger } = require('../core/ledger')
 const { normalizeTz, isValidTz, tzOffsetMin, tzParts } = require('../core/time')
 // Runner dispatch (Claude vs Codex by provider.runner) — so 测试/试跑 run codex
 // providers on the Codex CLI, not Claude. Same module the daemon/CLI use.
-const { runTurn, probeVersion } = require('../agent/runner')
+const { runTurn, probeVersion, isClosedRunnerResult, isClosedRunnerError } = require('../agent/runner')
 const codexstatus = require('../agent/codexstatus') // codex 订阅登录态 + 用量(卡片「验证登录」)
 const claudestatus = require('../agent/claudestatus') // Claude 订阅登录态(卡片「检测登录」· doctor 同源)
 const claudemodels = require('../agent/claudemodels') // Claude 模型候选(仅登录后给)
@@ -49,6 +49,7 @@ const DEFAULT_ISSUES_FILE = () => path.join(os.homedir(), '.sbot', 'issues.jsonl
 const DEFAULT_SESSIONS_FILE = () => path.join(os.homedir(), '.sbot', 'ui-sessions.json')
 
 const CONSOLE_HTML = path.join(__dirname, 'console.html')
+const LIVE_ACTIVITY_JS = fs.readFileSync(path.join(__dirname, 'liveactivity-client.js'), 'utf8')
 const BROWSER_HTML = path.join(__dirname, 'browser.html') // 接管浏览器页(自包含单文件,群成员凭一次性链接也能进)
 const takeover = require('./takeover') // 接管链接的票据与 cookie(纯逻辑)
 const dashboard = require('./dashboard') // 「需要你处理」收件箱 + 活动流的账本回填(纯逻辑)
@@ -404,9 +405,9 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
   // each click doesn't spawn a `claude --version` child.
   let probeCache = null // { val, ts }
   const probeCached = async (bin) => {
-    if (probeCache && Date.now() - probeCache.ts < 60_000) return probeCache.val
+    if (probeCache && probeCache.bin === bin && Date.now() - probeCache.ts < 60_000) return probeCache.val
     const val = await probeVersion(bin)
-    probeCache = { val, ts: Date.now() }
+    probeCache = { val, bin, ts: Date.now() }
     return val
   }
   // Same 60s cache for the codex CLI probe — only run when a codex provider exists.
@@ -521,7 +522,8 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
         icons: g.workdir ? design.projectIconCard(g.workdir) : null, crons: (Array.isArray(g.crons) ? g.crons : []).map((c) => ({ ...c, human: describeTask(c, nowTzStr), expired: cronExpired(c.at) })), exists: g.workdir ? fs.existsSync(g.workdir) : false }))
     // Console overview health — deliberately minimal: backend CLI 探针 + "有无可用模型/群"。
     // Codex CLI 行仅在配了 codex provider 时出现(与 doctor 一致);`sbot doctor` 保留全量。
-    const v = runtimePolicy ? null : await probeCached(cfg.agent.bin)
+    const hasClaude = providers.some((p) => !p.hidden && p.runner !== 'codex')
+    const v = !runtimePolicy || hasClaude ? await probeCached(cfg.agent.bin) : null
     const hasCodex = providers.some((p) => !p.hidden && p.runner === 'codex')
     const cv = hasCodex ? await probeCodexCached() : null
     // 「可用模型」= 能用的,不只是配了的(1.0.3;此前没登录的 Claude 订阅、试跑失败的 key 都算在内)。
@@ -683,14 +685,18 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
     const cfg = loadConfig(configPath); applyProxyEnv(cfg)
     const provider = cfg.providers[name]
     if (!provider) return { ok: false, error: `unknown provider '${name}'` }
+    if (provider.hidden) return { ok: false, error: '模型已隐藏，不能试运行' }
     if (provider.baseUrl && !provider.apiKey) return { ok: false, error: 'no apiKey' }
     const ac = new AbortController()
+    let lease, closed = false
+    try { lease = runtimePolicy ? await runtimePolicy.beginTrial(ac) : null }
+    catch (error) { return { ok: false, error: error.message } }
     // codex 跑整轮 GPT(冷启动 + reasoning)远慢于 Anthropic 的快问快答;给更长的测试超时。
     // 中止现在真生效(codexcode 强制收尾),超时到点能掐断,不会再干等到自然结束。
     const timer = setTimeout(() => ac.abort(), provider.runner === 'codex' ? 180000 : 60000)
     const t0 = Date.now()
     try {
-      const { result } = await runTurn({
+      const execution = await runTurn({
         bin: cfg.agent.bin,
         prompt: prompt || verify.TRIAL_PROMPT,
         provider,
@@ -698,13 +704,22 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
         permissionMode: cfg.agent.permissionMode,
         signal: ac.signal, // a one-line reply — needs no tools, so no allow list
       })
+      closed = isClosedRunnerResult(execution)
+      const { result } = execution
+      if (lease && !closed) throw new Error('试运行进程关闭状态未知，结果未保存，并发名额已保留')
+      lease?.assertWritable()
       const ok = !(result && result.isError)
       verify.recordTurn(provider, ok, (result && result.text) || '', vopts) // doctor / 概览据此报「能用」或「key 不对」
       return { ok, model: provider.model, reply: (result && result.text) || '(no text)', ms: Date.now() - t0 }
     } catch (e) {
-      verify.recordTurn(provider, false, (e && e.message) || String(e), vopts)
+      closed ||= isClosedRunnerError(e)
+      if (!lease) verify.recordTurn(provider, false, (e && e.message) || String(e), vopts)
+      else if (closed) {
+        try { lease.assertWritable(); verify.recordTurn(provider, false, e.message || String(e), vopts) }
+        catch { /* lease loss must never write verification evidence */ }
+      }
       return { ok: false, error: (e && e.message) || String(e), ms: Date.now() - t0 }
-    } finally { clearTimeout(timer) }
+    } finally { clearTimeout(timer); lease?.finish(closed) }
   }
 
   // ── request handling ──────────────────────────────────────────────────────
@@ -840,7 +855,7 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
         //   隧道对端哪天被写成 127.0.0.1:4600,也不会退化成「公网全员免密」;伪造这两个头只会让自己失去免密,方向安全。
         const localBypass = !loopbackBind && isLoopbackReq(req) && !req.headers['x-forwarded-for'] && !req.headers['x-forwarded-proto']
         const injectTok = (authConfigured() && !localBypass) ? '' : token
-        return fs.readFile(CONSOLE_HTML, 'utf8', (e, html) => e ? (res.writeHead(500), res.end('console.html missing')) : (res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' }), res.end(html.replace('__SBOT_TOKEN__', injectTok).replace('__SBOT_VERSION__', PKG_VERSION).replace('__SBOT_FEISHU_LOGIN__', feishuLoginInfo().ready ? '1' : ''))))
+        return fs.readFile(CONSOLE_HTML, 'utf8', (e, html) => e ? (res.writeHead(500), res.end('console.html missing')) : (res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' }), res.end(html.replace('__SBOT_TOKEN__', injectTok).replace('__SBOT_VERSION__', PKG_VERSION).replace('__SBOT_FEISHU_LOGIN__', feishuLoginInfo().ready ? '1' : '').replace('/*__LIVE_ACTIVITY__*/', () => LIVE_ACTIVITY_JS))))
       }
       // 接管浏览器页。群成员的一次性链接是 /browser#k=<票>:票在 URL 片段里,服务端根本收不到 ⇒ 不进任何日志、链接预览的
       //   裸 GET 也抓不走;页面脚本读片段、人点「开始接管」后 POST /api/browser/claim 换 cookie。这里只分发页面:
@@ -867,7 +882,12 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
       if (p === '/api/inbox' && req.method === 'GET') return sendJSON(res, 200, { inbox: await inboxOnly() })
       // Recent activity for the console to seed/merge on load + SSE reconnect (下一步 ②).
       // Lightweight + kept off /api/state so mutations don't re-ship it every write.
-      if (p === '/api/activity' && req.method === 'GET') return sendJSON(res, 200, { activity: recentActivity() })
+      if (p === '/api/activity' && req.method === 'GET') return sendJSON(res, 200, runtimePolicy?.activityPage
+        ? runtimePolicy.activityPage(Object.fromEntries(url.searchParams)) : { activity: recentActivity() })
+      if (p === '/api/activity/detail' && req.method === 'GET') {
+        const detail = runtimePolicy?.activityDetail?.(url.searchParams.get('chatId'), url.searchParams.get('id'))
+        return sendJSON(res, detail ? 200 : 404, detail || { error: '活动详情未记录' })
+      }
       // 版本历史(设置页「版本历史」卡):CHANGELOG.json 随包分发 = 单一事实源,发版时更新
       if (p === '/api/changelog' && req.method === 'GET') return sendJSON(res, 200, { changelog: readChangelog() })
       // 同一份版本历史的英文本(界面切英文时才拉;缺的版本前端按 version 回退中文)
@@ -1113,7 +1133,8 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
           const why = { 'no-daemon': '守护进程没在跑(纯配置模式)—— 插话需要它在线', paused: '这个群项目已暂停,先恢复再插话', unbound: '没有这个群项目', 'inject-failed': '注入失败(守护进程侧报错,看日志)',
             // 持久处理流程(第 1 版插话)的拒绝原因。shown-failed 之前的几条在发群消息之前就拒,群里没有任何字;
             // 从 shown-failed 起,群里可能已经有那行「【管理员】…」
-            busy: '该群有任务进行中,当前版本的插话不排队也不加入当前任务,等它结束再插',
+            busy: '该群正在停止、跳过或处理未结记录,请稍后再插话',
+            'queue-full': '该群等待处理的消息已满,请稍后再插话',
             held: '该群上一个任务结果不明,已暂停处理、等待人工确认;插话未执行',
             recovering: '该群上一个任务出错,正在收尾;插话未执行,请稍后再试',
             upgrading: '正在升级,插话未执行,请一分钟后再试',
@@ -1124,7 +1145,7 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
             'request-id': '这次提交缺少有效的提交编号,请刷新控制台后再试',
             empty: '内容不能为空',
             'shown-failed': '群里那行「【管理员】…」没能确认发出(失败或超时),插话未执行;即使群里随后出现这行,它也不会被处理',
-            'busy-after-post': '这行字发进群时该群刚好开始了别的任务,这句没有处理;等它结束后原样再点一次插入,会沿用群里已有的那行',
+            'busy-after-post': '这行字发进群时该群正在停止或处理未结记录,这句没有处理;稍后原样再点一次插入,会沿用群里已有的那行',
             refused: '该群拒收了这句(原因已回复在群里那行下面);插话未执行',
             quarantined: '这句的来源已被隔离,未执行',
             unconfirmed: '这行字已发进群,但没在 5 秒内确认登记,结果以群里和「实时活动」为准;原样再点一次插入不会重复处理' }[r.reason] || '插话失败'
@@ -2417,8 +2438,11 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
     const live = getLiveState ? getLiveState() : { running: false }
     const conn = getConnHealth ? getConnHealth() : null // 飞书 WS 健康度随心跳带上(SSE 无重放,轮询兜底)
     const msg = `event: tick\ndata: ${JSON.stringify({ live, conn, ts: Date.now(),
-      ...(runtimePolicy ? { activity: runtimePolicy.getActivity() } : {}) })}\n\n`
-    for (const c of sseClients) { try { c.write(msg) } catch { sseClients.delete(c) } }
+      ...(runtimePolicy && !runtimePolicy.activityPage ? { activity: runtimePolicy.getActivity() } : {}) })}\n\n`
+    for (const c of sseClients) { try {
+      if (c.writableLength > 256 * 1024) { c.destroy(); sseClients.delete(c) }
+      else c.write(msg)
+    } catch { sseClients.delete(c) } }
   }, 3000)
 
   return {
@@ -2434,7 +2458,10 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
       if (type === 'turn' && getLiveState) {
         msg += `event: tick\ndata: ${JSON.stringify({ live: getLiveState(), conn: getConnHealth ? getConnHealth() : null, ts: Date.now() })}\n\n`
       }
-      for (const c of sseClients) { try { c.write(msg) } catch { sseClients.delete(c) } }
+      for (const c of sseClients) { try {
+        if (c.writableLength > 256 * 1024) { c.destroy(); sseClients.delete(c) }
+        else c.write(msg)
+      } catch { sseClients.delete(c) } }
     },
     close() { clearInterval(tick); for (const c of sseClients) { try { c.end() } catch {} } try { browserRoutes.close() } catch {} server.close(); if (typeof server.closeAllConnections === 'function') server.closeAllConnections(); if (updater) updater.close() },
     _browserRoutes: browserRoutes, // 测试探 CDP 会话注册表用