dsh-team-bots 0.3.12 → 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 +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 +53 -4
- package/src/db.js +28 -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/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 +87 -25
- package/src/services/scheduler.js +20 -0
- package/src/services/system.js +162 -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 +10 -0
- package/ui/i18n/en/settings.js +75 -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 +75 -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 +1 -1
- 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 +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 +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/NOTICE
CHANGED
|
@@ -9,10 +9,9 @@ Architecture and DSH integration were informed by:
|
|
|
9
9
|
- Cindy, Copyright Cindy contributors, Apache-2.0
|
|
10
10
|
https://github.com/makecindy/cindy
|
|
11
11
|
|
|
12
|
-
Collaboration protocol ideas (
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
contributors, MIT License:
|
|
12
|
+
Collaboration protocol ideas (mutation fence, tiered notifications,
|
|
13
|
+
ledger-authoritative task events, acceptance-boundary memory reminder) were
|
|
14
|
+
informed by dsh-agent-team, Copyright Contexera contributors, MIT License:
|
|
16
15
|
https://github.com/Contexera/dsh-agent-team
|
|
17
16
|
|
|
18
17
|
Runtime dependency:
|
package/README.md
CHANGED
|
@@ -48,7 +48,7 @@ A group chat has three reply modes (switchable in project settings): **Director
|
|
|
48
48
|
|
|
49
49
|
States: backlog, todo, in progress, blocked, in review, done, canceled. A card carries assignee, priority, parent/child links, tags, write scopes, an optional time budget (a hard limit that aborts the run), comments, and its own usage. Rows are grouped by state and can be dragged onto another group to change status.
|
|
50
50
|
|
|
51
|
-
Acceptance
|
|
51
|
+
Acceptance is uniformly arranged by the director through subagent verification: the mechanical gate requires a subagent verification ledger entry within the current review cycle, the verification conclusion grounds the decision, and a director fallback must be explicitly marked. Read-only deliveries (the delivering run's effective sandbox is `read-only`) skip the automatic verification delegate and the gate, marked "read-only, verification skipped" on the card — they could not have written the workspace; write deliveries stay fully gated (`DSH_TEAM_REVIEW_READ_ONLY_SKIP=0` restores mandatory verification for all). Amending a card (`team_assign_task` re-dispatch with card edits) accepts an optional `expected_version` mutation fence: if the card changed since you last saw it (delivery, transition, another edit) the write is refused with the most recent changes listed, so you can re-decide in place.
|
|
52
52
|
|
|
53
53
|
Task status transitions now write an authoritative `status` task event in the same transaction as the update, so the event stream fully replays the task state machine; the `task_projection_drift` API is a read-only check that replays the ledger and reports any drift from the projection.
|
|
54
54
|
|
|
@@ -72,7 +72,7 @@ The usage page breaks the numbers down by model, bot and project, exports CSV, a
|
|
|
72
72
|
|
|
73
73
|
### Workspace settings
|
|
74
74
|
|
|
75
|
-
Run limits (timeout abort, no-progress watchdog, review idle threshold), budgets and retention windows are set per workspace, together with the interface preferences and the local DSH paths.
|
|
75
|
+
Run limits (timeout abort, no-progress watchdog, review idle threshold), budgets and retention windows are set per workspace, together with the interface preferences, the team-wide prompt segments and the local DSH paths.
|
|
76
76
|
|
|
77
77
|

|
|
78
78
|
|
package/docs/README.zh.md
CHANGED
|
@@ -48,7 +48,7 @@ http://<host>:<port>/api/dsh-team/ui 团队工作台本身
|
|
|
48
48
|
|
|
49
49
|
状态:待规划、待执行、进行中、受阻、待验收、已完成、已取消。一张卡带负责人、优先级、父子任务、标签、写范围、可选的时效要求(硬性时限,到期中止运行)、评论,以及本卡自己的用量。任务行按状态分组,可拖到别的分组直接改状态。
|
|
50
50
|
|
|
51
|
-
|
|
51
|
+
验收统一由总监安排子代理核验:验收机械闸要求本评审周期内有子代理核验账目,核验结论作为验收依据,总监兜底须显式注明。只读档交付(交付运行生效沙箱为 `read-only`)免自动核验并同口径放宽闸门,卡面标「只读免核验」——它物理上写不了工作区;写档交付维持全量强制(`DSH_TEAM_REVIEW_READ_ONLY_SKIP=0` 恢复全部强制核验)。改卡(`team_assign_task` 重派附卡面修正)可带 `expected_version` 做变更栅栏:卡在你读取之后被交付、流转或他人编辑过时写入被拒,拒绝附最近变更事实,可据此就地重新裁决。
|
|
52
52
|
|
|
53
53
|
任务状态迁移统一落权威 `status` 事件(与状态更新同事务),事件流可完整重放状态机;`task_projection_drift` API 从事件流重放对照投影做只读巡检,漂移即报。
|
|
54
54
|
|
|
@@ -87,7 +87,7 @@ Bot 要工具审批、要密钥或要人回答时,工作台在聊天里出一
|
|
|
87
87
|
| `DSH_TEAM_WORKSPACE` | `~/.dsh/workspace/team-bots` | 团队工作区根目录 |
|
|
88
88
|
| `DSH_TEAM_DATA` | `<workspace>/.data` | 数据库与运行记录 |
|
|
89
89
|
|
|
90
|
-
其余变量的默认值与解析顺序(显式环境变量 > 页面上保存的值 > 代码默认值)都写在 `src/config.ts`,常用项见 `.env.example
|
|
90
|
+
其余变量的默认值与解析顺序(显式环境变量 > 页面上保存的值 > 代码默认值)都写在 `src/config.ts`,常用项见 `.env.example`。除引导期变量(工作区/数据目录/首次种子)与通道凭据(微信/飞书在各自通道页)外,**全部运行期 `DSH_TEAM_*` 变量都可在工作台「全局配置 → 运行与预算 → 运行参数(环境变量)」卡里直接配置**:保存即生效(进行中的运行与已建会话不追溯),显式环境变量仍最高优先。不要在仓库根目录放 `.env`,否则 `DSH_*` 会泄进 `npm test` 和 `npm run dev`。
|
|
91
91
|
|
|
92
92
|
`DSH_TEAM_DATA` 下有 `team.sqlite`、`wechat-channel.sqlite`、`secret.key`、`memory/`、`messages/` 与 `secrets-runtime/`。备份时把 `secret.key` 和数据一起带走——没有它,已存的密文解不开。
|
|
93
93
|
|
|
Binary file
|
|
Binary file
|
package/docs/assets/tasks.png
CHANGED
|
Binary file
|
package/docs/assets/tasks.zh.png
CHANGED
|
Binary file
|
package/docs/assets/usage.png
CHANGED
|
Binary file
|
package/docs/assets/usage.zh.png
CHANGED
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-team-bots",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.64",
|
|
4
4
|
"description": "Project spaces, group chats, task boards, memory and usage for teams of DSH bots",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -51,6 +51,7 @@
|
|
|
51
51
|
"start": "node scripts/dev-server.mjs",
|
|
52
52
|
"prepack": "npm run build",
|
|
53
53
|
"doctor": "node scripts/doctor.mjs",
|
|
54
|
+
"preflight": "node scripts/preflight.mjs",
|
|
54
55
|
"profile:install": "node scripts/install-profile.mjs",
|
|
55
56
|
"verify:agent-team": "node scripts/verify-agent-team.mjs",
|
|
56
57
|
"backup": "node scripts/backup.mjs",
|
|
@@ -70,5 +71,10 @@
|
|
|
70
71
|
"bundle": {
|
|
71
72
|
"patch": "./cordis.patch.yml"
|
|
72
73
|
}
|
|
73
|
-
}
|
|
74
|
+
},
|
|
75
|
+
"directories": {
|
|
76
|
+
"doc": "docs",
|
|
77
|
+
"test": "tests"
|
|
78
|
+
},
|
|
79
|
+
"author": ""
|
|
74
80
|
}
|
package/src/api.js
CHANGED
|
@@ -14,6 +14,8 @@ const ACTIONS = new Set([
|
|
|
14
14
|
'create_memory', 'update_memory', 'delete_memory', 'search_memories', 'approve_memory', 'reject_memory',
|
|
15
15
|
'create_proposal', 'decide_proposal', 'evaluate_proposal', 'promote_proposal',
|
|
16
16
|
'approval_decide', 'approvals_pending',
|
|
17
|
+
// 免审规则编辑面(DSHBOTS-365):读走 state.approvalRules,此处备用直查;写仅 type=user。
|
|
18
|
+
'approval_rules', 'update_approval_rules',
|
|
17
19
|
'question_answer', 'questions_pending',
|
|
18
20
|
'sync_skills', 'skill_detail', 'toggle_skill', 'set_skill_binding', 'rollback_skill',
|
|
19
21
|
'save_price', 'reset_price',
|
|
@@ -31,7 +33,8 @@ export async function handleAction(service, action , payload
|
|
|
31
33
|
case 'health':
|
|
32
34
|
return service.health()
|
|
33
35
|
case 'state':
|
|
34
|
-
|
|
36
|
+
// since:版本短路(system.state)——客户端带上上次响应的 version,相等即回 unchanged。
|
|
37
|
+
return service.state(payload.projectId, payload.soloBotId ?? null, { since: payload.since ?? null })
|
|
35
38
|
case 'messages_page':
|
|
36
39
|
// 聊天历史游标分页:更早的消息按最旧一条 created_at+id 向前翻页。
|
|
37
40
|
return service.messagesPage(payload)
|
|
@@ -159,6 +162,12 @@ export async function handleAction(service, action , payload
|
|
|
159
162
|
return service.decideApproval(required(payload.approvalId, 'approvalId'), required(payload.decision, 'decision'), actor)
|
|
160
163
|
case 'approvals_pending':
|
|
161
164
|
return service.approvalsPending()
|
|
165
|
+
// 免审规则(DSHBOTS-365):bot 写免审规则由服务层守卫拒绝(actor.type!=='user' forbidden),
|
|
166
|
+
// 与 task_update_scopes 同口径。
|
|
167
|
+
case 'approval_rules':
|
|
168
|
+
return service.approvalRulesView()
|
|
169
|
+
case 'update_approval_rules':
|
|
170
|
+
return service.updateApprovalRules(payload.rules, actor)
|
|
162
171
|
case 'question_answer':
|
|
163
172
|
return service.answerQuestion(required(payload.questionId, 'questionId'), payload, actor)
|
|
164
173
|
case 'questions_pending':
|
package/src/config.js
CHANGED
|
@@ -39,6 +39,14 @@ const int = (value, fallback, min, max) => {
|
|
|
39
39
|
return Math.min(max, Math.max(min, parsed))
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
+
|
|
43
|
+
// 运行参数目录条目类型(全局设置「运行参数」卡,见 RUNTIME_SETTING_DEFS 注释)。
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
|
|
42
50
|
// ── 运行时效(全局配置页「运行时效」卡)────────────────────────────────────
|
|
43
51
|
// 设置键沿用 settings 表的 snake_case;范围单位为分钟,与页面保存校验一致。
|
|
44
52
|
export const RUN_TIMEOUT_KEY = 'run_timeout_minutes'
|
|
@@ -47,11 +55,16 @@ export const STALL_WATCHDOG_KEY = 'stall_watchdog_minutes'
|
|
|
47
55
|
// owner 2026-11-07 拍板上调);空串/越界/非法回退默认,优先级与运行时效同款。
|
|
48
56
|
export const APPROVAL_TIMEOUT_KEY = 'approval_timeout_minutes'
|
|
49
57
|
export const QUESTION_TIMEOUT_KEY = 'question_timeout_minutes'
|
|
58
|
+
// 验收/受阻处理分档时效(DSHBOTS-302 起;DSHBOTS-364 默认改关闭):键放这里进
|
|
59
|
+
// RUN_LIMIT_RANGES,updateSettings 的范围校验即自动覆盖;生效值函数在
|
|
60
|
+
// runtime/session.js 的 effectiveReviewTimeoutMinutes(消费点在 startRun)。
|
|
61
|
+
export const REVIEW_TIMEOUT_KEY = 'review_timeout_minutes'
|
|
50
62
|
export const RUN_LIMIT_RANGES = {
|
|
51
63
|
[RUN_TIMEOUT_KEY]: [1, 360],
|
|
52
64
|
[STALL_WATCHDOG_KEY]: [0, 360],
|
|
53
65
|
[APPROVAL_TIMEOUT_KEY]: [1, 60],
|
|
54
66
|
[QUESTION_TIMEOUT_KEY]: [1, 60],
|
|
67
|
+
[REVIEW_TIMEOUT_KEY]: [0, 60],
|
|
55
68
|
}
|
|
56
69
|
|
|
57
70
|
// ── 验收滞留守门(DSHBOTS-194 / DSHBOTS-235)───────────────────────────────
|
|
@@ -87,6 +100,15 @@ export const SESSION_COMPACT_CTX_TOKENS_RANGE = [0, 10_000_000]
|
|
|
87
100
|
export const SESSION_ROLLOVER_CTX_TOKENS_KEY = 'session_rollover_ctx_tokens'
|
|
88
101
|
export const SESSION_ROLLOVER_CTX_TOKENS_RANGE = [0, 10_000_000]
|
|
89
102
|
|
|
103
|
+
// 会话子代理消费判据:DSH 宿主对单个会话可派生的子代理数量有上限,长期复用的会话
|
|
104
|
+
// (尤其总监控制面)派满后 subagent 派生开始失败且无自动恢复。口径 = 该会话名下运行
|
|
105
|
+
// 的 run_events 中 type='subagent_spawned' 计数(DSHBOTS-294 子代理账本)。轮数/体积
|
|
106
|
+
// 之外累计消费达到阈值同样触发结转。默认 128:结转在会话复用时判定、摘要就绪后下一次
|
|
107
|
+
// 复用才换会话,阈值须低于宿主上限(口径 200)留出摘要往返期间继续消费的余量。
|
|
108
|
+
// 0 = 关闭该判据;生效链与轮次键一致。
|
|
109
|
+
export const SESSION_ROLLOVER_SUBAGENTS_KEY = 'session_rollover_subagents'
|
|
110
|
+
export const SESSION_ROLLOVER_SUBAGENTS_RANGE = [0, 10_000]
|
|
111
|
+
|
|
90
112
|
// 保存值必须是范围内的整数;非法或越界按未保存处理(回退默认),不做钳制。
|
|
91
113
|
// 空串/null(未保存)必须先于数值化判空:Number('') 是 0,会把「未保存」误判成
|
|
92
114
|
// 合法值 0(关闭)。用 Number() 而非 parseInt:parseInt('1.5') 会吞小数当 1。
|
|
@@ -98,7 +120,7 @@ const savedInt = (value, range) => {
|
|
|
98
120
|
return Number.isInteger(num) && num >= min && num <= max ? num : null
|
|
99
121
|
}
|
|
100
122
|
|
|
101
|
-
const envExplicit = (name) => {
|
|
123
|
+
export const envExplicit = (name) => {
|
|
102
124
|
const raw = process.env[name]
|
|
103
125
|
return raw !== undefined && String(raw).trim() !== ''
|
|
104
126
|
}
|
|
@@ -152,8 +174,13 @@ export function effectiveQuestionTimeoutMs(config, getSetting
|
|
|
152
174
|
export const TASK_TIME_BUDGET_FALLBACK_MINUTES = 40
|
|
153
175
|
export function effectiveTaskTimeBudgetMinutes(config, getSetting = () => null) {
|
|
154
176
|
const env = envExplicit('DSH_TEAM_TASK_TIME_BUDGET_MINUTES')
|
|
177
|
+
if (env) return config.taskTimeBudgetMinutes
|
|
178
|
+
// 全局设置「运行参数」卡保存值(运行参数目录条目,skipOverlay 专属链):
|
|
179
|
+
// env > 页面保存值 > 看门狗兜底 > 默认。
|
|
180
|
+
const saved = runtimeSettingSavedValue(RUNTIME_SETTING_BY_KEY.get(TASK_TIME_BUDGET_KEY), getSetting)
|
|
181
|
+
if (saved !== null) return saved
|
|
155
182
|
const stallMinutes = Math.round(effectiveRunLimits(config, getSetting).stallTimeoutMs / 60_000)
|
|
156
|
-
return
|
|
183
|
+
return stallMinutes > 0 ? stallMinutes : config.taskTimeBudgetMinutes
|
|
157
184
|
}
|
|
158
185
|
|
|
159
186
|
// 派单预算优先级分档(DSHBOTS-325):派单路径(assignFromBot 建卡/重派)漏传
|
|
@@ -197,6 +224,13 @@ export function effectiveSessionRolloverCtxTokens(config, getSetting
|
|
|
197
224
|
return !env && saved !== null ? saved : config.sessionRolloverCtxTokens
|
|
198
225
|
}
|
|
199
226
|
|
|
227
|
+
// 结转子代理消费上限生效值:默认 128 个(宿主上限 200 留余量),0 = 关闭该判据。
|
|
228
|
+
export function effectiveSessionRolloverSubagents(config, getSetting = () => null) {
|
|
229
|
+
const env = envExplicit('DSH_TEAM_SESSION_ROLLOVER_SUBAGENTS')
|
|
230
|
+
const saved = savedInt(getSetting(SESSION_ROLLOVER_SUBAGENTS_KEY), SESSION_ROLLOVER_SUBAGENTS_RANGE)
|
|
231
|
+
return !env && saved !== null ? saved : config.sessionRolloverSubagents
|
|
232
|
+
}
|
|
233
|
+
|
|
200
234
|
// 验收滞留阈值生效值(DSHBOTS-194):优先级与会话结转一致——env 显式 > 保存值 >
|
|
201
235
|
// 默认 30 分钟;0 = 关闭。消费点(scheduler 验收守门、runLimitsView 透出)每次
|
|
202
236
|
// 现算,改值对下一轮扫描生效;env 标志供 UI 提示「环境变量已覆盖」。
|
|
@@ -279,6 +313,140 @@ export function effectiveFeishuCredentials(config, savedGetter
|
|
|
279
313
|
return { appId: '', appSecret: '', source: 'none' }
|
|
280
314
|
}
|
|
281
315
|
|
|
316
|
+
|
|
317
|
+
// ── 运行参数目录(全局配置页「运行参数」卡)────────────────────────────────
|
|
318
|
+
// 目标:所有运行期 DSH_TEAM_* 环境变量都能在全局设置里配置。生效优先级与运行时效
|
|
319
|
+
// 同款:env 显式 > settings 表保存值 > 启动默认(resolveConfig 已烘进 config 的值)。
|
|
320
|
+
// 引导期变量(DSH_HOME / DSH_TEAM_WORKSPACE / DSH_TEAM_DATA / DSH_TEAM_DEV_SEED)
|
|
321
|
+
// 决定数据落盘位置与首次种子,运行期改设置无意义,不进目录;通道类变量
|
|
322
|
+
//(DSH_TEAM_WECHAT / DSH_BOTS_FEISHU*)已由通道页配置覆盖,也不在此重复。
|
|
323
|
+
// kind 口径:'int' 整数(min/max 校验,空串 = 清除保存值回默认);'bool' 0/1/空;
|
|
324
|
+
// 'str' 自由文本;'extlist' 扩展名清单(空白/逗号/分号分隔);'json' JSON 文本。
|
|
325
|
+
// skipOverlay 的条目有专属生效链(如 task_time_budget_minutes 依赖看门狗兜底),
|
|
326
|
+
// 不进通用覆盖视图,由各自 effective* 函数自行读取 settings。
|
|
327
|
+
export const TASK_TIME_BUDGET_KEY = 'task_time_budget_minutes'
|
|
328
|
+
export const TASK_TIME_BUDGET_RANGE = [1, 10_080]
|
|
329
|
+
export const RUNTIME_SETTING_DEFS = [
|
|
330
|
+
// 调度与并行
|
|
331
|
+
{ key: 'max_concurrent_runs', env: 'DSH_TEAM_MAX_RUNS', field: 'maxConcurrentRuns', kind: 'int', min: 1, max: 16, group: 'sched' },
|
|
332
|
+
{ key: 'max_write_scopes', env: 'DSH_TEAM_MAX_WRITE_SCOPES', field: 'maxWriteScopesPerTask', kind: 'int', min: 1, max: 64, group: 'sched' },
|
|
333
|
+
{ key: 'max_teammates', env: 'DSH_TEAM_MAX_TEAMMATES', field: 'maxTeammates', kind: 'int', min: 1, max: 8, group: 'sched' },
|
|
334
|
+
{ key: 'agent_team', env: 'DSH_TEAM_AGENT_TEAM', field: 'agentTeam', kind: 'bool', group: 'sched' },
|
|
335
|
+
// 运行限额与会话
|
|
336
|
+
{ key: 'max_run_tokens', env: 'DSH_TEAM_MAX_RUN_TOKENS', field: 'maxRunTokens', kind: 'int', min: 0, max: 500_000_000, group: 'limits' },
|
|
337
|
+
{ key: 'task_time_budget_minutes', env: 'DSH_TEAM_TASK_TIME_BUDGET_MINUTES', field: 'taskTimeBudgetMinutes', kind: 'int', min: TASK_TIME_BUDGET_RANGE[0], max: TASK_TIME_BUDGET_RANGE[1], group: 'limits', skipOverlay: true },
|
|
338
|
+
{ key: 'session_rollover_turns', env: 'DSH_TEAM_SESSION_ROLLOVER_TURNS', field: 'sessionRolloverTurns', kind: 'int', min: 0, max: 10_000, group: 'session' },
|
|
339
|
+
{ key: 'session_compact_turns', env: 'DSH_TEAM_SESSION_COMPACT_TURNS', field: 'sessionCompactTurns', kind: 'int', min: 0, max: 10_000, group: 'session' },
|
|
340
|
+
{ key: 'session_compact_ctx_tokens', env: 'DSH_TEAM_SESSION_COMPACT_CTX_TOKENS', field: 'sessionCompactCtxTokens', kind: 'int', min: 0, max: 10_000_000, group: 'session' },
|
|
341
|
+
{ key: 'session_rollover_ctx_tokens', env: 'DSH_TEAM_SESSION_ROLLOVER_CTX_TOKENS', field: 'sessionRolloverCtxTokens', kind: 'int', min: 0, max: 10_000_000, group: 'session' },
|
|
342
|
+
{ key: 'session_rollover_subagents', env: 'DSH_TEAM_SESSION_ROLLOVER_SUBAGENTS', field: 'sessionRolloverSubagents', kind: 'int', min: 0, max: 10_000, group: 'session' },
|
|
343
|
+
{ key: 'router_preset', env: 'DSH_TEAM_ROUTER_PRESET', field: 'routerPreset', kind: 'str', group: 'session' },
|
|
344
|
+
{ key: 'worker_preset', env: 'DSH_TEAM_WORKER_PRESET', field: 'workerPreset', kind: 'str', group: 'session' },
|
|
345
|
+
// 消息体量
|
|
346
|
+
{ key: 'chat_max_chars', env: 'DSH_TEAM_CHAT_MAX_CHARS', field: 'chatReplyMaxChars', kind: 'int', min: 80, max: 8_000, group: 'chat' },
|
|
347
|
+
{ key: 'delivery_report_max_chars', env: 'DSH_TEAM_DELIVERY_REPORT_MAX_CHARS', field: 'deliveryReportMaxChars', kind: 'int', min: 200, max: 20_000, group: 'chat' },
|
|
348
|
+
{ key: 'dm_archive_days', env: 'DSH_TEAM_DM_ARCHIVE_DAYS', field: 'dmArchiveDays', kind: 'int', min: 0, max: 3650, group: 'chat' },
|
|
349
|
+
{ key: 'dm_keep_recent', env: 'DSH_TEAM_DM_KEEP_RECENT', field: 'dmKeepRecent', kind: 'int', min: 0, max: 10_000, group: 'chat' },
|
|
350
|
+
// 运维杂项
|
|
351
|
+
{ key: 'secrets_ttl_ms', env: 'DSH_TEAM_SECRETS_TTL_MS', field: 'secretsRuntimeTtlMs', kind: 'int', min: 1_000, max: 24 * 60 * 60_000, group: 'ops' },
|
|
352
|
+
{ key: 'image_png_jpeg_threshold_bytes', env: 'DSH_TEAM_IMAGE_PNG_JPEG_THRESHOLD_BYTES', field: 'imagePngJpegThresholdBytes', kind: 'int', min: 0, max: 5 * 1024 * 1024, group: 'ops' },
|
|
353
|
+
{ key: 'usage_snapshot_cache_ms', env: 'DSH_TEAM_USAGE_SNAPSHOT_CACHE_MS', field: 'usageSnapshotCacheMs', kind: 'int', min: 0, max: 300_000, group: 'ops' },
|
|
354
|
+
{ key: 'catalog_stale_ms', env: 'DSH_TEAM_CATALOG_STALE_MS', field: 'catalogStaleMs', kind: 'int', min: 0, max: 3_600_000, group: 'ops' },
|
|
355
|
+
{ key: 'code_hygiene_exts', env: 'DSH_TEAM_CODE_HYGIENE_EXTS', field: 'codeHygieneExts', kind: 'extlist', group: 'ops' },
|
|
356
|
+
{ key: 'github_watch', env: 'DSH_TEAM_GITHUB_WATCH', field: 'githubWatch', kind: 'json', group: 'ops' },
|
|
357
|
+
{ key: 'github_poll_minutes', env: 'DSH_TEAM_GITHUB_POLL_MINUTES', field: 'githubPollMinutes', kind: 'int', min: 0, max: 1440, group: 'ops' },
|
|
358
|
+
{ key: 'auto_review_delegate', env: 'DSH_TEAM_AUTO_REVIEW_DELEGATE', field: 'autoReviewDelegate', kind: 'bool', group: 'review' },
|
|
359
|
+
{ key: 'review_read_only_skip', env: 'DSH_TEAM_REVIEW_READ_ONLY_SKIP', field: 'reviewReadOnlySkip', kind: 'bool', group: 'review' },
|
|
360
|
+
// 派生模型代理(成对生效,见 config 注释)
|
|
361
|
+
{ key: 'vision_proxy_provider', env: 'DSH_TEAM_VISION_PROXY_PROVIDER', field: 'visionProxyProvider', kind: 'str', group: 'models' },
|
|
362
|
+
{ key: 'vision_proxy_model', env: 'DSH_TEAM_VISION_PROXY_MODEL', field: 'visionProxyModel', kind: 'str', group: 'models' },
|
|
363
|
+
{ key: 'memory_review_provider', env: 'DSH_TEAM_MEMORY_REVIEW_PROVIDER', field: 'memoryReviewProvider', kind: 'str', group: 'models' },
|
|
364
|
+
{ key: 'memory_review_model', env: 'DSH_TEAM_MEMORY_REVIEW_MODEL', field: 'memoryReviewModel', kind: 'str', group: 'models' },
|
|
365
|
+
]
|
|
366
|
+
export const RUNTIME_SETTING_KEYS = RUNTIME_SETTING_DEFS.map(def => def.key)
|
|
367
|
+
const RUNTIME_SETTING_BY_KEY = new Map(RUNTIME_SETTING_DEFS.map(def => [def.key, def]))
|
|
368
|
+
|
|
369
|
+
// 保存值校验 + 规范化:返回 { ok, normalized, value } 或 { ok:false, error }。
|
|
370
|
+
// normalized 是落库形态(字符串);value 是覆盖视图可直接赋给 config 字段的形态。
|
|
371
|
+
// 空串一律合法(= 清除保存值回默认),由调用方先短路。
|
|
372
|
+
export function validateRuntimeSettingValue(def , raw ) {
|
|
373
|
+
const text = String(raw ?? '').trim()
|
|
374
|
+
if (def.kind === 'int') {
|
|
375
|
+
const num = Number(text)
|
|
376
|
+
if (!Number.isInteger(num) || num < def.min || num > def.max) {
|
|
377
|
+
return { ok: false , error: `必须是 ${def.min}–${def.max} 的整数` }
|
|
378
|
+
}
|
|
379
|
+
return { ok: true , normalized: String(num), value: num }
|
|
380
|
+
}
|
|
381
|
+
if (def.kind === 'bool') {
|
|
382
|
+
if (text !== '0' && text !== '1' && text.toLowerCase() !== 'true' && text.toLowerCase() !== 'false') {
|
|
383
|
+
return { ok: false , error: '必须是 0 或 1' }
|
|
384
|
+
}
|
|
385
|
+
const on = text === '1' || text.toLowerCase() === 'true'
|
|
386
|
+
return { ok: true , normalized: on ? '1' : '0', value: on }
|
|
387
|
+
}
|
|
388
|
+
if (def.kind === 'extlist') {
|
|
389
|
+
const list = parseExtList(text)
|
|
390
|
+
return { ok: true , normalized: list.join(','), value: list }
|
|
391
|
+
}
|
|
392
|
+
if (def.kind === 'json') {
|
|
393
|
+
try {
|
|
394
|
+
const parsed = JSON.parse(text)
|
|
395
|
+
if (!Array.isArray(parsed)) return { ok: false , error: '必须是 JSON 数组 [{projectKey, repo}]' }
|
|
396
|
+
for (const item of parsed) {
|
|
397
|
+
if (!item || typeof item !== 'object' || !String(item?.projectKey ?? '').trim() || !String(item?.repo ?? '').trim()) {
|
|
398
|
+
return { ok: false , error: '数组元素必须是 {projectKey, repo} 且两字段非空' }
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
const normalized = JSON.stringify(parsed.map(item => ({ projectKey: String(item.projectKey).trim(), repo: String(item.repo).trim() })))
|
|
402
|
+
return { ok: true , normalized, value: JSON.parse(normalized) }
|
|
403
|
+
} catch {
|
|
404
|
+
return { ok: false , error: '不是合法 JSON' }
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
return { ok: true , normalized: text, value: text }
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
// 读取某条目录项的「已保存且合法」覆盖值;未保存/非法返回 null(回退默认)。
|
|
411
|
+
export function runtimeSettingSavedValue(def , getSetting = () => null) {
|
|
412
|
+
const raw = String(getSetting?.(def.key) ?? '').trim()
|
|
413
|
+
if (raw === '') return null
|
|
414
|
+
const check = validateRuntimeSettingValue(def, raw)
|
|
415
|
+
return check.ok ? check.value : null
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
// 存活覆盖视图:把 settings 表保存值(env 未显式设置时)叠到启动配置上。
|
|
419
|
+
// 无任何生效覆盖时原样返回 config(不复制对象,读路径零成本)。
|
|
420
|
+
// skipOverlay 条目不参与(有专属生效链)。
|
|
421
|
+
export function applyRuntimeSettingOverrides(config , getSetting = () => null) {
|
|
422
|
+
const overrides = {}
|
|
423
|
+
for (const def of RUNTIME_SETTING_DEFS) {
|
|
424
|
+
if (def.skipOverlay) continue
|
|
425
|
+
if (envExplicit(def.env)) continue
|
|
426
|
+
const saved = runtimeSettingSavedValue(def, getSetting)
|
|
427
|
+
if (saved === null) continue
|
|
428
|
+
overrides[def.field] = saved
|
|
429
|
+
}
|
|
430
|
+
return Object.keys(overrides).length ? { ...config, ...overrides } : config
|
|
431
|
+
}
|
|
432
|
+
|
|
433
|
+
// 全局设置页「运行参数」卡的展示视图:每条目录项的保存值/生效值/env 覆盖标志。
|
|
434
|
+
export function runtimeSettingsView(config , getSetting = () => null) {
|
|
435
|
+
const effective = applyRuntimeSettingOverrides(config, getSetting)
|
|
436
|
+
return RUNTIME_SETTING_DEFS.map(def => ({
|
|
437
|
+
key: def.key,
|
|
438
|
+
env: def.env,
|
|
439
|
+
group: def.group,
|
|
440
|
+
kind: def.kind,
|
|
441
|
+
...(def.min === undefined ? {} : { min: def.min, max: def.max }),
|
|
442
|
+
envExplicit: envExplicit(def.env),
|
|
443
|
+
saved: String(getSetting?.(def.key) ?? ''),
|
|
444
|
+
// skipOverlay 条目也从覆盖视图取值(其 saved 由专属链处理,这里仅展示)。
|
|
445
|
+
effective: String(effective[def.field] ?? config[def.field] ?? ''),
|
|
446
|
+
default: String(config[def.field] ?? ''),
|
|
447
|
+
}))
|
|
448
|
+
}
|
|
449
|
+
|
|
282
450
|
export function resolveConfig(config = {}) {
|
|
283
451
|
const dshHome = resolve(process.env.DSH_HOME?.trim() || join(homedir(), '.dsh'))
|
|
284
452
|
const workspace = resolve(config.workspace || defaultWorkspace())
|
|
@@ -345,6 +513,9 @@ export function resolveConfig(config = {}) {
|
|
|
345
513
|
// 0 = 关闭体积判据;生效值见 effectiveSession{Compact,Rollover}CtxTokens。
|
|
346
514
|
sessionCompactCtxTokens: int(config.sessionCompactCtxTokens ?? process.env.DSH_TEAM_SESSION_COMPACT_CTX_TOKENS, 80_000, 0, 10_000_000),
|
|
347
515
|
sessionRolloverCtxTokens: int(config.sessionRolloverCtxTokens ?? process.env.DSH_TEAM_SESSION_ROLLOVER_CTX_TOKENS, 150_000, 0, 10_000_000),
|
|
516
|
+
// 会话子代理消费上限:默认 128 个(低于宿主上限 200 留摘要往返余量),0 = 关闭;
|
|
517
|
+
// 生效值见 effectiveSessionRolloverSubagents。
|
|
518
|
+
sessionRolloverSubagents: int(config.sessionRolloverSubagents ?? process.env.DSH_TEAM_SESSION_ROLLOVER_SUBAGENTS, 128, 0, 10_000),
|
|
348
519
|
// 验收滞留守门(DSHBOTS-194):in_review 卡静置超此分钟数 = 滞留。生效值可被
|
|
349
520
|
// 全局设置 review_idle_minutes 覆盖(effectiveReviewIdleMinutes),0 = 关闭。
|
|
350
521
|
reviewIdleMinutes: int(config.reviewIdleMinutes ?? process.env.DSH_TEAM_REVIEW_IDLE_MINUTES, 30, 0, 1440),
|
|
@@ -401,9 +572,16 @@ export function resolveConfig(config = {}) {
|
|
|
401
572
|
// (与手动「子代理核验」按钮同一入口)。总监裁决不受影响:owner_bot 卡在核验运行
|
|
402
573
|
// 结束后再触发总监验收;user 卡核验结论写回评论,裁决仍归工作台 owner。
|
|
403
574
|
autoReviewDelegate: bool(config.autoReviewDelegate ?? process.env.DSH_TEAM_AUTO_REVIEW_DELEGATE, true),
|
|
575
|
+
// 验收核验分档:生效沙箱为只读档(run_type 收紧或任务覆盖/负责人配置 read-only)的交付
|
|
576
|
+
// 免自动核验委派,验收闸门同口径放宽;写档交付维持强制子代理核验。
|
|
577
|
+
// DSH_TEAM_REVIEW_READ_ONLY_SKIP=0 关闭回到全量强制。
|
|
578
|
+
reviewReadOnlySkip: bool(config.reviewReadOnlySkip ?? process.env.DSH_TEAM_REVIEW_READ_ONLY_SKIP, true),
|
|
404
579
|
// 代码卫生(DSHBOTS-172):扫描扩展名白名单覆盖(默认白名单见 services/hygiene.js)。
|
|
405
580
|
codeHygieneExts: parseExtList(config.codeHygieneExts ?? process.env.DSH_TEAM_CODE_HYGIENE_EXTS),
|
|
406
581
|
schedulerIntervalMs: int(config.schedulerIntervalMs, 1_500, 250, 30_000),
|
|
582
|
+
// 空载降频:周期定时器在无 queued/running 运行、无可领 outbox 且距上次全量拍不足该间隔时,
|
|
583
|
+
// 只做一次索引计数探测即返回。事件唤醒的 tick() 不受影响,永远全量。
|
|
584
|
+
schedulerIdleIntervalMs: int(config.schedulerIdleIntervalMs, 15_000, 1_500, 60_000),
|
|
407
585
|
modelCacheMs: int(config.modelCacheMs, 8_000, 0, 120_000),
|
|
408
586
|
// 用量快照缓存:state() 每轮轮询都跑 30d 全口径聚合(生产库实测约 500ms),
|
|
409
587
|
// 这里做 TTL 缓存把 state() 拉回几十毫秒。0 = 关闭缓存(每次重算)。
|
package/src/db-migrations.js
CHANGED
|
@@ -258,6 +258,14 @@ function migrateUsageEvents(db) {
|
|
|
258
258
|
// FTS5 全文索引:可用则建立并回填,不可用则回退到 LIKE 扫描。
|
|
259
259
|
function setupFts(db) {
|
|
260
260
|
try {
|
|
261
|
+
// 旧库可能带着非 trigram(unicode61 默认分词)的 memories_fts:中文整段被切成单 token,
|
|
262
|
+
// 子串检索永远 0 命中。IF NOT EXISTS 不会重建,须显式检测分词器并丢弃重建后回填。
|
|
263
|
+
const existing = db.prepare(
|
|
264
|
+
"SELECT sql FROM sqlite_master WHERE type='table' AND name = 'memories_fts'",
|
|
265
|
+
).get()
|
|
266
|
+
if (existing && !/tokenize\s*=\s*'trigram'/.test(String(existing.sql))) {
|
|
267
|
+
db.exec('DROP TABLE memories_fts')
|
|
268
|
+
}
|
|
261
269
|
db.exec(FTS_SCHEMA)
|
|
262
270
|
} catch {
|
|
263
271
|
return false
|
|
@@ -357,8 +365,15 @@ function migrateSessionBindingProjectScope(db) {
|
|
|
357
365
|
// 完整落地,但激活必须与 §5.2-2 入站路由收敛同车——现行运行时仍是「同 bot 多条 queued 领取时
|
|
358
366
|
// 合批」(scheduler.coalesceQueuedRuns)与四车道并行,先建索引会让 enqueue 家族直接撞唯一约束
|
|
359
367
|
// (实测全量 1540 例红 68,全部为 UNIQUE constraint failed: runs.bot_id)。步骤 2 把合批改为
|
|
360
|
-
// 入队合并后,在 runMigrations
|
|
368
|
+
// 入队合并后,在 runMigrations 里调用本函数激活。
|
|
369
|
+
// 账本闸(ZONGM-140 三会话事故复盘):串行化收口是一次性存量迁移,不是每次开库的常驻
|
|
370
|
+
// 逻辑——无闸时每次宿主重启都会把同 bot「较新的活跃运行」再收一遍,且下方 UPDATE 的
|
|
371
|
+
// 收口口径(全 bot、不限 kind)与最终豁免口径(task/治理运行免串行,见 exempt 系列
|
|
372
|
+
// 索引谓词)并不一致,生产表现是每次重启杀掉新排队的任务卡/治理运行(ZONGM-140 首发
|
|
373
|
+
// 运行 10:40:25 入队 15 秒后被杀、DSHBOTS-368 两次被杀、11-13 两条治理运行被杀)。
|
|
374
|
+
// 已记录账本即跳过:索引重建由 exempt 系列每次开库兜底,收口 UPDATE 只跑一次。
|
|
361
375
|
export function activateBotRunSerialization(db) {
|
|
376
|
+
if (db.prepare("SELECT 1 FROM schema_migrations WHERE name = 'bot_run_serialization'").get()) return
|
|
362
377
|
// 存量运行串行化(ADR §2.3):同 bot 多条 queued/running 只保留最早一条,其余置 canceled。
|
|
363
378
|
// 被收掉的均为未启动的排队运行,消息与运行留痕不丢(同 scheduler 合批的 MERGED 口径)。
|
|
364
379
|
db.prepare(
|
|
@@ -379,9 +394,11 @@ export function activateBotRunSerialization(db) {
|
|
|
379
394
|
|
|
380
395
|
// 串行域收窄(DSHBOTS-308,owner 拍板同一 bot 跨工作区并行):one_active_run_per_bot 从
|
|
381
396
|
// bot 全局收窄为 (bot, 工作区) 域,solo 域归一口径与 one_bot_binding 的 COALESCE 一致。
|
|
382
|
-
// 同名索引列集已变,IF NOT EXISTS 不替换旧列集,须 DROP
|
|
383
|
-
//
|
|
397
|
+
// 同名索引列集已变,IF NOT EXISTS 不替换旧列集,须 DROP 再建;必须排 activateBotRunSerialization
|
|
398
|
+
// 之后——前者未记账本时可能重建出 bot 级旧索引,靠本函数收口到域级。账本闸同前者(一次性
|
|
399
|
+
// 存量迁移,重复执行的取消 UPDATE 会在每次重启时误杀活跃运行,见前者注释)。
|
|
384
400
|
export function activateBotRunSerializationDomain(db) {
|
|
401
|
+
if (db.prepare("SELECT 1 FROM schema_migrations WHERE name = 'bot_run_serialization_domain'").get()) return
|
|
385
402
|
// 存量按域分桶重做串行化:每 (bot, 域) 桶只留最早一条(queued_at, rowid),其余取消留痕。
|
|
386
403
|
db.prepare(
|
|
387
404
|
`UPDATE runs SET status = 'canceled', ended_at = ?, error_code = 'SERIALIZATION_DOMAIN',
|
|
@@ -408,15 +425,45 @@ export function activateBotRunSerializationDomain(db) {
|
|
|
408
425
|
// 重复由 one_active_run_per_task 兜底,写安全由调度器写范围闸门兜底。review/handle(owner_task)
|
|
409
426
|
// 与消息族照旧串行。不追改存量(历史串行取消行为不回滚)。
|
|
410
427
|
export function exemptTaskRunsFromBotSerialization(db) {
|
|
428
|
+
// 本函数与 exemptGovernanceRunsFromBotSerialization 一样无账本闸(每次开库 DROP+重建,
|
|
429
|
+
// 兜住中间版本/损坏库的索引漂移)。但中间谓词(只豁免 task)比最终谓词(再豁免治理
|
|
430
|
+
// 运行)窄:库内存在最终态合法共存(如 review:running + rollover_summary:queued)时,
|
|
431
|
+
// 本步 CREATE UNIQUE INDEX 直接撞约束,宿主启动崩溃且 DROP 已执行、索引缺失→每次
|
|
432
|
+
// 启动都崩(生产实测 0.3.51:exemptTaskRunsFromBotSerialization UNIQUE constraint
|
|
433
|
+
// failed: one_active_run_per_bot)。修复:重建谓词直接收敛到最终口径(两步语义上
|
|
434
|
+
// 原本就是同车演进的收窄链,中间索引只活到下一行执行,不承担运行期约束),
|
|
435
|
+
// 并在 CREATE 前按最终谓词收口重复活跃运行自愈脏数据。
|
|
436
|
+
convergeActiveRunsForDomainIndex(db, ['task', 'session_compact', 'rollover_summary'])
|
|
411
437
|
db.exec(`
|
|
412
438
|
DROP INDEX IF EXISTS one_active_run_per_bot;
|
|
413
439
|
CREATE UNIQUE INDEX IF NOT EXISTS one_active_run_per_bot
|
|
414
440
|
ON runs(bot_id, COALESCE(project_id, '~solo'))
|
|
415
|
-
WHERE status IN ('queued', 'running') AND kind
|
|
441
|
+
WHERE status IN ('queued', 'running') AND kind NOT IN ('task', 'session_compact', 'rollover_summary');
|
|
416
442
|
`)
|
|
417
443
|
recordMigration(db, 'task_runs_exempt_bot_serialization')
|
|
418
444
|
}
|
|
419
445
|
|
|
446
|
+
// 按最终索引谓词收口同 (bot, 工作区) 域内重复的非豁免活跃运行:每桶只留最早一条
|
|
447
|
+
// (queued_at, rowid),其余取消留痕。稳态下索引本身保证无重复,本收口只在脏数据
|
|
448
|
+
// (崩溃残留/中间版本共存)上各执行一次,不会重复误杀。
|
|
449
|
+
function convergeActiveRunsForDomainIndex(db, exemptKinds) {
|
|
450
|
+
const placeholders = exemptKinds.map(() => '?').join(', ')
|
|
451
|
+
db.prepare(
|
|
452
|
+
`UPDATE runs SET status = 'canceled', ended_at = ?, error_code = 'INDEX_CONVERGE',
|
|
453
|
+
error_message = '开库重建 one_active_run_per_bot 前收口:同 (bot, 工作区) 域重复活跃运行,仅保留最早一条'
|
|
454
|
+
WHERE status IN ('queued', 'running')
|
|
455
|
+
AND kind NOT IN (${placeholders})
|
|
456
|
+
AND rowid <> (
|
|
457
|
+
SELECT r2.rowid FROM runs r2
|
|
458
|
+
WHERE r2.status IN ('queued', 'running')
|
|
459
|
+
AND r2.kind NOT IN (${placeholders})
|
|
460
|
+
AND r2.bot_id = runs.bot_id
|
|
461
|
+
AND COALESCE(r2.project_id, '~solo') = COALESCE(runs.project_id, '~solo')
|
|
462
|
+
ORDER BY r2.queued_at, r2.rowid LIMIT 1
|
|
463
|
+
)`,
|
|
464
|
+
).run(nowIso(), ...exemptKinds, ...exemptKinds)
|
|
465
|
+
}
|
|
466
|
+
|
|
420
467
|
// 只读治理运行豁免 bot 串行域(单轮上下文治理 P3):session_compact / rollover_summary
|
|
421
468
|
// 由 ensureSession 在 bot 自己的运行进行中排入(startRun 路径,当前运行此刻必占串行域),
|
|
422
469
|
// 不豁免时 INSERT OR IGNORE 被 one_active_run_per_bot 部分唯一索引静默吞掉(changes=0 被
|
|
@@ -425,6 +472,8 @@ export function exemptTaskRunsFromBotSerialization(db) {
|
|
|
425
472
|
// 闲时语义由领取顺序保住;botBusy 查询口径不变(治理运行排队/执行中视为忙,消息族
|
|
426
473
|
// 照旧挂待处理队列,不与治理运行互抢)。
|
|
427
474
|
export function exemptGovernanceRunsFromBotSerialization(db) {
|
|
475
|
+
// 同上:CREATE 前收口脏数据(崩溃残留的重复活跃行),避免开库重建撞约束。
|
|
476
|
+
convergeActiveRunsForDomainIndex(db, ['task', 'session_compact', 'rollover_summary'])
|
|
428
477
|
db.exec(`
|
|
429
478
|
DROP INDEX IF EXISTS one_active_run_per_bot;
|
|
430
479
|
CREATE UNIQUE INDEX IF NOT EXISTS one_active_run_per_bot
|
package/src/db.js
CHANGED
|
@@ -507,29 +507,54 @@ export function openDatabase(path) {
|
|
|
507
507
|
export class Store {
|
|
508
508
|
// 同连接事务深度(transaction 嵌套时内层加入外层,见 transaction 实现)。
|
|
509
509
|
|
|
510
|
+
// 预编译语句缓存:热路径(调度 tick、UI 轮询、消息尾窗)反复执行同一批语句,
|
|
511
|
+
// 按语句文本缓存 StatementSync,免去每次调用的 SQL 解析;语句系于本连接,随 Store 一起丢弃。
|
|
512
|
+
// 值类型保持 any:精确标注 StatementSync 会让 all/get 摆脱 any 推断,
|
|
513
|
+
// 连锁暴露全项目 400+ 存量宽松类型错误,属独立任务,不在本次范围。
|
|
514
|
+
|
|
510
515
|
constructor(db, options = {} ) {
|
|
511
516
|
this.db = db
|
|
512
517
|
this.ftsEnabled = options.ftsEnabled === true
|
|
513
518
|
this.txDepth = 0
|
|
519
|
+
this.stmtCache = new Map()
|
|
520
|
+
}
|
|
521
|
+
|
|
522
|
+
// 语句文本在本项目是有限形状集(占位符列表按长度、固定前缀 LIKE、固定表名拼接),
|
|
523
|
+
// 上限只作病态增长的保险:超限整体清空,代价是下一次重新 prepare。
|
|
524
|
+
statement(sql) {
|
|
525
|
+
let stmt = this.stmtCache.get(sql)
|
|
526
|
+
if (!stmt) {
|
|
527
|
+
if (this.stmtCache.size >= 1000) this.stmtCache.clear()
|
|
528
|
+
stmt = this.db.prepare(sql)
|
|
529
|
+
this.stmtCache.set(sql, stmt)
|
|
530
|
+
}
|
|
531
|
+
return stmt
|
|
514
532
|
}
|
|
515
533
|
|
|
516
534
|
all(sql, ...params) {
|
|
517
|
-
return this.
|
|
535
|
+
return this.statement(sql).all(...params).map(row => ({ ...row }))
|
|
518
536
|
}
|
|
519
537
|
|
|
520
538
|
get(sql, ...params) {
|
|
521
|
-
const row = this.
|
|
539
|
+
const row = this.statement(sql).get(...params)
|
|
522
540
|
return row === undefined ? undefined : { ...row }
|
|
523
541
|
}
|
|
524
542
|
|
|
525
543
|
run(sql, ...params) {
|
|
526
|
-
return this.
|
|
544
|
+
return this.statement(sql).run(...params)
|
|
527
545
|
}
|
|
528
546
|
|
|
529
547
|
exec(sql) {
|
|
530
548
|
this.db.exec(sql)
|
|
531
549
|
}
|
|
532
550
|
|
|
551
|
+
// 数据变更计数:本连接自打开以来的累计行变更数(total_changes(),O(1) 读取)。
|
|
552
|
+
// 用作 state 轮询的版本基底——任何 INSERT/UPDATE/DELETE 都会推进它,读操作不影响。
|
|
553
|
+
// 注意用函数形式:node:sqlite 的 prepare('PRAGMA …').get() 不返回行。
|
|
554
|
+
changes() {
|
|
555
|
+
return Number(this.db.prepare('SELECT total_changes() AS n').get()?.n ?? 0)
|
|
556
|
+
}
|
|
557
|
+
|
|
533
558
|
// 事务纪律(B7/DSHBOTS-332):回调内只做本库写——宿主副作用(起会话/steer/微信推送/
|
|
534
559
|
// tick)一律放在事务提交之后执行,回滚不产生幽灵消息/幽灵会话;outbox 的「先落库后
|
|
535
560
|
// 同栈投递」在事务内也只发生 runs/outbox 行写入(投递的宿主动作由提交后的 tick/领取
|
package/src/http.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readFile } from 'node:fs/promises'
|
|
2
|
+
import { appendFileSync, renameSync, statSync } from 'node:fs'
|
|
2
3
|
import { createRequire } from 'node:module'
|
|
3
4
|
import { basename, dirname, extname, join } from 'node:path'
|
|
4
5
|
import { fileURLToPath } from 'node:url'
|
|
@@ -175,6 +176,7 @@ export function installHttp(ctx, service, logger = console) {
|
|
|
175
176
|
route('/api/dsh-team/modules/page-shell.js', ['GET'], moduleScript('page-shell.js'))
|
|
176
177
|
route('/api/dsh-team/modules/composer.js', ['GET'], moduleScript('composer.js'))
|
|
177
178
|
route('/api/dsh-team/modules/tasks.js', ['GET'], moduleScript('tasks.js'))
|
|
179
|
+
route('/api/dsh-team/modules/permissions.js', ['GET'], moduleScript('permissions.js'))
|
|
178
180
|
route('/api/dsh-team/modules/modal-layer.js', ['GET'], moduleScript('modal-layer.js'))
|
|
179
181
|
route('/api/dsh-team/modules/file-preview.js', ['GET'], moduleScript('file-preview.js'))
|
|
180
182
|
route('/api/dsh-team/modules/dom-morph.js', ['GET'], moduleScript('dom-morph.js'))
|
|
@@ -186,6 +188,8 @@ export function installHttp(ctx, service, logger = console) {
|
|
|
186
188
|
route('/api/dsh-team/modules/events-click.js', ['GET'], moduleScript('events-click.js'))
|
|
187
189
|
route('/api/dsh-team/modules/events-submit.js', ['GET'], moduleScript('events-submit.js'))
|
|
188
190
|
route('/api/dsh-team/modules/events-misc.js', ['GET'], moduleScript('events-misc.js'))
|
|
191
|
+
route('/api/dsh-team/modules/form-validation.js', ['GET'], moduleScript('form-validation.js'))
|
|
192
|
+
route('/api/dsh-team/modules/task-menu.js', ['GET'], moduleScript('task-menu.js'))
|
|
189
193
|
route('/api/dsh-team/i18n/zh.js', ['GET'], i18nDict('zh.js'))
|
|
190
194
|
route('/api/dsh-team/i18n/en.js', ['GET'], i18nDict('en.js'))
|
|
191
195
|
// DSHBOTS-233:词表按域拆分后,聚合入口(zh.js/en.js)相对导入域切片,
|
|
@@ -259,6 +263,17 @@ export function installHttp(ctx, service, logger = console) {
|
|
|
259
263
|
return response(JSON.stringify({ ok: false, error: { code, message } }), 'application/json; charset=utf-8', status)
|
|
260
264
|
}
|
|
261
265
|
|
|
266
|
+
// 临时诊断(用户报「群聊/bots 切换加载中过久」):超过 120ms 的动作落 dataDir/perf-actions.log
|
|
267
|
+
// 一行(动作、耗时、响应字节数;state 额外记 unchanged),定位真热点后本块整体移除。
|
|
268
|
+
const perfLog = (action , ms , bytes , data ) => {
|
|
269
|
+
try {
|
|
270
|
+
const file = join(service.config.dataDir, 'perf-actions.log')
|
|
271
|
+
try { if (statSync(file).size > 1_000_000) renameSync(file, `${file}.old`) } catch {}
|
|
272
|
+
const unchanged = action === 'state' && data && typeof data === 'object' ? ` unchanged=${String((data ).unchanged)}` : ''
|
|
273
|
+
appendFileSync(file, `${new Date().toISOString()} ${action} ${ms.toFixed(0)}ms ${bytes}B${unchanged}\n`)
|
|
274
|
+
} catch { /* 诊断写失败不影响业务 */ }
|
|
275
|
+
}
|
|
276
|
+
|
|
262
277
|
route('/api/dsh-team/api', ['POST'], async (request) => {
|
|
263
278
|
try {
|
|
264
279
|
const length = Number(request.headers.get('content-length') ?? 0)
|
|
@@ -274,8 +289,12 @@ export function installHttp(ctx, service, logger = console) {
|
|
|
274
289
|
const action = String(body?.action ?? '')
|
|
275
290
|
const payload = body?.payload && typeof body.payload === 'object' ? body.payload : {}
|
|
276
291
|
const actor = { type: 'user', id: service.localUserId }
|
|
292
|
+
const startedAt = performance.now()
|
|
277
293
|
const data = await handleAction(service, action , payload, actor)
|
|
278
|
-
|
|
294
|
+
const bodyJson = JSON.stringify({ ok: true, data })
|
|
295
|
+
const elapsed = performance.now() - startedAt
|
|
296
|
+
if (elapsed > 120) perfLog(action, elapsed, bodyJson.length, data)
|
|
297
|
+
return response(bodyJson, 'application/json; charset=utf-8')
|
|
279
298
|
} catch (error) {
|
|
280
299
|
return errorResponse(error)
|
|
281
300
|
}
|