agentworkshop 0.7.5 → 0.7.7

package/scripts/start.mjs

@@ -7,10 +7,14 @@
 // 另在启动前预载 .env（cwd 的 .env;NUXT_SESSION_PASSWORD 等密钥只经环境
 // 注入,绝不写入 config.yml/仓库;已导出的真实环境变量优先）。
 // ============================================================
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, readFileSync, writeFileSync } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { resolveRunMode } from '../shared/config/home.mjs'
+import { installLocalIso } from '../shared/local-time.mjs'
+
+// 生产进程时间输出统一本地时区(先于 .env 预载与 worker 启动)
+installLocalIso()
 
 const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..')
 
@@ -22,6 +26,8 @@ for (const envPath of [resolve(process.cwd(), '.env'), join(packageRoot, '.env')
     if (!m || line.trim().startsWith('#')) continue
     const key = m[1]
     let val = m[2] ?? ''
+    // 行内注释剥离(未加引号时):`KEY=value # 说明` 不应把 " # 说明" 烧进密钥
+    if (hashIdx(val) >= 0) val = val.slice(0, hashIdx(val)).trim()
     if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith('\'') && val.endsWith('\''))) val = val.slice(1, -1)
     if (process.env[key] === undefined) process.env[key] = val
   }
@@ -30,6 +36,12 @@ for (const envPath of [resolve(process.cwd(), '.env'), join(packageRoot, '.env')
 // 共享配置引擎：config.yml + runtime-settings + env（模式感知路径）
 const { loadEffective } = await import('../shared/config/engine.mjs')
 
+/** 未加引号值中行内注释的起始下标(` #` 起算,避开 URL hash 等无空格场景) */
+function hashIdx(val) {
+  const i = val.indexOf(' #')
+  return i
+}
+
 // CLI 传参优先（node scripts/start.mjs --port 8080）
 let argPort
 {
@@ -53,21 +65,60 @@ const prodPort = eff.effective['server.prod.port'] ?? 3000
 const portSource = eff.sources['server.prod.port']
 
 // ---- 单实例互斥(hardening ST-1):同配置根双开直接退出码 2,防 SQLite 锁崩溃 ----
-const { acquireLock } = await import('../shared/config/single-instance.mjs')
-const lock = acquireLock(rm.configRoot, { mode: `prod:${rm.mode}`, port: argPort ? Number(argPort) : prodPort })
+// ---- 单实例互斥 + 自动顶替:同配置根已有实例 → 自动停止后重启新实例(防 SQLite 锁崩溃) ----
+const { acquireLock, checkPort, terminatePid } = await import('../shared/config/single-instance.mjs')
+let requestedPort = argPort ? Number(argPort) : prodPort
+// CLI 传参校验:--port -1 之类会被 parseArgs 弄成怪值,这里显式拒绝而非绑定到端口 1
+if (!Number.isInteger(requestedPort) || requestedPort < 1 || requestedPort > 65535) {
+  console.error(`✖ 无效端口:${argPort ?? requestedPort}(须为 1-65535 的整数)`)
+  process.exit(1)
+}
+let lock = acquireLock(rm.configRoot, { mode: `prod:${rm.mode}`, port: requestedPort })
 if (!lock.ok) {
   const h = lock.holder
-  console.error(`✖ 已有实例在运行(pid=${h.pid}${h.port ? `,端口=${h.port}` : ''},启动于 ${h.startedAt ?? '未知'},模式=${h.mode ?? '未知'})`)
-  console.error(`  › 配置根: ${rm.configRoot}`)
-  console.error(`  › 如确认是残留锁文件,可删除 ${lock.lockPath} 后重试`)
-  process.exit(2)
+  console.log(`› 发现已运行实例(pid=${h.pid}${h.port ? `,端口=${h.port}` : ''},启动于 ${h.startedAt ?? '未知'})— 自动停止后重启 ...`)
+  const stopped = await terminatePid(h.pid).catch(() => false)
+  if (!stopped) {
+    console.error(`✖ 旧实例(pid=${h.pid})自动停止失败,请手动执行 aw stop 或 taskkill /PID ${h.pid} /T /F`)
+    process.exit(2)
+  }
+  lock = acquireLock(rm.configRoot, { mode: `prod:${rm.mode}`, port: requestedPort })
+  if (!lock.ok) {
+    console.error(`✖ 旧实例已停止但锁仍被占用(可能并发启动):pid=${lock.holder?.pid ?? '?'}`)
+    process.exit(2)
+  }
+}
+
+// ---- 端口顺延:配置端口被任意进程占用(含其他配置根的实例)→ 逐个 +1(最多 10 次) ----
+let port = requestedPort
+let bumped = 0
+while (bumped < 10 && await checkPort(host, port)) {
+  console.log(`› 端口 ${port} 被占用,顺延至 ${port + 1} ...`)
+  port += 1
+  bumped += 1
+}
+if (bumped >= 10) {
+  console.error(`✖ ${host} 上 ${requestedPort}-${port} 全部被占用,无法启动`)
+  process.exit(1)
+}
+if (bumped > 0) {
+  console.log(`✔ 使用顺延端口 ${port}(配置端口 ${requestedPort} 被占用)`)
+  // 顺延结果回写锁文件:aw stop 的展示、aw status/TUI 的端口发现都读锁
+  try {
+    const cur = JSON.parse(readFileSync(lock.lockPath, 'utf8'))
+    if (cur?.pid === process.pid) {
+      cur.port = port
+      writeFileSync(lock.lockPath, JSON.stringify(cur, null, 2), 'utf-8')
+    }
+  }
+  catch { /* 锁自清/被接管等场景:展示值回退为配置端口,可接受 */ }
 }
 
 process.env.HOST = process.env.HOST || process.env.NITRO_HOST || String(host)
-process.env.PORT = process.env.PORT || process.env.NITRO_PORT || String(prodPort)
+process.env.PORT = process.env.PORT || process.env.NITRO_PORT || String(port)
 process.env.NITRO_HOST = process.env.HOST
 process.env.NITRO_PORT = process.env.PORT
 
-console.log(`[config] 生产服务启动 -> http://${process.env.HOST}:${process.env.PORT}  (模式: ${rm.mode}, port source: ${portSource})`)
+console.log(`[config] 生产服务启动 -> http://${process.env.HOST}:${process.env.PORT}  (模式: ${rm.mode}, port source: ${portSource}${bumped > 0 ? ' + 顺延' : ''})`)
 
 await import('../.output/server/index.mjs')

package/server/api/system/settings/index.get.ts

@@ -2,13 +2,13 @@
  * GET /api/system/settings —— 运行时设置全量快照。
  * 返回描述符 + 有效值 + 各键来源(config.yml/runtime/env) + 覆盖文件路径。
  * 前端「系统设置 → 运行配置」表单据此渲染;CLI `aw status` 也走同源概念。
- * 鉴权:任何已登录用户可读(config.get 同语义)。
+ * 鉴权:admin/editor(effective 含 MQTT 密钥/objectstore secretKey 等敏感字段)。
  */
 import { defineApiHandler } from '../../../utils/response'
-import { resolveUser } from '../../workshop/caller'
+import { requireRole } from '../../workshop/caller'
 import { getSystemConfigService } from '../../../services/system-config'
 
 export default defineApiHandler((event) => {
-  resolveUser(event)
+  requireRole(event, ['admin', 'editor'])
   return getSystemConfigService().snapshot()
 })

package/server/api/workshop/agent-tools/invoke.post.ts

@@ -1,41 +1,27 @@
-/**
- * POST /api/workshop/agent-tools/invoke —— 工具调用 HTTP 桥。
- * 与 omp host tools(工业工具族)同一服务层:鉴权(节点绑定)→ 手动审批 → 安全联锁 → 物理语义结果。
- * body: { agentId, tool, args }
- */
-import { readBody } from 'h3'
-import { resolveUser } from '@/server/api/workshop/caller'
-import { defineApiHandler } from '@/server/utils/response'
-import { getWorkshopManager } from '@/server/plugins/workshop'
-import {
-  toolDaqQuery,
-  toolDcwControl,
-  toolDcwJournal,
-  toolDcwJudge,
-  toolDcwRollback,
-  toolMyIndustrialNodes,
-} from '@/server/services/workshop/agents/industrial-tools'
-
-/** 协作工具族:经 manager 工具桥落到 agent workspace(跨团队可见性/跨 Channel 通信) */
-const COLLAB_TOOLS = new Set(['list_other_teams', 'search_other_teams_memory', 'send_cross_channel_message'])
-
-export default defineApiHandler(async (event) => {
-  resolveUser(event)
-  const body = await readBody<{ agentId?: string, tool?: string, args?: Record<string, unknown> }>(event) ?? {}
-  const agentId = String(body.agentId ?? '')
-  const tool = String(body.tool ?? '')
-  const args = body.args ?? {}
-  if (!agentId) throw createError({ statusCode: 400, statusMessage: 'agentId required' })
-  let result: { text: string, isError?: boolean }
-  if (COLLAB_TOOLS.has(tool)) {
-    result = getWorkshopManager().invokeAgentWorkspaceTool(agentId, tool, args)
-  }
-  else if (tool === 'my_industrial_nodes') result = await toolMyIndustrialNodes(agentId)
-  else if (tool === 'dcw_control') result = await toolDcwControl(agentId, args as { node_id?: string, value?: number, hypothesis?: string, task_id?: string })
-  else if (tool === 'daq_query') result = await toolDaqQuery(agentId, args as Parameters<typeof toolDaqQuery>[1])
-  else if (tool === 'dcw_judge') result = await toolDcwJudge(agentId, args as { record_id?: string, verdict?: string, reason?: string })
-  else if (tool === 'dcw_rollback') result = await toolDcwRollback(agentId, args as { record_id?: string, node_id?: string, to?: string })
-  else if (tool === 'dcw_journal') result = await toolDcwJournal(agentId, args as { node_id?: string, recipe_id?: string, limit?: number | string })
-  else throw createError({ statusCode: 400, statusMessage: `unknown tool: ${tool}` })
-  return { result }
-})
+/**
+ * POST /api/workshop/agent-tools/invoke —— 工具调用 HTTP 桥。
+ * 全量 host tool 分发(协作/任务/记忆/工业全族,与 omp set_host_tools 同源):
+ * manager.invokeHostTool → impl.dispatchHostTool(共享 host-tool-bridge)。
+ *
+ * 鉴权(双通道):
+ *  - 仪表盘用户:authorization Bearer(resolveUser);
+ *  - agent 自证:x-aw-agent-token 头(channel_agents.token,stdio MCP 桥回程)。
+ * body: { agentId, tool, args }
+ */
+import { readBody, getHeader } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { getWorkshopManager } from '@/server/plugins/workshop'
+
+export default defineApiHandler(async (event) => {
+  const agentToken = getHeader(event, 'x-aw-agent-token')
+  if (!agentToken) resolveUser(event) // 桥路径免用户鉴权,由 token 校验兜底
+  const body = await readBody<{ agentId?: string, tool?: string, args?: Record<string, unknown> }>(event) ?? {}
+  const agentId = String(body.agentId ?? '')
+  const tool = String(body.tool ?? '')
+  const args = body.args ?? {}
+  if (!agentId) throw createError({ statusCode: 400, statusMessage: 'agentId required' })
+  if (!tool) throw createError({ statusCode: 400, statusMessage: 'tool required' })
+  const result = await getWorkshopManager().invokeHostTool({ agentId, tool, args, token: agentToken || undefined })
+  return { result }
+})

package/server/api/workshop/agent-tools/list.get.ts

@@ -0,0 +1,25 @@
+/**
+ * GET /api/workshop/agent-tools/list?agentId= —— 工具面 schema(stdio MCP 桥 tools/list 源)。
+ * 按 agent 角色装配(host-tools.json + 插件工具),与 omp set_host_tools 注入面同源。
+ * 鉴权:agent token(x-aw-agent-token)或仪表盘用户。
+ */
+import { getQuery, getHeader } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { getWorkshopManager } from '@/server/plugins/workshop'
+
+export default defineApiHandler(async (event) => {
+  const agentToken = getHeader(event, 'x-aw-agent-token')
+  if (!agentToken) resolveUser(event)
+  const q = getQuery(event)
+  const agentId = String(q.agentId ?? '')
+  if (!agentId) throw createError({ statusCode: 400, statusMessage: 'agentId required' })
+  if (agentToken) {
+    const resolved = getWorkshopManager().resolveAgentByToken(String(agentToken))
+    if (!resolved || resolved.agentId !== agentId) {
+      throw createError({ statusCode: 401, statusMessage: 'agent token 校验失败' })
+    }
+  }
+  const tools = getWorkshopManager().hostToolDefsFor(agentId)
+  return { tools }
+})

package/server/api/workshop/channels/[id]/index.patch.ts

@@ -1,30 +1,38 @@
-/**
- * PATCH /api/workshop/channels/:id —— 更新 channel(name/description/workspace/enabled)。
- * - channel 不存在 → 404 NOT_FOUND
- * - workspace 变更确保目录存在并卸载已装配成员(cwd 重载)
- * - enabled=0 停调度器并卸载全部成员
- */
-import { z } from 'zod'
-import { resolveUser } from '../../caller'
-import { getRouterParam, readValidatedBody } from 'h3'
-import { zValidator } from '../../../../utils/validate'
-import { defineApiHandler } from '../../../../utils/response'
-import { getWorkshopManager } from '../../../../plugins/workshop'
-
-const patchChannelSchema = z.object({
-  name: z.string().min(1).optional(),
-  description: z.string().optional(),
-  scenarioPrompt: z.string().optional(),
-  workspace: z.string().min(1).optional(),
-  enabled: z.number().int().min(0).max(1).optional(),
-})
-
-export default defineApiHandler(async (event) => {
-  const channelId = getRouterParam(event, 'id')!
-  const user = resolveUser(event)
-  const body = await readValidatedBody(event, zValidator(patchChannelSchema))
-  const manager = getWorkshopManager()
-  const channel = manager.getChannelForUser(channelId, user.id)
-  manager.requireWritable(channel.ownerUserId, user, 'channel')
-  return manager.updateChannel(channelId, body)
-})
+/**
+ * PATCH /api/workshop/channels/:id —— 更新 channel(name/description/workspace/enabled)。
+ * - channel 不存在 → 404 NOT_FOUND
+ * - workspace 变更确保目录存在并卸载已装配成员(cwd 重载)
+ * - enabled=0 停调度器并卸载全部成员
+ */
+import { z } from 'zod'
+import { resolveUser } from '../../caller'
+import { getRouterParam, readValidatedBody } from 'h3'
+import { zValidator } from '../../../../utils/validate'
+import { defineApiHandler } from '../../../../utils/response'
+import { getWorkshopManager } from '../../../../plugins/workshop'
+
+const channelLlmSchema = z.object({
+  provider: z.string().min(1).optional(),
+  model: z.string().min(1).optional(),
+  effort: z.string().min(1).optional(),
+}).optional()
+
+const patchChannelSchema = z.object({
+  name: z.string().min(1).optional(),
+  description: z.string().optional(),
+  scenarioPrompt: z.string().optional(),
+  workspace: z.string().min(1).optional(),
+  enabled: z.number().int().min(0).max(1).optional(),
+  /** channel 级默认 LLM(不传 = 不变;null = 清除回引擎默认) */
+  llm: channelLlmSchema.nullable(),
+})
+
+export default defineApiHandler(async (event) => {
+  const channelId = getRouterParam(event, 'id')!
+  const user = resolveUser(event)
+  const body = await readValidatedBody(event, zValidator(patchChannelSchema))
+  const manager = getWorkshopManager()
+  const channel = manager.getChannelForUser(channelId, user.id)
+  manager.requireWritable(channel.ownerUserId, user, 'channel')
+  return manager.updateChannel(channelId, body)
+})

package/server/api/workshop/daq/[id]/samples.get.ts

@@ -1,6 +1,6 @@
 /**
  * GET /api/workshop/daq/:id/samples —— 节点历史(时序库)。
- * query: from?/to?(epoch ms)、bucketMs?(降采样桶宽,给出返回桶聚合)、limit?(默认 500)
+ * query: from?/to?(epoch ms)、bucketMs?(降采样桶宽;缺省 15000ms=15s,可调 1000~3600000)、limit?(默认 500)
  */
 import { getQuery, getRouterParam } from 'h3'
 import { resolveUser } from '@/server/api/workshop/caller'
@@ -12,11 +12,14 @@ export default defineApiHandler(async (event) => {
   const id = getRouterParam(event, 'id') ?? ''
   const q = getQuery(event)
   const num = (k: string): number | undefined => (q[k] != null && !Number.isNaN(Number(q[k])) ? Number(q[k]) : undefined)
+  // 时间间隔参数(bucketMs):缺省 15s;可调,下限 1s(降采样桶聚合;返回体携带实际生效间隔)
+  const rawBucket = num('bucketMs')
+  const bucketMs = rawBucket == null ? 15_000 : Math.max(1000, Math.min(3_600_000, Math.round(rawBucket)))
   const points = await getDaqController().samples(id, {
     fromMs: num('from'),
     toMs: num('to'),
-    bucketMs: num('bucketMs'),
+    bucketMs,
     limit: num('limit'),
   })
-  return { points }
+  return { points, bucketMs }
 })

package/server/api/workshop/harnesses/[id]/providers.get.ts

@@ -0,0 +1,16 @@
+/**
+ * GET /api/workshop/harnesses/[id]/providers —— 该 harness 已配置的 LLM provider/model 目录。
+ * 数据源:各引擎官方目录面(omp models list / codex model/list / opencode models /
+ * dsh 内置目录 + settings.yaml),5 分钟缓存。
+ */
+import { getRouterParam } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { harnessModelCatalog } from '@/server/services/workshop/agents/harness-models'
+
+export default defineApiHandler(async (event) => {
+  resolveUser(event)
+  const id = getRouterParam(event, 'id') ?? ''
+  const catalog = await harnessModelCatalog(id)
+  return { catalog }
+})

package/server/api/workshop/harnesses.get.ts

@@ -0,0 +1,12 @@
+/**
+ * GET /api/workshop/harnesses —— 可用执行引擎注册表(前端下拉/能力徽标)。
+ * 数据源 HARNESS_REGISTRY(单一事实源;与 factory/manager 校验同源)。
+ */
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { harnessMetas } from '@/server/services/workshop/agents/registry'
+
+export default defineApiHandler(async (event) => {
+  resolveUser(event)
+  return { harnesses: harnessMetas() }
+})

package/server/api/workshop/hitl/respond.post.ts

@@ -1,67 +1,87 @@
-/**
- * POST /api/workshop/hitl/respond —— 统一 HITL 应答路由(WebUI/TUI 共用)。
- *
- * body: { kind: 'omp-dialog' | 'dcw-approval', id, value?, confirmed?, cancelled?, comment? }
- *  - omp-dialog   → respondTerminalUi(pid, …):extension_ui_response 直写 omp stdin
- *  - dcw-approval → toolApprovals.decide(id, approved=confirmed===true, comment)(audit 留痕)
- *
- * 幂等:待办不在登记处(已被他端处理/超时/撤销)→ 409 ALREADY_RESOLVED。
- * 鉴权:用户 token + channel 所有权(与 pending.get 同口径)。
- */
-import { readBody } from 'h3'
-import { resolveUser } from '@/server/api/workshop/caller'
-import { defineApiHandler } from '@/server/utils/response'
-import { AppError } from '@/server/utils/errors'
-import { getWorkshopManager } from '@/server/plugins/workshop'
-import { getHitlRegistry } from '@/server/services/workshop/agents/hitl-registry'
-import { getToolApprovals } from '@/server/services/workshop/agents/tool-approvals'
-import { respondTerminalUi } from '@/server/services/workshop/agents/harness-terminal'
-import { audit } from '@/server/services/workshop/ops/ops'
-
-interface RespondBody {
-  kind?: string
-  id?: string
-  value?: string
-  confirmed?: boolean
-  cancelled?: boolean
-  comment?: string
-}
-
-export default defineApiHandler(async (event) => {
-  const user = resolveUser(event)
-  const body = await readBody<RespondBody>(event) ?? {}
-  const kind = body.kind
-  const id = String(body.id ?? '')
-  if ((kind !== 'omp-dialog' && kind !== 'dcw-approval') || !id) {
-    throw new AppError(400, 'BAD_REQUEST', 'body 需要 { kind: omp-dialog|dcw-approval, id, value?/confirmed?/cancelled?/comment? }')
-  }
-
-  // 所有权校验:待办必须属于请求者可见的 channel
-  const item = getHitlRegistry().find(kind, id)
-  if (!item) throw new AppError(409, 'ALREADY_RESOLVED', `待办已处理或不存在: ${id}`)
-  const manager = getWorkshopManager()
-  manager.getChannelForUser(item.channelId, user.id)
-
-  if (kind === 'omp-dialog') {
-    if (!item.pid) throw new AppError(410, 'SESSION_GONE', '对话框缺少 pid(进程已退出?)')
-    try {
-      respondTerminalUi(item.pid, {
-        id,
-        value: typeof body.value === 'string' ? body.value : undefined,
-        confirmed: typeof body.confirmed === 'boolean' ? body.confirmed : undefined,
-        cancelled: body.cancelled === true,
-      })
-    }
-    catch (err) {
-      throw new AppError(410, 'SESSION_GONE', `omp 会话不可用: ${err instanceof Error ? err.message : String(err)}`)
-    }
-    audit({ actor: user.id, actorName: user.name, actorKind: 'user', action: 'hitl.respond', targetKind: 'omp-dialog', targetId: id, detail: { channelId: item.channelId, agentId: item.agentId, cancelled: body.cancelled === true } })
-    return { ok: true, kind, id }
-  }
-
-  // dcw-approval:approved = confirmed === true(缺省视为拒绝,与 decide 端点同语义)
-  const approved = body.confirmed === true
-  const approval = getToolApprovals().decide(id, approved, String(body.comment ?? ''), user.id, user.name)
-  audit({ actor: user.id, actorName: user.name, actorKind: 'user', action: approved ? 'approval.approve' : 'approval.reject', targetKind: 'tool-approval', targetId: id, detail: { comment: String(body.comment ?? ''), via: 'hitl.respond' } })
-  return { ok: true, kind, id, approval }
-})
+/**
+ * POST /api/workshop/hitl/respond —— 统一 HITL 应答路由(WebUI/TUI 共用)。
+ *
+ * body: { kind, id, value?, confirmed?, cancelled?, response?, comment? }
+ *  - omp-dialog          → respondTerminalUi(pid, …):extension_ui_response 直写 omp stdin
+ *  - dcw-approval        → toolApprovals.decide(id, approved=confirmed===true, comment)(audit 留痕)
+ *  - codex-approval      → impl.respondHitl:JSON-RPC 应答回 app-server(accept/decline)
+ *  - opencode-permission → impl.respondHitl:POST permissions {once|always|reject} / question 回答
+ *  - dsh-permission      → impl.respondHitl:ACP session/request_permission 应答(allow/reject)
+ *
+ * 幂等:待办不在登记处(已被他端处理/超时/撤销)→ 409 ALREADY_RESOLVED。
+ * 鉴权:用户 token + channel 所有权(与 pending.get 同口径)。
+ */
+import { readBody } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { AppError } from '@/server/utils/errors'
+import { getWorkshopManager } from '@/server/plugins/workshop'
+import { getHitlRegistry } from '@/server/services/workshop/agents/hitl-registry'
+import { getToolApprovals } from '@/server/services/workshop/agents/tool-approvals'
+import { respondTerminalUi } from '@/server/services/workshop/agents/harness-terminal'
+import { audit } from '@/server/services/workshop/ops/ops'
+
+const RESPONDABLE_KINDS = ['omp-dialog', 'dcw-approval', 'codex-approval', 'opencode-permission', 'dsh-permission'] as const
+
+interface RespondBody {
+  kind?: string
+  id?: string
+  value?: string
+  confirmed?: boolean
+  cancelled?: boolean
+  /** 引擎原生选项(opencode permission:once|always|reject) */
+  response?: string
+  comment?: string
+}
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  const body = await readBody<RespondBody>(event) ?? {}
+  const kind = body.kind
+  const id = String(body.id ?? '')
+  if (!kind || !(RESPONDABLE_KINDS as readonly string[]).includes(kind) || !id) {
+    throw new AppError(400, 'BAD_REQUEST', `body 需要 { kind: ${RESPONDABLE_KINDS.join('|')}, id, value?/confirmed?/cancelled?/response?/comment? }`)
+  }
+
+  // 所有权校验:待办必须属于请求者可见的 channel
+  const item = getHitlRegistry().find(kind as typeof RESPONDABLE_KINDS[number], id)
+  if (!item) throw new AppError(409, 'ALREADY_RESOLVED', `待办已处理或不存在: ${id}`)
+  const manager = getWorkshopManager()
+  manager.getChannelForUser(item.channelId, user.id)
+
+  if (kind === 'omp-dialog') {
+    if (!item.pid) throw new AppError(410, 'SESSION_GONE', '对话框缺少 pid(进程已退出?)')
+    try {
+      respondTerminalUi(item.pid, {
+        id,
+        value: typeof body.value === 'string' ? body.value : undefined,
+        confirmed: typeof body.confirmed === 'boolean' ? body.confirmed : undefined,
+        cancelled: body.cancelled === true,
+      })
+    }
+    catch (err) {
+      throw new AppError(410, 'SESSION_GONE', `omp 会话不可用: ${err instanceof Error ? err.message : String(err)}`)
+    }
+    audit({ actor: user.id, actorName: user.name, actorKind: 'user', action: 'hitl.respond', targetKind: 'omp-dialog', targetId: id, detail: { channelId: item.channelId, agentId: item.agentId, cancelled: body.cancelled === true } })
+    return { ok: true, kind, id }
+  }
+
+  if (kind === 'dcw-approval') {
+    // dcw-approval:approved = confirmed === true(缺省视为拒绝,与 decide 端点同语义)
+    const approved = body.confirmed === true
+    const approval = getToolApprovals().decide(id, approved, String(body.comment ?? ''), user.id, user.name)
+    audit({ actor: user.id, actorName: user.name, actorKind: 'user', action: approved ? 'approval.approve' : 'approval.reject', targetKind: 'tool-approval', targetId: id, detail: { comment: String(body.comment ?? ''), via: 'hitl.respond' } })
+    return { ok: true, kind, id, approval }
+  }
+
+  // 引擎审批(codex/opencode/dsh):传导到 impl.respondHitl(引擎协议应答)
+  await manager.respondHarnessHitl(item.agentId, kind, id, {
+    confirmed: typeof body.confirmed === 'boolean' ? body.confirmed : undefined,
+    cancelled: body.cancelled === true,
+    value: typeof body.value === 'string' ? body.value : undefined,
+    response: typeof body.response === 'string' ? body.response : undefined,
+    comment: typeof body.comment === 'string' ? body.comment : undefined,
+  })
+  audit({ actor: user.id, actorName: user.name, actorKind: 'user', action: body.cancelled === true || body.confirmed === false ? 'hitl.respond' : 'hitl.respond', targetKind: kind, targetId: id, detail: { channelId: item.channelId, agentId: item.agentId, cancelled: body.cancelled === true, confirmed: body.confirmed === true, response: body.response } })
+  return { ok: true, kind, id }
+})

package/server/api/workshop/ws.ts

@@ -226,6 +226,19 @@ function flushDbBuffer(manager: AgentChannelManager, stream: ChannelStream): voi
     const g = globalThis as typeof globalThis & { __wsDbFlushFails?: number }
     g.__wsDbFlushFails = (g.__wsDbFlushFails ?? 0) + 1
     log.error('[workshop-ws] 事件批量落库失败:', err)
+    // 帧 回队 + 稍后重试:retention/backup 持写锁的 SQLITE_BUSY 窗口不应永久丢帧
+    // (带上限,防止库长期不可用时缓冲无限膨胀)
+    const WS_DB_BUFFER_MAX = 5000
+    if (buffered.length <= WS_DB_BUFFER_MAX) {
+      stream.dbBuffer = [...buffered, ...stream.dbBuffer]
+      if (!stream.dbFlushTimer) {
+        stream.dbFlushTimer = setTimeout(() => flushDbBuffer(manager, stream), DB_FLUSH_MS)
+        stream.dbFlushTimer.unref?.()
+      }
+    }
+    else {
+      log.error(`[workshop-ws] 落库缓冲超出上限(${WS_DB_BUFFER_MAX}),丢弃 ${buffered.length} 帧`)
+    }
   }
 }