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.
- package/README.md +60 -122
- package/docs/README.zh.md +61 -123
- 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 +14 -5
- package/src/services/approvals.js +109 -24
- package/src/services/backoff.js +34 -0
- 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 +169 -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 +186 -17
- 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 +146 -19
- package/src/services/secrets.js +1 -1
- package/src/services/system.js +23 -6
- package/src/services/task-dispatch.js +315 -0
- package/src/services/task-notify.js +55 -11
- package/src/services/task-runs.js +179 -0
- package/src/services/task-stage.js +4 -0
- package/src/services/tasks.js +51 -399
- 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 +57 -53
- package/ui/i18n/en/chat.js +140 -0
- package/ui/i18n/en/common.js +187 -0
- package/ui/i18n/en/nav.js +89 -0
- package/ui/i18n/en/settings.js +352 -0
- package/ui/i18n/en/tasks.js +229 -0
- package/ui/i18n/en/usage.js +141 -0
- package/ui/i18n/en/wechat.js +23 -0
- package/ui/i18n/en.js +17 -237
- package/ui/i18n/zh/chat.js +140 -0
- package/ui/i18n/zh/common.js +187 -0
- package/ui/i18n/zh/nav.js +89 -0
- package/ui/i18n/zh/settings.js +352 -0
- package/ui/i18n/zh/tasks.js +229 -0
- package/ui/i18n/zh/usage.js +141 -0
- package/ui/i18n/zh/wechat.js +23 -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 +125 -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 +196 -203
- 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 +167 -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 +56 -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
package/src/services/tasks.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
// src/services/tasks.js ——
|
|
2
|
-
//
|
|
1
|
+
// src/services/tasks.js —— 任务核心域(建档、状态流转与视图)
|
|
2
|
+
// 派单/改派/看板联动见 ./task-dispatch.js;运行入队、写占用释放与评论见 ./task-runs.js;
|
|
3
|
+
// 交付验收/退回与核验委派见 ./task-review.js。
|
|
3
4
|
// 本文件只放方法体,方法挂到 TeamService 原型上(见 src/service.js 的 defineMethods 调用),
|
|
4
5
|
// 因此方法体内的 this 与拆分前完全一致。
|
|
5
6
|
|
|
6
|
-
import { badRequest, conflict,
|
|
7
|
+
import { badRequest, conflict, notFound } from '../errors.js'
|
|
7
8
|
import { clampNumber, id, nowIso, projectKey, TASK_ID_PATTERN, text } from '../util.js'
|
|
8
|
-
import {
|
|
9
|
+
import { parseWriteScopes, parseWriteScopesFromDescription, readWriteScopes } from './write-scopes.js'
|
|
9
10
|
import { ensureAttentionSchema, parseAttention } from './attention-schema.js'
|
|
10
|
-
import {
|
|
11
|
+
import { SANDBOX_OVERRIDES } from './file-policy.js'
|
|
11
12
|
import { ensureTaskSandboxSchema } from './task-sandbox-schema.js'
|
|
12
13
|
import {
|
|
13
14
|
ensureTaskRelationsSchema, normalizeBlockedByInput, taskDepsView, validateTaskRelations,
|
|
@@ -15,6 +16,7 @@ import {
|
|
|
15
16
|
// 任务工单七态派生与标签口径的唯一来源:task-stage 纯函数域(tests/task-stage.test.js 断言其判定表)。
|
|
16
17
|
import { taskStage, taskStageLabel } from './task-stage.js'
|
|
17
18
|
import { effectiveTaskTimeBudgetMinutes } from '../config.js'
|
|
19
|
+
import { taskSubtreeIds, taskTreeUsageTotals, taskUsageTotals } from '../usage.js'
|
|
18
20
|
|
|
19
21
|
export const TASK_STATUSES = new Set(['backlog', 'todo', 'in_progress', 'blocked', 'in_review', 'done', 'canceled'])
|
|
20
22
|
|
|
@@ -63,12 +65,17 @@ export const tasksMethods = {
|
|
|
63
65
|
return effectiveTaskTimeBudgetMinutes(this.config, key => this.store.setting(key))
|
|
64
66
|
},
|
|
65
67
|
async createTask(input, actor = this.actor()) {
|
|
68
|
+
// DSHBOTS-237:建卡强制项目编号(项目 KEY-N)。无项目语境直接报错引导,
|
|
69
|
+
// 不再允许脱离项目建卡(共享板 task-N 口径废弃:存量可读,新建一律走项目编号)。
|
|
70
|
+
if (input.projectId === undefined || input.projectId === null || String(input.projectId).trim() === '') {
|
|
71
|
+
throw badRequest('建卡必须归属项目:请指定项目后再建卡,任务卡编号统一为「项目 KEY-N」(如 DSHBOTS-1),不再支持无项目的共享板建卡')
|
|
72
|
+
}
|
|
66
73
|
const project = this.projectRow(input.projectId)
|
|
67
74
|
if (project.status !== 'active') throw conflict('项目已归档')
|
|
68
75
|
const title = text(input.title, 240)
|
|
69
76
|
if (!title) throw badRequest('任务标题不能为空')
|
|
70
77
|
const assigneeId = input.assigneeBotId || null
|
|
71
|
-
if (assigneeId) this.
|
|
78
|
+
if (assigneeId) this.assertDispatchTarget(project.id, assigneeId)
|
|
72
79
|
const status = input.status && TASK_STATUSES.has(input.status) ? input.status : (assigneeId ? 'todo' : 'backlog')
|
|
73
80
|
const priority = TASK_PRIORITIES.has(input.priority) ? input.priority : 'medium'
|
|
74
81
|
// 写范围:显式传参优先(含空数组 = 明确不声明);未传时从描述的「写范围:」行兜底解析。
|
|
@@ -83,13 +90,15 @@ export const tasksMethods = {
|
|
|
83
90
|
const rawTimeBudget = input.timeBudgetMinutes ?? input.time_budget_minutes
|
|
84
91
|
const timeBudgetMinutes = (Number(rawTimeBudget) > 0 ? clampNumber(rawTimeBudget, 1, 10_080, null) : null)
|
|
85
92
|
?? this.defaultTaskTimeBudget()
|
|
86
|
-
// 派发沙箱覆盖(DSHBOTS-156
|
|
87
|
-
//
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
93
|
+
// 派发沙箱覆盖(DSHBOTS-156/234):档位解析顺序=卡面显式声明 > bot 配置(inherit 为缺省)。
|
|
94
|
+
// 'inherit'/空值同义=跟随 bot 配置档(列落 NULL);列只收合法收紧档,垃圾值拒收。
|
|
95
|
+
// 「只收紧不放大」校验在派发入口 assignFromBot(对准承接 bot 的 file_policy)。
|
|
96
|
+
const rawSandboxOverride = input.sandboxOverride
|
|
97
|
+
if (rawSandboxOverride !== undefined && rawSandboxOverride !== null && rawSandboxOverride !== ''
|
|
98
|
+
&& rawSandboxOverride !== 'inherit' && !SANDBOX_OVERRIDES.includes(rawSandboxOverride)) {
|
|
99
|
+
throw badRequest(`沙箱覆盖无效,允许值:inherit / ${SANDBOX_OVERRIDES.join(' / ')}`)
|
|
91
100
|
}
|
|
92
|
-
const sandboxOverride =
|
|
101
|
+
const sandboxOverride = !rawSandboxOverride || rawSandboxOverride === 'inherit' ? null : rawSandboxOverride
|
|
93
102
|
const taskId = id('task')
|
|
94
103
|
const createdAt = nowIso()
|
|
95
104
|
// 终态时间在创建时补齐(DSHBOTS-69):以 done/canceled 建档的任务终态列取同一 createdAt,
|
|
@@ -202,6 +211,9 @@ export const tasksMethods = {
|
|
|
202
211
|
stage,
|
|
203
212
|
stageLabel: taskStageLabel(stage),
|
|
204
213
|
reviewStatus: this.taskReviewStatus(task),
|
|
214
|
+
// 验收滞留同源视图(DSHBOTS-235):锚点/阈值/最近判定由 review-watchdog 域统一供出,
|
|
215
|
+
// UI badge 与后端守门同一口径(H3),面板据此展示三档判定与依据。
|
|
216
|
+
reviewIdle: task.status === 'in_review' ? this.reviewIdleView(task) : null,
|
|
205
217
|
}
|
|
206
218
|
},
|
|
207
219
|
|
|
@@ -243,12 +255,12 @@ export const tasksMethods = {
|
|
|
243
255
|
},
|
|
244
256
|
// options.startTriggerType:进入「进行中」时给运行用的触发类型标签(看板拖拽沿用 D-54 的 board_resume,
|
|
245
257
|
// 其余路径默认 task_started)。只影响运行元数据与幂等键,不影响行为口径。
|
|
246
|
-
async updateTask(taskId, patch, actor = this.actor(), options = {}) {
|
|
258
|
+
async updateTask(taskId, patch, actor = this.actor(), options = {} ) {
|
|
247
259
|
const task = this.taskRow(taskId)
|
|
248
260
|
if (patch.version !== undefined && Number(patch.version) !== Number(task.version)) {
|
|
249
261
|
throw conflict('任务已被其他人更新,请刷新后重试')
|
|
250
262
|
}
|
|
251
|
-
const updates
|
|
263
|
+
const updates = {}
|
|
252
264
|
if (patch.title !== undefined) {
|
|
253
265
|
const title = text(patch.title, 240)
|
|
254
266
|
if (!title) throw badRequest('任务标题不能为空')
|
|
@@ -260,7 +272,7 @@ export const tasksMethods = {
|
|
|
260
272
|
updates.priority = patch.priority
|
|
261
273
|
}
|
|
262
274
|
if (patch.assigneeBotId !== undefined) {
|
|
263
|
-
if (patch.assigneeBotId) this.
|
|
275
|
+
if (patch.assigneeBotId) this.assertDispatchTarget(task.project_id, patch.assigneeBotId)
|
|
264
276
|
updates.assignee_bot_id = patch.assigneeBotId || null
|
|
265
277
|
}
|
|
266
278
|
if (patch.position !== undefined) updates.position = Number(patch.position) || 0
|
|
@@ -330,397 +342,23 @@ export const tasksMethods = {
|
|
|
330
342
|
if (updates.status === 'done' && task.status !== 'done') {
|
|
331
343
|
this.notifyTaskDone(this.taskRow(taskId))
|
|
332
344
|
}
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
// 看板暂停路径:取消该任务全部在跑/排队运行并写 PAUSED_BY_BOARD(DSHBOTS-54 既有口径)。
|
|
343
|
-
return await this.pauseRunsForBoard(taskId)
|
|
344
|
-
}
|
|
345
|
-
const runs = this.store.all(
|
|
346
|
-
"SELECT id FROM runs WHERE task_id = ? AND status IN ('queued', 'running') AND mode = 'write'",
|
|
347
|
-
taskId,
|
|
348
|
-
)
|
|
349
|
-
const errorMessage = `任务离开「进行中」(${fromStatus ?? '-'} → ${toStatus ?? '-'}),写运行中止,写占用已释放`
|
|
350
|
-
for (const run of runs) {
|
|
351
|
-
await this.cancelRunInternal(run.id, false)
|
|
352
|
-
this.store.run(
|
|
353
|
-
'UPDATE runs SET error_code = ?, error_message = ? WHERE id = ?',
|
|
354
|
-
'TASK_LEFT_IN_PROGRESS', errorMessage, run.id,
|
|
355
|
-
)
|
|
356
|
-
this.insertRunEvent(run.id, 'task_left_in_progress', errorMessage)
|
|
357
|
-
}
|
|
358
|
-
return runs.length
|
|
359
|
-
},
|
|
360
|
-
// 终态清理(DSHBOTS-110):任务流转到 done/canceled 时,把该任务残留的 queued 运行全部置
|
|
361
|
-
// canceled(SUPERSEDED + stale_superseded 事件),防止调度窗口内漏网的排队运行被起跑执行。
|
|
362
|
-
// 只清 queued:running 的写运行由 releaseTaskWriteLocks 按 TASK_LEFT_IN_PROGRESS 口径处理。
|
|
363
|
-
// 清理任务名下的排队运行(SUPERSEDED 口径)。体内纯同步 store 调用、无 await,
|
|
364
|
-
// 因此是同步函数:调用点可直接放进事务,抛错即回滚,不会出现「事务已提交但清理失败」的静默态。
|
|
365
|
-
cancelSupersededQueuedRuns(taskId) {
|
|
366
|
-
const rows = this.store.all(
|
|
367
|
-
"SELECT id FROM runs WHERE task_id = ? AND status = 'queued'",
|
|
368
|
-
taskId,
|
|
369
|
-
)
|
|
370
|
-
let canceled = 0
|
|
371
|
-
for (const row of rows) {
|
|
372
|
-
if (this.cancelQueuedRunAsSuperseded(row.id)) canceled += 1
|
|
345
|
+
// 任务卡修正闭环(DSHBOTS-232 ①):已派单卡的卡面(标题/描述/优先级/写范围)实际变值时
|
|
346
|
+
// 通知负责人修正。只认卡面字段——状态/负责人等流转字段各有自己的通知口径,不在此重复;
|
|
347
|
+
// 值未变的字段(同值重写)不触发。
|
|
348
|
+
if (task.assignee_bot_id) {
|
|
349
|
+
const cardChanged = ['title', 'description', 'priority'].some(
|
|
350
|
+
field => updates[field] !== undefined && updates[field] !== task[field],
|
|
351
|
+
) || (updates.write_scopes !== undefined
|
|
352
|
+
&& JSON.stringify(readWriteScopes(updates.write_scopes)) !== JSON.stringify(readWriteScopes(task.write_scopes)))
|
|
353
|
+
if (cardChanged) await this.notifyTaskCardChanged(this.taskRow(taskId))
|
|
373
354
|
}
|
|
374
|
-
return
|
|
355
|
+
return this.taskView(this.taskRow(taskId))
|
|
375
356
|
},
|
|
376
357
|
assertTransition(from, to) {
|
|
377
358
|
if (from === to) return
|
|
378
359
|
if (!TRANSITIONS[from]?.has(to)) throw conflict(`任务不能从 ${from} 变为 ${to}`)
|
|
379
360
|
},
|
|
380
|
-
// sandboxOverride 选项(DSHBOTS-156):undefined=不动(重派未传 sandbox 时保留旧覆盖);
|
|
381
|
-
// null=显式清掉回落 bot 配置档(重派传 sandbox='inherit');字符串=收紧档(派发入口已校验)。
|
|
382
|
-
async assignTask(taskId, botId, actor = this.actor(), { autoStart = true, sandboxOverride } = {}) {
|
|
383
|
-
const task = this.taskRow(taskId)
|
|
384
|
-
const project = this.projectRow(task.project_id)
|
|
385
|
-
this.assertMember(project.id, botId)
|
|
386
|
-
const active = this.store.get(
|
|
387
|
-
"SELECT id, kind FROM runs WHERE task_id = ? AND status IN ('queued', 'running')",
|
|
388
|
-
taskId,
|
|
389
|
-
)
|
|
390
|
-
// 换负责人闸门(DSHBOTS-169):queued 占位运行(死队列,永远不会被领取)不是执行中,
|
|
391
|
-
// 不再阻断改派——事务内按 SUPERSEDED 口径清掉后放行;只有 running 的任务运行照旧阻断
|
|
392
|
-
// (文案不变)。同负责人重派不走此闸,行为不变。
|
|
393
|
-
const reassigning = task.assignee_bot_id !== botId
|
|
394
|
-
if (reassigning && this.store.get(
|
|
395
|
-
"SELECT id FROM runs WHERE task_id = ? AND kind = 'task' AND status = 'running' LIMIT 1",
|
|
396
|
-
taskId,
|
|
397
|
-
)) throw conflict('任务有正在执行的运行,不能更换负责人')
|
|
398
|
-
const supersedeQueued = reassigning && !!this.store.get(
|
|
399
|
-
"SELECT id FROM runs WHERE task_id = ? AND kind = 'task' AND status = 'queued' LIMIT 1",
|
|
400
|
-
taskId,
|
|
401
|
-
)
|
|
402
|
-
ensureTaskSandboxSchema(this.store)
|
|
403
|
-
const sandboxTouched = sandboxOverride !== undefined
|
|
404
|
-
// 存量 NULL 预算卡补挂(DSHBOTS-198):COALESCE 只补空,显式已设的卡不覆盖。
|
|
405
|
-
const defaultTimeBudget = this.defaultTaskTimeBudget()
|
|
406
|
-
this.store.transaction(() => {
|
|
407
|
-
// queued 占位清理与改派同事务(DSHBOTS-169):SUPERSEDED 不进任务执行历史,run 事件可审计。
|
|
408
|
-
// 助手是同步函数(体内无 await),抛错会让整个事务回滚,不会留下「改派已生效但占位还在」的半成品。
|
|
409
|
-
if (supersedeQueued) this.cancelSupersededQueuedRuns(taskId)
|
|
410
|
-
this.store.run(
|
|
411
|
-
`UPDATE tasks SET assignee_bot_id = ?, review_target = ?,
|
|
412
|
-
status = CASE WHEN status IN ('backlog', 'blocked') THEN 'todo' ELSE status END,
|
|
413
|
-
time_budget_minutes = COALESCE(time_budget_minutes, ?),
|
|
414
|
-
version = version + 1, updated_at = ?${sandboxTouched ? ', sandbox_override = ?' : ''} WHERE id = ?`,
|
|
415
|
-
...(sandboxTouched
|
|
416
|
-
? [botId, actor.type === 'bot' ? 'owner_bot' : 'user', defaultTimeBudget, nowIso(), sandboxOverride ?? null, taskId]
|
|
417
|
-
: [botId, actor.type === 'bot' ? 'owner_bot' : 'user', defaultTimeBudget, nowIso(), taskId]),
|
|
418
|
-
)
|
|
419
|
-
this.addTaskEvent(taskId, 'assigned', actor, {
|
|
420
|
-
botId,
|
|
421
|
-
...(sandboxTouched && { sandbox: sandboxOverride ?? 'inherit' }),
|
|
422
|
-
})
|
|
423
|
-
this.audit(actor, 'task.assign', 'task', taskId, { botId, ...(sandboxTouched && { sandbox: sandboxOverride ?? 'inherit' }) })
|
|
424
|
-
})
|
|
425
|
-
// 总监bot的验收/受阻处理运行本身占用任务的唯一活动运行名额,
|
|
426
|
-
// 此时由 finishRun 的收尾逻辑负责重新排队执行,这里跳过。
|
|
427
|
-
// 换负责人清掉 queued 占位后名额已空:重算判定才会按新负责人重排 task_run(DSHBOTS-169)。
|
|
428
|
-
// 幂等键:task_run 是先写者赢闸(ON CONFLICT DO NOTHING 且撞键不再 applyOutboxRow),
|
|
429
|
-
// 稳定键 task:<id>:assigned 会在再次改派时撞上历史 delivered 行而被静默吞掉、排不出新运行
|
|
430
|
-
// (不限清 queued 占位场景,无活跃运行的改派同样会写键)。凡换负责人一律带事务内单调自增
|
|
431
|
-
// 的 task.version 后缀(确定性、跨改派不碰撞);同负责人重派保持稳定键,slotHeld 已提供幂等。
|
|
432
|
-
const slotHeld = supersedeQueued
|
|
433
|
-
? this.store.get(
|
|
434
|
-
"SELECT id FROM runs WHERE task_id = ? AND status IN ('queued', 'running')",
|
|
435
|
-
taskId,
|
|
436
|
-
)
|
|
437
|
-
: active
|
|
438
|
-
if (!slotHeld) {
|
|
439
|
-
const assignedVersion = reassigning ? this.taskRow(taskId).version : null
|
|
440
|
-
this.enqueueOutbox({
|
|
441
|
-
kind: 'task_run',
|
|
442
|
-
payload: { taskId, triggerType: 'assigned' },
|
|
443
|
-
projectId: task.project_id,
|
|
444
|
-
taskId,
|
|
445
|
-
idempotencyKey: `task:${taskId}:assigned${assignedVersion === null ? '' : `:v${assignedVersion}`}`,
|
|
446
|
-
})
|
|
447
|
-
}
|
|
448
|
-
if (autoStart) void this.tick()
|
|
449
|
-
return this.taskView(this.taskRow(taskId))
|
|
450
|
-
},
|
|
451
|
-
async transitionTask(taskId, status, actor = this.actor()) {
|
|
452
|
-
const before = this.taskRow(taskId)
|
|
453
|
-
// 离开「进行中」前的活跃运行数:运行中止已由 updateTask 内的写占用释放统一完成,
|
|
454
|
-
// 这里只按中止条数决定要不要发看板暂停的系统指令消息,避免同一处中止被算两遍。
|
|
455
|
-
const activeRuns = Number(this.store.get(
|
|
456
|
-
"SELECT COUNT(*) AS n FROM runs WHERE task_id = ? AND status IN ('queued', 'running')",
|
|
457
|
-
taskId,
|
|
458
|
-
)?.n ?? 0)
|
|
459
|
-
// 看板拖拽沿用 D-54 的运行触发类型(board_resume):拖入「执行中」的通知与开工由
|
|
460
|
-
// updateTask 内的统一触发点完成(同一任务只发一条消息、只入队一次运行)。
|
|
461
|
-
await this.updateTask(taskId, { status }, actor, { startTriggerType: 'board_resume' })
|
|
462
|
-
await this.applyBoardDragDirective(before, status, { activeRuns })
|
|
463
|
-
// 重新取数:拖拽联动可能刚入队或暂停了运行,沿用 updateTask 的返回会带过期的 latestRun。
|
|
464
|
-
return this.taskView(this.taskRow(taskId))
|
|
465
|
-
},
|
|
466
361
|
|
|
467
|
-
// 看板拖拽联动(DSHBOTS-54):拖出到 todo/blocked 自动暂停。
|
|
468
|
-
// 拖入「执行中」一侧的通知与开工已收进 updateTask 内的统一触发点(DSHBOTS-100):
|
|
469
|
-
// blocked/in_review → in_progress 与编辑表单改状态同样要通知并开工,逻辑只有那一处,
|
|
470
|
-
// 这里不再重复发消息、重复入队(同一任务只发一条)。
|
|
471
|
-
// 指令消息由系统直接发(sender_type='system',不触发 bot 运行);
|
|
472
|
-
// 出向 in_review/done/canceled 的写运行中止由 updateTask 内的写占用释放统一处理(DSHBOTS-73)。
|
|
473
|
-
async applyBoardDragDirective(before, afterStatus, { activeRuns = 0 } = {}) {
|
|
474
|
-
if (before.status === afterStatus) return
|
|
475
|
-
if (before.status === 'in_progress' && (afterStatus === 'todo' || afterStatus === 'blocked')) {
|
|
476
|
-
// 运行中止已由 updateTask 内的写占用释放统一完成(同一处处理),这里只按中止条数发系统指令消息。
|
|
477
|
-
if (activeRuns > 0) {
|
|
478
|
-
const project = this.projectRow(before.project_id)
|
|
479
|
-
this.insertMessage({
|
|
480
|
-
projectId: before.project_id,
|
|
481
|
-
senderType: 'system',
|
|
482
|
-
senderId: 'system',
|
|
483
|
-
taskId: before.id,
|
|
484
|
-
body: `任务 ${project.key}-${before.number} 已移出执行中,运行已暂停。`,
|
|
485
|
-
})
|
|
486
|
-
}
|
|
487
|
-
}
|
|
488
|
-
},
|
|
489
|
-
async addComment(taskId, bodyInput, actor = this.actor()) {
|
|
490
|
-
const task = this.taskRow(taskId)
|
|
491
|
-
const body = text(bodyInput, 20_000)
|
|
492
|
-
if (!body) throw badRequest('评论不能为空')
|
|
493
|
-
const commentId = id('cmt')
|
|
494
|
-
this.store.transaction(() => {
|
|
495
|
-
this.store.run(
|
|
496
|
-
'INSERT INTO task_comments(id, task_id, author_type, author_id, body, created_at) VALUES (?, ?, ?, ?, ?, ?)',
|
|
497
|
-
commentId, taskId, actor.type, actor.id, body, nowIso(),
|
|
498
|
-
)
|
|
499
|
-
this.addTaskEvent(taskId, 'commented', actor, { commentId })
|
|
500
|
-
this.audit(actor, 'task.comment', 'task', taskId, { commentId })
|
|
501
|
-
})
|
|
502
|
-
const comment = this.store.get('SELECT * FROM task_comments WHERE id = ?', commentId)
|
|
503
|
-
const steered = await this.steerRunningTaskRun(task, comment, actor)
|
|
504
|
-
return { ...comment, steered }
|
|
505
|
-
},
|
|
506
|
-
|
|
507
|
-
// 任务运行期间的评论直接投递给正在执行的会话,避免只能等下一次运行才被读到。
|
|
508
|
-
async steerRunningTaskRun(task, comment, actor) {
|
|
509
|
-
if (!this.runtime?.steer || actor.type === 'bot') return false
|
|
510
|
-
const run = this.store.get(
|
|
511
|
-
"SELECT * FROM runs WHERE task_id = ? AND status = 'running' ORDER BY started_at DESC LIMIT 1",
|
|
512
|
-
task.id,
|
|
513
|
-
)
|
|
514
|
-
if (!run?.session_id) return false
|
|
515
|
-
const project = this.store.get('SELECT key FROM projects WHERE id = ?', task.project_id)
|
|
516
|
-
const author = this.actorName(actor)
|
|
517
|
-
try {
|
|
518
|
-
await this.runtime.steer(
|
|
519
|
-
run.session_id,
|
|
520
|
-
`New comment on ${project?.key ?? 'TASK'}-${task.number} from ${author}:\n${comment.body}\n\nIf this changes the plan, adjust the work in progress; otherwise keep going and mention it in the delivery report.`,
|
|
521
|
-
)
|
|
522
|
-
this.store.run(
|
|
523
|
-
'INSERT INTO run_events(id, run_id, type, message, created_at) VALUES (?, ?, ?, ?, ?)',
|
|
524
|
-
id('evt'), run.id, 'steered', `评论直通(${author})`, nowIso(),
|
|
525
|
-
)
|
|
526
|
-
return true
|
|
527
|
-
} catch (error) {
|
|
528
|
-
this.logger.warn?.('dsh-team: steer run %s failed: %s', run.id, error)
|
|
529
|
-
return false
|
|
530
|
-
}
|
|
531
|
-
},
|
|
532
|
-
enqueueTaskRun(task, triggerType, actor) {
|
|
533
|
-
if (!task.assignee_bot_id) throw badRequest('任务没有负责人')
|
|
534
|
-
if (task.status === 'done' || task.status === 'canceled') throw conflict('已完成或取消的任务不能运行')
|
|
535
|
-
const active = this.store.get(
|
|
536
|
-
"SELECT id FROM runs WHERE task_id = ? AND status IN ('queued', 'running')",
|
|
537
|
-
task.id,
|
|
538
|
-
)
|
|
539
|
-
if (active) return active.id
|
|
540
|
-
const runId = id('run')
|
|
541
|
-
const createdAt = nowIso()
|
|
542
|
-
// 写范围在入队时快照:任务后续改声明不影响已排队的运行。
|
|
543
|
-
const writeScopes = JSON.stringify(readWriteScopes(task.write_scopes))
|
|
544
|
-
this.store.run(
|
|
545
|
-
`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,
|
|
549
|
-
)
|
|
550
|
-
this.store.run(
|
|
551
|
-
'INSERT INTO run_events(id, run_id, type, message, created_at) VALUES (?, ?, ?, ?, ?)',
|
|
552
|
-
id('evt'), runId, 'queued', `由 ${actor.type}:${actor.id} 触发`, createdAt,
|
|
553
|
-
)
|
|
554
|
-
if (triggerType === 'board_resume') {
|
|
555
|
-
this.insertRunEvent(runId, 'board_resume', '看板拖入执行中,系统指令自动开工')
|
|
556
|
-
}
|
|
557
|
-
return runId
|
|
558
|
-
},
|
|
559
|
-
enqueueOwnerTaskRun(task, kind) {
|
|
560
|
-
const project = this.projectRow(task.project_id)
|
|
561
|
-
const owner = project.owner_bot_id
|
|
562
|
-
? this.store.get("SELECT * FROM bots WHERE id = ? AND status = 'active'", project.owner_bot_id)
|
|
563
|
-
: null
|
|
564
|
-
if (!owner) return null
|
|
565
|
-
const active = this.store.get(
|
|
566
|
-
"SELECT id FROM runs WHERE task_id = ? AND status IN ('queued', 'running')",
|
|
567
|
-
task.id,
|
|
568
|
-
)
|
|
569
|
-
if (active) return active.id
|
|
570
|
-
const runId = id('run')
|
|
571
|
-
const createdAt = nowIso()
|
|
572
|
-
const triggerType = kind === 'review' ? 'review_requested' : 'blocked_handoff'
|
|
573
|
-
this.store.run(
|
|
574
|
-
`INSERT INTO runs(id, project_id, bot_id, task_id, kind, mode, trigger_type, trigger_ref, status,
|
|
575
|
-
attempt, idempotency_key, queued_at)
|
|
576
|
-
VALUES (?, ?, ?, ?, ?, 'read', ?, ?, 'queued', 1, ?, ?)`,
|
|
577
|
-
runId, project.id, owner.id, task.id, kind, triggerType, task.id,
|
|
578
|
-
`${kind}:${task.id}:${Date.now()}:${runId}`, createdAt,
|
|
579
|
-
)
|
|
580
|
-
this.store.run(
|
|
581
|
-
'INSERT INTO run_events(id, run_id, type, message, created_at) VALUES (?, ?, ?, ?, ?)',
|
|
582
|
-
id('evt'), runId, 'queued',
|
|
583
|
-
kind === 'review' ? '任务交付,转总监验收' : '任务受阻,转总监处理',
|
|
584
|
-
createdAt,
|
|
585
|
-
)
|
|
586
|
-
void this.tick()
|
|
587
|
-
return runId
|
|
588
|
-
},
|
|
589
|
-
resolveBotTask(project, ref) {
|
|
590
|
-
const raw = String(ref ?? '').trim()
|
|
591
|
-
if (!raw) throw badRequest('缺少任务编号')
|
|
592
|
-
let task
|
|
593
|
-
if (raw.startsWith('task_')) {
|
|
594
|
-
task = this.store.get('SELECT * FROM tasks WHERE id = ? AND project_id = ?', raw, project.id)
|
|
595
|
-
} else {
|
|
596
|
-
const match = raw.match(/^(?:([A-Za-z][A-Za-z0-9]*)-)?(\d+)$/)
|
|
597
|
-
if (match && (!match[1] || match[1].toLowerCase() === project.key.toLowerCase())) {
|
|
598
|
-
task = this.store.get('SELECT * FROM tasks WHERE project_id = ? AND number = ?', project.id, Number(match[2]))
|
|
599
|
-
}
|
|
600
|
-
}
|
|
601
|
-
if (!task) throw notFound(`找不到任务 ${raw}`)
|
|
602
|
-
return task
|
|
603
|
-
},
|
|
604
|
-
ownerContextFor(sessionId) {
|
|
605
|
-
const binding = this.store.get('SELECT * FROM session_bindings WHERE session_id = ?', sessionId)
|
|
606
|
-
if (!binding) throw forbidden('只有项目群中的 Bot 可以执行该操作')
|
|
607
|
-
if (!binding.project_id) throw forbidden('单聊会话不在项目中,无法管理任务')
|
|
608
|
-
const project = this.projectRow(binding.project_id)
|
|
609
|
-
if (project.owner_bot_id !== binding.bot_id) throw forbidden('只有项目总监 Bot 可以执行该操作')
|
|
610
|
-
return { binding, project, actor: { type: 'bot', id: binding.bot_id } }
|
|
611
|
-
},
|
|
612
|
-
// 派单侧同写范围重复检测(DSHBOTS-82):同一文件上叠 N 张小卡时,各卡各立各排,
|
|
613
|
-
// 后面的卡只能等前一张跑完,形成排队空转。这里在派单入口找「写范围完全一致」的同项目在办卡。
|
|
614
|
-
// 只比完全一致(集合相等,顺序无关);相交但不同的放行——那属于正常的串行依赖,
|
|
615
|
-
// 正确性由调度器写范围闸门保证,不在派单入口拦截。
|
|
616
|
-
findDuplicateScopeTask(projectId, scopes) {
|
|
617
|
-
const target = new Set(scopes)
|
|
618
|
-
if (!target.size) return null
|
|
619
|
-
const candidates = this.store.all(
|
|
620
|
-
`SELECT id, number, title, write_scopes FROM tasks
|
|
621
|
-
WHERE project_id = ? AND status IN ('todo', 'in_progress', 'blocked')`,
|
|
622
|
-
projectId,
|
|
623
|
-
)
|
|
624
|
-
for (const row of candidates) {
|
|
625
|
-
const other = readWriteScopes(row.write_scopes)
|
|
626
|
-
if (other.length !== target.size) continue
|
|
627
|
-
if ([...target].every(scope => other.includes(scope))) return row
|
|
628
|
-
}
|
|
629
|
-
return null
|
|
630
|
-
},
|
|
631
|
-
// 派单清洗(DSHBOTS-168):写范围声明的程序化质量闸门,三入口共用——
|
|
632
|
-
// createTask(owner 派单路径权威清洗)、assignFromBot(经 createTask 同一清洗)、
|
|
633
|
-
// taskUpdateScopes(改卡入口)。两步:
|
|
634
|
-
// ① ignored 机械移除——命中项目 .gitignore 的条目没有写保护价值,剔除并落审计
|
|
635
|
-
// task.scopes_normalize(removed=[...]);全部被移除后调用方各自的「必须声明写
|
|
636
|
-
// 范围」闸门自然接管(清单为空)。非 git 目录 / git 不可用时保守放行不清洗。
|
|
637
|
-
// ② 一级目录驳回——清洗后仍不含 / 的条目(src、tests 这类整目录声明)直接拒绝:
|
|
638
|
-
// 整目录会把同项目全部写运行判为冲突锁死并发,这不是清洗能救的,必须改卡。
|
|
639
|
-
normalizeDispatchScopes(project, scopes, { actor, taskId }) {
|
|
640
|
-
const { kept, removed } = filterIgnoredWriteScopes(scopes, this.projectWorkDir(project))
|
|
641
|
-
if (removed.length) this.audit(actor, 'task.scopes_normalize', 'task', taskId, { removed })
|
|
642
|
-
const bare = kept.filter(scope => !scope.includes('/'))
|
|
643
|
-
if (bare.length) {
|
|
644
|
-
throw badRequest(
|
|
645
|
-
`写范围不能声明整目录:${bare.join('、')} —— 写范围必须声明到二级路径或具体文件,`
|
|
646
|
-
+ '整目录声明会锁死同项目全部写运行。',
|
|
647
|
-
)
|
|
648
|
-
}
|
|
649
|
-
return kept
|
|
650
|
-
},
|
|
651
|
-
async assignFromBot(sessionId, input) {
|
|
652
|
-
const { project, actor } = this.ownerContextFor(sessionId)
|
|
653
|
-
const member = this.membersOf(project.id).find(bot => bot.name.toLowerCase() === String(input.assignee ?? '').toLowerCase())
|
|
654
|
-
if (!member) throw badRequest(`项目中没有 Bot ${input.assignee}`)
|
|
655
|
-
// 派发沙箱覆盖(DSHBOTS-156):可选 sandbox 只收紧不放大,校验对准承接 bot 的配置档;
|
|
656
|
-
// 缺省 = 跟随 bot 配置(新卡 NULL/重派保留旧值),'inherit' 显式回落 bot 配置(重派清覆盖)。
|
|
657
|
-
const sandboxOverride = input.sandbox === undefined
|
|
658
|
-
? undefined
|
|
659
|
-
: resolveSandboxOverride(this.botRow(member.id), input.sandbox)
|
|
660
|
-
if (input.taskId || input.task) {
|
|
661
|
-
const task = this.resolveBotTask(project, input.taskId ?? input.task)
|
|
662
|
-
if (['done', 'canceled'].includes(task.status)) throw conflict(`任务 ${project.key}-${task.number} 已结束,不能重派`)
|
|
663
|
-
const updated = await this.assignTask(task.id, member.id, actor, { autoStart: false, sandboxOverride })
|
|
664
|
-
void this.tick()
|
|
665
|
-
return updated
|
|
666
|
-
}
|
|
667
|
-
// 派单必须声明写范围(程序化闸门,不靠派单方自觉):未声明写范围的任务其写运行会与
|
|
668
|
-
// 同项目所有写运行判为冲突并保守串行,一条空范围任务就能把整队堵死。这里直接拒绝,
|
|
669
|
-
// 而不是留到调度器里把并发能力悄悄吃掉。
|
|
670
|
-
const parsedScopes = input.write_scopes === undefined || input.write_scopes === null
|
|
671
|
-
? parseWriteScopesFromDescription(input.description)
|
|
672
|
-
: parseWriteScopes(input.write_scopes)
|
|
673
|
-
// 闸门按清洗后清单预判(DSHBOTS-168):全部命中忽略规则 = 实际未声明,落上面的
|
|
674
|
-
// 拒绝。原清单透传 createTask 做权威清洗+审计(审计需真实 taskId),此处只预览不落账。
|
|
675
|
-
const scopes = filterIgnoredWriteScopes(parsedScopes, this.projectWorkDir(project)).kept
|
|
676
|
-
if (!scopes.length) {
|
|
677
|
-
throw badRequest(
|
|
678
|
-
'派单必须声明写范围:传 write_scopes 路径数组,或在描述里写一行「写范围:a, b」。'
|
|
679
|
-
+ '未声明会让该任务的写运行与同项目其他写运行全部串行,一条任务即可堵死队列。',
|
|
680
|
-
)
|
|
681
|
-
}
|
|
682
|
-
// 同写范围重复卡拦截(DSHBOTS-82):同项目已有「写范围完全一致」的在办卡时直接拒绝,
|
|
683
|
-
// 避免同一文件上叠 N 张排队卡空转。force_duplicate 是逃生口:跳过检测,但留审计痕迹。
|
|
684
|
-
// 紧急豁免(DSHBOTS-126):priority='urgent' 的新卡放行——紧急任务无视排队立即施工,
|
|
685
|
-
// 但创建消息报备与哪张在办卡共用车道,不静默并行。
|
|
686
|
-
const duplicate = this.findDuplicateScopeTask(project.id, scopes)
|
|
687
|
-
const forceDuplicate = input.force_duplicate === true
|
|
688
|
-
const urgentExempt = input.priority === 'urgent'
|
|
689
|
-
if (duplicate && !forceDuplicate && !urgentExempt) {
|
|
690
|
-
throw conflict(
|
|
691
|
-
`已存在同写范围任务 ${project.key}-${duplicate.number} ${duplicate.title},请勿重复派单;`
|
|
692
|
-
+ '若需合并多张小卡,请在原任务描述追加清单后重派原任务。'
|
|
693
|
-
+ '紧急任务(priority=urgent)豁免此拦截,可立即派单施工。',
|
|
694
|
-
)
|
|
695
|
-
}
|
|
696
|
-
const task = await this.createTask({
|
|
697
|
-
projectId: project.id,
|
|
698
|
-
title: input.title,
|
|
699
|
-
description: input.description,
|
|
700
|
-
assigneeBotId: member.id,
|
|
701
|
-
priority: input.priority,
|
|
702
|
-
// 透传原始清单(DSHBOTS-168):清洗+审计由 createTask 统一做(审计挂真实 taskId)。
|
|
703
|
-
writeScopes: parsedScopes,
|
|
704
|
-
// 总监派单可带父子/依赖关系(snake_case 透传,createTask 内统一校验与落库)。
|
|
705
|
-
parentTaskId: input.parent_task_id,
|
|
706
|
-
blockedBy: input.blocked_by,
|
|
707
|
-
// 时效要求(新任务 only):重派已有任务(上面 input.taskId/input.task 分支)不更新该字段。
|
|
708
|
-
timeBudgetMinutes: input.time_budget_minutes ?? input.timeBudgetMinutes,
|
|
709
|
-
// 紧急豁免共用车道报备(DSHBOTS-126):urgent 放行同写范围派单时,创建消息注明与哪张在办卡共用车道。
|
|
710
|
-
laneShareTask: urgentExempt && duplicate ? `${project.key}-${duplicate.number}` : null,
|
|
711
|
-
sandboxOverride,
|
|
712
|
-
autoStart: true,
|
|
713
|
-
postCard: true,
|
|
714
|
-
}, actor)
|
|
715
|
-
if (forceDuplicate) {
|
|
716
|
-
this.audit(actor, 'dispatch_force_duplicate', 'task', task.id, {
|
|
717
|
-
writeScopes: scopes,
|
|
718
|
-
duplicateTaskId: duplicate?.id ?? null,
|
|
719
|
-
duplicateIdentifier: duplicate ? `${project.key}-${duplicate.number}` : null,
|
|
720
|
-
})
|
|
721
|
-
}
|
|
722
|
-
return task
|
|
723
|
-
},
|
|
724
362
|
resolveTaskByIdentifier(identifier) {
|
|
725
363
|
const match = TASK_ID_PATTERN.exec(String(identifier ?? '').trim())
|
|
726
364
|
if (!match) throw badRequest('任务号格式应为 <项目key>-<序号>,如 web-3')
|
|
@@ -739,6 +377,9 @@ export const tasksMethods = {
|
|
|
739
377
|
const { task } = this.resolveTaskByIdentifier(identifier)
|
|
740
378
|
return {
|
|
741
379
|
...this.taskView(task),
|
|
380
|
+
// 指派者名(DSHBOTS-257):/detail 卡片直读 assigneeName,在此按 assignee_bot_id
|
|
381
|
+
// 解析(同 task-notify 口径),不进 taskView 列表热路径(每卡一次 bots 查询)。
|
|
382
|
+
assigneeName: task.assignee_bot_id ? this.botRow(task.assignee_bot_id)?.name ?? null : null,
|
|
742
383
|
comments: this.store.all(
|
|
743
384
|
'SELECT author_type, author_id, body, created_at FROM task_comments WHERE task_id = ? ORDER BY created_at DESC LIMIT 3',
|
|
744
385
|
task.id,
|
|
@@ -755,9 +396,20 @@ export const tasksMethods = {
|
|
|
755
396
|
'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
397
|
taskId,
|
|
757
398
|
)
|
|
399
|
+
// 任务级 usage 口径(DSHBOTS-212):usage = 本卡全部运行(成功交付 + 失败重试 + 核验/受阻
|
|
400
|
+
// 派生运行)端到端 token/成本,缓存读写分列;usageTotal = 本卡 + 全部后代子卡,
|
|
401
|
+
// 拆分划算判定(C_removed > C_introduced)拿它与同类整卡任务的 usage 对比。
|
|
402
|
+
// 只挂 taskDetail 单卡详情,不进 taskView 列表热路径(每卡一次聚合会放大列表查询)。
|
|
403
|
+
const subtreeIds = taskSubtreeIds(this.store, taskId)
|
|
404
|
+
const budgetCurrency = this.budgetCurrency()
|
|
758
405
|
return {
|
|
759
406
|
...this.taskView(task),
|
|
760
407
|
projectKey: project.key,
|
|
408
|
+
usage: {
|
|
409
|
+
own: taskUsageTotals(this.store, taskId, budgetCurrency),
|
|
410
|
+
total: taskTreeUsageTotals(this.store, taskId, budgetCurrency),
|
|
411
|
+
subtaskCount: subtreeIds.length - 1,
|
|
412
|
+
},
|
|
761
413
|
comments: comments.map(comment => ({
|
|
762
414
|
...comment,
|
|
763
415
|
authorName: comment.author_type === 'bot'
|
package/src/services/terminal.js
CHANGED
|
@@ -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
|
}
|