dsh-team-bots 0.2.289 → 0.2.338

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 (116) hide show
  1. package/README.md +12 -136
  2. package/docs/README.zh.md +15 -139
  3. package/docs/assets/channel-redesign.png +0 -0
  4. package/docs/assets/global-config-dark.png +0 -0
  5. package/docs/assets/global-config-light.png +0 -0
  6. package/docs/assets/global-config-light.zh.png +0 -0
  7. package/docs/assets/global-config-redesign.png +0 -0
  8. package/docs/assets/secrets-redesign.png +0 -0
  9. package/docs/assets/tasks.png +0 -0
  10. package/docs/assets/tasks.zh.png +0 -0
  11. package/docs/assets/usage-redesign-global.png +0 -0
  12. package/docs/assets/usage.png +0 -0
  13. package/docs/assets/usage.zh.png +0 -0
  14. package/package.json +17 -5
  15. package/scripts/doctor.mjs +4 -4
  16. package/src/api.js +6 -3
  17. package/src/botmsg.js +1 -1
  18. package/src/config.js +18 -8
  19. package/src/db-migrations.js +76 -9
  20. package/src/db.js +28 -2
  21. package/src/http.js +22 -3
  22. package/src/paths.js +32 -1
  23. package/src/pricing.js +2 -2
  24. package/src/runtime.js +1 -1
  25. package/src/secrets.js +4 -4
  26. package/src/service.js +10 -5
  27. package/src/services/approvals.js +109 -24
  28. package/src/services/bot-quota.js +242 -0
  29. package/src/services/bots.js +35 -6
  30. package/src/services/chat.js +15 -9
  31. package/src/services/core.js +33 -5
  32. package/src/services/hygiene.js +8 -4
  33. package/src/services/locale.js +17 -0
  34. package/src/services/memory.js +112 -1
  35. package/src/services/message-images.js +3 -3
  36. package/src/services/notify.js +99 -0
  37. package/src/services/projects.js +119 -10
  38. package/src/services/proposals.js +2 -3
  39. package/src/services/questions.js +75 -32
  40. package/src/services/review-watchdog.js +261 -30
  41. package/src/services/run-finish.js +119 -7
  42. package/src/services/runs.js +42 -13
  43. package/src/services/runtime/lifecycle.js +3 -1
  44. package/src/services/runtime/model-restore.js +5 -5
  45. package/src/services/runtime/prompt.js +106 -45
  46. package/src/services/runtime/session.js +38 -14
  47. package/src/services/runtime/trajectory.js +1 -1
  48. package/src/services/scheduler.js +139 -13
  49. package/src/services/secrets.js +1 -1
  50. package/src/services/system.js +23 -6
  51. package/src/services/task-notify.js +49 -7
  52. package/src/services/task-stage.js +4 -0
  53. package/src/services/tasks.js +121 -12
  54. package/src/services/terminal.js +2 -2
  55. package/src/services/vision-proxy.js +3 -3
  56. package/src/services/wechat.js +228 -7
  57. package/src/services/workspace-groups.js +4 -3
  58. package/src/skill-parse.js +1 -1
  59. package/src/skills.js +1 -1
  60. package/src/tools.js +275 -6
  61. package/src/updater.js +52 -0
  62. package/src/usage-reconcile.js +1 -1
  63. package/src/usage.js +52 -11
  64. package/src/wechat/channel.js +14 -20
  65. package/src/wechat/commands.js +129 -81
  66. package/src/wechat/format.js +247 -0
  67. package/src/wechat/store.js +30 -2
  68. package/ui/app.js +56 -52
  69. package/ui/i18n/en/chat.js +140 -0
  70. package/ui/i18n/en/common.js +189 -0
  71. package/ui/i18n/en/nav.js +90 -0
  72. package/ui/i18n/en/settings.js +354 -0
  73. package/ui/i18n/en/tasks.js +232 -0
  74. package/ui/i18n/en/usage.js +141 -0
  75. package/ui/i18n/en/wechat.js +24 -0
  76. package/ui/i18n/en.js +17 -237
  77. package/ui/i18n/zh/chat.js +140 -0
  78. package/ui/i18n/zh/common.js +189 -0
  79. package/ui/i18n/zh/nav.js +90 -0
  80. package/ui/i18n/zh/settings.js +354 -0
  81. package/ui/i18n/zh/tasks.js +232 -0
  82. package/ui/i18n/zh/usage.js +141 -0
  83. package/ui/i18n/zh/wechat.js +24 -0
  84. package/ui/i18n/zh.js +17 -236
  85. package/ui/modules/api.js +4 -3
  86. package/ui/modules/bot-quota.js +27 -0
  87. package/ui/modules/cards.js +96 -58
  88. package/ui/modules/chat.js +28 -30
  89. package/ui/modules/composer.js +41 -37
  90. package/ui/modules/dom-morph.js +292 -0
  91. package/ui/modules/events-board.js +22 -22
  92. package/ui/modules/events-click.js +100 -68
  93. package/ui/modules/events-misc.js +34 -34
  94. package/ui/modules/events-submit.js +28 -28
  95. package/ui/modules/global-pages.js +127 -116
  96. package/ui/modules/i18n.js +0 -5
  97. package/ui/modules/icons.js +0 -1
  98. package/ui/modules/markdown.js +1 -1
  99. package/ui/modules/modal-forms.js +195 -202
  100. package/ui/modules/modal-layer.js +6 -9
  101. package/ui/modules/page-shell.js +62 -0
  102. package/ui/modules/settings.js +211 -198
  103. package/ui/modules/solo-archive.js +0 -4
  104. package/ui/modules/state.js +57 -50
  105. package/ui/modules/tasks.js +168 -171
  106. package/ui/modules/typing-linger.js +1 -4
  107. package/ui/modules/usage.js +65 -78
  108. package/ui/modules/util.js +92 -25
  109. package/ui/styles/avatars.css +14 -0
  110. package/ui/styles/cards.css +49 -0
  111. package/ui/styles/chat-cards.css +17 -21
  112. package/ui/styles/global-config.css +59 -2
  113. package/ui/styles/modal.css +13 -0
  114. package/ui/styles/usage.css +3 -61
  115. package/CONTRIBUTING.md +0 -20
  116. package/docs/assets/usage-dark.png +0 -0
@@ -15,6 +15,7 @@ import {
15
15
  // 任务工单七态派生与标签口径的唯一来源:task-stage 纯函数域(tests/task-stage.test.js 断言其判定表)。
16
16
  import { taskStage, taskStageLabel } from './task-stage.js'
17
17
  import { effectiveTaskTimeBudgetMinutes } from '../config.js'
18
+ import { taskSubtreeIds, taskTreeUsageTotals, taskUsageTotals } from '../usage.js'
18
19
 
19
20
  export const TASK_STATUSES = new Set(['backlog', 'todo', 'in_progress', 'blocked', 'in_review', 'done', 'canceled'])
20
21
 
@@ -63,6 +64,11 @@ export const tasksMethods = {
63
64
  return effectiveTaskTimeBudgetMinutes(this.config, key => this.store.setting(key))
64
65
  },
65
66
  async createTask(input, actor = this.actor()) {
67
+ // DSHBOTS-237:建卡强制项目编号(项目 KEY-N)。无项目语境直接报错引导,
68
+ // 不再允许脱离项目建卡(共享板 task-N 口径废弃:存量可读,新建一律走项目编号)。
69
+ if (input.projectId === undefined || input.projectId === null || String(input.projectId).trim() === '') {
70
+ throw badRequest('建卡必须归属项目:请指定项目后再建卡,任务卡编号统一为「项目 KEY-N」(如 DSHBOTS-1),不再支持无项目的共享板建卡')
71
+ }
66
72
  const project = this.projectRow(input.projectId)
67
73
  if (project.status !== 'active') throw conflict('项目已归档')
68
74
  const title = text(input.title, 240)
@@ -83,13 +89,15 @@ export const tasksMethods = {
83
89
  const rawTimeBudget = input.timeBudgetMinutes ?? input.time_budget_minutes
84
90
  const timeBudgetMinutes = (Number(rawTimeBudget) > 0 ? clampNumber(rawTimeBudget, 1, 10_080, null) : null)
85
91
  ?? this.defaultTaskTimeBudget()
86
- // 派发沙箱覆盖(DSHBOTS-156):列只收合法收紧档;入参解析与「只收紧不放大」校验
87
- // 在派发入口 assignFromBot(对准承接 bot 的 file_policy),这里挡直写的垃圾值。
88
- if (input.sandboxOverride !== undefined && input.sandboxOverride !== null
89
- && !SANDBOX_OVERRIDES.includes(input.sandboxOverride)) {
90
- throw badRequest(`沙箱覆盖无效,允许值:${SANDBOX_OVERRIDES.join(' / ')}`)
92
+ // 派发沙箱覆盖(DSHBOTS-156/234):档位解析顺序=卡面显式声明 > bot 配置(inherit 为缺省)。
93
+ // 'inherit'/空值同义=跟随 bot 配置档(列落 NULL);列只收合法收紧档,垃圾值拒收。
94
+ // 「只收紧不放大」校验在派发入口 assignFromBot(对准承接 bot 的 file_policy)。
95
+ const rawSandboxOverride = input.sandboxOverride
96
+ if (rawSandboxOverride !== undefined && rawSandboxOverride !== null && rawSandboxOverride !== ''
97
+ && rawSandboxOverride !== 'inherit' && !SANDBOX_OVERRIDES.includes(rawSandboxOverride)) {
98
+ throw badRequest(`沙箱覆盖无效,允许值:inherit / ${SANDBOX_OVERRIDES.join(' / ')}`)
91
99
  }
92
- const sandboxOverride = input.sandboxOverride ?? null
100
+ const sandboxOverride = !rawSandboxOverride || rawSandboxOverride === 'inherit' ? null : rawSandboxOverride
93
101
  const taskId = id('task')
94
102
  const createdAt = nowIso()
95
103
  // 终态时间在创建时补齐(DSHBOTS-69):以 done/canceled 建档的任务终态列取同一 createdAt,
@@ -202,6 +210,9 @@ export const tasksMethods = {
202
210
  stage,
203
211
  stageLabel: taskStageLabel(stage),
204
212
  reviewStatus: this.taskReviewStatus(task),
213
+ // 验收滞留同源视图(DSHBOTS-235):锚点/阈值/最近判定由 review-watchdog 域统一供出,
214
+ // UI badge 与后端守门同一口径(H3),面板据此展示三档判定与依据。
215
+ reviewIdle: task.status === 'in_review' ? this.reviewIdleView(task) : null,
205
216
  }
206
217
  },
207
218
 
@@ -243,12 +254,12 @@ export const tasksMethods = {
243
254
  },
244
255
  // options.startTriggerType:进入「进行中」时给运行用的触发类型标签(看板拖拽沿用 D-54 的 board_resume,
245
256
  // 其余路径默认 task_started)。只影响运行元数据与幂等键,不影响行为口径。
246
- async updateTask(taskId, patch, actor = this.actor(), options = {}) {
257
+ async updateTask(taskId, patch, actor = this.actor(), options = {} ) {
247
258
  const task = this.taskRow(taskId)
248
259
  if (patch.version !== undefined && Number(patch.version) !== Number(task.version)) {
249
260
  throw conflict('任务已被其他人更新,请刷新后重试')
250
261
  }
251
- const updates = {}
262
+ const updates = {}
252
263
  if (patch.title !== undefined) {
253
264
  const title = text(patch.title, 240)
254
265
  if (!title) throw badRequest('任务标题不能为空')
@@ -330,6 +341,16 @@ export const tasksMethods = {
330
341
  if (updates.status === 'done' && task.status !== 'done') {
331
342
  this.notifyTaskDone(this.taskRow(taskId))
332
343
  }
344
+ // 任务卡修正闭环(DSHBOTS-232 ①):已派单卡的卡面(标题/描述/优先级/写范围)实际变值时
345
+ // 通知负责人修正。只认卡面字段——状态/负责人等流转字段各有自己的通知口径,不在此重复;
346
+ // 值未变的字段(同值重写)不触发。
347
+ if (task.assignee_bot_id) {
348
+ const cardChanged = ['title', 'description', 'priority'].some(
349
+ field => updates[field] !== undefined && updates[field] !== task[field],
350
+ ) || (updates.write_scopes !== undefined
351
+ && JSON.stringify(readWriteScopes(updates.write_scopes)) !== JSON.stringify(readWriteScopes(task.write_scopes)))
352
+ if (cardChanged) await this.notifyTaskCardChanged(this.taskRow(taskId))
353
+ }
333
354
  return this.taskView(this.taskRow(taskId))
334
355
  },
335
356
  // 写占用释放(DSHBOTS-73,用户口径):写范围占用只看「进行中」的任务,
@@ -379,7 +400,7 @@ export const tasksMethods = {
379
400
  },
380
401
  // sandboxOverride 选项(DSHBOTS-156):undefined=不动(重派未传 sandbox 时保留旧覆盖);
381
402
  // null=显式清掉回落 bot 配置档(重派传 sandbox='inherit');字符串=收紧档(派发入口已校验)。
382
- async assignTask(taskId, botId, actor = this.actor(), { autoStart = true, sandboxOverride } = {}) {
403
+ async assignTask(taskId, botId, actor = this.actor(), { autoStart = true, sandboxOverride } = {} ) {
383
404
  const task = this.taskRow(taskId)
384
405
  const project = this.projectRow(task.project_id)
385
406
  this.assertMember(project.id, botId)
@@ -486,6 +507,47 @@ export const tasksMethods = {
486
507
  }
487
508
  }
488
509
  },
510
+ // 总监强制受阻(DSHBOTS-232 ②):把「进行中」任务强制移「受阻」并中止其名下全部
511
+ // 排队/执行中运行。运行中止走既有 abort 链路(cancelRunInternal → runtime.cancelRun),
512
+ // 与看板暂停(PAUSED_BY_BOARD,可续跑的暂停语义)区分:强制受阻是中止语义,
513
+ // 稳定码 TASK_FORCE_BLOCKED + run 事件 force_blocked + 审计 task.force_blocked 留痕。
514
+ // 先停运行再改状态:状态变更经 updateTask 单一触发点,此时活跃运行已清空,
515
+ // 不会落进看板暂停分支造成双重口径。
516
+ async forceBlockTask(taskId, actor = this.actor()) {
517
+ const task = this.taskRow(taskId)
518
+ if (task.status !== 'in_progress') throw conflict(`任务不在进行中,不能强制受阻(当前 ${task.status})`)
519
+ const runs = this.store.all(
520
+ "SELECT id FROM runs WHERE task_id = ? AND status IN ('queued', 'running')",
521
+ taskId,
522
+ )
523
+ const stoppedRuns = []
524
+ for (const run of runs) {
525
+ await this.cancelRunInternal(run.id, false)
526
+ this.store.run(
527
+ 'UPDATE runs SET error_code = ?, error_message = ? WHERE id = ?',
528
+ 'TASK_FORCE_BLOCKED', '总监强制移为受阻,运行中止', run.id,
529
+ )
530
+ this.insertRunEvent(run.id, 'force_blocked', '总监强制受阻,运行中止')
531
+ stoppedRuns.push(run.id)
532
+ }
533
+ await this.updateTask(taskId, { status: 'blocked' }, actor)
534
+ this.audit(actor, 'task.force_blocked', 'task', taskId, { stoppedRuns })
535
+ const project = this.projectRow(task.project_id)
536
+ this.insertMessage({
537
+ projectId: task.project_id,
538
+ senderType: 'system',
539
+ senderId: 'system',
540
+ taskId,
541
+ body: `任务 ${project.key}-${task.number} 被总监强制移为受阻,运行已中止。`,
542
+ })
543
+ return this.taskView(this.taskRow(taskId))
544
+ },
545
+ // 总监会话入口(team_block_task 工具):与 reviewFromBot 同款 owner 校验。
546
+ async forceBlockFromBot(sessionId, input) {
547
+ const { project, actor } = this.ownerContextFor(sessionId)
548
+ const task = this.resolveBotTask(project, input.task)
549
+ return this.forceBlockTask(task.id, actor)
550
+ },
489
551
  async addComment(taskId, bodyInput, actor = this.actor()) {
490
552
  const task = this.taskRow(taskId)
491
553
  const body = text(bodyInput, 20_000)
@@ -541,16 +603,40 @@ export const tasksMethods = {
541
603
  const createdAt = nowIso()
542
604
  // 写范围在入队时快照:任务后续改声明不影响已排队的运行。
543
605
  const writeScopes = JSON.stringify(readWriteScopes(task.write_scopes))
606
+ // DSHBOTS-241:额度耗尽期内派发不撞墙——主 provider 耗尽时直接走备用模型;
607
+ // 未配备用或备用同样耗尽则留 queued 等恢复(调度器按额度状态放行,恢复后自动回主模型)。
608
+ const bot = this.store.get(
609
+ 'SELECT id, provider, fallback_provider, fallback_model, fallback_effort FROM bots WHERE id = ?',
610
+ task.assignee_bot_id,
611
+ )
612
+ const routing = this.quotaRoutingForBot(bot)
613
+ const fallbackProvider = routing.mode === 'fallback' ? routing.provider : null
614
+ const fallbackModel = routing.mode === 'fallback' ? routing.model : null
615
+ const fallbackEffort = routing.mode === 'fallback' ? routing.effort : null
544
616
  this.store.run(
545
617
  `INSERT INTO runs(id, project_id, bot_id, task_id, kind, mode, trigger_type, trigger_ref, status,
546
- attempt, idempotency_key, write_scopes, queued_at)
547
- VALUES (?, ?, ?, ?, 'task', 'write', ?, ?, 'queued', 1, ?, ?, ?)`,
548
- runId, task.project_id, task.assignee_bot_id, task.id, triggerType, task.id, `task:${task.id}:${Date.now()}:${runId}`, writeScopes, createdAt,
618
+ attempt, idempotency_key, write_scopes, model_provider, model_model, model_effort, queued_at)
619
+ VALUES (?, ?, ?, ?, 'task', 'write', ?, ?, 'queued', 1, ?, ?, ?, ?, ?, ?)`,
620
+ runId, task.project_id, task.assignee_bot_id, task.id, triggerType, task.id,
621
+ `task:${task.id}:${Date.now()}:${runId}`, writeScopes, fallbackProvider, fallbackModel, fallbackEffort, createdAt,
549
622
  )
550
623
  this.store.run(
551
624
  'INSERT INTO run_events(id, run_id, type, message, created_at) VALUES (?, ?, ?, ?, ?)',
552
625
  id('evt'), runId, 'queued', `由 ${actor.type}:${actor.id} 触发`, createdAt,
553
626
  )
627
+ if (routing.mode === 'fallback') {
628
+ this.insertRunEvent(
629
+ runId,
630
+ 'quota_fallback',
631
+ `主 provider 额度耗尽,本次直接走备用模型 ${routing.ref}(预计 ${this.botQuotaState(bot.id, bot.provider)?.resetAt ?? '未知'} 恢复)`,
632
+ )
633
+ } else if (routing.mode === 'wait') {
634
+ this.insertRunEvent(
635
+ runId,
636
+ 'quota_wait',
637
+ `主 provider 额度耗尽且无可用备用模型,排队等待至 ${routing.resetAt ?? '恢复'}`,
638
+ )
639
+ }
554
640
  if (triggerType === 'board_resume') {
555
641
  this.insertRunEvent(runId, 'board_resume', '看板拖入执行中,系统指令自动开工')
556
642
  }
@@ -660,6 +746,15 @@ export const tasksMethods = {
660
746
  if (input.taskId || input.task) {
661
747
  const task = this.resolveBotTask(project, input.taskId ?? input.task)
662
748
  if (['done', 'canceled'].includes(task.status)) throw conflict(`任务 ${project.key}-${task.number} 已结束,不能重派`)
749
+ // 任务卡修正闭环(DSHBOTS-232 ①):重派可同时改卡面(标题/描述/优先级)——先经
750
+ // updateTask 落卡,卡面变化由其统一触发点通知负责人修正,再走原重派链路。
751
+ // 写范围不在此口改:入队运行快照与调度闸门消费的不是同一份数据,
752
+ // 改范围走工作台 taskUpdateScopes(含排队运行快照同步),不在这里开第二入口。
753
+ const patch = {}
754
+ if (input.title !== undefined) patch.title = input.title
755
+ if (input.description !== undefined) patch.description = input.description
756
+ if (input.priority !== undefined) patch.priority = input.priority
757
+ if (Object.keys(patch).length) await this.updateTask(task.id, patch, actor)
663
758
  const updated = await this.assignTask(task.id, member.id, actor, { autoStart: false, sandboxOverride })
664
759
  void this.tick()
665
760
  return updated
@@ -739,6 +834,9 @@ export const tasksMethods = {
739
834
  const { task } = this.resolveTaskByIdentifier(identifier)
740
835
  return {
741
836
  ...this.taskView(task),
837
+ // 指派者名(DSHBOTS-257):/detail 卡片直读 assigneeName,在此按 assignee_bot_id
838
+ // 解析(同 task-notify 口径),不进 taskView 列表热路径(每卡一次 bots 查询)。
839
+ assigneeName: task.assignee_bot_id ? this.botRow(task.assignee_bot_id)?.name ?? null : null,
742
840
  comments: this.store.all(
743
841
  'SELECT author_type, author_id, body, created_at FROM task_comments WHERE task_id = ? ORDER BY created_at DESC LIMIT 3',
744
842
  task.id,
@@ -755,9 +853,20 @@ export const tasksMethods = {
755
853
  'SELECT t.id, t.number, t.title, t.status FROM task_dependencies d JOIN tasks t ON t.id = d.depends_on_task_id WHERE d.task_id = ?',
756
854
  taskId,
757
855
  )
856
+ // 任务级 usage 口径(DSHBOTS-212):usage = 本卡全部运行(成功交付 + 失败重试 + 核验/受阻
857
+ // 派生运行)端到端 token/成本,缓存读写分列;usageTotal = 本卡 + 全部后代子卡,
858
+ // 拆分划算判定(C_removed > C_introduced)拿它与同类整卡任务的 usage 对比。
859
+ // 只挂 taskDetail 单卡详情,不进 taskView 列表热路径(每卡一次聚合会放大列表查询)。
860
+ const subtreeIds = taskSubtreeIds(this.store, taskId)
861
+ const budgetCurrency = this.budgetCurrency()
758
862
  return {
759
863
  ...this.taskView(task),
760
864
  projectKey: project.key,
865
+ usage: {
866
+ own: taskUsageTotals(this.store, taskId, budgetCurrency),
867
+ total: taskTreeUsageTotals(this.store, taskId, budgetCurrency),
868
+ subtaskCount: subtreeIds.length - 1,
869
+ },
761
870
  comments: comments.map(comment => ({
762
871
  ...comment,
763
872
  authorName: comment.author_type === 'bot'
@@ -63,7 +63,7 @@ export const terminalMethods = {
63
63
  env: process.env,
64
64
  detached: true, // 独立进程组:kill(-pid) 能带走整条命令管线
65
65
  })
66
- } catch (error) {
66
+ } catch (error ) {
67
67
  this.finishTerminalCommand(commandId, 'failed', null, `无法启动命令:${error?.message ?? error}`)
68
68
  throw badRequest(`无法启动命令:${error?.message ?? error}`)
69
69
  }
@@ -146,7 +146,7 @@ export const terminalMethods = {
146
146
  status, exitCode, output, errorMessage, nowIso(), commandId,
147
147
  )
148
148
  if (row) this.trimTerminalHistory(row.project_id)
149
- } catch (error) {
149
+ } catch (error ) {
150
150
  this.logger.warn?.(`dsh-team: terminal command ${commandId} 收尾落库失败:${error?.message ?? error}`)
151
151
  }
152
152
  },
@@ -83,7 +83,7 @@ export function spawnVisionProxyRun(service, { bot, message, target }) {
83
83
  createdAt,
84
84
  )
85
85
  })
86
- } catch (insertError) {
86
+ } catch (insertError ) {
87
87
  if (String(insertError).includes('UNIQUE')) {
88
88
  return service.store.get('SELECT * FROM runs WHERE idempotency_key = ?', idempotencyKey) ?? null
89
89
  }
@@ -111,7 +111,7 @@ export async function considerVisionProxy(service, { bot, message }) {
111
111
  return null
112
112
  }
113
113
  return spawnVisionProxyRun(service, { bot, message, target })
114
- } catch (error) {
114
+ } catch (error ) {
115
115
  service.logger?.warn?.('dsh-team: vision proxy consideration failed: %s', error?.message ?? error)
116
116
  return null
117
117
  }
@@ -141,7 +141,7 @@ export function maybeSpawnVisionAfterFailure(service, { run, bot, error }) {
141
141
  return null
142
142
  }
143
143
  return spawnVisionProxyRun(service, { bot, message, target })
144
- } catch (spawnError) {
144
+ } catch (spawnError ) {
145
145
  service.logger?.warn?.('dsh-team: vision proxy spawn after failure failed: %s', spawnError?.message ?? spawnError)
146
146
  return null
147
147
  }
@@ -6,6 +6,8 @@
6
6
  import { createRequire } from 'node:module'
7
7
  import { AppError, conflict } from '../errors.js'
8
8
  import { WechatIlinkError } from '../wechat/commands.js'
9
+ import { jsonParse, parseMentions } from '../util.js'
10
+ import { answerFailed, answerReceipt, approvalCard, questionCard, wechatToken } from '../wechat/format.js'
9
11
 
10
12
  // 微信登录二维码:服务端直接出 SVG,UI 注入即可,无需前端 QR 库(vendor/qrcode,MIT)。
11
13
  // 依赖按需加载:二维码库缺失只影响扫码,不应让整个插件加载失败。
@@ -17,6 +19,9 @@ export function wechatQrSvg(url) {
17
19
  return qr.createSvgTag({ cellSize: 4, margin: 2 })
18
20
  }
19
21
 
22
+ /** 项目外导演通道的正文来源标记(DSHBOTS-258):让 director 一眼看出该消息来自微信管理员。 */
23
+ const WECHAT_SOLO_SOURCE_MARK = '[微信管理员] '
24
+
20
25
  /** channel.js 的状态守卫文案全集(未启用/已登录等,抛的都是裸 Error)。 */
21
26
  const CHANNEL_GUARD_MESSAGES = new Set([
22
27
  '微信通道未启用(DSH_TEAM_WECHAT=1)',
@@ -82,17 +87,233 @@ export const wechatMethods = {
82
87
  },
83
88
 
84
89
  /**
85
- * 微信派单转发(DSHBOTS-183):按 key 定位 active 项目,把消息以工作台用户身份
86
- * 插入该项目群聊并触发一轮 chat 运行(无 mention 时定向总监,由其自行安排任务)。
87
- * 未命中 key 返回 null,提示文案由 commands.js 统一拼装(带 q 列表)。
90
+ * 项目外导演通道的目标解析(DSHBOTS-258):微信自由文本的默认且唯一去向是 director
91
+ * bot 的专属工作区单聊。解析规则:active bot 里 name='director'(大小写不敏感)优先于
92
+ * role='director'/'总监';同级多个按 created_at、id 取最旧,保证确定性。不过滤 solo_dir:
93
+ * 目录一律读 bots.solo_dir 既有链路,为空时按 soloPromptFor 现有兜底路径处理,不写死目录。
94
+ * 0 命中返回 null(异常状态防御,走次级回退避免消息黑洞)。
95
+ */
96
+ wechatDirectorBot() {
97
+ const rows = this.store.all(
98
+ `SELECT * FROM bots
99
+ WHERE status = 'active' AND (lower(name) = 'director' OR role IN ('director', '总监'))
100
+ ORDER BY CASE WHEN lower(name) = 'director' THEN 0 ELSE 1 END, created_at, id`,
101
+ )
102
+ return rows[0] ?? null
103
+ },
104
+
105
+ /**
106
+ * 项目外导演通道投递(DSHBOTS-258):消息落 director 的 solo_messages 并触发
107
+ * solo_chat 运行,不进任何项目群聊。身份用微信 admin 的 peer id(不以 localUserId
108
+ * 冒充工作台用户);正文前缀 [微信管理员] 让 director 能看出消息来自微信通道。
109
+ * firstContact:该管理员此前没在这个专属工作区说过话(首触回执依据,见 commands)。
110
+ */
111
+ async wechatDirectorChat(director, body) {
112
+ const adminPeerId = this.wechat?.status?.()?.adminPeerId ?? null
113
+ const actor = { type: 'user', id: adminPeerId ?? 'user:wechat' }
114
+ const firstContact = !this.store.get(
115
+ "SELECT id FROM solo_messages WHERE bot_id = ? AND sender_type = 'user' AND sender_id = ? LIMIT 1",
116
+ director.id,
117
+ actor.id,
118
+ )
119
+ const result = await this.sendSoloMessage(
120
+ director.id,
121
+ `${WECHAT_SOLO_SOURCE_MARK}${body}`,
122
+ actor,
123
+ [],
124
+ { origin: 'wechat' },
125
+ )
126
+ return { director, messageId: result?.messageId ?? null, firstContact }
127
+ },
128
+
129
+ /**
130
+ * 微信直达对话(DSHBOTS-208 起,258 四次拍板后收敛为绝对二值路由):
131
+ * /tr 显式转发(key 非空)→ 消息以工作台用户身份插入项目群聊并触发 chat 运行,
132
+ * 运行结束的 bot 回复由 run-finish 按 trigger_type='wechat' 推回微信管理员;
133
+ * 自由文本(key 为空)→ 一律投项目外 director 专属工作区单聊(不随 direct_project_key
134
+ * 绑定、active 项目数变化,路由层无绑定/项目数判断分支),返回
135
+ * { director, messageId, firstContact };解析不到 director(通道异常)→ { error: 'no_director' }。
136
+ * 项目无可定向 Bot(无 mention 且总监不可用)→ { error: 'no_owner', project };
137
+ * 群聊直达成功 → { project, messageId, runBots };显式 key 未命中 → null。
88
138
  */
89
- async wechatDispatch(key, body) {
139
+ async wechatChat(key, body) {
140
+ let project = null
141
+ if (key) {
142
+ project = this.store.get(
143
+ "SELECT * FROM projects WHERE key = ? COLLATE NOCASE AND status = 'active'",
144
+ String(key ?? '').trim(),
145
+ )
146
+ if (!project) return null
147
+ } else {
148
+ // DSHBOTS-258 绝对口径:自由文本永远走 director 专属工作区,用户不直接进群。
149
+ // 路由层不出现 direct_project_key 绑定判断,也不出现 active 项目数量判断——
150
+ // 唯一分流条件是 /tr 显式转发(key 非空)。解析不到 director 属通道异常,
151
+ // 独立 no_director 出口(不复用 no_target:那是「需要用户选项目」的语义链)。
152
+ const director = this.wechatDirectorBot()
153
+ if (director) return this.wechatDirectorChat(director, String(body ?? ''))
154
+ return { error: 'no_director' }
155
+ }
156
+ const members = this.membersOf(project.id).filter(bot => bot.status === 'active')
157
+ const text = String(body ?? '')
158
+ // 无 mention 时 sendMessage 兜底定向 owner_bot_id:总监必须可用,否则消息发出无人接。
159
+ if (parseMentions(text, members).length === 0
160
+ && !members.some(bot => bot.id === project.owner_bot_id)) {
161
+ return { error: 'no_owner', project }
162
+ }
163
+ const result = await this.sendMessage(project.id, text, { type: 'user', id: this.localUserId }, null, [], { origin: 'wechat' })
164
+ return { project, ...result }
165
+ },
166
+
167
+ /**
168
+ * 微信 /bots 指令(DSHBOTS-249):按项目 key 列当前项目机器人清单。
169
+ * 数据源与工作台项目成员表同源(membersOf),只读;key 未命中返回空表。
170
+ */
171
+ wechatProjectBots(key) {
90
172
  const project = this.store.get(
91
173
  "SELECT * FROM projects WHERE key = ? COLLATE NOCASE AND status = 'active'",
92
174
  String(key ?? '').trim(),
93
175
  )
94
- if (!project) return null
95
- await this.sendMessage(project.id, String(body ?? ''), { type: 'user', id: this.localUserId })
96
- return project
176
+ if (!project) return []
177
+ return this.membersOf(project.id)
97
178
  },
179
+
180
+ // ===== DSHBOTS-215:微信问答回路 =====
181
+ // 群聊提问/审批转发微信:只推纯文本镜像,状态仍由工作台卡片与群消息承载;
182
+ // 管理员在微信的答复经 commands 的「答/批 <token> …」路由回原条目(见 wechatAnswerQuestion /
183
+ // wechatDecideApproval)。转发失败只告警,不阻塞提问主流程。
184
+
185
+ /** 提问转发微信(只推文本;token 取问题 id 末 6 位)。 */
186
+ wechatQuestion(project, row, items) {
187
+ if (!this.wechat || typeof this.wechat.notify !== 'function') return false
188
+ try {
189
+ this.wechat.notify(questionCard(project.name || project.key, row.bot_name ?? 'Bot', items, wechatToken(row.id)))
190
+ return true
191
+ } catch (error ) {
192
+ this.logger.warn?.('dsh-team: 微信提问转发失败: %s', error?.message ?? error)
193
+ return false
194
+ }
195
+ },
196
+
197
+ /** 审批转发微信(只推文本;token 取审批 id 末 6 位)。 */
198
+ wechatApproval(project, row) {
199
+ if (!this.wechat || typeof this.wechat.notify !== 'function') return false
200
+ try {
201
+ this.wechat.notify(approvalCard(project.name || project.key, row.bot_name ?? 'Bot', row.tool_name, row.reason, wechatToken(row.id)))
202
+ return true
203
+ } catch (error ) {
204
+ this.logger.warn?.('dsh-team: 微信审批转发失败: %s', error?.message ?? error)
205
+ return false
206
+ }
207
+ },
208
+
209
+ /** 按 token + 绑定项目定位 pending 条目(questions / approvals 共用)。 */
210
+ pendingWechatRow(table, token, fallbackKey = null) {
211
+ const rows = this.store.all(
212
+ `SELECT ${table}.*, p.key AS project_key FROM ${table}
213
+ LEFT JOIN projects p ON p.id = ${table}.project_id
214
+ WHERE ${table}.status = 'pending' AND lower(substr(${table}.id, -6)) = ?`,
215
+ String(token ?? '').toLowerCase(),
216
+ )
217
+ if (!rows.length) return null
218
+ if (fallbackKey) {
219
+ const key = String(fallbackKey).toUpperCase()
220
+ return rows.find(row => String(row.project_key ?? '').toUpperCase() === key) ?? null
221
+ }
222
+ return rows[0]
223
+ },
224
+
225
+ /**
226
+ * 微信答复路由(DSHBOTS-215):把管理员的「答 <token> <内容>」落成对应提问的宿主应答。
227
+ * 来源标识为 user:wechat,与工作台作答(user:<actorId>)区分,审计单独记 question.answer_wechat。
228
+ */
229
+ async wechatAnswerQuestion(token, body, fallbackKey = null) {
230
+ const row = this.pendingWechatRow('questions', token, fallbackKey)
231
+ if (!row) return answerFailed(token, '没有匹配的待答提问(可能已作答或已过期)')
232
+ const items = jsonParse(row.questions, [])
233
+ const parsed = parseWechatAnswers(items, body)
234
+ if (parsed.error) return answerFailed(token, parsed.error)
235
+ this.settleQuestion(row.id, 'answered', { answers: parsed.answers }, 'user:wechat')
236
+ this.audit({ type: 'user', id: 'user_wechat' }, 'question.answer_wechat', 'question', row.id, {
237
+ token,
238
+ answers: parsed.answers,
239
+ })
240
+ return answerReceipt(wechatToken(row.id), parsed.summary)
241
+ },
242
+
243
+ /** 微信审批路由(DSHBOTS-215):把「批 <token> 允许|拒绝」落成对应审批的宿主应答。 */
244
+ async wechatDecideApproval(token, decision, fallbackKey = null) {
245
+ const row = this.pendingWechatRow('approvals', token, fallbackKey)
246
+ if (!row) return answerFailed(token, '没有匹配的待审批请求(可能已处理或已过期)')
247
+ if (!['allow', 'reject'].includes(decision)) return answerFailed(token, '只能回复「允许」或「拒绝」')
248
+ this.settleApproval(
249
+ row.id,
250
+ decision === 'allow' ? 'allowed' : 'rejected',
251
+ decision === 'allow' ? 'allowed-once' : 'rejected',
252
+ 'user:wechat',
253
+ )
254
+ this.audit({ type: 'user', id: 'user_wechat' }, `approval.${decision}_wechat`, 'approval', row.id, {
255
+ token,
256
+ toolName: row.tool_name,
257
+ })
258
+ return answerReceipt(wechatToken(row.id), `${row.tool_name} 已${decision === 'allow' ? '允许' : '拒绝'}`)
259
+ },
260
+ }
261
+
262
+ /** 选项匹配:序号(1 起)或选项文字精确命中(大小写不敏感)。 */
263
+ function matchWechatOptions(options, raw) {
264
+ const value = String(raw ?? '').trim().toLowerCase()
265
+ if (!value) return []
266
+ const numeric = /^(\d+)$/.exec(value)
267
+ if (numeric) {
268
+ const index = Number(numeric[1])
269
+ return index >= 1 && index <= options.length ? [options[index - 1].label] : []
270
+ }
271
+ const hit = options.find(option => String(option.label ?? '').trim().toLowerCase() === value)
272
+ return hit ? [hit.label] : []
273
+ }
274
+
275
+ /**
276
+ * 微信答复解析:支持「1:选项一;2:补充说明」的按题作答,也支持单题直接回选项/文字。
277
+ * 带序前缀的段按序号指派,其余段按顺序补到未指派题;选项题必须命中选项,否则整单拒绝。
278
+ */
279
+ function parseWechatAnswers(items, body) {
280
+ if (!Array.isArray(items) || items.length === 0) return { error: '提问内容缺失' }
281
+ const segments = String(body ?? '').split(/[;;]/).map(segment => segment.trim()).filter(Boolean)
282
+ const assigned = new Map()
283
+ const rest = []
284
+ for (const segment of segments) {
285
+ const indexed = /^(\d+)\s*[::]\s*([\s\S]*)$/.exec(segment)
286
+ if (indexed && Number(indexed[1]) >= 1 && Number(indexed[1]) <= items.length) {
287
+ assigned.set(Number(indexed[1]) - 1, indexed[2].trim())
288
+ } else {
289
+ rest.push(segment)
290
+ }
291
+ }
292
+ let cursor = 0
293
+ for (let i = 0; i < items.length; i++) {
294
+ if (assigned.has(i)) continue
295
+ if (rest.length === 0) break
296
+ if (rest.length === 1 && items.length === 1) {
297
+ assigned.set(i, rest[0])
298
+ continue
299
+ }
300
+ if (cursor < rest.length) assigned.set(i, rest[cursor++])
301
+ }
302
+ const answers = []
303
+ const parts = []
304
+ for (let i = 0; i < items.length; i++) {
305
+ const item = items[i]
306
+ const raw = String(assigned.get(i) ?? '').trim()
307
+ const options = Array.isArray(item.options) ? item.options : []
308
+ if (options.length > 0) {
309
+ const selected = matchWechatOptions(options, raw)
310
+ if (selected.length === 0) return { error: `Q${i + 1} 无法解析,请回复选项文字或序号(如 1)` }
311
+ answers.push({ id: String(item.id), selected })
312
+ parts.push(`Q${i + 1}: ${selected.join('、')}`)
313
+ } else {
314
+ answers.push({ id: String(item.id), selected: [], ...(raw ? { custom: raw } : {}) })
315
+ parts.push(`Q${i + 1}: ${raw || '(未填)'}`)
316
+ }
317
+ }
318
+ return { answers, summary: parts.join('\n') }
98
319
  }
@@ -41,7 +41,7 @@ export async function attachSessionToWorkspace(registry, { cwd, title, sessionId
41
41
  const entity = await ensureWorkspaceForCwd(registry, { cwd, title })
42
42
  await entity.attachSession(sessionId)
43
43
  return true
44
- } catch (error) {
44
+ } catch (error ) {
45
45
  logger.warn?.(`dsh-team: 会话挂工作区分组失败(不影响会话运行): ${error?.message ?? error}`)
46
46
  return false
47
47
  }
@@ -61,7 +61,8 @@ export async function backfillWorkspaceGroupBindings(service) {
61
61
  bt.solo_dir, bt.name AS bot_name
62
62
  FROM session_bindings b
63
63
  LEFT JOIN projects p ON p.id = b.project_id
64
- LEFT JOIN bots bt ON bt.id = b.bot_id`)
64
+ LEFT JOIN bots bt ON bt.id = b.bot_id
65
+ WHERE b.alias = 0`)
65
66
  const groups = new Map()
66
67
  for (const row of rows) {
67
68
  const bot = { name: row.bot_name, solo_dir: row.solo_dir }
@@ -74,7 +75,7 @@ export async function backfillWorkspaceGroupBindings(service) {
74
75
  }
75
76
  group.sessionIds.push(row.session_id)
76
77
  groups.set(cwd, group)
77
- } catch (error) {
78
+ } catch (error ) {
78
79
  // 项目/单聊目录已不可推导(如记录残留)时只跳过该条会话。
79
80
  service.logger.warn?.(`dsh-team: 回填跳过会话 ${row.session_id}(工作区路径不可用): ${error?.message ?? error}`)
80
81
  }
@@ -3,7 +3,7 @@ import { basename, dirname } from 'node:path'
3
3
  // 技能包(SKILL.md)解析:frontmatter 优先,缺失时回退到目录名与正文首段。
4
4
  export function parseSkill(raw, locator) {
5
5
  const frontmatter = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/u.exec(raw)
6
- const metadata = {}
6
+ const metadata = {}
7
7
  if (frontmatter?.[1]) {
8
8
  for (const line of frontmatter[1].split('\n')) {
9
9
  const match = /^([A-Za-z][\w-]*):\s*(.*)$/.exec(line.trim())
package/src/skills.js CHANGED
@@ -144,7 +144,7 @@ export function syncSkills(store, skillRoot) {
144
144
 
145
145
  // 技能 provider:共享技能池 + 当前会话所在项目的项目技能池。
146
146
  // 项目技能按 .agents > .claude > .codex 优先级去重,且优先于同名共享技能。
147
- export function skillProvider(skillRoot, options = {}) {
147
+ export function skillProvider(skillRoot, options = {} ) {
148
148
  const resolveProjectDir = options.resolveProjectDir ?? (() => null)
149
149
  const list = (cwd) => {
150
150
  const candidates = []