dsh-team-bots 0.2.465 → 0.3.64
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/NOTICE +5 -0
- package/README.md +8 -2
- package/docs/README.zh.md +8 -2
- package/docs/assets/global-config.png +0 -0
- package/docs/assets/global-config.zh.png +0 -0
- package/docs/assets/tasks.png +0 -0
- package/docs/assets/tasks.zh.png +0 -0
- package/docs/assets/usage.png +0 -0
- package/docs/assets/usage.zh.png +0 -0
- package/package.json +8 -2
- package/src/api.js +16 -2
- package/src/config.js +193 -8
- package/src/db-migrations.js +53 -4
- package/src/db.js +37 -3
- package/src/http.js +20 -1
- package/src/runtime.js +16 -1
- package/src/seed-bots.js +4 -0
- package/src/service.js +21 -2
- package/src/services/approvals.js +276 -8
- package/src/services/bot-quota.js +54 -0
- package/src/services/bots.js +8 -0
- package/src/services/chat.js +54 -5
- package/src/services/core.js +31 -2
- package/src/services/memory.js +112 -25
- package/src/services/model-fallback.js +55 -15
- package/src/services/projects.js +13 -2
- package/src/services/run-finish.js +44 -11
- package/src/services/runs.js +15 -7
- package/src/services/runtime/prompt.js +31 -6
- package/src/services/runtime/session.js +87 -25
- package/src/services/scheduler.js +26 -5
- package/src/services/system.js +162 -10
- package/src/services/task-dispatch.js +24 -0
- package/src/services/task-notify.js +18 -0
- package/src/services/task-review.js +102 -23
- package/src/services/task-runs.js +31 -3
- package/src/services/tasks.js +91 -3
- package/src/tools.js +20 -14
- package/ui/app.js +7 -10
- package/ui/i18n/en/chat.js +2 -0
- package/ui/i18n/en/common.js +10 -0
- package/ui/i18n/en/settings.js +76 -1
- package/ui/i18n/en/tasks.js +3 -0
- package/ui/i18n/zh/chat.js +2 -0
- package/ui/i18n/zh/common.js +10 -0
- package/ui/i18n/zh/settings.js +76 -1
- package/ui/i18n/zh/tasks.js +3 -0
- package/ui/modules/api.js +9 -1
- package/ui/modules/cards.js +6 -3
- package/ui/modules/chat.js +1 -1
- package/ui/modules/composer.js +6 -1
- package/ui/modules/events-board.js +48 -0
- package/ui/modules/events-misc.js +43 -0
- package/ui/modules/events-submit.js +20 -0
- package/ui/modules/form-validation.js +204 -0
- package/ui/modules/global-pages.js +8 -5
- package/ui/modules/modal-forms.js +4 -4
- package/ui/modules/modal-layer.js +4 -1
- package/ui/modules/page-shell.js +10 -7
- package/ui/modules/permissions.js +99 -0
- package/ui/modules/settings.js +108 -26
- package/ui/modules/state.js +10 -0
- package/ui/modules/task-menu.js +147 -0
- package/ui/modules/tasks.js +11 -10
- package/ui/modules/util.js +43 -6
- package/ui/styles/a11y.css +13 -0
- package/ui/styles/base.css +57 -11
- package/ui/styles/buttons.css +46 -6
- package/ui/styles/cards.css +90 -0
- package/ui/styles/chat.css +23 -2
- package/ui/styles/global-config.css +7 -4
- package/ui/styles/modal.css +28 -0
- package/ui/styles/settings.css +23 -1
- package/ui/styles/tasks.css +51 -1
- package/ui/styles/toast.css +18 -11
- package/ui/styles/usage.css +2 -0
- package/ui/styles/wide.css +5 -0
- 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/usage-redesign-global.png +0 -0
package/src/services/runs.js
CHANGED
|
@@ -192,20 +192,31 @@ export const runsMethods = {
|
|
|
192
192
|
}
|
|
193
193
|
// owner 任务运行挂起项(review/handle/review_delegate,DSHBOTS-290 busy 闸):
|
|
194
194
|
// 只读任务运行,按入队时快照建回,列面与 enqueueOwnerTaskRun 一致。
|
|
195
|
+
// DSHBOTS-358:额度路由快照随挂起项带回来,建回时同样落 model_* 三列。
|
|
195
196
|
if (item.kind === 'owner_task') {
|
|
197
|
+
const routing = item.routing ?? {}
|
|
196
198
|
try {
|
|
197
199
|
this.store.run(
|
|
198
200
|
`INSERT INTO runs(id, project_id, bot_id, task_id, kind, mode, trigger_type, trigger_ref, status,
|
|
199
|
-
attempt, idempotency_key, queued_at)
|
|
200
|
-
VALUES (?, ?, ?, ?, ?, 'read', ?, ?, 'queued', 1, ?, ?)`,
|
|
201
|
+
attempt, idempotency_key, model_provider, model_model, model_effort, queued_at)
|
|
202
|
+
VALUES (?, ?, ?, ?, ?, 'read', ?, ?, 'queued', 1, ?, ?, ?, ?, ?)`,
|
|
201
203
|
runId, item.projectId, bot.id, item.taskId, item.runKind, item.triggerType, item.taskId,
|
|
202
|
-
`${item.triggerType}:${item.taskId}:${Date.now()}:${runId}`,
|
|
204
|
+
`${item.triggerType}:${item.taskId}:${Date.now()}:${runId}`,
|
|
205
|
+
routing.mode === 'fallback' ? routing.provider ?? null : null,
|
|
206
|
+
routing.mode === 'fallback' ? routing.model ?? null : null,
|
|
207
|
+
routing.mode === 'fallback' ? routing.effort ?? null : null,
|
|
208
|
+
createdAt,
|
|
203
209
|
)
|
|
204
210
|
} catch (error ) {
|
|
205
211
|
if (String(error).includes('UNIQUE')) return null
|
|
206
212
|
throw error
|
|
207
213
|
}
|
|
208
214
|
this.insertRunEvent(runId, 'queued', 'bot 空闲,挂起的 owner 任务运行建回(验收/接管)')
|
|
215
|
+
if (routing.mode === 'fallback') {
|
|
216
|
+
this.insertRunEvent(runId, 'quota_fallback', `主 provider 额度耗尽,本次直接走备用模型 ${routing.ref ?? ''}`)
|
|
217
|
+
} else if (routing.mode === 'wait') {
|
|
218
|
+
this.insertRunEvent(runId, 'quota_wait', `主 provider 额度耗尽且无可用备用模型,排队等待至 ${routing.resetAt ?? '恢复'}`)
|
|
219
|
+
}
|
|
209
220
|
return runId
|
|
210
221
|
}
|
|
211
222
|
const spec = item.kind === 'chat'
|
|
@@ -560,10 +571,7 @@ export const runsMethods = {
|
|
|
560
571
|
id('evt'), runId, 'canceled', '运行已取消', nowIso(),
|
|
561
572
|
)
|
|
562
573
|
if (updateTask && run.task_id) {
|
|
563
|
-
this.
|
|
564
|
-
"UPDATE tasks SET status = 'todo', version = version + 1, updated_at = ? WHERE id = ? AND status = 'in_progress'",
|
|
565
|
-
nowIso(), run.task_id,
|
|
566
|
-
)
|
|
574
|
+
this.setTaskStatus(run.task_id, 'todo', { type: 'system', id: 'system' }, { ifIs: 'in_progress' })
|
|
567
575
|
this.addTaskEvent(run.task_id, 'run_canceled', { type: 'system', id: 'system' }, { runId })
|
|
568
576
|
}
|
|
569
577
|
return this.runRow(runId)
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
import { createHash } from 'node:crypto'
|
|
13
13
|
import { join } from 'node:path'
|
|
14
14
|
import { scanProjectSkills } from '../../project-skills.js'
|
|
15
|
-
import { parseDisabledSkills } from '../../util.js'
|
|
15
|
+
import { parseDisabledSkills, jsonParse } from '../../util.js'
|
|
16
16
|
import { dmPrompt, replyDeliveryPrompt } from '../../botmsg.js'
|
|
17
17
|
import { rolloverPendingKey, rolloverSummaryKey } from '../../config.js'
|
|
18
18
|
import { taskDeadlineInfo } from '../tasks.js'
|
|
@@ -329,6 +329,24 @@ You can spawn child agents (\`subagent\` / \`subagent_fork\`) or named teammates
|
|
|
329
329
|
].join('\n')
|
|
330
330
|
},
|
|
331
331
|
|
|
332
|
+
// 验收边界沉淀提醒块(搭车投递,吸收 dsh-agent-team acceptance-boundary 理念):
|
|
333
|
+
// 标记由 noteTaskAccepted 落(验收通过的负责人 × 项目),在这里渲染一次性提醒并清空——
|
|
334
|
+
// 附着在本就要跑的这一轮提示词里,不产生额外轮次,不注入会话日志。上限 3 条防积压。
|
|
335
|
+
acceptReminderBlock(bot, project) {
|
|
336
|
+
const key = `accept_remind:${bot.id}:${project.id}`
|
|
337
|
+
const list = jsonParse(this.store.setting(key), [])
|
|
338
|
+
if (!Array.isArray(list) || !list.length) return ''
|
|
339
|
+
this.store.setSetting(key, '[]')
|
|
340
|
+
const lines = list.slice(0, 3)
|
|
341
|
+
.map(item => `- ${item.identifier}(${item.title ?? ''},验收于 ${item.at ?? ''})`)
|
|
342
|
+
.join('\n')
|
|
343
|
+
return `
|
|
344
|
+
|
|
345
|
+
# Accepted tasks — persist durable conclusions
|
|
346
|
+
Tasks you executed below have been accepted. If any durable fact, decision or lesson worth keeping across tasks emerged and is not yet in memory, persist it now with team_remember (short topic, self-contained content; one-off process detail does not belong there). This notice appears once; skip silently if nothing qualifies.
|
|
347
|
+
${lines}`
|
|
348
|
+
},
|
|
349
|
+
|
|
332
350
|
// 单聊会话的身份段:没有项目上下文,工作区是 bot 自己的 _the_bots/<dir>。
|
|
333
351
|
soloPromptFor(bot) {
|
|
334
352
|
const workspace = bot.solo_dir ? join(this.config.workspace, '_the_bots', bot.solo_dir) : join(this.config.workspace, '_the_bots')
|
|
@@ -685,7 +703,7 @@ ${parallelMergeBody(this.config.maxTeammates)}` : ''
|
|
|
685
703
|
const deliverablesLine = readDeliverables(task.deliverables).length
|
|
686
704
|
? `\nDeliverables (file paths): ${readDeliverables(task.deliverables).join(', ')}`
|
|
687
705
|
: ''
|
|
688
|
-
return `${header}${subtaskDisciplineBlock}${splittingGuidanceBlock}
|
|
706
|
+
return `${header}${subtaskDisciplineBlock}${splittingGuidanceBlock}${this.acceptReminderBlock(bot, project)}
|
|
689
707
|
|
|
690
708
|
Do the task in the project workspace. End with a delivery report (≤${this.config.deliveryReportMaxChars} chars): what changed, verification performed, blockers or risks — not just a plan. Never paste file contents into the report or chat — reference paths; reviewers open the files.${parallel}${parallelMerge}
|
|
691
709
|
|
|
@@ -700,7 +718,7 @@ ${description}${threads}${timeBudgetBlock}${urgentExemptionBlock}${recoveryNoteB
|
|
|
700
718
|
sessionId,
|
|
701
719
|
// 审批卡片(kind='approval')是给人看的 UI 锚点,不进 bot 上下文;旧行迁移后回填 'text'。
|
|
702
720
|
table: 'messages',
|
|
703
|
-
columns: 'id, sender_type, sender_id, body, task_id',
|
|
721
|
+
columns: 'id, sender_type, sender_id, body, task_id, mentions_json',
|
|
704
722
|
where: "project_id = ? AND kind = 'text'",
|
|
705
723
|
params: [project.id],
|
|
706
724
|
excludeId: chatMessage?.id,
|
|
@@ -708,9 +726,16 @@ ${description}${threads}${timeBudgetBlock}${urgentExemptionBlock}${recoveryNoteB
|
|
|
708
726
|
// P3-1:无信息量 system 短状态不进尾窗;合批消息已在专门段落呈现,同样不进尾窗(不双份)。
|
|
709
727
|
const mergedIds = new Set((extraMessages ?? []).map(item => item.id))
|
|
710
728
|
const visible = recent.filter(item => !mergedIds.has(item.id) && !(item.sender_type === 'system' && NOISE_SYSTEM_BODY.test(item.body)))
|
|
729
|
+
// 分级注入(吸收 dsh-agent-team 直接信号/背景折叠理念):@本 bot 的消息与人的消息
|
|
730
|
+
// 保持 240 全文(@我的另加标记);其他 bot 的闲聊折叠成 80 字背景摘要,降噪省 token。
|
|
731
|
+
const botId = (bot ).id
|
|
711
732
|
const context = visible.map((item) => {
|
|
712
|
-
const
|
|
713
|
-
|
|
733
|
+
const mentions = jsonParse(item.mentions_json, [])
|
|
734
|
+
const directed = Array.isArray(mentions) && mentions.includes(botId)
|
|
735
|
+
const limit = item.sender_type === 'bot' && !directed ? 80 : 240
|
|
736
|
+
const body = item.body.length > limit ? `${item.body.slice(0, limit)}…` : item.body
|
|
737
|
+
const mark = directed ? ' [→你]' : (item.sender_type === 'bot' && !directed ? ' (背景)' : '')
|
|
738
|
+
return `- [m_${item.id.slice(-6)}] ${item.sender_type}:${item.sender_id}${item.task_id ? ' (task thread)' : ''}${mark}: ${body}`
|
|
714
739
|
}).join('\n')
|
|
715
740
|
const recentBlock = context
|
|
716
741
|
? `${incremental ? 'New project messages since your last turn (ids are for team_recall):' : 'Recent project messages (truncated, ids are for team_recall):'}\n${context}`
|
|
@@ -753,7 +778,7 @@ Reply as ${bot.name} in the project group. Keep it under ${this.config.chatReply
|
|
|
753
778
|
|
|
754
779
|
# Group message
|
|
755
780
|
${(chatMessage?.body ?? '(no message)').slice(0, 4_000)}
|
|
756
|
-
${this.mergedMessagesBlock(extraMessages)}${quoteLine}${this.rolloverSummaryBlock(bot, project, sessionId)}
|
|
781
|
+
${this.mergedMessagesBlock(extraMessages)}${quoteLine}${this.rolloverSummaryBlock(bot, project, sessionId)}${this.acceptReminderBlock(bot, project)}
|
|
757
782
|
${recentBlock}
|
|
758
783
|
|
|
759
784
|
Open tasks:
|
|
@@ -7,7 +7,7 @@ import { randomUUID } from 'node:crypto'
|
|
|
7
7
|
import { AppError } from '../../errors.js'
|
|
8
8
|
import { id } from '../../util.js'
|
|
9
9
|
import { attachSessionToWorkspace, resolveSessionCwd, workspaceGroupTitle } from '../workspace-groups.js'
|
|
10
|
-
import { effectiveRunLimits, effectiveSessionCompactCtxTokens, effectiveSessionCompactTurns, effectiveSessionRolloverCtxTokens, effectiveSessionRolloverTurns, rolloverPendingKey, rolloverSummaryKey, sessionCompactMarkerKey } from '../../config.js'
|
|
10
|
+
import { effectiveRunLimits, effectiveSessionCompactCtxTokens, effectiveSessionCompactTurns, effectiveSessionRolloverCtxTokens, effectiveSessionRolloverSubagents, effectiveSessionRolloverTurns, REVIEW_TIMEOUT_KEY, rolloverPendingKey, rolloverSummaryKey, RUN_LIMIT_RANGES, sessionCompactMarkerKey } from '../../config.js'
|
|
11
11
|
import { imageContentPartsForMessage } from '../message-images.js'
|
|
12
12
|
import { restoreDefaultModel } from './model-restore.js'
|
|
13
13
|
import { applyBotToolPolicy } from '../../tools.js'
|
|
@@ -23,8 +23,9 @@ export const modelOverrideFor = (run) => (run?.model_provider && run?.model_mode
|
|
|
23
23
|
// 运行时效上限(DSHBOTS-131):任务派生运行(runs.task_id 非空)若任务声明了时效要求,
|
|
24
24
|
// 其超时上限取 min(全局 runTimeoutMs, 时效分钟数);无时效、非任务运行沿用全局值。
|
|
25
25
|
// DSHBOTS-302 预算分档:review/handle(owner_task 运行族)在全局上限内再收紧到 review
|
|
26
|
-
//
|
|
27
|
-
//
|
|
26
|
+
// 分档(0 = 关闭分档,默认;DSHBOTS-364)——验收长尾不再被硬上限误杀,真挂死由无进展
|
|
27
|
+
// 看门狗兜底,director 单车道(one_active_run_per_bot)的排队语义不变;task 时效取
|
|
28
|
+
// min 逻辑不变。
|
|
28
29
|
export const runTimeoutMsForTaskRun = ({ run, task, globalRunTimeoutMs, reviewTimeoutMs = null }) => {
|
|
29
30
|
if ((run?.kind === 'review' || run?.kind === 'handle') && Number(reviewTimeoutMs) > 0) {
|
|
30
31
|
return Math.min(globalRunTimeoutMs, reviewTimeoutMs)
|
|
@@ -34,26 +35,26 @@ export const runTimeoutMsForTaskRun = ({ run, task, globalRunTimeoutMs, reviewTi
|
|
|
34
35
|
return Math.min(globalRunTimeoutMs, minutes * 60_000)
|
|
35
36
|
}
|
|
36
37
|
|
|
37
|
-
// review 分档分钟(DSHBOTS-302
|
|
38
|
-
//
|
|
38
|
+
// review 分档分钟(DSHBOTS-302 起;DSHBOTS-364 默认改关闭):env 显式 > settings 保存
|
|
39
|
+
// 整数(范围随 RUN_LIMIT_RANGES,[0,60],0 = 关闭分档、跟随全局运行时效)> 默认 0。
|
|
40
|
+
// 默认关闭的理由:验收/受阻处理链自带子代理核验,慢而健康是常态,硬上限只会砍掉仍在
|
|
41
|
+
// 推进的验收;真挂死由无进展看门狗兜底——子代理活动计入根运行进展(lifecycle 的子会话
|
|
42
|
+
// 归账),看门狗不会误杀在跑的验收。与 effectiveRunLimits 同款生效链;消费点在 startRun
|
|
39
43
|
// 启动瞬间参与定格,改值只影响之后启动的运行,进行中不追溯。
|
|
40
|
-
export const
|
|
41
|
-
export const REVIEW_TIMEOUT_MINUTES_DEFAULT = 10
|
|
42
|
-
export const REVIEW_TIMEOUT_MINUTES_RANGE = [3, 60]
|
|
44
|
+
export const REVIEW_TIMEOUT_MINUTES_DEFAULT = 0
|
|
43
45
|
|
|
44
46
|
export function effectiveReviewTimeoutMinutes(getSetting = () => null) {
|
|
47
|
+
const range = RUN_LIMIT_RANGES[REVIEW_TIMEOUT_KEY]
|
|
45
48
|
const env = process.env.DSH_TEAM_REVIEW_TIMEOUT_MINUTES
|
|
46
49
|
if (env !== undefined && String(env).trim() !== '') {
|
|
47
50
|
const envMinutes = Number(env)
|
|
48
|
-
if (Number.isFinite(envMinutes) && envMinutes
|
|
49
|
-
|
|
50
|
-
return Math.min(max, Math.max(min, Math.round(envMinutes)))
|
|
51
|
+
if (Number.isFinite(envMinutes) && envMinutes >= 0) {
|
|
52
|
+
return Math.min(range[1], Math.max(range[0], Math.round(envMinutes)))
|
|
51
53
|
}
|
|
52
54
|
}
|
|
53
|
-
const [min, max] = REVIEW_TIMEOUT_MINUTES_RANGE
|
|
54
55
|
const raw = String(getSetting?.(REVIEW_TIMEOUT_KEY) ?? '')
|
|
55
56
|
const saved = Number(raw)
|
|
56
|
-
if (raw !== '' && Number.isInteger(saved) && saved >=
|
|
57
|
+
if (raw !== '' && Number.isInteger(saved) && saved >= range[0] && saved <= range[1]) return saved
|
|
57
58
|
return REVIEW_TIMEOUT_MINUTES_DEFAULT
|
|
58
59
|
}
|
|
59
60
|
|
|
@@ -262,6 +263,16 @@ export const sessionMethods = {
|
|
|
262
263
|
sessionId,
|
|
263
264
|
)?.ctx ?? 0
|
|
264
265
|
},
|
|
266
|
+
// 会话累计消费的子代理数(DSH 会话子代理上限口径):该会话名下运行的 run_events 中
|
|
267
|
+
// type='subagent_spawned' 计数(DSHBOTS-294 账本落账)。无账本记录返回 0,不误触发。
|
|
268
|
+
sessionSubagentCount(sessionId) {
|
|
269
|
+
if (!sessionId) return 0
|
|
270
|
+
return this.store.get(
|
|
271
|
+
`SELECT COUNT(*) AS n FROM run_events re JOIN runs r ON r.id = re.run_id
|
|
272
|
+
WHERE r.session_id = ? AND re.type = 'subagent_spawned'`,
|
|
273
|
+
sessionId,
|
|
274
|
+
)?.n ?? 0
|
|
275
|
+
},
|
|
265
276
|
// 结转判定(DSHBOTS-145 / DSHBOTS-286):旧会话是否该让位。返回 true 表示旧绑定已
|
|
266
277
|
// alias 化、调用方走新建路径;false 表示继续复用旧会话。
|
|
267
278
|
// - 阈值 0 = 关闭(配置见 config.js 的 sessionRolloverTurns,默认 512);
|
|
@@ -270,6 +281,9 @@ export const sessionMethods = {
|
|
|
270
281
|
// - 体积判据(单轮上下文治理 P2):轮数未到但会话上下文已达上限(默认 150k token,
|
|
271
282
|
// 0 = 关闭)同样触发——胖会话不用等 512 轮,live 实测稳态单轮 55 万 token 的会话
|
|
272
283
|
// 按轮数口径永远追不上真实膨胀速度;
|
|
284
|
+
// - 子代理判据:DSH 宿主对单会话子代理派生有上限(口径 200),累计消费达阈值(默认
|
|
285
|
+
// 128 留摘要往返余量,0 = 关闭)同样触发——派满后会话再也无法派子代理,核验/并行
|
|
286
|
+
// 加速被阻塞且无自动恢复;
|
|
273
287
|
// - 幂等(DSHBOTS-286):alias 行永不触发结转——本判定只在活跃绑定上被调用
|
|
274
288
|
// (唯一调用点 ensureSession 以 !existing.alias 前置短路保证);已结转的旧会话
|
|
275
289
|
// 即使轮数继续增长(承接未终态任务流量),也只参与闲时压缩,不再二次结转;
|
|
@@ -278,11 +292,13 @@ export const sessionMethods = {
|
|
|
278
292
|
shouldRolloverSession({ bot, project, existing }) {
|
|
279
293
|
const turns = effectiveSessionRolloverTurns(this.config, key => this.store.setting(key))
|
|
280
294
|
const ctxLimit = effectiveSessionRolloverCtxTokens(this.config, key => this.store.setting(key))
|
|
281
|
-
|
|
295
|
+
const subagentLimit = effectiveSessionRolloverSubagents(this.config, key => this.store.setting(key))
|
|
296
|
+
// 三个判据各自独立(0 = 该判据关闭),全关即整体关闭结转。
|
|
282
297
|
const count = this.store.get('SELECT COUNT(*) AS n FROM runs WHERE session_id = ?', existing.session_id)?.n ?? 0
|
|
283
298
|
const countOver = turns > 0 && count >= turns
|
|
284
299
|
const ctxOver = ctxLimit > 0 && this.sessionContextTokens(existing.session_id) >= ctxLimit
|
|
285
|
-
|
|
300
|
+
const subagentsOver = subagentLimit > 0 && this.sessionSubagentCount(existing.session_id) >= subagentLimit
|
|
301
|
+
if (!countOver && !ctxOver && !subagentsOver) return false
|
|
286
302
|
if (this.store.setting(rolloverSummaryKey(bot.id, project?.id))) return true
|
|
287
303
|
const active = this.store.get(
|
|
288
304
|
"SELECT id FROM runs WHERE kind = 'rollover_summary' AND trigger_ref = ? AND status IN ('queued', 'running')",
|
|
@@ -437,19 +453,34 @@ export const sessionMethods = {
|
|
|
437
453
|
// 标记推进到窗口下界:即使压缩运行后续失败也不回退,失败留痕由下一窗口再补。
|
|
438
454
|
this.store.setSetting(sessionCompactMarkerKey(sessionId), String(window * every))
|
|
439
455
|
},
|
|
456
|
+
// 会话策略归属(2026-11-15「recall 拦截循环」事故):复用分支的工具面/文件面/模型必须
|
|
457
|
+
// 跟「会话绑定行的 bot」走,而不是当前运行方 bot。in_review 亲和(DSHBOTS-306)会把
|
|
458
|
+
// 成员运行送进项目 owner 的控制面会话:若按运行方套成员策略,applyBotToolPolicy 的
|
|
459
|
+
// 总监专权 deny(宿主 restriction 粘滞、兜底路径丢弃 disposer)会挂在整个 owner 会话上,
|
|
460
|
+
// owner 后续轮次丢 team_assign_task/team_review_task——模型层表现为 unknown tool 连发
|
|
461
|
+
// 或退化成 team_recall 重复调用;selectModel 同理会把 owner 会话模型翻成成员模型。
|
|
462
|
+
// 绑定行缺失/查无此 bot 时回退运行方 bot(不改变既有行为)。
|
|
463
|
+
sessionPolicyBot(binding , fallbackBot ) {
|
|
464
|
+
const botId = binding?.bot_id
|
|
465
|
+
if (!botId || !fallbackBot || botId === fallbackBot.id) return fallbackBot
|
|
466
|
+
return this.store.get('SELECT * FROM bots WHERE id = ?', botId) ?? fallbackBot
|
|
467
|
+
},
|
|
440
468
|
async ensureSession(bot, project, { run, task, modelOverride } = {} ) {
|
|
441
|
-
// DSHBOTS-238:成员 bot 工具层兜底——隐藏总监专权工具(子代理生成工具由 preset 全局
|
|
442
|
-
// 注册,成员默认可见)。仅作用于项目绑定会话;solo 无项目上下文,本策略自然不触发。
|
|
443
|
-
const isOwner = Boolean(project && bot && project.owner_bot_id === bot.id)
|
|
444
469
|
// 结转摘要运行(DSHBOTS-145)与闲时压缩运行(DSHBOTS-286):必须回到原会话执行,
|
|
445
470
|
// 且不能参与阈值判定——否则这两类运行自己又会触发结转/压缩;solo 摘要运行也没有
|
|
446
471
|
// 项目上下文,不查项目。
|
|
447
472
|
if ((run?.kind === 'rollover_summary' || run?.kind === 'session_compact') && run.session_id) {
|
|
448
473
|
const resolved = await liveAgentFor(this.ctx, run.session_id)
|
|
449
474
|
if (resolved) {
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
475
|
+
// 策略面按会话归属 bot(sessionPolicyBot):历史误挂到成员名下的压缩运行
|
|
476
|
+
// 不得再把成员工具面/模型套到 owner 会话上。
|
|
477
|
+
const sessionBot = this.sessionPolicyBot(this.bindingOfSession(run.session_id), bot)
|
|
478
|
+
this.applyFilePolicy(resolved, sessionBot, run, task)
|
|
479
|
+
applyBotToolPolicy(resolved, {
|
|
480
|
+
isOwner: Boolean(project && sessionBot && project.owner_bot_id === sessionBot.id),
|
|
481
|
+
logger: this.logger,
|
|
482
|
+
})
|
|
483
|
+
await this.selectModel(run.session_id, sessionBot, modelOverride)
|
|
453
484
|
return run.session_id
|
|
454
485
|
}
|
|
455
486
|
this.retireBinding(run.session_id)
|
|
@@ -472,12 +503,18 @@ export const sessionMethods = {
|
|
|
472
503
|
if (affinity) {
|
|
473
504
|
const resolved = await liveAgentFor(this.ctx, affinity.session_id)
|
|
474
505
|
if (resolved) {
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
506
|
+
// 同 sessionPolicyBot:in_review 亲和把成员运行送进 owner 会话时,
|
|
507
|
+
// 工具面/文件面/模型保持 owner 会话自身,压缩入队也记到会话归属 bot 名下。
|
|
508
|
+
const sessionBot = this.sessionPolicyBot(affinity, bot)
|
|
509
|
+
this.applyFilePolicy(resolved, sessionBot, run, task)
|
|
510
|
+
applyBotToolPolicy(resolved, {
|
|
511
|
+
isOwner: Boolean(project && sessionBot && project.owner_bot_id === sessionBot.id),
|
|
512
|
+
logger: this.logger,
|
|
513
|
+
})
|
|
514
|
+
await this.selectModel(affinity.session_id, sessionBot, modelOverride)
|
|
478
515
|
// 任务会话同样在承接流量:跨过压缩窗口且闲时排队总结压缩
|
|
479
516
|
// (结转仍豁免——任务会话生命周期短,DSHBOTS-286 口径不变)。
|
|
480
|
-
this.maybeCompactSession({ bot, project, existing: affinity, currentRunId: run?.id })
|
|
517
|
+
this.maybeCompactSession({ bot: sessionBot, project, existing: affinity, currentRunId: run?.id })
|
|
481
518
|
return affinity.session_id
|
|
482
519
|
}
|
|
483
520
|
this.retireBinding(affinity.session_id)
|
|
@@ -509,6 +546,31 @@ export const sessionMethods = {
|
|
|
509
546
|
// 并发首建去重键带 task 维度,同任务并发首建共用同一 in-flight Promise。
|
|
510
547
|
async ensureTaskSession(bot, project, { run, task, modelOverride } = {} ) {
|
|
511
548
|
const isOwner = Boolean(project && bot && project.owner_bot_id === bot.id)
|
|
549
|
+
// 任务会话复用(ZONGM-140 三会话事故):runs 归属亲和(taskAffinityBinding)只看
|
|
550
|
+
// runs.session_id,而宿主重启重排队会把 running 运行的 session_id 置空——亲和断链后
|
|
551
|
+
// 直落下方首建,旧任务会话(绑定行 kind='task' 仍在、宿主仍活)被孤儿化,同一张卡
|
|
552
|
+
// 每重启一次多一个会话。绑定行才是任务会话的家谱:先按 (bot, task) 找活跃绑定,
|
|
553
|
+
// 宿主仍活就回本会话(策略面与亲和复用分支同款);死了退役重建。多活跃行只可能来自
|
|
554
|
+
// 历史孤儿/并发残留,保留最新一条、其余 alias 化收敛。
|
|
555
|
+
const bindings = this.store.all(
|
|
556
|
+
"SELECT * FROM session_bindings WHERE bot_id = ? AND task_id = ? AND kind = 'task' AND alias = 0 ORDER BY created_at DESC, rowid DESC",
|
|
557
|
+
bot.id, task.id,
|
|
558
|
+
)
|
|
559
|
+
if (bindings.length > 1) {
|
|
560
|
+
for (const stale of bindings.slice(1)) this.retireBinding(stale.session_id)
|
|
561
|
+
}
|
|
562
|
+
const existing = bindings[0]
|
|
563
|
+
if (existing) {
|
|
564
|
+
const resolved = await liveAgentFor(this.ctx, existing.session_id)
|
|
565
|
+
if (resolved) {
|
|
566
|
+
this.applyFilePolicy(resolved, bot, run, task)
|
|
567
|
+
applyBotToolPolicy(resolved, { isOwner, logger: this.logger })
|
|
568
|
+
await this.selectModel(existing.session_id, bot, modelOverride)
|
|
569
|
+
this.maybeCompactSession({ bot, project, existing, currentRunId: run?.id })
|
|
570
|
+
return existing.session_id
|
|
571
|
+
}
|
|
572
|
+
this.retireBinding(existing.session_id)
|
|
573
|
+
}
|
|
512
574
|
const key = `${bot.id}:${project.id}:task:${task.id}`
|
|
513
575
|
if (this.sessionCreates.has(key)) return this.sessionCreates.get(key)
|
|
514
576
|
const creating = (async () => {
|
|
@@ -8,6 +8,7 @@ import { badRequest } from '../errors.js'
|
|
|
8
8
|
import { applyRetention, reconcileUsage } from '../usage-reconcile.js'
|
|
9
9
|
import { id, jsonParse, nowIso, text } from '../util.js'
|
|
10
10
|
import { MAX_RATE_LIMIT_RETRIES, isQuotaExhausted, isRetryChainError } from './backoff.js'
|
|
11
|
+
import { INTERNAL_FALLBACK_KINDS } from './model-fallback.js'
|
|
11
12
|
import { ensureTaskRelationsSchema, unsatisfiedBlockedDeps } from './task-relations.js'
|
|
12
13
|
import { TASK_BUDGET_ROUNDS, TRANSITIONS, taskDeadlineInfo } from './tasks.js'
|
|
13
14
|
import { effectiveWriteScopes, writeScopesOverlap } from './write-scopes.js'
|
|
@@ -515,9 +516,29 @@ export const schedulerMethods = {
|
|
|
515
516
|
return true
|
|
516
517
|
},
|
|
517
518
|
|
|
519
|
+
// 空载门(效率优化):只挂在周期定时器上(core.start 的 setInterval)。距上次全量拍不足
|
|
520
|
+
// schedulerIdleIntervalMs 时,先用一次索引计数探测是否有可做的工作——无 queued/running
|
|
521
|
+
// 运行且无可领 outbox 即本拍直接返回,把空载 tick 从十来次查询压到一次计数。
|
|
522
|
+
// 有工作或窗口到期则照常全量。提醒类扫描(滞留卡/验收守门)与到期重试派生在慢拍粒度
|
|
523
|
+
// (默认 15s)下运行,阈值均为分钟级,无感;入队路径的事件唤醒 tick() 与测试直调不经此门。
|
|
524
|
+
tickIdleGate() {
|
|
525
|
+
const idleMs = Number(this.config.schedulerIdleIntervalMs ?? 15_000)
|
|
526
|
+
if (Date.now() - this.lastFullTickAt < idleMs) {
|
|
527
|
+
const probe = this.store.get(
|
|
528
|
+
`SELECT
|
|
529
|
+
(SELECT COUNT(*) FROM runs WHERE status IN ('queued', 'running')) AS active_runs,
|
|
530
|
+
(SELECT COUNT(*) FROM outbox WHERE status = 'pending' AND available_at <= ?) AS ready_outbox`,
|
|
531
|
+
nowIso(),
|
|
532
|
+
)
|
|
533
|
+
if (!Number(probe?.active_runs) && !Number(probe?.ready_outbox)) return null
|
|
534
|
+
}
|
|
535
|
+
return this.tick()
|
|
536
|
+
},
|
|
537
|
+
|
|
518
538
|
async tick() {
|
|
519
539
|
if (this.ticking || !this.started) return
|
|
520
540
|
this.ticking = true
|
|
541
|
+
this.lastFullTickAt = Date.now()
|
|
521
542
|
try {
|
|
522
543
|
// tasks 的依赖列由 task-relations 域自管迁移(db.js 不加行),闸门读列前懒迁移一次。
|
|
523
544
|
ensureTaskRelationsSchema(this.store)
|
|
@@ -632,8 +653,11 @@ export const schedulerMethods = {
|
|
|
632
653
|
}
|
|
633
654
|
// DSHBOTS-241 额度闸门:主 provider 仍在耗尽期、且本次没走备用模型的任务运行不领取——
|
|
634
655
|
// 留 queued,恢复时间过后下一拍自动回主模型(避免每拍撞同一堵墙)。
|
|
656
|
+
// DSHBOTS-358:闸门扩到内部运行种类(任务/验收/受阻处理/记忆审查),
|
|
657
|
+
// mode='wait' 的内部运行同样留 queued 等恢复,不空转撞墙。
|
|
635
658
|
// 走备用的运行(model_provider 非空)不受此闸影响,主备两套额度各自独立。
|
|
636
|
-
|
|
659
|
+
// 聊天类运行不在此列:照发现行下发,失败文案与重试口径不动。
|
|
660
|
+
if (INTERNAL_FALLBACK_KINDS.has(run.kind) && !run.model_provider) {
|
|
637
661
|
const quota = this.botQuotaState(run.bot_id, bot.provider)
|
|
638
662
|
if (quota?.exhausted) {
|
|
639
663
|
const alreadyNoted = this.store.get(
|
|
@@ -722,10 +746,7 @@ export const schedulerMethods = {
|
|
|
722
746
|
}
|
|
723
747
|
}
|
|
724
748
|
if (run.task_id && run.kind === 'task') {
|
|
725
|
-
this.
|
|
726
|
-
"UPDATE tasks SET status = 'in_progress', version = version + 1, updated_at = ? WHERE id = ? AND status NOT IN ('done', 'canceled')",
|
|
727
|
-
nowIso(), run.task_id,
|
|
728
|
-
)
|
|
749
|
+
this.setTaskStatus(run.task_id, 'in_progress', { type: 'system', id: 'system' })
|
|
729
750
|
this.addTaskEvent(run.task_id, 'run_started', { type: 'system', id: 'system' }, { runId: run.id })
|
|
730
751
|
}
|
|
731
752
|
void this.executeRun(run.id)
|
package/src/services/system.js
CHANGED
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
// 因此方法体内的 this 与拆分前完全一致。
|
|
5
5
|
|
|
6
6
|
import { createRequire } from 'node:module'
|
|
7
|
+
import { appendFileSync } from 'node:fs'
|
|
8
|
+
import { join } from 'node:path'
|
|
7
9
|
import { AppError, badRequest, conflict, hotUpgradeUnsupported } from '../errors.js'
|
|
8
10
|
import { usageSnapshot } from '../usage.js'
|
|
9
11
|
import { latestDshVersion, latestTeamBotsVersion, compareVersions, validTargetVersion, detectDshRuntimeVersion, detectHostDshVersionFromPlugin, displayDshVersion } from '../updater.js'
|
|
@@ -58,9 +60,80 @@ function soloVisibleMessages(store, botId, { days = 0, keep = 0, beforeCreatedAt
|
|
|
58
60
|
|
|
59
61
|
|
|
60
62
|
|
|
61
|
-
|
|
63
|
+
const systemMethodsBase = {
|
|
64
|
+
// state 版本(效率优化):DB 变更计数(total_changes,O(1))+ 两通道内存相位 + 模型目录
|
|
65
|
+
// 刷新时间戳。state 的全部数据源变更都会推进版本;轮询带 since 且版本相等时服务端直接
|
|
66
|
+
// 回 unchanged,跳过整套组装(几十次查询 + 序列化 + 传输)。usage 快照/设置/技能等均由
|
|
67
|
+
// DB 派生,被变更计数覆盖;微信/飞书连接相位与模型目录是不落库的易变成分,单独入版本。
|
|
68
|
+
stateVersion() {
|
|
69
|
+
// 视图作用域版本(perf 实测修复):旧口径用全库 total_changes,任何后台写入
|
|
70
|
+
// (usage_events/run_trajectory/普通 outbox 投递等高频表)都会打穿 since 短路,
|
|
71
|
+
// 活跃运行期间每拍 2.8s 轮询都全量组装并回传 1~2MB。这里改为只对 state() 实读
|
|
72
|
+
// 的表取「行数 + 最新变更时刻」签名:与本视图无关的写入不再失效短路。
|
|
73
|
+
// 漏表的最坏后果由既有 60s 兜底上限覆盖(到期强制重组装一次)。
|
|
74
|
+
// 任一表/列不存在(老库、懒建表未建)时整体回退旧口径,宁可多传不可 500。
|
|
75
|
+
try {
|
|
76
|
+
const sig = (sql ) => {
|
|
77
|
+
const row = this.store.get(sql)
|
|
78
|
+
return `${row?.n ?? 0}:${row?.m ?? ''}`
|
|
79
|
+
}
|
|
80
|
+
const count = (table ) => sig(`SELECT COUNT(*) AS n, '' AS m FROM ${table}`)
|
|
81
|
+
const stamp = (table , column ) =>
|
|
82
|
+
sig(`SELECT COUNT(*) AS n, COALESCE(MAX(${column}), '') AS m FROM ${table}`)
|
|
83
|
+
const parts = [
|
|
84
|
+
stamp('projects', 'updated_at'),
|
|
85
|
+
stamp('bots', 'updated_at'),
|
|
86
|
+
stamp('tasks', 'updated_at'),
|
|
87
|
+
stamp('task_labels', 'rowid'),
|
|
88
|
+
stamp('task_comments', 'rowid'),
|
|
89
|
+
// runs 不含 updated_at:新运行看行数、启动/结束看 started_at/ended_at;
|
|
90
|
+
// last_progress_at 的巡检心跳不进签名——它不改变视图载荷,计入会重新引入高频失效。
|
|
91
|
+
sig(`SELECT COUNT(*) AS n, COALESCE(MAX(queued_at), '') || COALESCE(MAX(started_at), '') || COALESCE(MAX(ended_at), '') AS m FROM runs`),
|
|
92
|
+
stamp('messages', 'rowid'),
|
|
93
|
+
stamp('solo_messages', 'rowid'),
|
|
94
|
+
// bot_messages 的 status/reply 变更不推 rowid,靠 replied_at 捕捉。
|
|
95
|
+
sig(`SELECT COUNT(*) AS n, COALESCE(MAX(COALESCE(replied_at, created_at)), '') AS m FROM bot_messages`),
|
|
96
|
+
stamp('memories', 'updated_at'),
|
|
97
|
+
sig(`SELECT COUNT(*) AS n, COALESCE(MAX(COALESCE(decided_at, created_at)), '') AS m FROM proposals`),
|
|
98
|
+
stamp('skills', 'updated_at'),
|
|
99
|
+
stamp('skill_versions', 'rowid'),
|
|
100
|
+
stamp('skill_bindings', 'updated_at'),
|
|
101
|
+
// approvals/questions 是懒建表,未建时此处抛错走兜底回退,语义安全。
|
|
102
|
+
sig(`SELECT COUNT(*) AS n, COALESCE(MAX(COALESCE(decided_at, created_at)), '') AS m FROM approvals`),
|
|
103
|
+
// questions 表没有 answered_at 列(answer/answered_by/ended_at)——答问不改行数也
|
|
104
|
+
// 多数不改 MAX(status),用答案总长度与 ended_at 一并作签名,漏检由 60s 兜底覆盖。
|
|
105
|
+
sig(`SELECT COUNT(*) AS n, COALESCE(MAX(ended_at), '') || ' #' || SUM(LENGTH(COALESCE(answer, ''))) AS m FROM questions`),
|
|
106
|
+
stamp('chat_reads', 'read_at'),
|
|
107
|
+
sig(`SELECT COUNT(*) AS n, COALESCE(MAX(COALESCE(ended_at, created_at)), '') AS m FROM terminal_commands`),
|
|
108
|
+
stamp('secrets', 'updated_at'),
|
|
109
|
+
sig(`SELECT COUNT(*) AS n, COALESCE(MAX(COALESCE(handled_at, created_at)), '') AS m FROM secret_requests`),
|
|
110
|
+
count('model_prices'),
|
|
111
|
+
// 只签 review 类 outbox 行(taskReviewStatus 实读口径):计数与最新变更都按
|
|
112
|
+
// kind 过滤——普通投递行的高频 pending→done 翻转不再打穿短路。
|
|
113
|
+
sig(`SELECT SUM(CASE WHEN kind = 'review_delegate_auto' THEN 1 ELSE 0 END) AS n, COALESCE(MAX(CASE WHEN kind = 'review_delegate_auto' THEN status || created_at ELSE NULL END), '') AS m FROM outbox`),
|
|
114
|
+
this.settingsRevision(),
|
|
115
|
+
]
|
|
116
|
+
return [...parts, this.wechat?.status?.()?.phase ?? 'off', this.feishu?.status?.()?.phase ?? 'off', this.runtime?.modelsCache?.at ?? 0].join(':')
|
|
117
|
+
} catch {
|
|
118
|
+
return [
|
|
119
|
+
this.store.changes(),
|
|
120
|
+
this.wechat?.status?.()?.phase ?? 'off',
|
|
121
|
+
this.feishu?.status?.()?.phase ?? 'off',
|
|
122
|
+
this.runtime?.modelsCache?.at ?? 0,
|
|
123
|
+
].join(':')
|
|
124
|
+
}
|
|
125
|
+
},
|
|
126
|
+
|
|
62
127
|
async state(projectId, soloBotId = null) {
|
|
128
|
+
// perf-diag(临时):分解组装耗时,>300ms 时在返回前落 breakdown 行;定位后整块移除。
|
|
129
|
+
const perf = { init: 0, db: 0, catalog: 0, lang: 0 }
|
|
130
|
+
const stateT0 = performance.now()
|
|
131
|
+
const initT0 = performance.now()
|
|
63
132
|
await this.initialize()
|
|
133
|
+
perf.init = performance.now() - initT0
|
|
134
|
+
const version = this.stateVersion()
|
|
135
|
+
const cacheKey = `${projectId ?? ''}|${soloBotId ?? ''}`
|
|
136
|
+
const dbT0 = performance.now()
|
|
64
137
|
const projects = this.store.all(`
|
|
65
138
|
SELECT p.*, (SELECT COUNT(*) FROM tasks t WHERE t.project_id = p.id AND t.status NOT IN ('done','canceled')) AS open_tasks,
|
|
66
139
|
(SELECT COUNT(*) FROM tasks t WHERE t.project_id = p.id AND t.status = 'in_review' AND t.review_target = 'user') AS review_tasks,
|
|
@@ -73,9 +146,20 @@ export const systemMethods = {
|
|
|
73
146
|
let project = projectId ? this.store.get('SELECT * FROM projects WHERE id = ?', projectId) : undefined
|
|
74
147
|
if (!project) project = this.store.get("SELECT * FROM projects WHERE status = 'active' ORDER BY updated_at DESC LIMIT 1")
|
|
75
148
|
const capabilityInfo = this.runtime?.capabilityInfo?.() ?? {}
|
|
149
|
+
const catalogT0 = performance.now()
|
|
150
|
+
const models = await this.runtime?.catalog() ?? []
|
|
151
|
+
perf.catalog = performance.now() - catalogT0
|
|
152
|
+
const langT0 = performance.now()
|
|
153
|
+
const language = await resolveUiLanguage({
|
|
154
|
+
loader: this.runtime?.ctx?.get?.('loader'),
|
|
155
|
+
dshHome: this.config.dshHome,
|
|
156
|
+
profile: process.env.DSH_PROFILE || 'team-bots',
|
|
157
|
+
uiLanguage: effectiveUiLanguage(this.config, key => this.store.setting(key)),
|
|
158
|
+
})
|
|
159
|
+
perf.lang = performance.now() - langT0
|
|
76
160
|
const view = {
|
|
77
161
|
me: this.store.get('SELECT id, name FROM users WHERE id = ?', this.localUserId),
|
|
78
|
-
models
|
|
162
|
+
models,
|
|
79
163
|
bots: bots.map(bot => this.botView(bot)),
|
|
80
164
|
projects: projects.map(item => ({
|
|
81
165
|
...item,
|
|
@@ -101,7 +185,11 @@ export const systemMethods = {
|
|
|
101
185
|
settingsRevision: this.settingsRevision(),
|
|
102
186
|
// 可编辑提示词段(B1/DSHBOTS-324):全局配置页「团队指令」分组唯一真值。
|
|
103
187
|
promptSegments: this.promptSegmentsView(),
|
|
188
|
+
// 审批免审规则(DSHBOTS-365):总览 bots 页「免审权限」卡唯一真值,规则量小随行下发。
|
|
189
|
+
approvalRules: this.approvalRulesView(),
|
|
104
190
|
runLimits: this.runLimitsView(),
|
|
191
|
+
// 运行参数目录(全局设置「运行参数」卡):全部 DSH_TEAM_* 运行期变量的可配置视图。
|
|
192
|
+
runtimeSettings: this.runtimeSettingsView(),
|
|
105
193
|
// 侧栏状态行全局口径(DSHBOTS-77):全库活跃运行(含 queued),不随群聊/单聊上下文收敛。
|
|
106
194
|
activeRuns: Number(this.store.get("SELECT COUNT(*) AS count FROM runs WHERE status IN ('queued', 'running')")?.count ?? 0),
|
|
107
195
|
// 侧栏状态行任务口径(DSHBOTS-105):全库任务 in_progress 计数;activeRuns 保留给其余消费方。
|
|
@@ -131,14 +219,9 @@ export const systemMethods = {
|
|
|
131
219
|
// 本插件(dsh-team-bots)部署生效版:与 health().version 同源。
|
|
132
220
|
pluginVersion: PLUGIN_VERSION,
|
|
133
221
|
// UI 语言(DSHBOTS-120):与 http.js page() 的 {{language}} 注入同源
|
|
134
|
-
// (页面保存值 zh/en > loader 直读 → patch 文件 → 'auto'
|
|
222
|
+
// (页面保存值 zh/en > loader 直读 → patch 文件 → 'auto' 交浏览器);
|
|
135
223
|
// state 轮询据此热切换字典包。
|
|
136
|
-
language
|
|
137
|
-
loader: this.runtime?.ctx?.get?.('loader'),
|
|
138
|
-
dshHome: this.config.dshHome,
|
|
139
|
-
profile: process.env.DSH_PROFILE || 'team-bots',
|
|
140
|
-
uiLanguage: effectiveUiLanguage(this.config, key => this.store.setting(key)),
|
|
141
|
-
}),
|
|
224
|
+
language,
|
|
142
225
|
// 每个 provider+model 只保留最新一条生效价格;历史版本不在这里展开。
|
|
143
226
|
prices: this.latestPrices(),
|
|
144
227
|
// 配置里的默认价格,Web 中可据此一键恢复。
|
|
@@ -249,7 +332,19 @@ export const systemMethods = {
|
|
|
249
332
|
view.dispatch = this.botDispatchView(soloBot.id)
|
|
250
333
|
}
|
|
251
334
|
}
|
|
252
|
-
|
|
335
|
+
// 版本在组装前取:组装中途发生的写入会让下一拍版本失配而走全量,方向安全。
|
|
336
|
+
this.stateCache = { key: cacheKey, version, at: Date.now() }
|
|
337
|
+
// perf-diag(临时):慢组装落一行分相耗时 + 各字段体积,与 http.ts 打点同日志文件,定位后一并移除。
|
|
338
|
+
const stateMs = performance.now() - stateT0
|
|
339
|
+
if (stateMs > 300) {
|
|
340
|
+
try {
|
|
341
|
+
const fields = ['messages', 'solo', 'memories', 'pendingMemories', 'proposals', 'tasks', 'runs', 'dispatch', 'directMessages', 'usage', 'skills', 'projectSkills']
|
|
342
|
+
const sizes = fields.filter(key => view[key] !== undefined).map(key => `${key}:${JSON.stringify(view[key]).length}`).join(' ')
|
|
343
|
+
appendFileSync(join(this.config.dataDir, 'perf-actions.log'),
|
|
344
|
+
`${new Date().toISOString()} state-breakdown total=${stateMs.toFixed(0)}ms init=${perf.init.toFixed(0)} db=${perf.db.toFixed(0)} catalog=${perf.catalog.toFixed(0)} lang=${perf.lang.toFixed(0)} rest=${(stateMs - perf.init - perf.db - perf.catalog - perf.lang).toFixed(0)} ${sizes}\n`)
|
|
345
|
+
} catch { /* 诊断写失败不影响业务 */ }
|
|
346
|
+
}
|
|
347
|
+
return { ...view, version }
|
|
253
348
|
},
|
|
254
349
|
|
|
255
350
|
/**
|
|
@@ -489,3 +584,60 @@ export const systemMethods = {
|
|
|
489
584
|
return { needsYou, issues }
|
|
490
585
|
},
|
|
491
586
|
}
|
|
587
|
+
|
|
588
|
+
// 版本短路外壳(1030854):api.ts 与测试的对外 state 入口(第 3 参 since = 上次响应
|
|
589
|
+
// 的 version)。全量组装器保持上面 systemMethodsBase.state 的两参签名(DSHBOTS-105 的
|
|
590
|
+
// workbench-ia 源锚点),不改写其形参。外壳提供两级省流:
|
|
591
|
+
// ① unchanged 短路——同视图、版本相等、60s 内,只回 { unchanged, version }(轮询路径);
|
|
592
|
+
// ② 视图载荷缓存——切换场景(客户端持别的视图 version 或不带 since)在目标视图
|
|
593
|
+
// 版本未变时直接回放缓存载荷,不再整段重组(实测组装在共享事件循环下 1.2~2s,
|
|
594
|
+
// 是切换「加载中…」的主导成本)。60s 兜底与 ① 同口径,防未入签名的易变字段
|
|
595
|
+
// (now 等)被永久冻结;缓存按 LRU 留最近 8 个视图。
|
|
596
|
+
const assembleState = systemMethodsBase.state
|
|
597
|
+
systemMethodsBase.state = async function ( projectId , soloBotId = null, { since } = {} ) {
|
|
598
|
+
await this.initialize()
|
|
599
|
+
const cacheKey = `${projectId ?? ''}|${soloBotId ?? ''}`
|
|
600
|
+
// 版本串编入视图键:since 只在「客户端持有的正是本视图数据」时才允许判 unchanged——
|
|
601
|
+
// 底层签名是全局的,两个视图的 version 会相等,切换回环(A→B→A)里 B 的 since 恰与
|
|
602
|
+
// 当前版本相同,不编键就会让客户端拿着 B 的数据当 A 用、骨架永不清除。
|
|
603
|
+
const version = `${cacheKey}@${this.stateVersion()}`
|
|
604
|
+
this.stateViewCache ??= new Map()
|
|
605
|
+
const cached = this.stateViewCache.get(cacheKey)
|
|
606
|
+
if (cached && cached.version === version) {
|
|
607
|
+
if (since === version && Date.now() - cached.at < 60_000) return { unchanged: true, version }
|
|
608
|
+
if (Date.now() - cached.at < 60_000) return { ...cached.view, version }
|
|
609
|
+
}
|
|
610
|
+
// 切换 SWR(与模型目录的 stale-while-revalidate 同哲学):只服务「显式切换」——调用方
|
|
611
|
+
// 携带的是别的视图键的 version(A→B→A 回环/会话内换视图);本视图轮询(since 以
|
|
612
|
+
// `${cacheKey}@` 开头)必须拿新数据,否则新消息可见性被推迟一轮。不带 since 的请求
|
|
613
|
+
// (首次加载/脚本直调/测试)一律现组装:无法与「切换」区分,回放旧载荷会让直调方
|
|
614
|
+
// 拿到 ≤5s 陈数据(实测打断 9 条服务层行为测试),切换收益只认显式持他视图版本的场景。
|
|
615
|
+
const isSwitch = since != null && !String(since).startsWith(`${cacheKey}@`)
|
|
616
|
+
if (cached && isSwitch && Date.now() - cached.at < 5_000) {
|
|
617
|
+
void assembleState.call(this, projectId, soloBotId).then(result => {
|
|
618
|
+
if (result && typeof result === 'object' && 'version' in result) {
|
|
619
|
+
const { version: _dropped, ...view } = result
|
|
620
|
+
this.stateViewCache.delete(cacheKey)
|
|
621
|
+
this.stateViewCache.set(cacheKey, { version, view, at: Date.now() })
|
|
622
|
+
}
|
|
623
|
+
}).catch(() => {})
|
|
624
|
+
// 版本号必须描述回传的数据本身:SWR 回放的是旧视图,必须配它自己的旧版本号。
|
|
625
|
+
// 若配当前版本号,客户端下一拍轮询会因缓存同版本而收到 unchanged,新消息被
|
|
626
|
+
// 卡到再下一次版本变化才可见(实测「新消息进来页面不及时刷新」即此)。
|
|
627
|
+
return { ...cached.view, version: cached.version }
|
|
628
|
+
}
|
|
629
|
+
const result = await assembleState.call(this, projectId, soloBotId)
|
|
630
|
+
if (result && typeof result === 'object' && 'version' in result) {
|
|
631
|
+
const { version: _dropped, ...view } = result
|
|
632
|
+
this.stateViewCache.delete(cacheKey)
|
|
633
|
+
this.stateViewCache.set(cacheKey, { version, view, at: Date.now() })
|
|
634
|
+
while (this.stateViewCache.size > 8) this.stateViewCache.delete(this.stateViewCache.keys().next().value)
|
|
635
|
+
return { ...result, version }
|
|
636
|
+
}
|
|
637
|
+
return result
|
|
638
|
+
}
|
|
639
|
+
|
|
640
|
+
// 对外静态类型按外壳签名收窄(base 字面量里的 state 是两参组装器签名,
|
|
641
|
+
// 直接 typeof 会让三参调用在 tsc 下报错)。
|
|
642
|
+
|
|
643
|
+
export const systemMethods = systemMethodsBase
|