dsh-team-bots 0.2.289 → 0.2.347

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 (119) hide show
  1. package/README.md +60 -122
  2. package/docs/README.zh.md +61 -123
  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 +14 -5
  27. package/src/services/approvals.js +109 -24
  28. package/src/services/backoff.js +34 -0
  29. package/src/services/bot-quota.js +242 -0
  30. package/src/services/bots.js +35 -6
  31. package/src/services/chat.js +15 -9
  32. package/src/services/core.js +33 -5
  33. package/src/services/hygiene.js +8 -4
  34. package/src/services/locale.js +17 -0
  35. package/src/services/memory.js +112 -1
  36. package/src/services/message-images.js +3 -3
  37. package/src/services/notify.js +169 -0
  38. package/src/services/projects.js +119 -10
  39. package/src/services/proposals.js +2 -3
  40. package/src/services/questions.js +75 -32
  41. package/src/services/review-watchdog.js +261 -30
  42. package/src/services/run-finish.js +186 -17
  43. package/src/services/runs.js +42 -13
  44. package/src/services/runtime/lifecycle.js +3 -1
  45. package/src/services/runtime/model-restore.js +5 -5
  46. package/src/services/runtime/prompt.js +106 -45
  47. package/src/services/runtime/session.js +38 -14
  48. package/src/services/runtime/trajectory.js +1 -1
  49. package/src/services/scheduler.js +146 -19
  50. package/src/services/secrets.js +1 -1
  51. package/src/services/system.js +23 -6
  52. package/src/services/task-dispatch.js +315 -0
  53. package/src/services/task-notify.js +55 -11
  54. package/src/services/task-runs.js +179 -0
  55. package/src/services/task-stage.js +4 -0
  56. package/src/services/tasks.js +51 -399
  57. package/src/services/terminal.js +2 -2
  58. package/src/services/vision-proxy.js +3 -3
  59. package/src/services/wechat.js +228 -7
  60. package/src/services/workspace-groups.js +4 -3
  61. package/src/skill-parse.js +1 -1
  62. package/src/skills.js +1 -1
  63. package/src/tools.js +275 -6
  64. package/src/updater.js +52 -0
  65. package/src/usage-reconcile.js +1 -1
  66. package/src/usage.js +52 -11
  67. package/src/wechat/channel.js +14 -20
  68. package/src/wechat/commands.js +129 -81
  69. package/src/wechat/format.js +247 -0
  70. package/src/wechat/store.js +30 -2
  71. package/ui/app.js +57 -53
  72. package/ui/i18n/en/chat.js +140 -0
  73. package/ui/i18n/en/common.js +187 -0
  74. package/ui/i18n/en/nav.js +89 -0
  75. package/ui/i18n/en/settings.js +352 -0
  76. package/ui/i18n/en/tasks.js +229 -0
  77. package/ui/i18n/en/usage.js +141 -0
  78. package/ui/i18n/en/wechat.js +23 -0
  79. package/ui/i18n/en.js +17 -237
  80. package/ui/i18n/zh/chat.js +140 -0
  81. package/ui/i18n/zh/common.js +187 -0
  82. package/ui/i18n/zh/nav.js +89 -0
  83. package/ui/i18n/zh/settings.js +352 -0
  84. package/ui/i18n/zh/tasks.js +229 -0
  85. package/ui/i18n/zh/usage.js +141 -0
  86. package/ui/i18n/zh/wechat.js +23 -0
  87. package/ui/i18n/zh.js +17 -236
  88. package/ui/modules/api.js +4 -3
  89. package/ui/modules/bot-quota.js +27 -0
  90. package/ui/modules/cards.js +96 -58
  91. package/ui/modules/chat.js +28 -30
  92. package/ui/modules/composer.js +41 -37
  93. package/ui/modules/dom-morph.js +292 -0
  94. package/ui/modules/events-board.js +22 -22
  95. package/ui/modules/events-click.js +100 -68
  96. package/ui/modules/events-misc.js +34 -34
  97. package/ui/modules/events-submit.js +28 -28
  98. package/ui/modules/global-pages.js +125 -116
  99. package/ui/modules/i18n.js +0 -5
  100. package/ui/modules/icons.js +0 -1
  101. package/ui/modules/markdown.js +1 -1
  102. package/ui/modules/modal-forms.js +196 -203
  103. package/ui/modules/modal-layer.js +6 -9
  104. package/ui/modules/page-shell.js +62 -0
  105. package/ui/modules/settings.js +211 -198
  106. package/ui/modules/solo-archive.js +0 -4
  107. package/ui/modules/state.js +57 -50
  108. package/ui/modules/tasks.js +167 -171
  109. package/ui/modules/typing-linger.js +1 -4
  110. package/ui/modules/usage.js +65 -78
  111. package/ui/modules/util.js +92 -25
  112. package/ui/styles/avatars.css +14 -0
  113. package/ui/styles/cards.css +49 -0
  114. package/ui/styles/chat-cards.css +17 -21
  115. package/ui/styles/global-config.css +56 -2
  116. package/ui/styles/modal.css +13 -0
  117. package/ui/styles/usage.css +3 -61
  118. package/CONTRIBUTING.md +0 -20
  119. package/docs/assets/usage-dark.png +0 -0
package/src/updater.js CHANGED
@@ -1,5 +1,7 @@
1
+ import { createRequire } from 'node:module'
1
2
  import { readFileSync } from 'node:fs'
2
3
  import { dirname, join, resolve } from 'node:path'
4
+ import { fileURLToPath } from 'node:url'
3
5
 
4
6
  const registry = (process.env.NPM_REGISTRY || 'https://registry.npmjs.org/').replace(/\/+$/, '')
5
7
  // 每个包一条缓存:{ at, version },5 分钟内复用。
@@ -107,3 +109,53 @@ export function detectDshRuntimeVersion(env, argv1) {
107
109
  }
108
110
  return 'unknown'
109
111
  }
112
+
113
+ // 插件部署位置向上找宿主包的目录级数上限(含起始目录):覆盖插件与宿主同装一张
114
+ // 依赖树的常见布局(<root>/node_modules/dsh-team-bots → <root>/node_modules/@deepseek-ai/dsh)。
115
+ const PLUGIN_HOST_PACKAGE_LEVELS = 6
116
+
117
+ // 从插件部署位置尽力探测宿主 dsh 版本(DSHBOTS-253):插件作为宿主子进程运行时
118
+ // process.argv[1] 是插件自身入口,detectDshRuntimeVersion 的 argv 链在插件宿主下恒 miss。
119
+ // 这里从插件自身文件位置再探两级:
120
+ // ① createRequire.resolve('@deepseek-ai/dsh/package.json')——插件与宿主同依赖树时命中;
121
+ // ② 沿插件目录逐级向上找 node_modules/@deepseek-ai/dsh/package.json。
122
+ // 都拿不到返回 ''(结果按进程 memoize:插件部署位置不会在运行中变化)。
123
+ let hostDshVersionCache = null
124
+ export function detectHostDshVersionFromPlugin(startDir = null) {
125
+ if (startDir === null && hostDshVersionCache !== null) return hostDshVersionCache
126
+ let version = ''
127
+ if (startDir === null) {
128
+ try {
129
+ const pkg = JSON.parse(readFileSync(createRequire(import.meta.url).resolve('@deepseek-ai/dsh/package.json'), 'utf8'))
130
+ if (typeof pkg?.version === 'string' && pkg.version) version = pkg.version
131
+ } catch {
132
+ // 不在可解析的依赖树内:走目录上溯。
133
+ }
134
+ }
135
+ if (!version) {
136
+ let dir = resolve(startDir ?? dirname(fileURLToPath(import.meta.url)))
137
+ for (let level = 0; level < PLUGIN_HOST_PACKAGE_LEVELS; level += 1) {
138
+ try {
139
+ const pkg = JSON.parse(readFileSync(join(dir, 'node_modules', '@deepseek-ai', 'dsh', 'package.json'), 'utf8'))
140
+ if (typeof pkg?.version === 'string' && pkg.version) {
141
+ version = pkg.version
142
+ break
143
+ }
144
+ } catch {
145
+ // 本级没有宿主包:继续向上。
146
+ }
147
+ const parent = dirname(dir)
148
+ if (parent === dir) break
149
+ dir = parent
150
+ }
151
+ }
152
+ if (startDir === null) hostDshVersionCache = version
153
+ return version
154
+ }
155
+
156
+ // dsh 版本展示值归一(DSHBOTS-253):探测失败形态(null/undefined/'unknown'/空串/纯空白)
157
+ // 一律归为 '',UI 据此整行隐藏,不再展示 unknown 占位。
158
+ export function displayDshVersion(version) {
159
+ const value = typeof version === 'string' ? version.trim() : ''
160
+ return value && value !== 'unknown' ? value : ''
161
+ }
@@ -33,7 +33,7 @@ export function setPrice(store, input) {
33
33
  Number(input.outputPerMtok ?? 0),
34
34
  String(input.currency ?? BUDGET_CURRENCY).trim().toUpperCase() || BUDGET_CURRENCY,
35
35
  ]
36
- if (vals.slice(0, 4).some(value => !Number.isFinite(value) || value < 0)) throw new Error('价格必须是非负数')
36
+ if (vals.slice(0, 4).some(value => !Number.isFinite(value) || value < 0)) throw new Error('价格必须是非负数')
37
37
  if (existing) {
38
38
  store.run(
39
39
  `UPDATE model_prices SET input_per_mtok = ?, cache_read_per_mtok = ?, cache_write_per_mtok = ?,
package/src/usage.js CHANGED
@@ -12,7 +12,7 @@ function currentPrice(store, provider, model) {
12
12
  // 单条明细成本:输入侧(含缓存读写)+ 输出侧,按每百万 token 计价。
13
13
  // recordUsage 入库与事后追认共用同一公式,保证两条口径算出的金额一致。
14
14
  // 导出给 ./usage-reconcile.js 的 CSV 追认口径复用,避免两处各写一份公式。
15
- export function costForTokens(price, tokens = {}) {
15
+ export function costForTokens(price, tokens = {} ) {
16
16
  const input = Number(tokens.input ?? 0)
17
17
  const cacheRead = Number(tokens.cacheRead ?? 0)
18
18
  const cacheWrite = Number(tokens.cacheWrite ?? 0)
@@ -111,7 +111,7 @@ function andClause(where, clause) {
111
111
  // 成本聚合(含追认):已计价明细用入库时算死的成本,未计价明细(total_cost IS NULL)
112
112
  // 按当前价目表补算——价目配齐后无需迁移,聚合结果即全量。pricedCalls/unpricedCalls
113
113
  // 也随之按「当前能否计价」统计:能追认的未计价计入 priced,仍无价可追认的才是真未计价。
114
- function costBreakdown(store, where, params, budgetCurrency, prices = null) {
114
+ function costBreakdown(store, where, params, budgetCurrency, prices = null, join = '') {
115
115
  const priceMap = prices ?? currentPriceMap(store)
116
116
  const rows = store.all(
117
117
  `SELECT u.currency AS currency,
@@ -125,7 +125,7 @@ function costBreakdown(store, where, params, budgetCurrency, prices = null) {
125
125
  COALESCE(SUM(CASE WHEN u.total_cost IS NULL THEN u.cache_write_tokens ELSE 0 END), 0) AS null_cache_write_tokens,
126
126
  COALESCE(SUM(CASE WHEN u.total_cost IS NULL THEN u.output_tokens ELSE 0 END), 0) AS null_output_tokens,
127
127
  COALESCE(SUM(CASE WHEN u.total_cost IS NULL THEN u.reasoning_tokens ELSE 0 END), 0) AS null_reasoning_tokens
128
- FROM usage_events u ${where}
128
+ FROM usage_events u ${join} ${where}
129
129
  GROUP BY u.currency, u.provider, u.model`,
130
130
  ...params,
131
131
  )
@@ -223,10 +223,11 @@ const ZERO_TOTALS = {
223
223
 
224
224
  // 单条件聚合:token 与调用次数 + 成本分币种。
225
225
  // prices 为调用方已取好的当前价目表(usageSnapshot 只取一次,避免 N+1);缺省自行加载。
226
- export function aggregateUsage(store, filters = [], params = [], budgetCurrency = BUDGET_CURRENCY, prices = null) {
226
+ // join 为可选的 JOIN 子句(任务级口径需要 LEFT JOIN runs 追认历史 task_id,见 taskUsageTotals)。
227
+ export function aggregateUsage(store, filters = [], params = [], budgetCurrency = BUDGET_CURRENCY, prices = null, join = '') {
227
228
  const where = filterClause(filters)
228
- const row = store.get(`SELECT ${AGGREGATES} FROM usage_events u ${where}`, ...params)
229
- const breakdown = costBreakdown(store, where, params, budgetCurrency, prices)
229
+ const row = store.get(`SELECT ${AGGREGATES} FROM usage_events u ${join} ${where}`, ...params)
230
+ const breakdown = costBreakdown(store, where, params, budgetCurrency, prices, join)
230
231
  return mapTotals(row, breakdown)
231
232
  }
232
233
 
@@ -234,6 +235,46 @@ export function runUsageTotals(store, runId, budgetCurrency = BUDGET_CURRENCY) {
234
235
  return aggregateUsage(store, ['u.run_id = ?'], [runId], budgetCurrency)
235
236
  }
236
237
 
238
+ // —— 任务级 usage 聚合(DSHBOTS-212)——
239
+ // 口径:一个任务端到端花多少 token。两条归因路径合一:
240
+ // 1) 新明细:usage_events.task_id(lifecycle 记账时随 run 透传,DSHBOTS-212 起)。
241
+ // 2) 历史明细:task_id 列上线前的存量行 task_id 为 NULL,经 run_id JOIN runs 追认
242
+ // (runs.task_id 自始有值)。COALESCE 两条路径同权,不做一次性回填迁移。
243
+ // 覆盖该任务全部运行:成功交付、失败重试(attempt 递增仍同 run 行)、核验/受阻处理
244
+ // 派生运行(task_id 相同)——「端到端成本」即该任务名下发生过的一切模型消费。
245
+ // 缓存 token 分列(cache_read/cache_write),计价沿用 costForTokens 既有口径,不另算。
246
+ const RUN_TASK_JOIN = 'LEFT JOIN runs r ON r.id = u.run_id'
247
+ const EFFECTIVE_TASK_ID = 'COALESCE(u.task_id, r.task_id)'
248
+
249
+ export function taskUsageTotals(store, taskId, budgetCurrency = BUDGET_CURRENCY) {
250
+ return aggregateUsage(store, [`${EFFECTIVE_TASK_ID} = ?`], [taskId], budgetCurrency, null, RUN_TASK_JOIN)
251
+ }
252
+
253
+ // 任务子树 id 集(含自身):沿 tasks.parent_task_id 下钻全部后代。
254
+ // UNION(非 UNION ALL)天然去重:即使脏数据造出环也会收敛终止。
255
+ export function taskSubtreeIds(store, taskId) {
256
+ const rows = store.all(
257
+ `WITH RECURSIVE tree(id) AS (
258
+ SELECT id FROM tasks WHERE id = ?
259
+ UNION
260
+ SELECT t.id FROM tasks t JOIN tree ON t.parent_task_id = tree.id
261
+ ) SELECT id FROM tree`,
262
+ taskId,
263
+ )
264
+ return rows.map(row => row.id)
265
+ }
266
+
267
+ // 含子树的任务级口径:主项 + 全部后代子卡一并聚合。
268
+ // 拆分划算判定(C_removed > C_introduced)用它与「同类整卡任务」的 taskUsageTotals
269
+ // 对比:拆分后总成本 = 主项 usageTotal(含子卡),拆掉的是串行等待,引入的是每卡的
270
+ // 会话预热/交接重复上下文——两个口径都含缓存 token 分列,可直接看输入侧增量。
271
+ export function taskTreeUsageTotals(store, taskId, budgetCurrency = BUDGET_CURRENCY) {
272
+ const ids = taskSubtreeIds(store, taskId)
273
+ if (!ids.length) return { ...ZERO_TOTALS }
274
+ const marks = `(${ids.map(() => '?').join(', ')})`
275
+ return aggregateUsage(store, [`${EFFECTIVE_TASK_ID} IN ${marks}`], ids, budgetCurrency, null, RUN_TASK_JOIN)
276
+ }
277
+
237
278
  // 用量时间窗(DSHBOTS-121):今日 / 7 日 / 30 日 / 至今 四档。
238
279
  // 口径:今日 = 产品时区(默认 Asia/Shanghai)当日 0 点起;7 日 / 30 日 = 滚动窗口;
239
280
  // 至今 = 不设下界。明细 occurred_at 存的是 ISO UTC 字符串,窗口起点先换算成 UTC ISO 再比较。
@@ -255,7 +296,7 @@ function zoneClock(ms, timeZone) {
255
296
  minute: '2-digit',
256
297
  second: '2-digit',
257
298
  })
258
- const parts = {}
299
+ const parts = {}
259
300
  for (const part of dtf.formatToParts(new Date(ms))) {
260
301
  if (part.type !== 'literal') parts[part.type] = part.value
261
302
  }
@@ -285,7 +326,7 @@ function zoneDay(ms, timeZone) {
285
326
 
286
327
  // 解析时间窗:today / 7d / 30d / all,非法键回退 30 日。
287
328
  // since 为 null 表示「至今」(没有下界);dayCount 是日历面板要画的根数。
288
- export function resolveUsageWindow(key, options = {}) {
329
+ export function resolveUsageWindow(key, options = {} ) {
289
330
  const now = Number(options.now ?? Date.now())
290
331
  const timeZone = options.timeZone ?? USAGE_TIME_ZONE
291
332
  const wanted = USAGE_WINDOW_KEYS.includes(String(key)) ? String(key) : '30d'
@@ -568,7 +609,7 @@ const SNAPSHOT_CACHE_MAX = 8
568
609
 
569
610
  // 缓存按 store 分桶:测试里每个用例一个临时库,共用一张表会串味。
570
611
  const snapshotCaches = new WeakMap()
571
- const liveSnapshotCaches = new Set()
612
+ const liveSnapshotCaches = new Set ()
572
613
 
573
614
  function cacheFor(store) {
574
615
  let cache = snapshotCaches.get(store)
@@ -604,7 +645,7 @@ export function clearUsageSnapshotCache() {
604
645
  for (const cache of liveSnapshotCaches) cache.clear()
605
646
  }
606
647
 
607
- export function usageSnapshot(store, projectId, days = 30, options = {}) {
648
+ export function usageSnapshot(store, projectId, days = 30, options = {} ) {
608
649
  const budgetCurrency = String(options.currency ?? BUDGET_CURRENCY).toUpperCase() || BUDGET_CURRENCY
609
650
  const soloBotId = options.soloBotId ?? null
610
651
  const ttl = Number.isFinite(options.cacheTtlMs) ? options.cacheTtlMs : SNAPSHOT_CACHE_TTL_MS
@@ -620,7 +661,7 @@ export function usageSnapshot(store, projectId, days = 30, options = {}) {
620
661
  return value
621
662
  }
622
663
 
623
- function computeUsageSnapshot(store, projectId, days = 30, options = {}) {
664
+ function computeUsageSnapshot(store, projectId, days = 30, options = {} ) {
624
665
  const budgetCurrency = String(options.currency ?? BUDGET_CURRENCY).toUpperCase() || BUDGET_CURRENCY
625
666
  const soloBotId = options.soloBotId ?? null
626
667
  // 时间窗口径(DSHBOTS-121):传 window 走四档窗口;不传时沿用旧的「近 N 天」滚动窗口。
@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto'
2
2
  import { createRequire } from 'node:module'
3
3
  import { TencentIlinkTransport } from '../../vendor/wechat-ilink/index.js'
4
4
  import { handleCommand, isRetryable, outboundChunks, WechatBusinessError, WechatIlinkError } from './commands.js'
5
+ import { batchDigest, failureText, welcomeAdmin } from './format.js'
5
6
  import { AppError } from '../errors.js'
6
7
 
7
8
  const { version: PLUGIN_VERSION } = createRequire(import.meta.url)('../../package.json')
@@ -18,12 +19,8 @@ const DAY_MS = 24 * 60 * 60 * 1000
18
19
  const OUTBOX_MAX_ATTEMPTS = 3
19
20
  /** 合批窗口:窗口内到达的多条推送合并为一次发送(一轮任务事件常并发多条,逐条发占消息额度)。 */
20
21
  const OUTBOX_BATCH_WINDOW_MS = 1500
21
- /** 合批摘要的明细行数上限:超过只保留最旧的 N 条原文,其余以「等 N 项」汇总。 */
22
- const OUTBOX_BATCH_LINES = 5
23
22
  /** 进程内记忆已处理消息,避免 cursor 未推进时重复回复。 */
24
23
  const PROCESSED_MEMORY_LIMIT = 500
25
- /** 用户侧只给通用失败提示,具体错误写日志。 */
26
- const GENERIC_FAILURE_TEXT = '消息处理失败,稍后重试'
27
24
  const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
28
25
 
29
26
  /** 授权响应里可能出现的用户标识字段(vendor 的 confirmed 返回 userId=ilink_user_id)。 */
@@ -238,7 +235,7 @@ export class WechatChannel {
238
235
  if (voided > 0) this.log.info?.(`[wechat] 链接建立,作废此前待发堆积 ${voided} 条(不补发)`)
239
236
  const transport = this.makeTransport(credentials)
240
237
  const abort = new AbortController()
241
- const epoch = { abort, credentials }
238
+ const epoch = { abort, credentials }
242
239
  this.transport = transport
243
240
  this.epoch = epoch
244
241
  this.phase = 'connecting'
@@ -276,9 +273,9 @@ export class WechatChannel {
276
273
  }
277
274
  } catch (error) {
278
275
  if (signal.aborted || this.epoch !== epoch) return
279
- if (error instanceof WechatIlinkError && ['AUTH_REPLACED', 'AUTH_EXPIRED'].includes(error.code)) {
276
+ if (error instanceof WechatIlinkError && ['AUTH_REPLACED', 'AUTH_EXPIRED'].includes((error ).code)) {
280
277
  this.phase = 'needs_reauth'
281
- this.error = `${error.code}: ${error.message}`
278
+ this.error = `${(error ).code}: ${(error ).message}`
282
279
  this.log.warn?.('[wechat] 凭证失效,需要重新扫码')
283
280
  return
284
281
  }
@@ -332,7 +329,7 @@ export class WechatChannel {
332
329
  this.store.saveAdminPeer(peerId)
333
330
  this.pendingAdmin = null
334
331
  this.log.info?.(`[wechat] 管理员已绑定(本次授权会话首条消息): ${peerId}`)
335
- await this.sendTo(peerId, '已绑定为本团队管理员。回复「帮助」查看指令。', signal)
332
+ await this.sendTo(peerId, welcomeAdmin(), signal)
336
333
  await this.flushOutbox(transport, signal)
337
334
  return
338
335
  }
@@ -341,18 +338,24 @@ export class WechatChannel {
341
338
  return
342
339
  }
343
340
  try {
344
- const reply = await handleCommand(this.service, message.text)
341
+ // DSHBOTS-208 直达对话上下文:管理员会话绑定的项目 key(路由成功后由命令层回写)。
342
+ const reply = await handleCommand(this.service, message.text, {
343
+ boundKey: this.store.getDirectProjectKey?.() ?? null,
344
+ bind: key => this.store.saveDirectProjectKey?.(key),
345
+ // 上方已校验 peerId === admin(非管理员消息整条忽略),显式带过 fail-closed 命令门
346
+ isAdmin: true,
347
+ })
345
348
  await this.sendTo(peerId, reply, signal)
346
349
  } catch (error) {
347
350
  if (isBusinessError(error)) {
348
351
  // 业务性拒绝(如任务不存在、任务号非法):给用户可读提示即可,不算处理失败
349
352
  this.log.warn?.(`[wechat] 指令被拒绝: ${this.errorText(error)}`)
350
- await this.sendTo(peerId, String(error?.message ?? '指令无法执行'), signal)
353
+ await this.sendTo(peerId, String((error )?.message ?? '指令无法执行'), signal)
351
354
  .catch(sendError => this.log.warn?.(`[wechat] 提示发送失败: ${this.errorText(sendError)}`))
352
355
  return
353
356
  }
354
357
  this.log.warn?.(`[wechat] 指令执行失败: ${this.errorText(error)}`)
355
- await this.sendTo(peerId, GENERIC_FAILURE_TEXT, signal)
358
+ await this.sendTo(peerId, failureText(), signal)
356
359
  .catch(sendError => this.log.warn?.(`[wechat] 失败提示发送失败: ${this.errorText(sendError)}`))
357
360
  // 交给上层:这条没处理成功,cursor 不推进,下一轮还会重试
358
361
  throw error
@@ -486,15 +489,6 @@ function isBusinessError(error) {
486
489
  return error instanceof AppError || error instanceof WechatBusinessError || error?.permanent === true
487
490
  }
488
491
 
489
- /** 合批摘要:首行条数,逐条保留原文(每条自带 KEY-N 与状态),超明细上限截断加「等 N 项」。 */
490
- function batchDigest(items) {
491
- const shown = items.slice(0, OUTBOX_BATCH_LINES)
492
- const rest = items.length - shown.length
493
- const lines = [`任务动态 ${items.length} 条:`, ...shown.map(item => item.text)]
494
- if (rest > 0) lines.push(`……等 ${rest} 项`)
495
- return lines.join('\n')
496
- }
497
-
498
492
  /** 从授权响应里取用户标识(vendor confirmed 返回 userId=ilink_user_id)。 */
499
493
  function extractAuthUserId(credentials) {
500
494
  if (!credentials || typeof credentials !== 'object') return null
@@ -1,25 +1,25 @@
1
1
  import { WechatIlinkError, chunkWechatText, filterWechatMarkdown } from '../../vendor/wechat-ilink/index.js'
2
2
  import { TASK_ID_PATTERN } from '../util.js'
3
+ import {
4
+ adminDenied, answerHelp, badTaskId, botsList, connectedReceipt, helpText, keysList,
5
+ needPickProject, needReturnReason, noDirector, noOwner, projectNotFound, statesView,
6
+ taskDetail, trHelp, unknownCommand,
7
+ } from './format.js'
3
8
 
4
- const HELP = [
5
- '可用指令:',
6
- ' 帮助 / help / ? 查看本帮助',
7
- ' 状态 概览各项目与待验收任务',
8
- ' 验收 <任务号> [评语] 通过验收,如:验收 web-3 做得好',
9
- ' 驳回 <任务号> <理由> 退回重做,理由必填',
10
- ' 详情 <任务号> 查看任务卡片',
11
- ' q 列出可派单的项目 key',
12
- ' <key>: <消息> 转发消息到项目群聊由总监安排,如:web: 上线新版官网',
13
- ].join('\n')
9
+ /** 微信答复路由:答 <token> <选项或文字>(DSHBOTS-215)。token 为提问/审批 id 末 6 位。 */
10
+ const ANSWER_PATTERN = /^(?:答|答复|回答|answer)\s+([A-Za-z0-9]{4,10})(?:\s+([\s\S]*))?$/i
14
11
 
15
- /** 需要任务号的任务指令。 */
16
- const TASK_VERBS = ['验收', '驳回', '详情']
12
+ /** 微信审批路由:批 <token> 允许|拒绝(DSHBOTS-215)。 */
13
+ const APPROVAL_PATTERN = /^(?:批|审批|approve)\s+([A-Za-z0-9]{4,10})\s*(允许|拒绝|allow|reject)$/i
17
14
 
18
15
  /** 正文里的任务号候选(不要求空格分隔),再由 TASK_ID_PATTERN 校验。 */
19
16
  const TASK_ID_CANDIDATE = /([a-z][a-z0-9-]*-\d+)/gi
20
17
 
21
- /** 派单转发格式 <key>: <消息>:key 与项目 key 同口径(字母数字、至多 10 位),全角冒号与大小写均容忍。 */
22
- const DISPATCH_PATTERN = /^([A-Za-z0-9]{1,10})\s*[::]\s*([\s\S]+)$/
18
+ /** /tr 格式:<key> <消息> 或 <key>: <消息>(DSHBOTS-258 容忍冒号写法),key 与项目 key 同口径。 */
19
+ const TR_PATTERN = /^([A-Za-z0-9]{1,10})(?:\s*[::]\s*|\s+)([\s\S]+)$/
20
+
21
+ /** 固定指令的写操作:需要 admin-peer 门(与 答/批 同口径)。 */
22
+ const ADMIN_VERBS = new Set(['reject', 'tr'])
23
23
 
24
24
  /** 业务性错误:重试无意义(区别于网络/限流等可重试错误)。 */
25
25
  export class WechatBusinessError extends Error {
@@ -31,87 +31,135 @@ export class WechatBusinessError extends Error {
31
31
  }
32
32
 
33
33
  /**
34
- * 把管理员消息解析为指令并执行。service 需要提供:
35
- * stateView() / taskByIdentifier(identifier) / wechatReview(identifier, {decision, comment})
36
- * / wechatDispatch(key, message)(派单转发:按 key 把消息插入项目群聊并触发运行,
37
- * 未命中返回 null;service.js 接线时实现,职责与 reviewFromBot 一致但 actor 为微信用户)。
34
+ * 项目外 director 通道首触回执(DSHBOTS-258)。文案本地放:format.js 不在本卡写范围,
35
+ * 且只有这一处新文案,不强行迁移。
38
36
  */
39
- export async function handleCommand(service, rawText) {
37
+ function directorReceipt(bot) {
38
+ return `已直达【${bot.name}】专属工作区(项目外单聊),回复会推送到微信;发「/tr <key> <消息>」可显式转发进指定项目。`
39
+ }
40
+
41
+ /**
42
+ * 把管理员消息解析为指令并执行(DSHBOTS-249 前缀固定指令集)。
43
+ * 拦截顺序:①以 / 开头的固定指令(D-249,/tr 是唯一显式转发进项目的通道);
44
+ * ②答/批 <token> 前缀(DSHBOTS-215);③其余一切自由文本直达项目外 director
45
+ * 专属工作区(DSHBOTS-258 三次收紧:不再有 <key>: 派单转发与绑定项目路由,用户不直接进群)。
46
+ * 旧触发式指令(帮助/状态/验收/驳回/详情/q)已全部收编进 / 前缀指令集——触发词
47
+ * 与无前缀对话路径冲突(任何中文首词都可能被当成指令拦截),本卡一并收口移除。
48
+ * ctx(DSHBOTS-208,通道侧传入):{ boundKey: 当前绑定项目 key | null,
49
+ * bind(key): 路由成功后更新绑定, isAdmin: 发送者是否管理员(写操作 fail-closed:未显式 true 即拒) }。
50
+ * 权限分档(DSHBOTS-249 口径②):只读指令(/? /keys /bots /states /detail)对
51
+ * 群成员开放;写操作(/reject /tr)走 admin-peer 门(与 答/批 同口径)——通道侧
52
+ * 非管理员消息本就被忽略,ctx.isAdmin 供群聊场景复用同一命令层。
53
+ */
54
+ export async function handleCommand(service, rawText, ctx = null) {
40
55
  const body = String(rawText ?? '').trim()
41
- if (!body) return HELP
42
- const { verb, rest } = splitCommand(body)
43
- const normalized = verb.toLowerCase()
44
-
45
- if (normalized === '帮助' || normalized === 'help' || normalized === '?') return HELP
46
-
47
- if (normalized === '状态') {
48
- const state = service.stateView()
49
- const lines = []
50
- for (const project of state.projects ?? []) {
51
- const open = (project.tasks ?? []).filter(task => task.status !== 'done' && task.status !== 'canceled')
52
- if (!open.length) continue
53
- lines.push(`【${project.name || project.key}】`)
54
- for (const task of open.slice(0, 10)) {
55
- lines.push(` ${project.key}-${task.number} [${task.status}] ${task.title}`)
56
- }
57
- }
58
- return lines.length ? lines.join('\n') : '当前没有进行中的任务。'
56
+ if (!body) return helpText()
57
+
58
+ // DSHBOTS-249 固定指令:/ 前缀一律不进对话链路,未知 /xxx 回简短帮助提示。
59
+ if (body.startsWith('/')) return handleFixedCommand(service, body, ctx)
60
+
61
+ // DSHBOTS-215 问答回路:微信答复/审批按 token 路由回对应条目,绝不进普通对话。
62
+ // 仅在 service 实现了对应方法时拦截(测试桩未实现时按普通文本处理)。
63
+ const approval = APPROVAL_PATTERN.exec(body)
64
+ if (approval && typeof (service ).wechatDecideApproval === 'function') {
65
+ const decision = ['允许', 'allow'].includes(approval[2].toLowerCase()) ? 'allow' : 'reject'
66
+ return (service ).wechatDecideApproval(approval[1].toLowerCase(), decision, ctx?.boundKey ?? null)
67
+ }
68
+ const answer = ANSWER_PATTERN.exec(body)
69
+ if (answer && typeof (service ).wechatAnswerQuestion === 'function') {
70
+ const text = String(answer[2] ?? '').trim()
71
+ if (!text) return answerHelp()
72
+ return (service ).wechatAnswerQuestion(answer[1].toLowerCase(), text, ctx?.boundKey ?? null)
59
73
  }
60
74
 
61
- if (TASK_VERBS.includes(verb)) {
62
- const identifier = extractTaskId(rest)
63
- if (!identifier) return `任务号格式不对:正文里没有形如 web-3 的任务号。${HELP}`
64
- if (verb === '详情') {
65
- const view = service.taskViewByIdentifier(identifier)
66
- const lines = [`${identifier} [${view.status}] ${view.title}`]
67
- for (const comment of (view.comments ?? []).slice(-3)) {
68
- lines.push(`— ${comment.author_type}:${comment.author_id} ${comment.created_at}\n ${String(comment.body).slice(0, 200)}`)
69
- }
70
- return lines.join('\n')
71
- }
72
- const decision = verb === '验收' ? 'accept' : 'return'
73
- const comment = stripTaskId(rest, identifier)
74
- if (decision === 'return' && !comment) return '驳回必须带理由:驳回 web-3 理由文字。'
75
- const result = await service.wechatReview(identifier, { decision, comment })
76
- return result
75
+ // DSHBOTS-258 三次收紧口径:原 <key>: <消息> 派单转发不再路由进项目——除 /tr 显式
76
+ // 转发外,其余一切文本(含带 key 前缀的写法)一律按自由文本走 director 专属工作区。
77
+
78
+ // DSHBOTS-208/258 任意交互:自由文本永远直达项目外 director 专属工作区(不随
79
+ // direct_project_key 绑定或 active 项目数变化),首触回执、之后静默直达。
80
+ const chat = await service.wechatChat(null, body)
81
+ // 项目外 director 通道:首触回执说明去向,之后静默直达(回复由运行回程推送),
82
+ // 不回写项目绑定(通道是项目外的)。
83
+ if (chat?.director) {
84
+ return chat.firstContact ? directorReceipt(chat.director) : ''
85
+ }
86
+ if (chat?.error === 'no_director') {
87
+ // 导演通道异常(DSHBOTS-258):独立出口,不触发选项目提示链。
88
+ return noDirector()
89
+ }
90
+ if (!chat || chat.error === 'no_target') {
91
+ return needPickProject(service.stateView().projects ?? [])
92
+ }
93
+ if (chat.error === 'no_owner') return noOwner(chat.project)
94
+ return ''
95
+ }
96
+
97
+ /**
98
+ * / 前缀固定指令集(DSHBOTS-249)。只读指令对群成员开放;写操作(ADMIN_VERBS)
99
+ * 走 admin 门(与 答/批 同口径,分档依据见 handleCommand 注释)。
100
+ * 需要的 service 方法:stateView() / wechatProjectBots(key) /
101
+ * taskViewByIdentifier(identifier) / wechatReview(identifier, {decision, comment}) /
102
+ * wechatChat(key, message)(同 D-208 直达)。
103
+ */
104
+ async function handleFixedCommand(service, body, ctx) {
105
+ const slash = /^\/([a-z?]+)(?:\s+([\s\S]*))?$/i.exec(body)
106
+ if (!slash) return unknownCommand()
107
+ const verb = slash[1].toLowerCase()
108
+ const rest = String(slash[2] ?? '').trim()
109
+
110
+ // 写操作权限门(fail-closed):未显式 isAdmin=true 一律拒绝(只读指令不设门)。
111
+ if (ADMIN_VERBS.has(verb) && ctx?.isAdmin !== true) return adminDenied()
112
+
113
+ if (verb === '?') return helpText()
114
+
115
+ if (verb === 'keys') {
116
+ return keysList(service.stateView().projects ?? [], ctx?.boundKey ?? null)
77
117
  }
78
118
 
79
- if (normalized === 'q') {
80
- return projectListText(service.stateView().projects ?? [])
119
+ if (verb === 'bots') {
120
+ const boundKey = ctx?.boundKey ?? null
121
+ const projects = service.stateView().projects ?? []
122
+ const target = boundKey
123
+ ? projects.find(project => String(project.key).toUpperCase() === String(boundKey).toUpperCase())
124
+ : (projects.length === 1 ? projects[0] : null)
125
+ if (!target) return needPickProject(projects)
126
+ const bots = typeof (service ).wechatProjectBots === 'function'
127
+ ? (service ).wechatProjectBots(target.key)
128
+ : []
129
+ return botsList(bots)
81
130
  }
82
131
 
83
- const dispatch = DISPATCH_PATTERN.exec(body)
84
- if (dispatch) {
85
- const key = dispatch[1].toUpperCase()
86
- const message = dispatch[2].trim()
87
- const project = await service.wechatDispatch(key, message)
88
- if (!project) {
89
- return `没有找到项目 ${key}。${projectListText(service.stateView().projects ?? [])}`
90
- }
91
- return `已转发到【${project.name || project.key}】群聊,总监会安排处理。`
132
+ if (verb === 'states') {
133
+ return statesView(service.stateView().projects ?? [])
92
134
  }
93
135
 
94
- return `未识别的指令。${HELP}`
95
- }
136
+ if (verb === 'detail') {
137
+ const identifier = extractTaskId(rest)
138
+ if (!identifier) return badTaskId()
139
+ return taskDetail(service.taskViewByIdentifier(identifier))
140
+ }
96
141
 
97
- /** 拆出指令词与其余正文:任务类指令允许「验收web-3」这种无空格写法。 */
98
- function splitCommand(body) {
99
- for (const verb of TASK_VERBS) {
100
- if (body === verb || body.startsWith(verb)) return { verb, rest: body.slice(verb.length).trim() }
142
+ if (verb === 'reject') {
143
+ const identifier = extractTaskId(rest)
144
+ if (!identifier) return badTaskId()
145
+ const comment = stripTaskId(rest, identifier)
146
+ if (!comment) return needReturnReason()
147
+ return service.wechatReview(identifier, { decision: 'return', comment })
101
148
  }
102
- const parts = body.split(/\s+/)
103
- return { verb: parts[0], rest: parts.slice(1).join(' ').trim() }
104
- }
105
149
 
106
- /** q 列表与派单未命中提示共用的可派单项目清单文案。 */
107
- function projectListText(projects) {
108
- const list = projects ?? []
109
- if (!list.length) return '当前没有可派单的项目。'
110
- const lines = ['可派单的项目:']
111
- for (const project of list) {
112
- lines.push(` ${project.key}${project.name && project.name !== project.key ? ` ${project.name}` : ''}`)
150
+ if (verb === 'tr') {
151
+ const match = TR_PATTERN.exec(rest)
152
+ if (!match) return trHelp()
153
+ const key = match[1].toUpperCase()
154
+ const message = match[2].trim()
155
+ const chat = await service.wechatChat(key, message)
156
+ if (!chat) return projectNotFound(key, service.stateView().projects ?? [])
157
+ if (chat.error === 'no_owner') return noOwner(chat.project)
158
+ ctx?.bind?.(chat.project.key)
159
+ return connectedReceipt(chat.project, 'dispatch')
113
160
  }
114
- return lines.join('\n')
161
+
162
+ return unknownCommand()
115
163
  }
116
164
 
117
165
  /** 从正文里提取任务号(不强制空格分隔);没有合法任务号时返回 null。 */