dsh-team-bots 0.3.12 → 0.3.70
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 +3 -4
- package/README.md +2 -2
- package/docs/README.zh.md +2 -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 +10 -1
- package/src/config.js +180 -2
- package/src/db-migrations.js +55 -4
- package/src/db.js +30 -3
- package/src/http.js +21 -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 +303 -10
- package/src/services/bots.js +12 -3
- package/src/services/core.js +31 -2
- package/src/services/memory.js +24 -8
- package/src/services/projects.js +12 -1
- package/src/services/run-finish.js +11 -0
- package/src/services/runtime/session.js +116 -32
- package/src/services/scheduler.js +20 -0
- package/src/services/system.js +164 -10
- package/src/services/task-review.js +90 -55
- package/src/services/tasks.js +5 -2
- package/ui/app.js +7 -10
- package/ui/i18n/en/chat.js +2 -0
- package/ui/i18n/en/common.js +14 -0
- package/ui/i18n/en/settings.js +81 -1
- package/ui/i18n/en/tasks.js +3 -0
- package/ui/i18n/zh/chat.js +2 -0
- package/ui/i18n/zh/common.js +14 -0
- package/ui/i18n/zh/settings.js +81 -1
- package/ui/i18n/zh/tasks.js +3 -0
- package/ui/modules/api.js +9 -1
- package/ui/modules/approval-rule-modal.js +31 -0
- package/ui/modules/cards.js +6 -3
- package/ui/modules/chat.js +3 -2
- package/ui/modules/composer.js +6 -1
- package/ui/modules/events-board.js +46 -0
- package/ui/modules/events-misc.js +43 -0
- package/ui/modules/events-submit.js +45 -0
- package/ui/modules/form-validation.js +204 -0
- package/ui/modules/global-pages.js +8 -5
- package/ui/modules/modal-forms.js +3 -2
- package/ui/modules/modal-layer.js +6 -1
- package/ui/modules/page-shell.js +10 -7
- package/ui/modules/permissions.js +56 -0
- package/ui/modules/settings.js +103 -21
- package/ui/modules/state.js +10 -0
- package/ui/modules/task-menu.js +147 -0
- package/ui/modules/tasks.js +9 -8
- package/ui/modules/util.js +58 -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 +54 -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 +4 -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/memory.js
CHANGED
|
@@ -179,13 +179,28 @@ export const memoryMethods = {
|
|
|
179
179
|
}
|
|
180
180
|
const reviewRunId = id('run')
|
|
181
181
|
const createdAt = nowIso()
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
182
|
+
try {
|
|
183
|
+
this.store.run(
|
|
184
|
+
`INSERT INTO runs(id, project_id, bot_id, task_id, kind, mode, trigger_type, trigger_ref, status,
|
|
185
|
+
attempt, idempotency_key, model_provider, model_model, model_effort, queued_at)
|
|
186
|
+
VALUES (?, ?, ?, NULL, 'memory_review', 'read', 'memory_review', ?, 'queued', 1, ?, ?, ?, ?, ?)`,
|
|
187
|
+
reviewRunId, project.id, bot.id, sourceRunId, `memory_review:${sourceRunId}`,
|
|
188
|
+
reviewProvider, reviewModel, reviewEffort, createdAt,
|
|
189
|
+
)
|
|
190
|
+
} catch (error) {
|
|
191
|
+
// memory_review 占 bot 串行域但入队点无 busy 闸(来源运行收尾/交付路径):同 (bot,
|
|
192
|
+
// 工作区) 已有活跃运行(如任务交付后新 chat 已排队)时 INSERT 撞 one_active_run_per_bot。
|
|
193
|
+
// 审查是尽力而为的治理动作,撞车降级为跳过(调用方按 null 走沉淀兜底/忽略),不把
|
|
194
|
+
// 收尾路径打成异常(生产实测:finishRun 尾部抛 UNIQUE 导致运行收尾报「异常」)。
|
|
195
|
+
if (this.isRunBotUniqueViolation(error)) {
|
|
196
|
+
this.logger?.warn?.(
|
|
197
|
+
'dsh-team: 记忆审查入队撞 bot 串行域(bot=%s run=%s source=%s),本次跳过',
|
|
198
|
+
bot?.id, reviewRunId, sourceRunId,
|
|
199
|
+
)
|
|
200
|
+
return null
|
|
201
|
+
}
|
|
202
|
+
throw error
|
|
203
|
+
}
|
|
189
204
|
this.store.run(
|
|
190
205
|
'INSERT INTO run_events(id, run_id, type, message, created_at) VALUES (?, ?, ?, ?, ?)',
|
|
191
206
|
id('evt'), reviewRunId, 'queued', '任务交付完成,触发记忆审查', createdAt,
|
|
@@ -447,7 +462,8 @@ export const memoryMethods = {
|
|
|
447
462
|
const keyword = text(query, 200).trim()
|
|
448
463
|
const limitN = Math.min(100, Math.max(1, Number(limit) || 20))
|
|
449
464
|
let rows
|
|
450
|
-
|
|
465
|
+
// trigram 分词器无法匹配不足 3 字符的关键词(如中文「发版」两字),短词走 LIKE 子串兜底。
|
|
466
|
+
if (keyword && this.store.ftsEnabled && keyword.length >= 3) {
|
|
451
467
|
const match = `"${keyword.replace(/"/g, '""')}"`
|
|
452
468
|
rows = this.store.all(
|
|
453
469
|
`SELECT m.* FROM memories_fts f JOIN memories m ON m.id = f.memory_id
|
package/src/services/projects.js
CHANGED
|
@@ -7,6 +7,7 @@ import { readdirSync, rmSync, statSync } from 'node:fs'
|
|
|
7
7
|
import { dirname, join, resolve } from 'node:path'
|
|
8
8
|
import { homedir } from 'node:os'
|
|
9
9
|
import { badRequest, conflict, forbidden, notFound } from '../errors.js'
|
|
10
|
+
import { REVIEWER_BOT_NAME } from '../seed-bots.js'
|
|
10
11
|
import { ensureBotTmpDirs, ensureExternalDir, ensureProjectWorkspace } from '../paths.js'
|
|
11
12
|
import { clampNumber, id, nowIso, parseDisabledSkills, projectKey, slugify, text } from '../util.js'
|
|
12
13
|
|
|
@@ -277,7 +278,17 @@ export const projectsMethods = {
|
|
|
277
278
|
const projectId = id('prj')
|
|
278
279
|
const groupId = id('grp')
|
|
279
280
|
const createdAt = nowIso()
|
|
280
|
-
|
|
281
|
+
// 成员默认(DSHBOTS-365):不显式指定成员的新群自动带入种子 reviewer——验收核验
|
|
282
|
+
// 优先落到质量评审角色上,总监只裁决。显式 memberIds 是用户裁剪过的名单,不擅自加人;
|
|
283
|
+
// 用户事后移除 reviewer 即回落总监自行核验(spawnReviewDelegate 兜底)。
|
|
284
|
+
const explicitMembers = Array.isArray(input.memberIds)
|
|
285
|
+
const memberIds = [...new Set([owner.id, ...(explicitMembers ? input.memberIds : [])])]
|
|
286
|
+
if (!explicitMembers) {
|
|
287
|
+
const reviewer = this.store.get(
|
|
288
|
+
"SELECT id FROM bots WHERE name = ? AND status = 'active'", REVIEWER_BOT_NAME,
|
|
289
|
+
)
|
|
290
|
+
if (reviewer && reviewer.id !== owner.id) memberIds.push(reviewer.id)
|
|
291
|
+
}
|
|
281
292
|
for (const botId of memberIds) this.botRow(botId)
|
|
282
293
|
await ensureProjectWorkspace(this.config.workspace, slug)
|
|
283
294
|
const productionDir = await this.resolveProductionDir(input.productionDir)
|
|
@@ -36,6 +36,10 @@ const FAILURE_CATEGORY_NOTICES = {
|
|
|
36
36
|
rate_limited: { label: '限流', summary: '上游限流,已按退避策略自动处理。' },
|
|
37
37
|
sandbox_denied: { label: '沙箱拒绝', summary: '文件或命令操作被沙箱策略拒绝。' },
|
|
38
38
|
timeout: { label: '超时', summary: '上游响应超时。' },
|
|
39
|
+
// DSHBOTS-364:本机时效中止/停滞收割与上游超时分开报——此前一律归「上游响应超时」,
|
|
40
|
+
// 把自家看门狗/分档时效的动作误报成 provider 故障,误导排查方向。
|
|
41
|
+
run_timeout: { label: '时效', summary: '运行超过时效上限被中止(非上游故障)。' },
|
|
42
|
+
stalled: { label: '停滞', summary: '运行长时间无进展,已被看门狗中止。' },
|
|
39
43
|
network: { label: '网络', summary: '网络瞬态失败,已按退避策略自动重试。' },
|
|
40
44
|
blocked: { label: '会话受阻', summary: '宿主拒绝执行该会话(可能已被归档),未产生任何模型输出。' },
|
|
41
45
|
internal: { label: '内部错误', summary: '服务内部错误。' },
|
|
@@ -46,6 +50,8 @@ export function classifyFailure(error) {
|
|
|
46
50
|
if (isQuotaExhausted(error)) return FAILURE_CATEGORY_NOTICES.quota
|
|
47
51
|
if (isRateLimitError(error)) return FAILURE_CATEGORY_NOTICES.rate_limited
|
|
48
52
|
if (SANDBOX_DENIED_PATTERN.test(raw)) return FAILURE_CATEGORY_NOTICES.sandbox_denied
|
|
53
|
+
if (error?.code === 'RUN_TIMEOUT') return FAILURE_CATEGORY_NOTICES.run_timeout
|
|
54
|
+
if (error?.code === 'RUN_STALLED') return FAILURE_CATEGORY_NOTICES.stalled
|
|
49
55
|
if (TIMEOUT_PATTERN.test(raw)) return FAILURE_CATEGORY_NOTICES.timeout
|
|
50
56
|
if (isTransientNetworkError(error)) return FAILURE_CATEGORY_NOTICES.network
|
|
51
57
|
if (error?.code === 'SESSION_BLOCKED') return FAILURE_CATEGORY_NOTICES.blocked
|
|
@@ -67,6 +73,11 @@ export const runFinishMethods = {
|
|
|
67
73
|
if (attentionPending) return false
|
|
68
74
|
const current = this.taskRow(task.id)
|
|
69
75
|
if (current.status !== 'in_review') return false
|
|
76
|
+
// 核验分档:只读档交付免自动核验(与验收闸门豁免同口径);审计留痕便于核对漏审。
|
|
77
|
+
if (this.readOnlyDelivery(run, current)) {
|
|
78
|
+
this.audit({ type: 'system', id: 'system' }, 'review.auto_delegate', 'task', task.id, { skipped: 'read_only' })
|
|
79
|
+
return false
|
|
80
|
+
}
|
|
70
81
|
const owner = project.owner_bot_id
|
|
71
82
|
? this.store.get("SELECT id FROM bots WHERE id = ? AND status = 'active'", project.owner_bot_id)
|
|
72
83
|
: null
|
|
@@ -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
|
|
|
@@ -232,10 +233,15 @@ export const sessionMethods = {
|
|
|
232
233
|
this.selecting = run.catch(() => {})
|
|
233
234
|
return run
|
|
234
235
|
},
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
236
|
+
// kind 'task' = 任务 worker 会话(全局链走 workerPreset);其余 = 控制面/单聊/核验会话
|
|
237
|
+
//(全局链走 routerPreset)。bot.agent_preset 非空时逐 bot 覆盖,两级都留空时 kind
|
|
238
|
+
// 决定用哪个全局链。可选 preset 只从宿主 roster 里实际可用(非 broken)的里挑。
|
|
239
|
+
async defaultAgentPreset(kind, bot = null) {
|
|
240
|
+
const botPreset = String(bot?.agent_preset ?? '').trim()
|
|
241
|
+
const wanted = botPreset
|
|
242
|
+
|| (kind === 'task'
|
|
243
|
+
? (this.config.workerPreset ?? '')
|
|
244
|
+
: (this.config.routerPreset ?? ''))
|
|
239
245
|
try {
|
|
240
246
|
const presets = this.ctx.get?.('agentPresets')
|
|
241
247
|
if (!presets) return {}
|
|
@@ -248,6 +254,23 @@ export const sessionMethods = {
|
|
|
248
254
|
return {}
|
|
249
255
|
}
|
|
250
256
|
},
|
|
257
|
+
// 宿主可用 agent preset 清单(Bot 配置下拉数据源):只列 roster 里非 broken 的,
|
|
258
|
+
// 附宿主默认 id(用户「设为新任务默认」),供 UI 标注「跟随全局」的当前生效值。
|
|
259
|
+
// 宿主无 agentPresets 服务(或调用失败)返回 null,UI 下拉退化为自由文本。
|
|
260
|
+
async agentPresetsRoster() {
|
|
261
|
+
try {
|
|
262
|
+
const presets = this.ctx.get?.('agentPresets')
|
|
263
|
+
if (!presets) return null
|
|
264
|
+
const list = await presets.list()
|
|
265
|
+
return {
|
|
266
|
+
presets: (list ?? []).filter(preset => preset.broken === undefined)
|
|
267
|
+
.map(preset => ({ id: preset.id, name: preset.name ?? preset.id })),
|
|
268
|
+
defaultId: (() => { try { return String(presets.defaultId ?? '') } catch { return '' } })(),
|
|
269
|
+
}
|
|
270
|
+
} catch {
|
|
271
|
+
return null
|
|
272
|
+
}
|
|
273
|
+
},
|
|
251
274
|
// 会话当前上下文体积估计(单轮上下文治理 P2):该会话最近一次模型调用的
|
|
252
275
|
// input+cache_read 即当前历史整体规模——usage_events 按调用记账、runs.session_id 归属。
|
|
253
276
|
// 无记录(新会话/尚未有成功调用)返回 0,两个消费点(压缩下限/结转上限)都判 >=,
|
|
@@ -262,6 +285,16 @@ export const sessionMethods = {
|
|
|
262
285
|
sessionId,
|
|
263
286
|
)?.ctx ?? 0
|
|
264
287
|
},
|
|
288
|
+
// 会话累计消费的子代理数(DSH 会话子代理上限口径):该会话名下运行的 run_events 中
|
|
289
|
+
// type='subagent_spawned' 计数(DSHBOTS-294 账本落账)。无账本记录返回 0,不误触发。
|
|
290
|
+
sessionSubagentCount(sessionId) {
|
|
291
|
+
if (!sessionId) return 0
|
|
292
|
+
return this.store.get(
|
|
293
|
+
`SELECT COUNT(*) AS n FROM run_events re JOIN runs r ON r.id = re.run_id
|
|
294
|
+
WHERE r.session_id = ? AND re.type = 'subagent_spawned'`,
|
|
295
|
+
sessionId,
|
|
296
|
+
)?.n ?? 0
|
|
297
|
+
},
|
|
265
298
|
// 结转判定(DSHBOTS-145 / DSHBOTS-286):旧会话是否该让位。返回 true 表示旧绑定已
|
|
266
299
|
// alias 化、调用方走新建路径;false 表示继续复用旧会话。
|
|
267
300
|
// - 阈值 0 = 关闭(配置见 config.js 的 sessionRolloverTurns,默认 512);
|
|
@@ -270,6 +303,9 @@ export const sessionMethods = {
|
|
|
270
303
|
// - 体积判据(单轮上下文治理 P2):轮数未到但会话上下文已达上限(默认 150k token,
|
|
271
304
|
// 0 = 关闭)同样触发——胖会话不用等 512 轮,live 实测稳态单轮 55 万 token 的会话
|
|
272
305
|
// 按轮数口径永远追不上真实膨胀速度;
|
|
306
|
+
// - 子代理判据:DSH 宿主对单会话子代理派生有上限(口径 200),累计消费达阈值(默认
|
|
307
|
+
// 128 留摘要往返余量,0 = 关闭)同样触发——派满后会话再也无法派子代理,核验/并行
|
|
308
|
+
// 加速被阻塞且无自动恢复;
|
|
273
309
|
// - 幂等(DSHBOTS-286):alias 行永不触发结转——本判定只在活跃绑定上被调用
|
|
274
310
|
// (唯一调用点 ensureSession 以 !existing.alias 前置短路保证);已结转的旧会话
|
|
275
311
|
// 即使轮数继续增长(承接未终态任务流量),也只参与闲时压缩,不再二次结转;
|
|
@@ -278,11 +314,13 @@ export const sessionMethods = {
|
|
|
278
314
|
shouldRolloverSession({ bot, project, existing }) {
|
|
279
315
|
const turns = effectiveSessionRolloverTurns(this.config, key => this.store.setting(key))
|
|
280
316
|
const ctxLimit = effectiveSessionRolloverCtxTokens(this.config, key => this.store.setting(key))
|
|
281
|
-
|
|
317
|
+
const subagentLimit = effectiveSessionRolloverSubagents(this.config, key => this.store.setting(key))
|
|
318
|
+
// 三个判据各自独立(0 = 该判据关闭),全关即整体关闭结转。
|
|
282
319
|
const count = this.store.get('SELECT COUNT(*) AS n FROM runs WHERE session_id = ?', existing.session_id)?.n ?? 0
|
|
283
320
|
const countOver = turns > 0 && count >= turns
|
|
284
321
|
const ctxOver = ctxLimit > 0 && this.sessionContextTokens(existing.session_id) >= ctxLimit
|
|
285
|
-
|
|
322
|
+
const subagentsOver = subagentLimit > 0 && this.sessionSubagentCount(existing.session_id) >= subagentLimit
|
|
323
|
+
if (!countOver && !ctxOver && !subagentsOver) return false
|
|
286
324
|
if (this.store.setting(rolloverSummaryKey(bot.id, project?.id))) return true
|
|
287
325
|
const active = this.store.get(
|
|
288
326
|
"SELECT id FROM runs WHERE kind = 'rollover_summary' AND trigger_ref = ? AND status IN ('queued', 'running')",
|
|
@@ -437,19 +475,34 @@ export const sessionMethods = {
|
|
|
437
475
|
// 标记推进到窗口下界:即使压缩运行后续失败也不回退,失败留痕由下一窗口再补。
|
|
438
476
|
this.store.setSetting(sessionCompactMarkerKey(sessionId), String(window * every))
|
|
439
477
|
},
|
|
478
|
+
// 会话策略归属(2026-11-15「recall 拦截循环」事故):复用分支的工具面/文件面/模型必须
|
|
479
|
+
// 跟「会话绑定行的 bot」走,而不是当前运行方 bot。in_review 亲和(DSHBOTS-306)会把
|
|
480
|
+
// 成员运行送进项目 owner 的控制面会话:若按运行方套成员策略,applyBotToolPolicy 的
|
|
481
|
+
// 总监专权 deny(宿主 restriction 粘滞、兜底路径丢弃 disposer)会挂在整个 owner 会话上,
|
|
482
|
+
// owner 后续轮次丢 team_assign_task/team_review_task——模型层表现为 unknown tool 连发
|
|
483
|
+
// 或退化成 team_recall 重复调用;selectModel 同理会把 owner 会话模型翻成成员模型。
|
|
484
|
+
// 绑定行缺失/查无此 bot 时回退运行方 bot(不改变既有行为)。
|
|
485
|
+
sessionPolicyBot(binding , fallbackBot ) {
|
|
486
|
+
const botId = binding?.bot_id
|
|
487
|
+
if (!botId || !fallbackBot || botId === fallbackBot.id) return fallbackBot
|
|
488
|
+
return this.store.get('SELECT * FROM bots WHERE id = ?', botId) ?? fallbackBot
|
|
489
|
+
},
|
|
440
490
|
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
491
|
// 结转摘要运行(DSHBOTS-145)与闲时压缩运行(DSHBOTS-286):必须回到原会话执行,
|
|
445
492
|
// 且不能参与阈值判定——否则这两类运行自己又会触发结转/压缩;solo 摘要运行也没有
|
|
446
493
|
// 项目上下文,不查项目。
|
|
447
494
|
if ((run?.kind === 'rollover_summary' || run?.kind === 'session_compact') && run.session_id) {
|
|
448
495
|
const resolved = await liveAgentFor(this.ctx, run.session_id)
|
|
449
496
|
if (resolved) {
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
497
|
+
// 策略面按会话归属 bot(sessionPolicyBot):历史误挂到成员名下的压缩运行
|
|
498
|
+
// 不得再把成员工具面/模型套到 owner 会话上。
|
|
499
|
+
const sessionBot = this.sessionPolicyBot(this.bindingOfSession(run.session_id), bot)
|
|
500
|
+
this.applyFilePolicy(resolved, sessionBot, run, task)
|
|
501
|
+
applyBotToolPolicy(resolved, {
|
|
502
|
+
isOwner: Boolean(project && sessionBot && project.owner_bot_id === sessionBot.id),
|
|
503
|
+
logger: this.logger,
|
|
504
|
+
})
|
|
505
|
+
await this.selectModel(run.session_id, sessionBot, modelOverride)
|
|
453
506
|
return run.session_id
|
|
454
507
|
}
|
|
455
508
|
this.retireBinding(run.session_id)
|
|
@@ -472,12 +525,18 @@ export const sessionMethods = {
|
|
|
472
525
|
if (affinity) {
|
|
473
526
|
const resolved = await liveAgentFor(this.ctx, affinity.session_id)
|
|
474
527
|
if (resolved) {
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
528
|
+
// 同 sessionPolicyBot:in_review 亲和把成员运行送进 owner 会话时,
|
|
529
|
+
// 工具面/文件面/模型保持 owner 会话自身,压缩入队也记到会话归属 bot 名下。
|
|
530
|
+
const sessionBot = this.sessionPolicyBot(affinity, bot)
|
|
531
|
+
this.applyFilePolicy(resolved, sessionBot, run, task)
|
|
532
|
+
applyBotToolPolicy(resolved, {
|
|
533
|
+
isOwner: Boolean(project && sessionBot && project.owner_bot_id === sessionBot.id),
|
|
534
|
+
logger: this.logger,
|
|
535
|
+
})
|
|
536
|
+
await this.selectModel(affinity.session_id, sessionBot, modelOverride)
|
|
478
537
|
// 任务会话同样在承接流量:跨过压缩窗口且闲时排队总结压缩
|
|
479
538
|
// (结转仍豁免——任务会话生命周期短,DSHBOTS-286 口径不变)。
|
|
480
|
-
this.maybeCompactSession({ bot, project, existing: affinity, currentRunId: run?.id })
|
|
539
|
+
this.maybeCompactSession({ bot: sessionBot, project, existing: affinity, currentRunId: run?.id })
|
|
481
540
|
return affinity.session_id
|
|
482
541
|
}
|
|
483
542
|
this.retireBinding(affinity.session_id)
|
|
@@ -509,13 +568,38 @@ export const sessionMethods = {
|
|
|
509
568
|
// 并发首建去重键带 task 维度,同任务并发首建共用同一 in-flight Promise。
|
|
510
569
|
async ensureTaskSession(bot, project, { run, task, modelOverride } = {} ) {
|
|
511
570
|
const isOwner = Boolean(project && bot && project.owner_bot_id === bot.id)
|
|
571
|
+
// 任务会话复用(ZONGM-140 三会话事故):runs 归属亲和(taskAffinityBinding)只看
|
|
572
|
+
// runs.session_id,而宿主重启重排队会把 running 运行的 session_id 置空——亲和断链后
|
|
573
|
+
// 直落下方首建,旧任务会话(绑定行 kind='task' 仍在、宿主仍活)被孤儿化,同一张卡
|
|
574
|
+
// 每重启一次多一个会话。绑定行才是任务会话的家谱:先按 (bot, task) 找活跃绑定,
|
|
575
|
+
// 宿主仍活就回本会话(策略面与亲和复用分支同款);死了退役重建。多活跃行只可能来自
|
|
576
|
+
// 历史孤儿/并发残留,保留最新一条、其余 alias 化收敛。
|
|
577
|
+
const bindings = this.store.all(
|
|
578
|
+
"SELECT * FROM session_bindings WHERE bot_id = ? AND task_id = ? AND kind = 'task' AND alias = 0 ORDER BY created_at DESC, rowid DESC",
|
|
579
|
+
bot.id, task.id,
|
|
580
|
+
)
|
|
581
|
+
if (bindings.length > 1) {
|
|
582
|
+
for (const stale of bindings.slice(1)) this.retireBinding(stale.session_id)
|
|
583
|
+
}
|
|
584
|
+
const existing = bindings[0]
|
|
585
|
+
if (existing) {
|
|
586
|
+
const resolved = await liveAgentFor(this.ctx, existing.session_id)
|
|
587
|
+
if (resolved) {
|
|
588
|
+
this.applyFilePolicy(resolved, bot, run, task)
|
|
589
|
+
applyBotToolPolicy(resolved, { isOwner, logger: this.logger })
|
|
590
|
+
await this.selectModel(existing.session_id, bot, modelOverride)
|
|
591
|
+
this.maybeCompactSession({ bot, project, existing, currentRunId: run?.id })
|
|
592
|
+
return existing.session_id
|
|
593
|
+
}
|
|
594
|
+
this.retireBinding(existing.session_id)
|
|
595
|
+
}
|
|
512
596
|
const key = `${bot.id}:${project.id}:task:${task.id}`
|
|
513
597
|
if (this.sessionCreates.has(key)) return this.sessionCreates.get(key)
|
|
514
598
|
const creating = (async () => {
|
|
515
599
|
const cwd = await resolveSessionCwd(this.config, { solo: false, bot, project })
|
|
516
600
|
const created = await this.ctx.sessionController.create({
|
|
517
601
|
cwd,
|
|
518
|
-
...(await this.defaultAgentPreset('project')),
|
|
602
|
+
...(await this.defaultAgentPreset('project', bot)),
|
|
519
603
|
})
|
|
520
604
|
const sessionId = created.sessionId
|
|
521
605
|
const agent = await this.ctx.sessionController.resolveAgent(sessionId)
|
|
@@ -583,7 +667,7 @@ export const sessionMethods = {
|
|
|
583
667
|
const cwd = await resolveSessionCwd(this.config, { solo: !project, bot, project })
|
|
584
668
|
const created = await this.ctx.sessionController.create({
|
|
585
669
|
cwd,
|
|
586
|
-
...(await this.defaultAgentPreset('project')),
|
|
670
|
+
...(await this.defaultAgentPreset('project', bot)),
|
|
587
671
|
})
|
|
588
672
|
const sessionId = created.sessionId
|
|
589
673
|
const agent = await this.ctx.sessionController.resolveAgent(sessionId)
|
|
@@ -671,7 +755,7 @@ export const sessionMethods = {
|
|
|
671
755
|
const cwd = await resolveSessionCwd(this.config, { solo, bot, project })
|
|
672
756
|
const created = await this.ctx.sessionController.create({
|
|
673
757
|
cwd,
|
|
674
|
-
...(await this.defaultAgentPreset('project')),
|
|
758
|
+
...(await this.defaultAgentPreset('project', bot)),
|
|
675
759
|
})
|
|
676
760
|
const sessionId = created.sessionId
|
|
677
761
|
const agent = await this.ctx.sessionController.resolveAgent(sessionId)
|
|
@@ -516,9 +516,29 @@ export const schedulerMethods = {
|
|
|
516
516
|
return true
|
|
517
517
|
},
|
|
518
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
|
+
|
|
519
538
|
async tick() {
|
|
520
539
|
if (this.ticking || !this.started) return
|
|
521
540
|
this.ticking = true
|
|
541
|
+
this.lastFullTickAt = Date.now()
|
|
522
542
|
try {
|
|
523
543
|
// tasks 的依赖列由 task-relations 域自管迁移(db.js 不加行),闸门读列前懒迁移一次。
|
|
524
544
|
ensureTaskRelationsSchema(this.store)
|
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,13 @@ 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
|
+
// Bot 配置页 preset 下拉数据源:宿主可用清单 + 默认值;无宿主服务时 null(UI 退化)。
|
|
192
|
+
agentPresets: await (this.runtime?.agentPresetsRoster?.() ?? null),
|
|
193
|
+
// 运行参数目录(全局设置「运行参数」卡):全部 DSH_TEAM_* 运行期变量的可配置视图。
|
|
194
|
+
runtimeSettings: this.runtimeSettingsView(),
|
|
105
195
|
// 侧栏状态行全局口径(DSHBOTS-77):全库活跃运行(含 queued),不随群聊/单聊上下文收敛。
|
|
106
196
|
activeRuns: Number(this.store.get("SELECT COUNT(*) AS count FROM runs WHERE status IN ('queued', 'running')")?.count ?? 0),
|
|
107
197
|
// 侧栏状态行任务口径(DSHBOTS-105):全库任务 in_progress 计数;activeRuns 保留给其余消费方。
|
|
@@ -131,14 +221,9 @@ export const systemMethods = {
|
|
|
131
221
|
// 本插件(dsh-team-bots)部署生效版:与 health().version 同源。
|
|
132
222
|
pluginVersion: PLUGIN_VERSION,
|
|
133
223
|
// UI 语言(DSHBOTS-120):与 http.js page() 的 {{language}} 注入同源
|
|
134
|
-
// (页面保存值 zh/en > loader 直读 → patch 文件 → 'auto'
|
|
224
|
+
// (页面保存值 zh/en > loader 直读 → patch 文件 → 'auto' 交浏览器);
|
|
135
225
|
// 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
|
-
}),
|
|
226
|
+
language,
|
|
142
227
|
// 每个 provider+model 只保留最新一条生效价格;历史版本不在这里展开。
|
|
143
228
|
prices: this.latestPrices(),
|
|
144
229
|
// 配置里的默认价格,Web 中可据此一键恢复。
|
|
@@ -249,7 +334,19 @@ export const systemMethods = {
|
|
|
249
334
|
view.dispatch = this.botDispatchView(soloBot.id)
|
|
250
335
|
}
|
|
251
336
|
}
|
|
252
|
-
|
|
337
|
+
// 版本在组装前取:组装中途发生的写入会让下一拍版本失配而走全量,方向安全。
|
|
338
|
+
this.stateCache = { key: cacheKey, version, at: Date.now() }
|
|
339
|
+
// perf-diag(临时):慢组装落一行分相耗时 + 各字段体积,与 http.ts 打点同日志文件,定位后一并移除。
|
|
340
|
+
const stateMs = performance.now() - stateT0
|
|
341
|
+
if (stateMs > 300) {
|
|
342
|
+
try {
|
|
343
|
+
const fields = ['messages', 'solo', 'memories', 'pendingMemories', 'proposals', 'tasks', 'runs', 'dispatch', 'directMessages', 'usage', 'skills', 'projectSkills']
|
|
344
|
+
const sizes = fields.filter(key => view[key] !== undefined).map(key => `${key}:${JSON.stringify(view[key]).length}`).join(' ')
|
|
345
|
+
appendFileSync(join(this.config.dataDir, 'perf-actions.log'),
|
|
346
|
+
`${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`)
|
|
347
|
+
} catch { /* 诊断写失败不影响业务 */ }
|
|
348
|
+
}
|
|
349
|
+
return { ...view, version }
|
|
253
350
|
},
|
|
254
351
|
|
|
255
352
|
/**
|
|
@@ -489,3 +586,60 @@ export const systemMethods = {
|
|
|
489
586
|
return { needsYou, issues }
|
|
490
587
|
},
|
|
491
588
|
}
|
|
589
|
+
|
|
590
|
+
// 版本短路外壳(1030854):api.ts 与测试的对外 state 入口(第 3 参 since = 上次响应
|
|
591
|
+
// 的 version)。全量组装器保持上面 systemMethodsBase.state 的两参签名(DSHBOTS-105 的
|
|
592
|
+
// workbench-ia 源锚点),不改写其形参。外壳提供两级省流:
|
|
593
|
+
// ① unchanged 短路——同视图、版本相等、60s 内,只回 { unchanged, version }(轮询路径);
|
|
594
|
+
// ② 视图载荷缓存——切换场景(客户端持别的视图 version 或不带 since)在目标视图
|
|
595
|
+
// 版本未变时直接回放缓存载荷,不再整段重组(实测组装在共享事件循环下 1.2~2s,
|
|
596
|
+
// 是切换「加载中…」的主导成本)。60s 兜底与 ① 同口径,防未入签名的易变字段
|
|
597
|
+
// (now 等)被永久冻结;缓存按 LRU 留最近 8 个视图。
|
|
598
|
+
const assembleState = systemMethodsBase.state
|
|
599
|
+
systemMethodsBase.state = async function ( projectId , soloBotId = null, { since } = {} ) {
|
|
600
|
+
await this.initialize()
|
|
601
|
+
const cacheKey = `${projectId ?? ''}|${soloBotId ?? ''}`
|
|
602
|
+
// 版本串编入视图键:since 只在「客户端持有的正是本视图数据」时才允许判 unchanged——
|
|
603
|
+
// 底层签名是全局的,两个视图的 version 会相等,切换回环(A→B→A)里 B 的 since 恰与
|
|
604
|
+
// 当前版本相同,不编键就会让客户端拿着 B 的数据当 A 用、骨架永不清除。
|
|
605
|
+
const version = `${cacheKey}@${this.stateVersion()}`
|
|
606
|
+
this.stateViewCache ??= new Map()
|
|
607
|
+
const cached = this.stateViewCache.get(cacheKey)
|
|
608
|
+
if (cached && cached.version === version) {
|
|
609
|
+
if (since === version && Date.now() - cached.at < 60_000) return { unchanged: true, version }
|
|
610
|
+
if (Date.now() - cached.at < 60_000) return { ...cached.view, version }
|
|
611
|
+
}
|
|
612
|
+
// 切换 SWR(与模型目录的 stale-while-revalidate 同哲学):只服务「显式切换」——调用方
|
|
613
|
+
// 携带的是别的视图键的 version(A→B→A 回环/会话内换视图);本视图轮询(since 以
|
|
614
|
+
// `${cacheKey}@` 开头)必须拿新数据,否则新消息可见性被推迟一轮。不带 since 的请求
|
|
615
|
+
// (首次加载/脚本直调/测试)一律现组装:无法与「切换」区分,回放旧载荷会让直调方
|
|
616
|
+
// 拿到 ≤5s 陈数据(实测打断 9 条服务层行为测试),切换收益只认显式持他视图版本的场景。
|
|
617
|
+
const isSwitch = since != null && !String(since).startsWith(`${cacheKey}@`)
|
|
618
|
+
if (cached && isSwitch && Date.now() - cached.at < 5_000) {
|
|
619
|
+
void assembleState.call(this, projectId, soloBotId).then(result => {
|
|
620
|
+
if (result && typeof result === 'object' && 'version' in result) {
|
|
621
|
+
const { version: _dropped, ...view } = result
|
|
622
|
+
this.stateViewCache.delete(cacheKey)
|
|
623
|
+
this.stateViewCache.set(cacheKey, { version, view, at: Date.now() })
|
|
624
|
+
}
|
|
625
|
+
}).catch(() => {})
|
|
626
|
+
// 版本号必须描述回传的数据本身:SWR 回放的是旧视图,必须配它自己的旧版本号。
|
|
627
|
+
// 若配当前版本号,客户端下一拍轮询会因缓存同版本而收到 unchanged,新消息被
|
|
628
|
+
// 卡到再下一次版本变化才可见(实测「新消息进来页面不及时刷新」即此)。
|
|
629
|
+
return { ...cached.view, version: cached.version }
|
|
630
|
+
}
|
|
631
|
+
const result = await assembleState.call(this, projectId, soloBotId)
|
|
632
|
+
if (result && typeof result === 'object' && 'version' in result) {
|
|
633
|
+
const { version: _dropped, ...view } = result
|
|
634
|
+
this.stateViewCache.delete(cacheKey)
|
|
635
|
+
this.stateViewCache.set(cacheKey, { version, view, at: Date.now() })
|
|
636
|
+
while (this.stateViewCache.size > 8) this.stateViewCache.delete(this.stateViewCache.keys().next().value)
|
|
637
|
+
return { ...result, version }
|
|
638
|
+
}
|
|
639
|
+
return result
|
|
640
|
+
}
|
|
641
|
+
|
|
642
|
+
// 对外静态类型按外壳签名收窄(base 字面量里的 state 是两参组装器签名,
|
|
643
|
+
// 直接 typeof 会让三参调用在 tsc 下报错)。
|
|
644
|
+
|
|
645
|
+
export const systemMethods = systemMethodsBase
|