dsh-team-bots 0.2.393 → 0.2.455

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/package.json +4 -1
  2. package/scripts/doctor.mjs +14 -3
  3. package/src/api.js +30 -3
  4. package/src/config.js +105 -0
  5. package/src/db-migrations.js +20 -0
  6. package/src/db.js +4 -0
  7. package/src/feishu/channel.js +702 -0
  8. package/src/feishu/commands.js +20 -0
  9. package/src/feishu/format.js +56 -0
  10. package/src/feishu/index.js +19 -0
  11. package/src/feishu/store.js +205 -0
  12. package/src/service.js +7 -0
  13. package/src/services/bots.js +42 -0
  14. package/src/services/chat.js +6 -4
  15. package/src/services/core.js +153 -8
  16. package/src/services/external-trigger-schema.js +61 -0
  17. package/src/services/feishu.js +181 -0
  18. package/src/services/github-source.js +157 -0
  19. package/src/services/memory.js +122 -34
  20. package/src/services/projects.js +2 -0
  21. package/src/services/reason-codes.js +63 -0
  22. package/src/services/review-watchdog.js +30 -8
  23. package/src/services/run-finish.js +33 -9
  24. package/src/services/runs.js +48 -7
  25. package/src/services/runtime/context-window.js +53 -0
  26. package/src/services/runtime/prompt.js +149 -134
  27. package/src/services/runtime/sandbox-policy.js +65 -0
  28. package/src/services/runtime/session-continuity.js +38 -0
  29. package/src/services/runtime/session.js +155 -5
  30. package/src/services/scheduler.js +9 -2
  31. package/src/services/system.js +50 -2
  32. package/src/services/task-dispatch.js +40 -4
  33. package/src/services/task-notify.js +13 -8
  34. package/src/services/task-review.js +27 -0
  35. package/src/services/wechat-trigger-schema.js +62 -0
  36. package/src/services/wechat.js +129 -19
  37. package/src/tools.js +11 -2
  38. package/src/wechat/channel.js +130 -26
  39. package/src/wechat/commands.js +13 -1
  40. package/src/wechat/store.js +69 -18
  41. package/ui/app.js +6 -2
  42. package/ui/i18n/en/chat.js +1 -0
  43. package/ui/i18n/en/nav.js +5 -0
  44. package/ui/i18n/en/settings.js +25 -5
  45. package/ui/i18n/en/tasks.js +4 -0
  46. package/ui/i18n/en/wechat.js +25 -3
  47. package/ui/i18n/zh/chat.js +1 -0
  48. package/ui/i18n/zh/nav.js +5 -0
  49. package/ui/i18n/zh/settings.js +25 -5
  50. package/ui/i18n/zh/tasks.js +4 -0
  51. package/ui/i18n/zh/wechat.js +25 -3
  52. package/ui/modules/api.js +23 -1
  53. package/ui/modules/cards.js +15 -0
  54. package/ui/modules/chat.js +43 -2
  55. package/ui/modules/dom-morph.js +14 -7
  56. package/ui/modules/events-board.js +73 -23
  57. package/ui/modules/events-click.js +11 -0
  58. package/ui/modules/global-pages.js +138 -10
  59. package/ui/modules/settings.js +51 -9
  60. package/ui/modules/state.js +2 -0
  61. package/ui/styles/chat-cards.css +28 -0
  62. package/ui/styles/frame.css +27 -3
  63. package/ui/styles/global-config.css +28 -3
  64. package/ui/styles/surfaces.css +2 -0
@@ -7,7 +7,7 @@ import { randomUUID } from 'node:crypto'
7
7
  import { AppError } from '../../errors.js'
8
8
  import { id } from '../../util.js'
9
9
  import { attachSessionToWorkspace, resolveSessionCwd, workspaceGroupTitle } from '../workspace-groups.js'
10
- import { effectiveRunLimits, effectiveSessionCompactTurns, effectiveSessionRolloverTurns, rolloverPendingKey, rolloverSummaryKey, sessionCompactMarkerKey } from '../../config.js'
10
+ import { effectiveRunLimits, effectiveSessionCompactCtxTokens, effectiveSessionCompactTurns, effectiveSessionRolloverCtxTokens, effectiveSessionRolloverTurns, rolloverPendingKey, rolloverSummaryKey, sessionCompactMarkerKey } from '../../config.js'
11
11
  import { imageContentPartsForMessage } from '../message-images.js'
12
12
  import { restoreDefaultModel } from './model-restore.js'
13
13
  import { applyBotToolPolicy } from '../../tools.js'
@@ -57,6 +57,12 @@ export function effectiveReviewTimeoutMinutes(getSetting
57
57
  return REVIEW_TIMEOUT_MINUTES_DEFAULT
58
58
  }
59
59
 
60
+ // 记忆审查专属会话的有界复用上限:审查提示词自包含(用户消息+回复/任务交付切片),
61
+ // 不需要控制面会话历史——历史整段重放,实测单次审查被顶到 65 万 token。审查流量改走
62
+ // 独立 kind='review' 绑定会话,每张服务 N 次审查后退役换新;宿主无会话删除 API,
63
+ // 按次开全新会话会无限累积宿主会话列表,有界绑定把宿主会话数压到 1/N。
64
+ export const MEMORY_REVIEW_BINDING_MAX_RUNS = 8
65
+
60
66
  export const sessionMethods = {
61
67
  bindingOfSession(sessionId) {
62
68
  if (!sessionId) return undefined
@@ -227,11 +233,28 @@ export const sessionMethods = {
227
233
  return {}
228
234
  }
229
235
  },
236
+ // 会话当前上下文体积估计(单轮上下文治理 P2):该会话最近一次模型调用的
237
+ // input+cache_read 即当前历史整体规模——usage_events 按调用记账、runs.session_id 归属。
238
+ // 无记录(新会话/尚未有成功调用)返回 0,两个消费点(压缩下限/结转上限)都判 >=,
239
+ // 0 不会误触发。
240
+ sessionContextTokens(sessionId) {
241
+ if (!sessionId) return 0
242
+ return this.store.get(
243
+ `SELECT ue.input_tokens + ue.cache_read_tokens AS ctx
244
+ FROM usage_events ue JOIN runs r ON r.id = ue.run_id
245
+ WHERE r.session_id = ?
246
+ ORDER BY ue.occurred_at DESC LIMIT 1`,
247
+ sessionId,
248
+ )?.ctx ?? 0
249
+ },
230
250
  // 结转判定(DSHBOTS-145 / DSHBOTS-286):旧会话是否该让位。返回 true 表示旧绑定已
231
251
  // alias 化、调用方走新建路径;false 表示继续复用旧会话。
232
252
  // - 阈值 0 = 关闭(配置见 config.js 的 sessionRolloverTurns,默认 512);
233
253
  // - 「轮次」口径 = runs 表按 session_id 的 COUNT(*),不限 status——失败运行的提示词同样
234
254
  // 已进会话历史,count-all 才与真实增长一致;
255
+ // - 体积判据(单轮上下文治理 P2):轮数未到但会话上下文已达上限(默认 150k token,
256
+ // 0 = 关闭)同样触发——胖会话不用等 512 轮,live 实测稳态单轮 55 万 token 的会话
257
+ // 按轮数口径永远追不上真实膨胀速度;
235
258
  // - 幂等(DSHBOTS-286):alias 行永不触发结转——本判定只在活跃绑定上被调用
236
259
  // (唯一调用点 ensureSession 以 !existing.alias 前置短路保证);已结转的旧会话
237
260
  // 即使轮数继续增长(承接未终态任务流量),也只参与闲时压缩,不再二次结转;
@@ -239,9 +262,12 @@ export const sessionMethods = {
239
262
  // - 摘要未就绪 → 幂等补排一条摘要运行(不阻塞对话,摘要就绪后下一次复用自然结转)。
240
263
  shouldRolloverSession({ bot, project, existing }) {
241
264
  const turns = effectiveSessionRolloverTurns(this.config, key => this.store.setting(key))
242
- if (turns <= 0) return false
265
+ const ctxLimit = effectiveSessionRolloverCtxTokens(this.config, key => this.store.setting(key))
266
+ // 两个判据各自独立(0 = 该判据关闭),全关即整体关闭结转。
243
267
  const count = this.store.get('SELECT COUNT(*) AS n FROM runs WHERE session_id = ?', existing.session_id)?.n ?? 0
244
- if (count < turns) return false
268
+ const countOver = turns > 0 && count >= turns
269
+ const ctxOver = ctxLimit > 0 && this.sessionContextTokens(existing.session_id) >= ctxLimit
270
+ if (!countOver && !ctxOver) return false
245
271
  if (this.store.setting(rolloverSummaryKey(bot.id, project?.id))) return true
246
272
  const active = this.store.get(
247
273
  "SELECT id FROM runs WHERE kind = 'rollover_summary' AND trigger_ref = ? AND status IN ('queued', 'running')",
@@ -344,8 +370,35 @@ export const sessionMethods = {
344
370
  )
345
371
  return runId
346
372
  },
373
+ // 宿主历史折叠(单轮上下文治理 P1):session_compact 运行收尾后调用宿主
374
+ // CompactionEngine.compactNow,把有用历史区间折叠为总结节点——会话前缀实际缩小。
375
+ // 自写总结轮只追加不折叠(DSHBOTS-286 既有行为),两者互补:总结轮管连续性叙事与
376
+ // 记忆落库,折叠管体积。宿主未提供 compaction 服务(ctx.get 不可达/未装实现)时
377
+ // 降级为「仅总结轮」,返回 unavailable 标记由收尾侧留痕;忙碌/取消等预期失败按
378
+ // ManualCompactionError 的 code 留痕返回,不告警不重试(下一窗口自然再试)。
379
+ async compactHostSessionHistory(sessionId ) {
380
+ if (!sessionId) return { folded: false, reason: 'no-session' }
381
+ const compaction = this.ctx?.get?.('compaction')
382
+ if (!compaction?.compactNow) return { folded: false, unavailable: true, reason: 'unavailable' }
383
+ const resolved = await this.ctx.sessionController.resolveAgent(sessionId)
384
+ const agent = (resolved )?.agent
385
+ if (!agent) return { folded: false, reason: 'agent-unresolved' }
386
+ try {
387
+ const result = await compaction.compactNow(agent, AbortSignal.timeout(5 * 60_000))
388
+ return {
389
+ folded: true,
390
+ shadowedTokens: result?.shadowedTokenCount ?? null,
391
+ shadowedItems: result?.shadowedSeqs?.length ?? null,
392
+ }
393
+ } catch (error ) {
394
+ return { folded: false, reason: error?.code ?? 'error', message: String(error?.message ?? error) }
395
+ }
396
+ },
347
397
  // 闲时压缩判定(DSHBOTS-286):会话复用时检查轮次是否跨过新的压缩窗口。
348
398
  // - 窗口 N 轮(session_compact_turns,0 = 关闭),轮次口径与结转一致;
399
+ // - 体积下限(单轮上下文治理 P2,session_compact_ctx_tokens 默认 80k、0 = 关闭):
400
+ // 窗口跨过且体积达下限才排——瘦会话(低频短轮)压缩是无用功,胖会话照常按窗口
401
+ // 节奏压缩;上限即防 flap(一个窗口至多一次),不依赖压缩是否真的缩小历史;
349
402
  // - 闲 = 该会话除当前运行外无 queued/running 运行;忙时推后(标记不动,下次复用再判,
350
403
  // 跨多个窗口合批为一次);
351
404
  // - 对仍在承接流量的会话生效:含 alias 旧会话(未终态任务流量)与 task/dm 短生命周期会话。
@@ -357,6 +410,8 @@ export const sessionMethods = {
357
410
  const marker = Number(this.store.setting(sessionCompactMarkerKey(sessionId)) ?? 0)
358
411
  const window = Math.floor(turns / every)
359
412
  if (window <= Math.floor(marker / every)) return
413
+ const ctxFloor = effectiveSessionCompactCtxTokens(this.config, key => this.store.setting(key))
414
+ if (ctxFloor > 0 && this.sessionContextTokens(sessionId) < ctxFloor) return
360
415
  const busy = this.store.get(
361
416
  "SELECT id FROM runs WHERE session_id = ? AND status IN ('queued', 'running') AND id != ?",
362
417
  sessionId,
@@ -384,10 +439,21 @@ export const sessionMethods = {
384
439
  }
385
440
  this.retireBinding(run.session_id)
386
441
  }
442
+ // 记忆审查运行:审查提示词自包含,控制面历史对它只是重放成本(实测单次 65 万
443
+ // token);也不享任务亲和(审查不是施工)。改走独立有界 review 会话。
444
+ if (run?.kind === 'memory_review') {
445
+ return this.ensureReviewSession(bot, project, { run, modelOverride })
446
+ }
387
447
  // ② 任务亲和(DSHBOTS-286/289,ADR §5.2-3):未终态任务按 runs 归属回原会话——含
388
448
  // dm_reply 经 sessionTaskFor 解析出的任务(executeRun 已把任务行透传进来)与结转后
389
449
  // alias 行上的旧任务流量;终态任务不享亲和,落下方控制面单绑定。
390
- const affinity = this.taskAffinityBinding(task)
450
+ // 总监侧运行(review/handle,owner_task 运行族)除外:亲和按 assignee 归属解析,会把
451
+ // 总监的核验/受阻处置运行开进成员任务会话——绑定属成员(ownerContextFor 按绑定行判
452
+ // 身份,总监专权工具 403,与 D-306 治的验收错位同款),且总监话语混进成员任务上下文。
453
+ // 一律落 ③ 总监自己的 (owner,project) 控制面绑定。
454
+ const affinity = (run?.kind === 'review' || run?.kind === 'handle')
455
+ ? undefined
456
+ : this.taskAffinityBinding(task)
391
457
  if (affinity) {
392
458
  const resolved = await this.ctx.sessionController.resolveAgent(affinity.session_id)
393
459
  if (!resolved?.error) {
@@ -472,6 +538,76 @@ export const sessionMethods = {
472
538
  this.sessionCreates.delete(key)
473
539
  }
474
540
  },
541
+ // 记忆审查会话(有界复用):memory_review 运行每 (bot, project) 一条 kind='review'
542
+ // 活跃绑定,复用至 MEMORY_REVIEW_BINDING_MAX_RUNS 次后退役换新——上下文与宿主会话
543
+ // 数都被钉在有界范围内。不参与结转/闲时压缩:审查轮次彼此独立,无可继承上下文,
544
+ // 轮次到量直接换新。创建/策略面与 ensureTaskSession 同款(cwd、preset、标题、
545
+ // 文件策略、工具策略、selectModel、工作区分组挂载)。
546
+ async ensureReviewSession(bot, project, { run, modelOverride } = {} ) {
547
+ const isOwner = Boolean(project && bot && project.owner_bot_id === bot.id)
548
+ const existing = this.store.get(
549
+ "SELECT * FROM session_bindings WHERE bot_id = ? AND kind = 'review' AND alias = 0 AND project_id IS ?",
550
+ bot.id,
551
+ project?.id ?? null,
552
+ )
553
+ if (existing) {
554
+ const served = this.store.get('SELECT COUNT(*) AS n FROM runs WHERE session_id = ?', existing.session_id)?.n ?? 0
555
+ if (served < MEMORY_REVIEW_BINDING_MAX_RUNS) {
556
+ const resolved = await this.ctx.sessionController.resolveAgent(existing.session_id)
557
+ if (!resolved?.error) {
558
+ this.applyFilePolicy(resolved, bot, run, null)
559
+ applyBotToolPolicy(resolved, { isOwner, logger: this.logger })
560
+ await this.selectModel(existing.session_id, bot, modelOverride)
561
+ return existing.session_id
562
+ }
563
+ }
564
+ this.retireBinding(existing.session_id)
565
+ }
566
+ // 并发首建去重键与控制面/任务会话同理,带 review 维度。
567
+ const key = `${bot.id}:${project?.id ?? 'solo'}:review`
568
+ if (this.sessionCreates.has(key)) return this.sessionCreates.get(key)
569
+ const creating = (async () => {
570
+ const cwd = await resolveSessionCwd(this.config, { solo: !project, bot, project })
571
+ const created = await this.ctx.sessionController.create({
572
+ cwd,
573
+ ...(await this.defaultAgentPreset('project')),
574
+ })
575
+ const sessionId = created.sessionId
576
+ const agent = await this.ctx.sessionController.resolveAgent(sessionId)
577
+ if (agent?.error) throw new AppError('SESSION_FAILED', `创建 DSH Session 失败:${agent.error.message ?? '未知'}`)
578
+ if (this.ctx.sessionTitle?.rename) {
579
+ const liveSession = agent?.agent?.session ?? agent?.session
580
+ if (liveSession) {
581
+ try { this.ctx.sessionTitle.rename(liveSession, `${bot.name} · 记忆审查`) } catch {}
582
+ }
583
+ }
584
+ this.applyFilePolicy(agent, bot, run, null)
585
+ applyBotToolPolicy(agent, { isOwner, logger: this.logger })
586
+ this.store.run(
587
+ `INSERT INTO session_bindings(session_id, bot_id, project_id, kind, task_id, created_at, alias)
588
+ VALUES (?, ?, ?, 'review', NULL, ?, 0)
589
+ ON CONFLICT(session_id) DO NOTHING`,
590
+ sessionId, bot.id, project?.id ?? null, new Date().toISOString(),
591
+ )
592
+ await this.selectModel(sessionId, bot, modelOverride)
593
+ // 挂到项目工作区分组(与控制面/任务会话同组),标题已可辨识审查会话身份。
594
+ const registry = this.ctx.get?.('workspaceRegistry')
595
+ if (registry && project) {
596
+ await attachSessionToWorkspace(registry, {
597
+ cwd,
598
+ title: workspaceGroupTitle({ kind: 'bot', project, bot }),
599
+ sessionId,
600
+ }, this.logger)
601
+ }
602
+ return sessionId
603
+ })()
604
+ this.sessionCreates.set(key, creating)
605
+ try {
606
+ return await creating
607
+ } finally {
608
+ this.sessionCreates.delete(key)
609
+ }
610
+ },
475
611
  async ensureBotBinding(bot, project, { run, task, modelOverride } = {} ) {
476
612
  const isOwner = Boolean(project && bot && project.owner_bot_id === bot.id)
477
613
  // DSHBOTS-299:查询带 project 维度(IS 比 = 多兼容 NULL——solo 域按 (bot, NULL) 命中),
@@ -492,6 +628,18 @@ export const sessionMethods = {
492
628
  if (!rolledOver) {
493
629
  this.applyFilePolicy(resolved, bot, run, task)
494
630
  applyBotToolPolicy(resolved, { isOwner, logger: this.logger })
631
+ // 存量坏显示名自愈:旧实现 slice(0,8) 把后缀截成字面量 session-,复用分支
632
+ // 遇到该已知坏值时重写为正确后缀;其他值(用户手工命名等)一律不动。
633
+ if (this.ctx.sessionTitle?.get && this.ctx.sessionTitle?.rename) {
634
+ const liveSession = resolved?.agent?.session ?? resolved?.session
635
+ if (liveSession) {
636
+ try {
637
+ if (this.ctx.sessionTitle.get(liveSession)?.title === `${bot.name} · session-`) {
638
+ this.ctx.sessionTitle.rename(liveSession, `${bot.name} · ${existing.session_id.replace(/^session-/, '').slice(0, 8)}`)
639
+ }
640
+ } catch {}
641
+ }
642
+ }
495
643
  await this.selectModel(existing.session_id, bot, modelOverride)
496
644
  // 闲时压缩(DSHBOTS-286):复用即「仍在承接流量」,跨过窗口且闲时排队总结压缩。
497
645
  this.maybeCompactSession({ bot, project, existing, currentRunId: run?.id })
@@ -520,7 +668,9 @@ export const sessionMethods = {
520
668
  if (liveSession) {
521
669
  // 会话列表显示名(DSHBOTS-315):bot 级会话后缀取 8 位 uuid 前缀——
522
670
  // 「控制面」在中文语境是生造词,用户看不懂(英文 controller 无妨)。
523
- try { this.ctx.sessionTitle.rename(liveSession, `${bot.name} · ${sessionId.slice(0, 8)}`) } catch {}
671
+ // 宿主会话 id 形如 session-<uuid>:先剥 session- 前缀再取 8 位,
672
+ // 否则 slice(0,8) 取到的是字面量 "session-"(显示名变成「xx · session-」)。
673
+ try { this.ctx.sessionTitle.rename(liveSession, `${bot.name} · ${sessionId.replace(/^session-/, '').slice(0, 8)}`) } catch {}
524
674
  }
525
675
  }
526
676
  this.applyFilePolicy(agent, bot, run, task)
@@ -12,7 +12,9 @@ import { ensureTaskRelationsSchema, unsatisfiedBlockedDeps } from './task-relati
12
12
  import { TASK_BUDGET_ROUNDS, TRANSITIONS, taskDeadlineInfo } from './tasks.js'
13
13
  import { effectiveWriteScopes, writeScopesOverlap } from './write-scopes.js'
14
14
  import { runReviewWatchdog } from './review-watchdog.js'
15
+ import { pollGithubSources } from './github-source.js'
15
16
  import { staleCardHit } from './notify.js'
17
+ import { originTriggerType } from './runs.js'
16
18
 
17
19
  // plan_wait 到期派生的宽限上界:退避到期超过这个时长视为时过境迁,不再自动续跑。
18
20
  const PLAN_RETRY_MAX_LATE_SECONDS = 24 * 3600
@@ -234,9 +236,10 @@ export const schedulerMethods = {
234
236
  const bot = this.store.get('SELECT * FROM bots WHERE id = ?', payload.botId)
235
237
  if (!bot || bot.status !== 'active') return null
236
238
  // payload.origin='wechat'(DSHBOTS-258):微信通道投的项目外 director 单聊,
237
- // solo 运行打 wechat 标记,运行收尾的回复据此推回微信;普通 UI 单聊保持 mention。
239
+ // solo 运行打 wechat 标记,运行收尾的回复据此推回微信;'feishu' 同款(DSHBOTS-329:
240
+ // 飞书触发运行的回复推回飞书管理员);普通 UI 单聊保持 mention。
238
241
  return this.enqueueSoloChatRun(bot, payload.messageId, {
239
- triggerType: payload.origin === 'wechat' ? 'wechat' : 'mention',
242
+ triggerType: originTriggerType(payload.origin),
240
243
  })
241
244
  }
242
245
  if (row.kind === 'dm_run') {
@@ -536,6 +539,10 @@ export const schedulerMethods = {
536
539
  // 待执行(todo/backlog)超 24h/48h/72h 三档向 owner 只提醒不自动处置;
537
540
  // 内部逐卡容错(单卡异常只 warn)。
538
541
  this.scanStaleCards()
542
+ // GitHub 只读触发源(B4-②/DSHBOTS-335):间隔闸 + 逐源容错,缺省全关零开销。
543
+ void pollGithubSources(this).catch(error => {
544
+ this.logger?.warn?.('github source poll failed: %s', error?.message ?? error)
545
+ })
539
546
  const activeRows = this.store.all(
540
547
  // 写占用只看「进行中」的任务(DSHBOTS-73,用户口径):join tasks 取任务当前状态,
541
548
  // 任务不在 in_progress 的写运行不再占槽——离开进行中即释放占用/锁定。
@@ -12,6 +12,7 @@ import { projectSkillRoots } from '../project-skills.js'
12
12
  import { resolveUiLanguage } from './locale.js'
13
13
  import { effectiveUiLanguage } from '../config.js'
14
14
  import { nowIso } from '../util.js'
15
+ import { staleCardHit } from './notify.js'
15
16
 
16
17
  // 插件自身版本:进程启动时从部署副本 package.json 定格,即当前生效版本。
17
18
  // health() 与「DSH 服务」卡展示同源(DSHBOTS-143)。
@@ -91,12 +92,15 @@ export const systemMethods = {
91
92
  skills: skillSnapshot(this.store, this.config),
92
93
  projectSkills: project ? this.projectSkillView(project) : [],
93
94
  skillBindings: this.skillBindings(project?.id ?? null),
94
- outbox: this.outboxCounts(),
95
95
  proposals: this.store.all('SELECT * FROM proposals ORDER BY created_at DESC LIMIT 100').map(item => this.proposalView(item)),
96
96
  revisions: {},
97
97
  // 用量快照默认按 30 日窗口(DSHBOTS-121):与页面默认档一致,其余三档按需单独取。
98
98
  usage: usageSnapshot(this.store, project?.id, 30, { currency: this.budgetCurrency(), soloBotId: soloBotId ?? null, window: '30d', cacheTtlMs: this.config.usageSnapshotCacheMs }),
99
99
  settings: this.settingsView(),
100
+ // 设置页乐观并发令牌(B2/DSHBOTS-325):UI 保存时随 patch 回传,不匹配即 409。
101
+ settingsRevision: this.settingsRevision(),
102
+ // 可编辑提示词段(B1/DSHBOTS-324):全局配置页「团队指令」分组唯一真值。
103
+ promptSegments: this.promptSegmentsView(),
100
104
  runLimits: this.runLimitsView(),
101
105
  // 侧栏状态行全局口径(DSHBOTS-77):全库活跃运行(含 queued),不随群聊/单聊上下文收敛。
102
106
  activeRuns: Number(this.store.get("SELECT COUNT(*) AS count FROM runs WHERE status IN ('queued', 'running')")?.count ?? 0),
@@ -140,6 +144,8 @@ export const systemMethods = {
140
144
  // 配置里的默认价格,Web 中可据此一键恢复。
141
145
  priceDefaults: this.config.modelPrices ?? [],
142
146
  wechat: this.wechatStatus(),
147
+ // 飞书通道状态(DSHBOTS-323 卡②):phase 广播含 conflict(exceed_conn_limit)。
148
+ feishu: this.feishuStatus(),
143
149
  now: nowIso(),
144
150
  }
145
151
  if (project) {
@@ -212,7 +218,7 @@ export const systemMethods = {
212
218
  messages: soloWindow.map(message => this.soloMessageView(message)),
213
219
  archived: { count: archivedCount, hasMore: archivedCount > 0 },
214
220
  runs: this.store.all(
215
- "SELECT * FROM runs WHERE bot_id = ? AND project_id IS NULL ORDER BY queued_at DESC LIMIT 30",
221
+ "SELECT * FROM runs WHERE bot_id = ? AND project_id IS NULL ORDER BY queued_at DESC LIMIT 10",
216
222
  soloBot.id,
217
223
  ).map(run => this.runView(run)),
218
224
  questions: soloQuestions,
@@ -438,6 +444,48 @@ export const systemMethods = {
438
444
  projects: this.store.get('SELECT COUNT(*) AS count FROM projects')?.count ?? 0,
439
445
  queued: this.store.get("SELECT COUNT(*) AS count FROM runs WHERE status = 'queued'")?.count ?? 0,
440
446
  running: this.store.get("SELECT COUNT(*) AS count FROM runs WHERE status = 'running'")?.count ?? 0,
447
+ // needs-attention 聚合(A2/DSHBOTS-322):外部巡检与 UI 顶部收口同源。
448
+ needsAttention: this.needsAttentionView(),
441
449
  }
442
450
  },
451
+
452
+ // needs-attention 聚合(A2/DSHBOTS-322,吸收 superagent 原型 overview「三问」+ B9 系统问题口径):
453
+ // 把散在各域的「需要人」事项收进一个只读聚合,供 health()(外部巡检)与 state(UI 顶部收口)
454
+ // 同源消费。反双真值:只做 COUNT 与既有谓词的复算,不改任何状态真值——待审/待答谓词与
455
+ // approvalsPending/questionsPending 同式,滞留判定复用 notify.js 的 staleCardHit 纯函数
456
+ // (与 scheduler 扫描同一口径),投递失败取 outboxCounts 的 failed 终态。
457
+ // B9 升级语义落在既有终态上:outbox failed = 退避重试耗尽(defer 不计数,D-136);
458
+ // 微信通道异常取 channel status 的权威 phase(connecting 是扫码过渡态不算异常)——
459
+ // 不另建失败计数表(报告 D5 警示:原型「记录不删」类技术债不搬)。
460
+ // runs.attention_json 的待答面(answer_attention)无 UI 消费者,且 question 卡已覆盖
461
+ // 提问入口,这里不发明不可行动的数字。
462
+ needsAttentionView() {
463
+ const staleRows = this.store.all(
464
+ `SELECT status, updated_at FROM tasks
465
+ WHERE status IN ('in_review', 'blocked', 'backlog', 'todo') AND updated_at IS NOT NULL LIMIT 500`,
466
+ )
467
+ const needsYou = {
468
+ approvals: Number(this.store.get("SELECT COUNT(*) AS count FROM approvals WHERE status = 'pending'")?.count ?? 0),
469
+ questions: Number(this.store.get("SELECT COUNT(*) AS count FROM questions WHERE status = 'pending'")?.count ?? 0),
470
+ reviews: Number(this.store.get("SELECT COUNT(*) AS count FROM tasks WHERE status = 'in_review'")?.count ?? 0),
471
+ stale: staleRows.filter(row => staleCardHit(row)).length,
472
+ }
473
+ const issues = []
474
+ const outboxFailed = Number(this.outboxCounts().failed ?? 0)
475
+ if (outboxFailed > 0) {
476
+ const oldest = this.store.get("SELECT created_at FROM outbox WHERE status = 'failed' ORDER BY created_at LIMIT 1")
477
+ issues.push({ kind: 'outbox_failed', count: outboxFailed, since: oldest?.created_at ?? null })
478
+ }
479
+ const wechat = this.wechatStatus()
480
+ if (wechat.enabled && wechat.phase && !['connected', 'connecting'].includes(wechat.phase)) {
481
+ issues.push({ kind: 'wechat_channel', phase: wechat.phase, message: wechat.error ?? null })
482
+ }
483
+ // 飞书通道异常同口径(DSHBOTS-323 卡②):conflict(连接数冲突)/unbound/reconnecting
484
+ // 都是需要人看的状态,经 phase 广播进 needs-attention。
485
+ const feishu = this.feishuStatus()
486
+ if (feishu.enabled && feishu.phase && !['ready'].includes(feishu.phase)) {
487
+ issues.push({ kind: 'feishu_channel', phase: feishu.phase, message: feishu.error ?? null })
488
+ }
489
+ return { needsYou, issues }
490
+ },
443
491
  }
@@ -7,6 +7,8 @@
7
7
 
8
8
  import { badRequest, conflict, forbidden, notFound } from '../errors.js'
9
9
  import { nowIso } from '../util.js'
10
+ import { PRIORITY_BUDGET_MINUTES } from '../config.js'
11
+ import { TASK_PRIORITIES } from './tasks.js'
10
12
  import { filterIgnoredWriteScopes, parseWriteScopes, parseWriteScopesFromDescription, readWriteScopes } from './write-scopes.js'
11
13
  import { resolveSandboxOverride } from './file-policy.js'
12
14
  import { ensureTaskSandboxSchema } from './task-sandbox-schema.js'
@@ -23,6 +25,12 @@ const RECENT_DONE_WINDOW_MS = 7 * 86_400_000
23
25
  // 覆盖。成员卡面自校要求(交付前自跑测试)不含三词,天然不命中。
24
26
  export const VERIFICATION_TASK_KEYWORDS = ['核验', '审计', '复核']
25
27
 
28
+ // 派单预算优先级分档兜底(DSHBOTS-325):漏传 time_budget_minutes 时按卡 priority
29
+ // 分档落库(档表 config.PRIORITY_BUDGET_MINUTES);无效 priority 与 createTask 同
30
+ // 口径回退 medium 档。
31
+ const dispatchBudgetTier = priority =>
32
+ PRIORITY_BUDGET_MINUTES[TASK_PRIORITIES.has(priority) ? priority : 'medium']
33
+
26
34
  export const taskDispatchMethods = {
27
35
  // 派发门禁(DSHBOTS-262):暂停中的 Bot 不接新卡——新建派单、改派、重派一律拒绝,
28
36
  // 先恢复(bot status → active)再派;归档/移除等其余不可用态沿用 assertMember 既有口径。
@@ -77,7 +85,9 @@ export const taskDispatchMethods = {
77
85
  },
78
86
  // sandboxOverride 选项(DSHBOTS-156):undefined=不动(重派未传 sandbox 时保留旧覆盖);
79
87
  // null=显式清掉回落 bot 配置档(重派传 sandbox='inherit');字符串=收紧档(派发入口已校验)。
80
- async assignTask(taskId, botId, actor = this.actor(), { autoStart = true, sandboxOverride } = {} ) {
88
+ // timeBudgetFallback 选项(DSHBOTS-325):派单路径传入的 priority 分档兜底,只用于
89
+ // 存量 NULL 预算卡补挂;非派单直派不传,沿用全局缺省链(defaultTaskTimeBudget)。
90
+ async assignTask(taskId, botId, actor = this.actor(), { autoStart = true, sandboxOverride, timeBudgetFallback } = {} ) {
81
91
  const task = this.taskRow(taskId)
82
92
  const project = this.projectRow(task.project_id)
83
93
  this.assertDispatchTarget(project.id, botId)
@@ -105,7 +115,8 @@ export const taskDispatchMethods = {
105
115
  ensureTaskSandboxSchema(this.store)
106
116
  const sandboxTouched = sandboxOverride !== undefined
107
117
  // 存量 NULL 预算卡补挂(DSHBOTS-198):COALESCE 只补空,显式已设的卡不覆盖。
108
- const defaultTimeBudget = this.defaultTaskTimeBudget()
118
+ // DSHBOTS-325:派单路径传 priority 分档兜底,非派单直派沿用全局缺省链。
119
+ const defaultTimeBudget = timeBudgetFallback ?? this.defaultTaskTimeBudget()
109
120
  this.store.transaction(() => {
110
121
  // queued 占位清理与改派同事务(DSHBOTS-169):SUPERSEDED 不进任务执行历史,run 事件可审计。
111
122
  // 助手是同步函数(体内无 await),抛错会让整个事务回滚,不会留下「改派已生效但占位还在」的半成品。
@@ -345,7 +356,13 @@ export const taskDispatchMethods = {
345
356
  if (input.description !== undefined) patch.description = input.description
346
357
  if (input.priority !== undefined) patch.priority = input.priority
347
358
  if (Object.keys(patch).length) await this.updateTask(task.id, patch, actor)
348
- const updated = await this.assignTask(task.id, member.id, actor, { autoStart: false, sandboxOverride })
359
+ // 派单预算优先级分档兜底(DSHBOTS-325)重派路:input.priority 已被 updateTask
360
+ // 校验(无效即抛,到不了这里),按改后生效优先级取档;COALESCE 只补存量 NULL
361
+ // 预算卡,已有预算不重算(②)。
362
+ const updated = await this.assignTask(task.id, member.id, actor, {
363
+ autoStart: false, sandboxOverride,
364
+ timeBudgetFallback: dispatchBudgetTier(input.priority ?? task.priority),
365
+ })
349
366
  void this.tick()
350
367
  return updated
351
368
  }
@@ -391,6 +408,10 @@ export const taskDispatchMethods = {
391
408
  description = `${input.description ? `${input.description}\n` : ''}(note: recent done card ${project.key}-${overlap.number} overlaps these scopes — consider merging follow-up corrections into one card)`
392
409
  }
393
410
  }
411
+ // 派单预算优先级分档兜底(DSHBOTS-325)建卡路:漏传 time_budget_minutes 时按卡
412
+ // priority 分档落库,不再落全局缺省值;显式值永远优先(②)。
413
+ const explicitBudget = input.time_budget_minutes ?? input.timeBudgetMinutes
414
+ const budgetTier = dispatchBudgetTier(input.priority)
394
415
  const task = await this.createTask({
395
416
  projectId: project.id,
396
417
  title: input.title,
@@ -403,13 +424,28 @@ export const taskDispatchMethods = {
403
424
  parentTaskId: input.parent_task_id,
404
425
  blockedBy: input.blocked_by,
405
426
  // 时效要求(新任务 only):重派已有任务(上面 input.taskId/input.task 分支)不更新该字段。
406
- timeBudgetMinutes: input.time_budget_minutes ?? input.timeBudgetMinutes,
427
+ // 漏传时按 priority 分档兜底(DSHBOTS-325),档值直接落库。
428
+ timeBudgetMinutes: explicitBudget ?? budgetTier,
407
429
  // 紧急豁免共用车道报备(DSHBOTS-126):urgent 放行同写范围派单时,创建消息注明与哪张在办卡共用车道。
408
430
  laneShareTask: urgentExempt && duplicate ? `${project.key}-${duplicate.number}` : null,
409
431
  sandboxOverride,
410
432
  autoStart: true,
411
433
  postCard: true,
412
434
  }, actor)
435
+ // 「N 分钟档」提示(DSHBOTS-325 ④):卡面描述写了预算档但与兜底档不一致时回执
436
+ // 提示一行,仅提示不拦截——确需按描述档执行就显式传 time_budget_minutes。
437
+ const describedTier = Number(String(input.description ?? '').match(/(\d+)\s*分钟档/)?.[1] ?? 0)
438
+ if (explicitBudget === undefined || explicitBudget === null) {
439
+ if (describedTier > 0 && describedTier !== budgetTier) {
440
+ this.insertMessage({
441
+ projectId: project.id,
442
+ senderType: 'system',
443
+ senderId: 'system',
444
+ taskId: task.id,
445
+ body: `任务 ${task.identifier} budget=${budgetTier}(priority 兜底,描述写 ${describedTier} 分钟档)`,
446
+ })
447
+ }
448
+ }
413
449
  if (forceDuplicate) {
414
450
  this.audit(actor, 'dispatch_force_duplicate', 'task', task.id, {
415
451
  writeScopes: scopes,
@@ -1,8 +1,9 @@
1
1
  // 任务通知域:任务生命周期事件的对外通知锚点。
2
- // 微信推送收敛(DSHBOTS-182):微信通道只在「创建成功」与「真正完成(→done 转换)」
2
+ // 微信推送收敛(DSHBOTS-182):通道只在「创建成功」与「真正完成(→done 转换)」
3
3
  // 各推一条(创建→完成闭环),交付(in_review/待验收)节点不推。幂等不靠通知键,
4
4
  // 靠锚定一次性事件本身:创建是单次 INSERT;done 是受 TRANSITIONS 守卫的状态转换
5
- // (done→done 不构成转换)。通道未启用时静默(service.wechat 为 null);
5
+ // (done→done 不构成转换)。通道未启用时静默(无可用通道即 no-op);
6
+ // DSHBOTS-328:出站经 channelNotify 扇出到各已启用通道(微信/飞书),不再只到微信。
6
7
  // 通知失败不能把已落库的变更打挂。
7
8
  // notifyTaskStarted(DSHBOTS-100)是群内开工通知+运行入队(非微信推送),
8
9
  // 与两个微信锚点同属任务通知域,一并落在本文件。
@@ -96,26 +97,30 @@ export const taskNotifyMethods = {
96
97
  }
97
98
  return { taskId: task.id, steered: Boolean(run) }
98
99
  },
99
- // 任务完成微信推送(DSHBOTS-182):锚定 →done 转换,触发点在 updateTask。
100
+ // 任务完成通知(DSHBOTS-182):锚定 →done 转换,触发点在 updateTask。
101
+ // 幂等收据键(A3/DSHBOTS-323):task-done:<task.id>——同卡重复推送在通道存留期内被吸收。
102
+ // DSHBOTS-328:出站经 channelNotify 扇出到各已启用通道(微信/飞书),不再只到微信。
100
103
  notifyTaskDone(task) {
101
104
  const project = this.projectRow(task.project_id)
102
105
  const identifier = `${project.key}-${task.number}`
103
106
  try {
104
- this.wechat?.notify(taskDone(identifier, task.title))
107
+ this.channelNotify?.(taskDone(identifier, task.title), { receiptKey: `task-done:${task.id}` })
105
108
  } catch (error ) {
106
- this.logger.warn?.('dsh-team: 任务完成微信通知失败 %s: %s', identifier, error?.message ?? error)
109
+ this.logger.warn?.('dsh-team: 任务完成通知失败 %s: %s', identifier, error?.message ?? error)
107
110
  }
108
111
  },
109
- // 任务创建微信推送(DSHBOTS-182 增补):锚定创建成功(单次 INSERT),触发点在 createTask。
112
+ // 任务创建通知(DSHBOTS-182 增补):锚定创建成功(单次 INSERT),触发点在 createTask。
110
113
  // 文案含 KEY-N/标题/派给谁;无负责人时如实注明「暂未指派」。
114
+ // 幂等收据键(A3/DSHBOTS-323):task-created:<task.id>。
115
+ // DSHBOTS-328:出站经 channelNotify 扇出到各已启用通道(微信/飞书),不再只到微信。
111
116
  notifyTaskCreated(task) {
112
117
  const project = this.projectRow(task.project_id)
113
118
  const identifier = `${project.key}-${task.number}`
114
119
  const assignee = task.assignee_bot_id ? this.botRow(task.assignee_bot_id)?.name : null
115
120
  try {
116
- this.wechat?.notify(taskCreated(identifier, task.title, assignee))
121
+ this.channelNotify?.(taskCreated(identifier, task.title, assignee), { receiptKey: `task-created:${task.id}` })
117
122
  } catch (error ) {
118
- this.logger.warn?.('dsh-team: 任务创建微信通知失败 %s: %s', identifier, error?.message ?? error)
123
+ this.logger.warn?.('dsh-team: 任务创建通知失败 %s: %s', identifier, error?.message ?? error)
119
124
  }
120
125
  },
121
126
  }
@@ -15,9 +15,36 @@ export const taskReviewMethods = {
15
15
  const { project, actor } = this.ownerContextFor(sessionId)
16
16
  if (!['accept', 'return'].includes(input.decision)) throw badRequest('验收结果只能是 accept 或 return')
17
17
  const task = this.resolveBotTask(project, input.task)
18
+ // 验收机械闸(DSHBOTS-318)只拦真验收动作(in_review 卡):非待验收状态保持既有
19
+ // 校验顺序,仍由 applyReview 抛 in_review conflict,闸不抢跑。
20
+ if (task.status === 'in_review') this.assertReviewSubagentVerified(sessionId, input.comment)
18
21
  return this.applyReview(task, project, input.decision, input.comment, actor)
19
22
  },
20
23
 
24
+ // 验收机械闸(DSHBOTS-318):把「验收必须经由子代理」从提示约束升级为机械约束——
25
+ // owner bot 的 team_review_task 前置校验调用方当前活跃运行的子代理账目
26
+ // (run_events 的 subagent_spawned),无账目即拒绝;comment 显式注明「兜底验收」
27
+ // 放行(对应 router 硬流程第 4 条:子代理失败重试一次仍失败时 director 兜底)。
28
+ // 仅机器人路径:微信管理员/看板 owner 走 applyReview,不经过本闸。
29
+ assertReviewSubagentVerified(sessionId, comment) {
30
+ if (comment?.includes('兜底验收')) return
31
+ const run = this.store.get(
32
+ "SELECT id FROM runs WHERE session_id = ? AND status IN ('running', 'queued') ORDER BY queued_at DESC LIMIT 1",
33
+ sessionId,
34
+ )
35
+ const ledger = run && this.store.get(
36
+ "SELECT id FROM run_events WHERE run_id = ? AND type = 'subagent_spawned' LIMIT 1",
37
+ run.id,
38
+ )
39
+ if (ledger) return
40
+ // DSHBOTS-269 失败语义引导:拒绝文案 = 原因 + 正确下一步。
41
+ throw badRequest(
42
+ '当前运行没有子代理账目(subagent_spawned),验收必须先经子代理核验:'
43
+ + '先派验收子代理(subagent/subagent_fork)做范围比对/目标测试/红线预测,把结论作为 comment;'
44
+ + '如需 director 兜底,在 comment 里注明「兜底验收」。',
45
+ )
46
+ },
47
+
21
48
  /** 验收/退回的共用流程:owner Bot 会话与微信管理员共用。 */
22
49
  async applyReview(task, project, decision, comment, actor) {
23
50
  const identifier = `${project.key}-${task.number}`
@@ -0,0 +1,62 @@
1
+ // src/services/wechat-trigger-schema.js —— 微信入站 Trigger 留痕表(B4-①/DSHBOTS-328)。
2
+ // 吸收原型 sources 层「不收的消息仍进系统并记 reason」的口径:微信是当前唯一外部入口,
3
+ // 每条入站事件按稳定 id 留痕(disposition:handled/filtered/rejected/duplicate + route +
4
+ // reason),面板与巡检可回答「这条消息为什么没有触发」。不做整套 Source 抽象(报告 B4
5
+ // 结论:按通道分步,勿整体搬 Source 层);读入(Trigger 翻译)与写出(notify 收据)分离
6
+ // 各自留痕,通道出站侧收据见 wechat/store.ts 的 receipt_key(A3)。
7
+ //
8
+ // 迁移独立成文件的原因:与 attention-schema/recovery-schema 同款手法——src/db.js 贴 800
9
+ // 行红线,独立迁移文件 + schema_migrations 幂等登记。
10
+
11
+ import { nowIso } from '../util.js'
12
+
13
+ export const WECHAT_TRIGGER_MIGRATION = 'wechat_inbound_log'
14
+ // 滚动封顶:留痕是运维观测面不是账本,超过上限裁掉最旧的(插一行查一次总量,量小)。
15
+ export const WECHAT_TRIGGER_LOG_CAP = 500
16
+
17
+ const migrated = new WeakSet()
18
+
19
+ export function ensureWechatTriggerSchema(store) {
20
+ if (!store || migrated.has(store)) return
21
+ store.exec(`
22
+ CREATE TABLE IF NOT EXISTS wechat_inbound (
23
+ id TEXT PRIMARY KEY,
24
+ received_at TEXT NOT NULL,
25
+ peer_id TEXT NOT NULL,
26
+ disposition TEXT NOT NULL,
27
+ route TEXT,
28
+ reason TEXT,
29
+ preview TEXT
30
+ );
31
+ CREATE INDEX IF NOT EXISTS wechat_inbound_time_idx ON wechat_inbound(received_at);
32
+ `)
33
+ store.run(
34
+ "INSERT INTO schema_migrations(name, applied_at) VALUES (?, ?) ON CONFLICT(name) DO NOTHING",
35
+ WECHAT_TRIGGER_MIGRATION,
36
+ nowIso(),
37
+ )
38
+ migrated.add(store)
39
+ }
40
+
41
+ /** 落一行留痕并滚动封顶(稳定 id 主键,重复事件静默吸收)。返回 'recorded' | 'duplicate'。 */
42
+ export function recordWechatTriggerRow(store, event) {
43
+ ensureWechatTriggerSchema(store)
44
+ const existing = store.get('SELECT id FROM wechat_inbound WHERE id = ?', event.id)
45
+ if (existing) return 'duplicate'
46
+ store.run(
47
+ `INSERT INTO wechat_inbound(id, received_at, peer_id, disposition, route, reason, preview)
48
+ VALUES (?, ?, ?, ?, ?, ?, ?)`,
49
+ event.id, event.received_at ?? nowIso(), String(event.peer_id ?? ''),
50
+ String(event.disposition ?? 'handled'), event.route ?? null, event.reason ?? null,
51
+ String(event.preview ?? '').slice(0, 120),
52
+ )
53
+ const count = Number(store.get('SELECT COUNT(*) AS count FROM wechat_inbound')?.count ?? 0)
54
+ if (count > WECHAT_TRIGGER_LOG_CAP) {
55
+ store.run(
56
+ `DELETE FROM wechat_inbound WHERE id IN (
57
+ SELECT id FROM wechat_inbound ORDER BY received_at DESC LIMIT -1 OFFSET ?)`,
58
+ WECHAT_TRIGGER_LOG_CAP,
59
+ )
60
+ }
61
+ return 'recorded'
62
+ }