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.
- package/README.md +12 -136
- package/docs/README.zh.md +15 -139
- package/docs/assets/channel-redesign.png +0 -0
- package/docs/assets/global-config-dark.png +0 -0
- package/docs/assets/global-config-light.png +0 -0
- package/docs/assets/global-config-light.zh.png +0 -0
- package/docs/assets/global-config-redesign.png +0 -0
- package/docs/assets/secrets-redesign.png +0 -0
- package/docs/assets/tasks.png +0 -0
- package/docs/assets/tasks.zh.png +0 -0
- package/docs/assets/usage-redesign-global.png +0 -0
- package/docs/assets/usage.png +0 -0
- package/docs/assets/usage.zh.png +0 -0
- package/package.json +17 -5
- package/scripts/doctor.mjs +4 -4
- package/src/api.js +6 -3
- package/src/botmsg.js +1 -1
- package/src/config.js +18 -8
- package/src/db-migrations.js +76 -9
- package/src/db.js +28 -2
- package/src/http.js +22 -3
- package/src/paths.js +32 -1
- package/src/pricing.js +2 -2
- package/src/runtime.js +1 -1
- package/src/secrets.js +4 -4
- package/src/service.js +10 -5
- package/src/services/approvals.js +109 -24
- package/src/services/bot-quota.js +242 -0
- package/src/services/bots.js +35 -6
- package/src/services/chat.js +15 -9
- package/src/services/core.js +33 -5
- package/src/services/hygiene.js +8 -4
- package/src/services/locale.js +17 -0
- package/src/services/memory.js +112 -1
- package/src/services/message-images.js +3 -3
- package/src/services/notify.js +99 -0
- package/src/services/projects.js +119 -10
- package/src/services/proposals.js +2 -3
- package/src/services/questions.js +75 -32
- package/src/services/review-watchdog.js +261 -30
- package/src/services/run-finish.js +119 -7
- package/src/services/runs.js +42 -13
- package/src/services/runtime/lifecycle.js +3 -1
- package/src/services/runtime/model-restore.js +5 -5
- package/src/services/runtime/prompt.js +106 -45
- package/src/services/runtime/session.js +38 -14
- package/src/services/runtime/trajectory.js +1 -1
- package/src/services/scheduler.js +139 -13
- package/src/services/secrets.js +1 -1
- package/src/services/system.js +23 -6
- package/src/services/task-notify.js +49 -7
- package/src/services/task-stage.js +4 -0
- package/src/services/tasks.js +121 -12
- package/src/services/terminal.js +2 -2
- package/src/services/vision-proxy.js +3 -3
- package/src/services/wechat.js +228 -7
- package/src/services/workspace-groups.js +4 -3
- package/src/skill-parse.js +1 -1
- package/src/skills.js +1 -1
- package/src/tools.js +275 -6
- package/src/updater.js +52 -0
- package/src/usage-reconcile.js +1 -1
- package/src/usage.js +52 -11
- package/src/wechat/channel.js +14 -20
- package/src/wechat/commands.js +129 -81
- package/src/wechat/format.js +247 -0
- package/src/wechat/store.js +30 -2
- package/ui/app.js +56 -52
- package/ui/i18n/en/chat.js +140 -0
- package/ui/i18n/en/common.js +189 -0
- package/ui/i18n/en/nav.js +90 -0
- package/ui/i18n/en/settings.js +354 -0
- package/ui/i18n/en/tasks.js +232 -0
- package/ui/i18n/en/usage.js +141 -0
- package/ui/i18n/en/wechat.js +24 -0
- package/ui/i18n/en.js +17 -237
- package/ui/i18n/zh/chat.js +140 -0
- package/ui/i18n/zh/common.js +189 -0
- package/ui/i18n/zh/nav.js +90 -0
- package/ui/i18n/zh/settings.js +354 -0
- package/ui/i18n/zh/tasks.js +232 -0
- package/ui/i18n/zh/usage.js +141 -0
- package/ui/i18n/zh/wechat.js +24 -0
- package/ui/i18n/zh.js +17 -236
- package/ui/modules/api.js +4 -3
- package/ui/modules/bot-quota.js +27 -0
- package/ui/modules/cards.js +96 -58
- package/ui/modules/chat.js +28 -30
- package/ui/modules/composer.js +41 -37
- package/ui/modules/dom-morph.js +292 -0
- package/ui/modules/events-board.js +22 -22
- package/ui/modules/events-click.js +100 -68
- package/ui/modules/events-misc.js +34 -34
- package/ui/modules/events-submit.js +28 -28
- package/ui/modules/global-pages.js +127 -116
- package/ui/modules/i18n.js +0 -5
- package/ui/modules/icons.js +0 -1
- package/ui/modules/markdown.js +1 -1
- package/ui/modules/modal-forms.js +195 -202
- package/ui/modules/modal-layer.js +6 -9
- package/ui/modules/page-shell.js +62 -0
- package/ui/modules/settings.js +211 -198
- package/ui/modules/solo-archive.js +0 -4
- package/ui/modules/state.js +57 -50
- package/ui/modules/tasks.js +168 -171
- package/ui/modules/typing-linger.js +1 -4
- package/ui/modules/usage.js +65 -78
- package/ui/modules/util.js +92 -25
- package/ui/styles/avatars.css +14 -0
- package/ui/styles/cards.css +49 -0
- package/ui/styles/chat-cards.css +17 -21
- package/ui/styles/global-config.css +59 -2
- package/ui/styles/modal.css +13 -0
- package/ui/styles/usage.css +3 -61
- package/CONTRIBUTING.md +0 -20
- package/docs/assets/usage-dark.png +0 -0
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
// DSHBOTS-116 群聊提问:宿主 user-questions/request waterfall 的插件侧应答器。
|
|
2
|
-
//
|
|
3
|
-
//
|
|
2
|
+
// 认领 session_bindings 命中的 bot 会话:绑定到项目的走群聊卡片;绑定为单聊(kind='solo'、
|
|
3
|
+
// project_id 为空)的走单聊卡片(DSHBOTS-218);其余 next() 透传(人类会话提问继续走原生界面)。
|
|
4
|
+
// 应答权仅用户(type=user)持有,bot 一律 forbidden 不能自答;pending 之外拒绝重复应答,动作写审计。
|
|
4
5
|
// DSHBOTS-177:宿主 timed 前台等待到期(ASK_TIMED_OUT abort)不杀卡——条目保持可答至插件
|
|
5
6
|
// questionTimeoutMs 窗口,窗口内迟到作答经宿主 userQuestions.answer 回投原 agent;其余 abort 立即失效。
|
|
6
7
|
// 注意:本域自管迁移(db.js 已贴 800 行上限,一行不加),手法与 approvals.js 一致。
|
|
7
8
|
import { badRequest, conflict, forbidden, notFound } from '../errors.js'
|
|
8
9
|
import { id, jsonParse, nowIso, text as textValue } from '../util.js'
|
|
10
|
+
import { columnNotNull, rebuildTable } from '../db-migrations.js'
|
|
9
11
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
+
// project_id 可空:单聊会话没有项目归属(DSHBOTS-218),卡片锚点改落 solo_messages。
|
|
13
|
+
const QUESTIONS_TABLE_DDL = `
|
|
12
14
|
id TEXT PRIMARY KEY,
|
|
13
|
-
project_id TEXT
|
|
15
|
+
project_id TEXT REFERENCES projects(id) ON DELETE CASCADE,
|
|
14
16
|
run_id TEXT,
|
|
15
17
|
bot_id TEXT NOT NULL,
|
|
16
18
|
session_id TEXT,
|
|
@@ -22,7 +24,9 @@ CREATE TABLE IF NOT EXISTS questions (
|
|
|
22
24
|
created_at TEXT NOT NULL,
|
|
23
25
|
expires_at TEXT NOT NULL,
|
|
24
26
|
ended_at TEXT
|
|
25
|
-
|
|
27
|
+
`
|
|
28
|
+
const QUESTIONS_DDL = `
|
|
29
|
+
CREATE TABLE IF NOT EXISTS questions (${QUESTIONS_TABLE_DDL});
|
|
26
30
|
CREATE INDEX IF NOT EXISTS questions_status_idx ON questions(status, created_at);
|
|
27
31
|
CREATE INDEX IF NOT EXISTS questions_project_idx ON questions(project_id, created_at);
|
|
28
32
|
`
|
|
@@ -31,6 +35,12 @@ CREATE INDEX IF NOT EXISTS questions_project_idx ON questions(project_id, create
|
|
|
31
35
|
// 重启清理也在此——宿主侧请求随进程消失,不可能再被应答,库里残留的 pending 一律置 timeout。
|
|
32
36
|
export function ensureQuestionSchema(store) {
|
|
33
37
|
store.exec(QUESTIONS_DDL)
|
|
38
|
+
// 旧库 questions.project_id 是 NOT NULL(群聊专用时期),单聊会话无处归属:重建放宽为可空。
|
|
39
|
+
if (columnNotNull(store.db, 'questions', 'project_id')) {
|
|
40
|
+
rebuildTable(store.db, 'questions', `CREATE TABLE questions (${QUESTIONS_TABLE_DDL})`)
|
|
41
|
+
store.exec('CREATE INDEX IF NOT EXISTS questions_status_idx ON questions(status, created_at)')
|
|
42
|
+
store.exec('CREATE INDEX IF NOT EXISTS questions_project_idx ON questions(project_id, created_at)')
|
|
43
|
+
}
|
|
34
44
|
const messageColumns = store.all('PRAGMA table_info(messages)').map(column => column.name)
|
|
35
45
|
if (!messageColumns.includes('question_id')) {
|
|
36
46
|
store.exec('ALTER TABLE messages ADD COLUMN question_id TEXT')
|
|
@@ -52,7 +62,7 @@ export function ensureQuestionSchema(store) {
|
|
|
52
62
|
// 问题条目清洗:文案统一过密钥掩码(会进群聊与 bot 可见范围),并夹取长度防单条撑爆卡片。
|
|
53
63
|
// intent 只保留 plan-review 的展示字段;未知 intent 一律按通用选项列表渲染(协议允许)。
|
|
54
64
|
function cleanQuestionItem(item) {
|
|
55
|
-
const cleaned
|
|
65
|
+
const cleaned = {
|
|
56
66
|
id: String(item?.id ?? '').slice(0, 100),
|
|
57
67
|
question: textValue(item?.question, 4_000),
|
|
58
68
|
}
|
|
@@ -60,7 +70,7 @@ function cleanQuestionItem(item) {
|
|
|
60
70
|
if (item?.header) cleaned.header = textValue(item.header, 200)
|
|
61
71
|
if (Array.isArray(item?.options)) {
|
|
62
72
|
cleaned.options = item.options.slice(0, 20).map(option => {
|
|
63
|
-
const row
|
|
73
|
+
const row = { label: textValue(option?.label, 200) }
|
|
64
74
|
if (option?.description) row.description = textValue(option.description, 1_000)
|
|
65
75
|
return row
|
|
66
76
|
})
|
|
@@ -92,10 +102,12 @@ export const questionsMethods = {
|
|
|
92
102
|
}, 'dsh-team: user question request binding')
|
|
93
103
|
},
|
|
94
104
|
|
|
95
|
-
// waterfall 监听器:DSHBOTS-190
|
|
96
|
-
// 未绑定会话无法归因,保持透传原生界面;命中 bot
|
|
105
|
+
// waterfall 监听器:DSHBOTS-190 起,项目会话的提问能力收紧为项目总监(owner bot)专属。
|
|
106
|
+
// 未绑定会话无法归因,保持透传原生界面;命中 bot 会话一律先过归属闸门,不再透传——
|
|
97
107
|
// 透传会把提问落回宿主面板,收紧形同虚设。拒绝以 rejected promise 回宿主,错误文案
|
|
98
108
|
// 即调用 bot 收到的 ask_user_question 工具结果。
|
|
109
|
+
// DSHBOTS-218:单聊会话(kind='solo')由工作台单聊卡片承接——单聊里 bot 就是对话方,
|
|
110
|
+
// 没有群聊可发,无需总监归属闸门;bot 间私信(kind='dm')没有人类作答方,照旧透传。
|
|
99
111
|
async handleQuestionRequest(req, next) {
|
|
100
112
|
const sessionId = req?.agent?.session?.id
|
|
101
113
|
// bindingOfSession 在 DshRuntime 原型上,服务层拿不到 this 绑定,这里直查同款 SQL。
|
|
@@ -104,21 +116,17 @@ export const questionsMethods = {
|
|
|
104
116
|
: undefined
|
|
105
117
|
if (!binding) return next()
|
|
106
118
|
|
|
107
|
-
if (!binding.project_id) {
|
|
108
|
-
return Promise.reject(new Error(
|
|
109
|
-
'ask_user_question 仅限项目总监 Bot 在项目群中使用;当前是单聊会话。如需向用户提问,请在项目群中由总监 Bot 发起。',
|
|
110
|
-
))
|
|
111
|
-
}
|
|
112
|
-
|
|
113
119
|
const store = this.store
|
|
120
|
+
const isSolo = binding.kind === 'solo' && !binding.project_id
|
|
121
|
+
if (!binding.project_id && !isSolo) return next()
|
|
114
122
|
const bot = store.get('SELECT * FROM bots WHERE id = ?', binding.bot_id)
|
|
115
|
-
const project = store.get('SELECT * FROM projects WHERE id = ?', binding.project_id)
|
|
116
|
-
if (!bot || !project) {
|
|
123
|
+
const project = isSolo ? null : store.get('SELECT * FROM projects WHERE id = ?', binding.project_id)
|
|
124
|
+
if (!bot || (!isSolo && !project)) {
|
|
117
125
|
return Promise.reject(new Error(
|
|
118
|
-
'ask_user_question
|
|
126
|
+
'ask_user_question 会话绑定失效,无法确认会话归属;请在项目群中由总监 Bot 发起提问,或与 Bot 单聊时重试。',
|
|
119
127
|
))
|
|
120
128
|
}
|
|
121
|
-
if (project.owner_bot_id !== binding.bot_id) {
|
|
129
|
+
if (!isSolo && project.owner_bot_id !== binding.bot_id) {
|
|
122
130
|
return Promise.reject(new Error(
|
|
123
131
|
`ask_user_question 仅限项目总监 Bot 使用;${bot.name} 不是本项目总监。需要用户决策时,请把问题交给总监 Bot 发起。`,
|
|
124
132
|
))
|
|
@@ -149,7 +157,7 @@ export const questionsMethods = {
|
|
|
149
157
|
store.run(
|
|
150
158
|
`INSERT INTO questions(id, project_id, run_id, bot_id, session_id, call_id, questions, status, created_at, expires_at)
|
|
151
159
|
VALUES (?, ?, ?, ?, ?, ?, ?, 'pending', ?, ?)`,
|
|
152
|
-
questionId, project
|
|
160
|
+
questionId, project?.id ?? null, run?.id ?? null, bot.id, sessionId, callId,
|
|
153
161
|
JSON.stringify(masked), createdAt, new Date(Date.parse(createdAt) + timeoutMs).toISOString(),
|
|
154
162
|
)
|
|
155
163
|
|
|
@@ -158,14 +166,33 @@ export const questionsMethods = {
|
|
|
158
166
|
sessionId, callId, count: masked.length,
|
|
159
167
|
})
|
|
160
168
|
|
|
161
|
-
//
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
+
// 卡片锚点:群聊落 messages(kind=question),单聊落 solo_messages(DSHBOTS-218)。
|
|
170
|
+
// 状态渲染时查 questions 表,消息体只是纯文本兜底,不承载状态。
|
|
171
|
+
const anchorBody = `【提问】${bot.name} 发起提问(${masked.length} 个问题)`
|
|
172
|
+
if (isSolo) {
|
|
173
|
+
this.insertSoloMessage?.({
|
|
174
|
+
botId: bot.id, senderType: 'system', senderId: 'system',
|
|
175
|
+
body: anchorBody, runId: run?.id ?? null, createdAt, kind: 'question', questionId,
|
|
176
|
+
})
|
|
177
|
+
} else {
|
|
178
|
+
const group = this.groupOf(project.id)
|
|
179
|
+
store.run(
|
|
180
|
+
`INSERT INTO messages(id, project_id, group_chat_id, sender_type, sender_id, body, mentions_json, kind, question_id, created_at)
|
|
181
|
+
VALUES (?, ?, ?, 'system', ?, ?, '[]', 'question', ?, ?)`,
|
|
182
|
+
id('msg'), project.id, group?.id ?? null, bot.id, anchorBody, questionId, createdAt,
|
|
183
|
+
)
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
// DSHBOTS-215 问答回路:提问转发微信管理员(通道可用时)。只推纯文本镜像,
|
|
187
|
+
// 状态仍由群卡片/工作台承载;管理员答复经「答 <token> …」路由回本条目。
|
|
188
|
+
// 单聊没有项目语境,不转发(微信侧只服务项目管理者)。
|
|
189
|
+
if (project) {
|
|
190
|
+
try {
|
|
191
|
+
this.wechatQuestion?.(project, { id: questionId, bot_name: bot.name }, masked)
|
|
192
|
+
} catch (error ) {
|
|
193
|
+
this.logger?.warn?.('dsh-team: 微信提问转发失败: %s', error?.message ?? error)
|
|
194
|
+
}
|
|
195
|
+
}
|
|
169
196
|
|
|
170
197
|
return new Promise((resolve, reject) => {
|
|
171
198
|
this.questionPending ??= new Map()
|
|
@@ -239,7 +266,7 @@ export const questionsMethods = {
|
|
|
239
266
|
const accepted = await userQuestions.answer(agent, callId, hostAnswer)
|
|
240
267
|
if (accepted !== true) throw new Error('question no longer answerable at host')
|
|
241
268
|
this.audit({ type: 'system', id: 'system' }, 'question.steer', 'question', questionId, { callId })
|
|
242
|
-
} catch (error) {
|
|
269
|
+
} catch (error ) {
|
|
243
270
|
this.audit({ type: 'system', id: 'system' }, 'question.steer_failed', 'question', questionId, {
|
|
244
271
|
callId,
|
|
245
272
|
reason: error?.message ?? String(error),
|
|
@@ -263,7 +290,7 @@ export const questionsMethods = {
|
|
|
263
290
|
.map(item => [String(item?.id), item]),
|
|
264
291
|
)
|
|
265
292
|
const answers = items.map(item => {
|
|
266
|
-
const answer = given.get(String(item.id))
|
|
293
|
+
const answer = given.get(String(item.id))
|
|
267
294
|
const selected = (Array.isArray(answer?.selected) ? answer.selected : [])
|
|
268
295
|
.map(value => String(value)).filter(Boolean).slice(0, 20)
|
|
269
296
|
const custom = answer?.custom ? String(answer.custom).slice(0, 2_000) : undefined
|
|
@@ -289,6 +316,8 @@ export const questionsMethods = {
|
|
|
289
316
|
questions: jsonParse(row.questions, []),
|
|
290
317
|
answer: jsonParse(row.answer, null),
|
|
291
318
|
botName: bot?.name ?? 'Bot',
|
|
319
|
+
// 会话归属(DSHBOTS-218):单聊提问没有项目,UI 据此显示来源列并决定跳转目标。
|
|
320
|
+
scope: row.project_id ? 'project' : 'solo',
|
|
292
321
|
remainingMs: row.status === 'pending'
|
|
293
322
|
? Math.max(0, (Number.isFinite(expiresAt) ? expiresAt : Date.parse(row.created_at) + this.config.questionTimeoutMs) - Date.now())
|
|
294
323
|
: 0,
|
|
@@ -305,8 +334,19 @@ export const questionsMethods = {
|
|
|
305
334
|
return rows.map(row => this.questionView(row))
|
|
306
335
|
},
|
|
307
336
|
|
|
337
|
+
// 单聊视图的提问条目(DSHBOTS-218):口径与 questionsForProject 一致,按 bot 取项目外条目。
|
|
338
|
+
questionsForBot(botId) {
|
|
339
|
+
const rows = this.store.all(
|
|
340
|
+
`SELECT * FROM questions WHERE project_id IS NULL AND bot_id = ?
|
|
341
|
+
ORDER BY CASE status WHEN 'pending' THEN 0 ELSE 1 END, created_at DESC LIMIT 30`,
|
|
342
|
+
botId,
|
|
343
|
+
)
|
|
344
|
+
return rows.map(row => this.questionView(row))
|
|
345
|
+
},
|
|
346
|
+
|
|
308
347
|
// 全局待答视图:跨项目聚合 status='pending',按创建时间倒序。
|
|
309
348
|
// count 是全库 pending 总数(徽标口径,已决一律不计),items 最多 50 条供顶部入口列明细。
|
|
349
|
+
// scope 区分项目群聊 / 单聊(DSHBOTS-218):顶部入口据此决定点击后跳哪个会话。
|
|
310
350
|
questionsPending(limit = 50) {
|
|
311
351
|
const rows = this.store.all(
|
|
312
352
|
`SELECT q.*, p.name AS project_name FROM questions q LEFT JOIN projects p ON p.id = q.project_id
|
|
@@ -316,7 +356,10 @@ export const questionsMethods = {
|
|
|
316
356
|
const count = Number(this.store.get("SELECT COUNT(*) AS count FROM questions WHERE status = 'pending'")?.count ?? 0)
|
|
317
357
|
return {
|
|
318
358
|
count,
|
|
319
|
-
items: rows.map(row => ({
|
|
359
|
+
items: rows.map(row => ({
|
|
360
|
+
...this.questionView(row),
|
|
361
|
+
projectName: row.project_name ?? '',
|
|
362
|
+
})),
|
|
320
363
|
}
|
|
321
364
|
},
|
|
322
365
|
}
|
|
@@ -1,14 +1,29 @@
|
|
|
1
|
-
//
|
|
2
|
-
// 背景:D-191/192 曾因「核验已闭环但 owner
|
|
3
|
-
//
|
|
4
|
-
//
|
|
5
|
-
|
|
1
|
+
// 验收滞留守门 + 三档收口规则引擎(DSHBOTS-194 检测/提醒 → DSHBOTS-235 程序化收口)。
|
|
2
|
+
// 背景:D-191/192 曾因「核验已闭环但 owner 未收口」滞留待验收面板被用户点名;D-194 只做
|
|
3
|
+
// 检测+提醒,收口靠模型自觉。本守门把收口做成规则引擎:scheduler 每轮 tick 调
|
|
4
|
+
// runReviewWatchdog,阈值每轮现算、逐卡容错(单卡失败不拖垮整轮扫描)。
|
|
5
|
+
//
|
|
6
|
+
// 三档判定(证据链不全一律落到 C 只提醒,自动 accept 是强动作):
|
|
7
|
+
// A 可验证交付:交付报告(最近一次成功 task 运行的 output)含 commit,且该 commit
|
|
8
|
+
// 已验证在项目 dev 分支上,且报告含「全量/全部测试通过」证据 → 自动 accept;
|
|
9
|
+
// B 交付方无响应:最近一次 task 运行已中止/死亡(failed/canceled)且此后无进展 → 自动 return;
|
|
10
|
+
// 失败 run 之后出现更新的「建议 accept」核验结论时降级 C 仅提醒(时序上较新的合格证据
|
|
11
|
+
// 不被自动退回盖过,但也绝不因此自动 accept);
|
|
12
|
+
// C 不可判定:仅系统提醒(owner_bot 卡同时排总监验收运行,H1),滞留达 2×阈值二次催办升级语气(H2)。
|
|
13
|
+
import { execFileSync } from 'node:child_process'
|
|
14
|
+
import { existsSync } from 'node:fs'
|
|
15
|
+
import { join } from 'node:path'
|
|
16
|
+
import { bool, effectiveReviewIdleMinutes, REVIEW_AUTO_CLOSE_KEY, REVIEW_ESCALATE_KEY, REVIEW_ESCALATE_RANGE } from '../config.js'
|
|
17
|
+
import { messageLocale, systemAlertLabel } from './locale.js'
|
|
6
18
|
|
|
7
|
-
//
|
|
8
|
-
//
|
|
9
|
-
//
|
|
19
|
+
// 单卡去重/判定表(settings 键,JSON map):{ taskId: { tier, verdict, basis, at, action? } }。
|
|
20
|
+
// tier = 已提醒到的层级(1 首次、2 二次催办),同层级不重复提醒;卡离开 in_review 即摘除,
|
|
21
|
+
// 回到 in_review 重新获得提醒资格。历史部署的 true 值按 tier 1 容忍。task id 全局唯一,
|
|
22
|
+
// 无需按项目分键。面板经 reviewIdleView 读取同表展示每张 in_review 卡的判定与依据。
|
|
10
23
|
export const REVIEW_IDLE_ALERTED_KEY = 'review_idle_alerted'
|
|
11
24
|
|
|
25
|
+
export const SYSTEM_ACTOR = { type: 'system', id: 'system' }
|
|
26
|
+
|
|
12
27
|
// 滞留锚点 = max(tasks.updated_at, 最新 task_comments.created_at, 最新关联 run 活动时间)。
|
|
13
28
|
// 三者任一更新都视为「有活动」,静置时长从锚点起算;空值跳过,全空返回 null(无法判定)。
|
|
14
29
|
export function latestAnchorMs({ updated_at = null, last_comment_at = null, last_run_at = null } = {}) {
|
|
@@ -22,47 +37,263 @@ export function latestAnchorMs({ updated_at = null, last_comment_at = null, last
|
|
|
22
37
|
return latest
|
|
23
38
|
}
|
|
24
39
|
|
|
25
|
-
//
|
|
26
|
-
|
|
27
|
-
//
|
|
40
|
+
// 交付报告里的 commit 候选(7–40 位十六进制);误命中(普通单词)会在 git 验证处自然淘汰。
|
|
41
|
+
const COMMIT_CANDIDATE_RE = /\b[0-9a-f]{7,40}\b/g
|
|
42
|
+
// 测试绿证据:关键词式(全量/全部/所有 测试/用例 …… 通过/全绿/pass)或计分式(N/N …… 通过)。
|
|
43
|
+
const TESTS_GREEN_RE = /(?:全量|全部|所有|all)\s*(?:测试|用例|tests?)[^\n]{0,80}?(?:通过|全绿|绿|pass(?:ed)?)|(\d+)\s*\/\s*\1[^\n]{0,40}?(?:通过|全绿|绿|pass(?:ed)?)/i
|
|
44
|
+
const COMMIT_VERIFY_LIMIT = 5
|
|
45
|
+
|
|
46
|
+
// 核验结论是否明确建议 accept(A 档核验证据链同口径;混入「建议 return」时不算)。
|
|
47
|
+
const advisesAccept = (conclusion ) =>
|
|
48
|
+
conclusion.includes('建议 accept') && !conclusion.includes('建议 return')
|
|
49
|
+
|
|
50
|
+
// later 是否在时间上严格晚于 earlier(任一端缺失/不可解析按 false:降级只在正证据下发生,
|
|
51
|
+
// 时间序无法判定时保持原判定,不因缺时间戳而放宽或收紧)。
|
|
52
|
+
const strictlyAfter = (later, earlier) => {
|
|
53
|
+
const laterMs = later ? new Date(later).getTime() : NaN
|
|
54
|
+
const earlierMs = earlier ? new Date(earlier).getTime() : NaN
|
|
55
|
+
return Number.isFinite(laterMs) && Number.isFinite(earlierMs) && laterMs > earlierMs
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
// 三档判定(纯函数,证据注入便于测试):
|
|
59
|
+
// latestTaskRun / latestTaskRunAt:该卡最近一次 task 运行及其活动时间(SUPERSEDED 清理
|
|
60
|
+
// 标记除外);report:最近一次成功 task 运行的 output(交付报告);reviewConclusion /
|
|
61
|
+
// reviewConcludedAt:最近一次成功核验委派运行的结论及其结束时间(以「子代理核验:」开头、
|
|
62
|
+
// 含「建议 accept/return」,用户拍板:核验结论+证据链是自动收口的合法证据源);
|
|
63
|
+
// verifyCommitOnDev:sha → 是否已在 dev 上(null = 无法验证)。
|
|
64
|
+
// A 的两条证据链:①交付报告 commit 已验证在 dev + 测试绿;②子代理核验结论明确建议 accept。
|
|
65
|
+
export function classifyDelivery({ report = '', latestTaskRun = null, latestTaskRunAt = null, reviewConclusion = '', reviewConcludedAt = null, verifyCommitOnDev = null }) {
|
|
66
|
+
if (latestTaskRun && ['failed', 'canceled'].includes(latestTaskRun.status)) {
|
|
67
|
+
const why = latestTaskRun.status === 'failed' ? '失败' : '已中止'
|
|
68
|
+
// B 压 A 时序降级:失败 run 之后出现更新的「建议 accept」核验结论,说明其后实际发生了
|
|
69
|
+
// 被认可的进展,B 档「此后无进展」前提被推翻——降级 C 仅提醒,不自动 return 盖过较新
|
|
70
|
+
// 的合格证据;方向保守,绝不因此自动 accept,裁决交还 owner。
|
|
71
|
+
if (advisesAccept(reviewConclusion) && strictlyAfter(reviewConcludedAt, latestTaskRunAt)) {
|
|
72
|
+
return { verdict: 'C', basis: `交付方运行${why}后有更新的核验结论建议 accept,时序冲突不自动退回(仅提醒)` }
|
|
73
|
+
}
|
|
74
|
+
const code = latestTaskRun.error_code ? `(${latestTaskRun.error_code})` : ''
|
|
75
|
+
return { verdict: 'B', basis: `交付方运行${why}${code}后无进展` }
|
|
76
|
+
}
|
|
77
|
+
if (advisesAccept(reviewConclusion)) {
|
|
78
|
+
return { verdict: 'A', basis: `子代理核验结论建议 accept(依据=核验证据)` }
|
|
79
|
+
}
|
|
80
|
+
if (latestTaskRun?.status === 'succeeded' && report) {
|
|
81
|
+
const candidates = [...new Set(report.match(COMMIT_CANDIDATE_RE) ?? [])].slice(0, COMMIT_VERIFY_LIMIT)
|
|
82
|
+
const testsGreen = TESTS_GREEN_RE.test(report)
|
|
83
|
+
const onDev = verifyCommitOnDev ? candidates.find(sha => verifyCommitOnDev(sha)) : null
|
|
84
|
+
if (onDev && testsGreen) {
|
|
85
|
+
return { verdict: 'A', basis: `交付报告含 commit ${onDev.slice(0, 7)}(已验证在 dev)与测试通过证据(依据=交付证据)` }
|
|
86
|
+
}
|
|
87
|
+
const missing = []
|
|
88
|
+
if (!candidates.length) missing.push('报告未含 commit')
|
|
89
|
+
else if (!onDev) missing.push(verifyCommitOnDev ? 'commit 未验证在 dev' : '无法验证 commit 是否在 dev')
|
|
90
|
+
if (!testsGreen) missing.push('缺测试通过证据')
|
|
91
|
+
if (reviewConclusion.includes('建议 return')) missing.push('子代理核验建议 return')
|
|
92
|
+
return { verdict: 'C', basis: `证据不全:${missing.join('、')}` }
|
|
93
|
+
}
|
|
94
|
+
return { verdict: 'C', basis: reviewConclusion.includes('建议 return')
|
|
95
|
+
? '子代理核验建议 return,裁决归 owner(仅提醒)'
|
|
96
|
+
: '无成功交付运行的报告可判定' }
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
// commit-on-dev 验证器:项目生产目录是 git 仓库才可用(merge-base --is-ancestor),
|
|
100
|
+
// 任何失败(无 dev 分支 / sha 无效 / git 不可用)按「未验证」处理,绝不放宽到 A。
|
|
101
|
+
export function commitOnDevVerifier(dir) {
|
|
102
|
+
if (!dir || !existsSync(join(dir, '.git'))) return null
|
|
103
|
+
return (sha) => {
|
|
104
|
+
try {
|
|
105
|
+
execFileSync('git', ['-C', dir, 'merge-base', '--is-ancestor', sha, 'dev'], { stdio: 'ignore' })
|
|
106
|
+
return true
|
|
107
|
+
} catch {
|
|
108
|
+
return false
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
// 二次催办倍数:保存值非法/未保存回退默认 2(≥2 才构成「升级」,上限 10 防误配成天级)。
|
|
114
|
+
export function effectiveReviewEscalateMultiple(getSetting) {
|
|
115
|
+
const [min, max] = REVIEW_ESCALATE_RANGE
|
|
116
|
+
const raw = Number.parseInt(String(getSetting?.(REVIEW_ESCALATE_KEY) ?? ''), 10)
|
|
117
|
+
return Number.isFinite(raw) && raw >= min && raw <= max ? raw : min
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
// 自动收口总开关:默认开(程序化收口是本卡产品目标),0 = 关闭自动 accept/return 只提醒。
|
|
121
|
+
export function reviewAutoCloseEnabled(service) {
|
|
122
|
+
return bool(service.store.setting(REVIEW_AUTO_CLOSE_KEY, '1'), true)
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
const alertedTier = (value) => {
|
|
126
|
+
if (value === true) return 1
|
|
127
|
+
return value && Number.isFinite(value.tier) ? value.tier : 0
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
const judgeCard = (service, row) => {
|
|
131
|
+
const latestTaskRun = service.store.get(
|
|
132
|
+
`SELECT id, status, error_code, COALESCE(ended_at, queued_at) AS last_activity_at
|
|
133
|
+
FROM runs WHERE task_id = ? AND kind = 'task'
|
|
134
|
+
AND COALESCE(error_code, '') <> 'SUPERSEDED'
|
|
135
|
+
ORDER BY COALESCE(ended_at, queued_at) DESC LIMIT 1`,
|
|
136
|
+
row.id,
|
|
137
|
+
)
|
|
138
|
+
const delivery = service.store.get(
|
|
139
|
+
`SELECT output FROM runs WHERE task_id = ? AND kind = 'task' AND status = 'succeeded'
|
|
140
|
+
AND COALESCE(error_code, '') <> 'SUPERSEDED'
|
|
141
|
+
ORDER BY ended_at DESC LIMIT 1`,
|
|
142
|
+
row.id,
|
|
143
|
+
)
|
|
144
|
+
// 子代理核验结论(DSHBOTS-235 用户拍板):最近一次成功核验委派运行的 output(含结束时间,
|
|
145
|
+
// 供 B 压 A 时序降级比较「建议 accept」是否晚于失败 run)。
|
|
146
|
+
const review = service.store.get(
|
|
147
|
+
`SELECT output, ended_at FROM runs WHERE task_id = ? AND trigger_type = 'review_delegate' AND status = 'succeeded'
|
|
148
|
+
ORDER BY ended_at DESC LIMIT 1`,
|
|
149
|
+
row.id,
|
|
150
|
+
)
|
|
151
|
+
const report = delivery?.output ?? ''
|
|
152
|
+
const verify = report
|
|
153
|
+
? commitOnDevVerifier(service.projectWorkDir(service.projectRow(row.project_id)))
|
|
154
|
+
: null
|
|
155
|
+
return classifyDelivery({
|
|
156
|
+
report,
|
|
157
|
+
latestTaskRun,
|
|
158
|
+
latestTaskRunAt: latestTaskRun?.last_activity_at ?? null,
|
|
159
|
+
reviewConclusion: review?.output ?? '',
|
|
160
|
+
reviewConcludedAt: review?.ended_at ?? null,
|
|
161
|
+
verifyCommitOnDev: verify,
|
|
162
|
+
})
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
// 自动收口动作:applyReview 是验收/退回的单一触发点(状态流转、通知、消息全走它);
|
|
166
|
+
// 失败(如并发下卡刚被人工收口)只 warn 不重试,去重表已记录本档位不会反复开火。
|
|
167
|
+
const autoClose = (service, row, judgment, tier) => {
|
|
168
|
+
const decision = judgment.verdict === 'A' ? 'accept' : 'return'
|
|
169
|
+
const comment = decision === 'accept'
|
|
170
|
+
? `程序化收口:${judgment.basis}`
|
|
171
|
+
: `交付方无响应:${judgment.basis}`
|
|
172
|
+
const task = service.taskRow(row.id)
|
|
173
|
+
const project = service.projectRow(row.project_id)
|
|
174
|
+
service.applyReview(task, project, decision, comment, SYSTEM_ACTOR)
|
|
175
|
+
.then(() => {
|
|
176
|
+
service.audit(SYSTEM_ACTOR, 'review.auto_close', 'task', row.id, {
|
|
177
|
+
decision, verdict: judgment.verdict, basis: judgment.basis, tier,
|
|
178
|
+
})
|
|
179
|
+
})
|
|
180
|
+
.catch((error ) => {
|
|
181
|
+
service.logger?.warn?.('review watchdog auto %s %s failed: %s', decision, row.id, error?.message ?? error)
|
|
182
|
+
})
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
// 扫一轮全部 in_review 卡(归档项目不扫):滞留者按三档判定收口/提醒。
|
|
186
|
+
// 返回 { skipped?: 'disabled', alerted, escalated, recovered, error? };
|
|
187
|
+
// 逐卡 try/catch,单卡异常只 warn 不抛,且每卡处理完即落去重表(H5)。
|
|
28
188
|
export function runReviewWatchdog(service) {
|
|
29
189
|
try {
|
|
30
190
|
const { minutes } = effectiveReviewIdleMinutes(service.config, key => service.store.setting(key))
|
|
191
|
+
const escalateMultiple = effectiveReviewEscalateMultiple(key => service.store.setting(key))
|
|
192
|
+
const autoCloseEnabled = reviewAutoCloseEnabled(service)
|
|
31
193
|
const rows = service.store.all(`
|
|
32
|
-
SELECT t.id, t.project_id, t.updated_at, p.key AS project_key, t.number,
|
|
194
|
+
SELECT t.id, t.project_id, t.updated_at, t.assignee_bot_id, p.key AS project_key, t.number,
|
|
195
|
+
t.review_target,
|
|
33
196
|
(SELECT MAX(c.created_at) FROM task_comments c WHERE c.task_id = t.id) AS last_comment_at,
|
|
34
197
|
(SELECT MAX(COALESCE(r.last_progress_at, r.ended_at, r.started_at, r.queued_at))
|
|
35
198
|
FROM runs r WHERE r.task_id = t.id) AS last_run_at
|
|
36
199
|
FROM tasks t JOIN projects p ON p.id = t.project_id
|
|
37
|
-
WHERE t.status = 'in_review'
|
|
200
|
+
WHERE t.status = 'in_review' AND p.status = 'active'
|
|
38
201
|
`)
|
|
39
202
|
const map = JSON.parse(service.store.setting(REVIEW_IDLE_ALERTED_KEY) ?? '{}')
|
|
40
203
|
const inReviewIds = new Set(rows.map(row => row.id))
|
|
41
204
|
// 去重表回收:已离开 in_review(或已删除)的卡摘除,恢复再报资格。
|
|
42
205
|
const recovered = Object.keys(map).filter(id => !inReviewIds.has(id))
|
|
43
206
|
for (const id of recovered) delete map[id]
|
|
207
|
+
const persist = () => service.store.setSetting(REVIEW_IDLE_ALERTED_KEY, JSON.stringify(map))
|
|
208
|
+
// 回收即落库(H5):卡离开 in_review 的摘除不依赖后续是否有卡触发提醒。
|
|
209
|
+
if (recovered.length > 0) persist()
|
|
44
210
|
if (minutes <= 0) {
|
|
45
|
-
|
|
46
|
-
return { skipped: 'disabled', alerted: [], recovered }
|
|
211
|
+
return { skipped: 'disabled', alerted: [], escalated: [], recovered }
|
|
47
212
|
}
|
|
48
213
|
const alerted = []
|
|
214
|
+
const escalated = []
|
|
49
215
|
for (const row of rows) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
216
|
+
try {
|
|
217
|
+
const anchorMs = latestAnchorMs(row)
|
|
218
|
+
if (anchorMs === null) continue
|
|
219
|
+
const idleMs = Date.now() - anchorMs
|
|
220
|
+
// 两端口径同源(H3):后端与 UI badge 都用「静置毫秒严格大于阈值」判滞留。
|
|
221
|
+
const tier = idleMs > minutes * escalateMultiple * 60_000 ? 2 : idleMs > minutes * 60_000 ? 1 : 0
|
|
222
|
+
if (tier === 0) continue
|
|
223
|
+
const prevTier = alertedTier(map[row.id])
|
|
224
|
+
if (prevTier >= tier) continue
|
|
225
|
+
// 首次接触一律从一档话术起(二次催办必须先有一次催办):巡检接手时已过 2×阈值
|
|
226
|
+
// 的卡先按一档提醒,跨档升级由下一轮扫描完成,避免一口气连发两档消息。
|
|
227
|
+
const fireTier = prevTier === 0 ? 1 : tier
|
|
228
|
+
const judgment = judgeCard(service, row)
|
|
229
|
+
const actionable = autoCloseEnabled
|
|
230
|
+
&& (judgment.verdict === 'A' || (judgment.verdict === 'B' && row.assignee_bot_id))
|
|
231
|
+
const entry = { tier: fireTier, verdict: judgment.verdict, basis: judgment.basis, at: new Date().toISOString() }
|
|
232
|
+
if (actionable) entry.action = judgment.verdict === 'A' ? 'accept' : 'return'
|
|
233
|
+
map[row.id] = entry
|
|
234
|
+
persist()
|
|
235
|
+
const label = `${row.project_key}-${row.number}`
|
|
236
|
+
const idleMinutes = Math.floor(idleMs / 60_000)
|
|
237
|
+
if (actionable) {
|
|
238
|
+
autoClose(service, row, judgment, fireTier)
|
|
239
|
+
} else {
|
|
240
|
+
// C(或开关关闭):仅提醒;滞留达阈值×倍数升级语气二次催办(H2)。
|
|
241
|
+
// 前缀按 locale 落库(DSHBOTS-228):缺省英文 [SYSTEM ALERT],中文环境【系统指令】。
|
|
242
|
+
const alertPrefix = systemAlertLabel(messageLocale(service.config, key => service.store.setting(key), service.runtime?.ctx?.get?.('loader')))
|
|
243
|
+
const body = fireTier === 2
|
|
244
|
+
? `${alertPrefix}${label} 验收已滞留 ${idleMinutes} 分钟(超过 ${minutes * escalateMultiple} 分钟二次催办),请立即收口(accept/return),否则将按三档规则持续评估自动收口。`
|
|
245
|
+
: `${alertPrefix}${label} 验收已滞留 ${idleMinutes} 分钟,核验若已闭环请尽快收口(accept/return)。`
|
|
246
|
+
service.insertMessage({ projectId: row.project_id, senderType: 'system', senderId: 'system', taskId: row.id, body })
|
|
247
|
+
// H1:提醒不触发收口的老缺口——owner_bot 卡同时给总监排一次验收运行
|
|
248
|
+
// (复用 owner_task_run outbox,消息本身仍不触发任何 bot 运行);幂等键绑档位,
|
|
249
|
+
// 去重表保证同档位只排一次。user 卡裁决归工作台 owner,只提醒不排运行。
|
|
250
|
+
if ((row.review_target ?? 'user') === 'owner_bot') {
|
|
251
|
+
service.enqueueOutbox({
|
|
252
|
+
kind: 'owner_task_run',
|
|
253
|
+
payload: { taskId: row.id, reviewKind: 'review' },
|
|
254
|
+
projectId: row.project_id,
|
|
255
|
+
taskId: row.id,
|
|
256
|
+
idempotencyKey: `owner_review:${row.id}:watchdog:t${fireTier}`,
|
|
257
|
+
})
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
;(fireTier === 2 ? escalated : alerted).push(row.id)
|
|
261
|
+
} catch (cardError ) {
|
|
262
|
+
service.logger?.warn?.('review watchdog card %s failed: %s', row.id, cardError?.message ?? cardError)
|
|
263
|
+
}
|
|
62
264
|
}
|
|
63
|
-
return { alerted, recovered }
|
|
64
|
-
} catch (error) {
|
|
265
|
+
return { alerted, escalated, recovered }
|
|
266
|
+
} catch (error ) {
|
|
65
267
|
service.logger?.warn?.('review watchdog failed: %s', error?.message ?? error)
|
|
66
|
-
return { alerted: [], recovered: [], error: String(error?.message ?? error) }
|
|
268
|
+
return { alerted: [], escalated: [], recovered: [], error: String(error?.message ?? error) }
|
|
67
269
|
}
|
|
68
270
|
}
|
|
271
|
+
|
|
272
|
+
// 面板同源视图(H3):taskView 对 in_review 卡透出与守门同一 SQL 口径的滞留锚点
|
|
273
|
+
// (含最新评论与 run 活动,UI badge 不再自算口径)+ 生效阈值/升级线 + 最近一次判定与依据。
|
|
274
|
+
export const reviewWatchdogMethods = {
|
|
275
|
+
reviewIdleView(task) {
|
|
276
|
+
const anchors = this.store.get(
|
|
277
|
+
`SELECT
|
|
278
|
+
(SELECT MAX(c.created_at) FROM task_comments c WHERE c.task_id = ?) AS last_comment_at,
|
|
279
|
+
(SELECT MAX(COALESCE(r.last_progress_at, r.ended_at, r.started_at, r.queued_at))
|
|
280
|
+
FROM runs r WHERE r.task_id = ?) AS last_run_at`,
|
|
281
|
+
task.id, task.id,
|
|
282
|
+
)
|
|
283
|
+
const anchorMs = latestAnchorMs({
|
|
284
|
+
updated_at: task.updated_at,
|
|
285
|
+
last_comment_at: anchors?.last_comment_at ?? null,
|
|
286
|
+
last_run_at: anchors?.last_run_at ?? null,
|
|
287
|
+
})
|
|
288
|
+
const { minutes } = effectiveReviewIdleMinutes(this.config, key => this.store.setting(key))
|
|
289
|
+
const escalateMinutes = minutes > 0 ? minutes * effectiveReviewEscalateMultiple(key => this.store.setting(key)) : 0
|
|
290
|
+
const verdictEntry = JSON.parse(this.store.setting(REVIEW_IDLE_ALERTED_KEY) ?? '{}')[task.id]
|
|
291
|
+
return {
|
|
292
|
+
anchorMs,
|
|
293
|
+
anchorIso: anchorMs === null ? null : new Date(anchorMs).toISOString(),
|
|
294
|
+
thresholdMinutes: minutes,
|
|
295
|
+
escalateMinutes,
|
|
296
|
+
verdict: verdictEntry && verdictEntry !== true ? verdictEntry : null,
|
|
297
|
+
}
|
|
298
|
+
},
|
|
299
|
+
}
|