dsh-team-bots 0.2.395 → 0.2.455
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/package.json +4 -1
- package/scripts/doctor.mjs +14 -3
- package/src/api.js +30 -3
- package/src/config.js +105 -0
- package/src/db-migrations.js +20 -0
- package/src/db.js +4 -0
- package/src/feishu/channel.js +702 -0
- package/src/feishu/commands.js +20 -0
- package/src/feishu/format.js +56 -0
- package/src/feishu/index.js +19 -0
- package/src/feishu/store.js +205 -0
- package/src/service.js +7 -0
- package/src/services/bots.js +42 -0
- package/src/services/chat.js +6 -4
- package/src/services/core.js +153 -8
- package/src/services/external-trigger-schema.js +61 -0
- package/src/services/feishu.js +181 -0
- package/src/services/github-source.js +157 -0
- package/src/services/memory.js +122 -34
- package/src/services/projects.js +2 -0
- package/src/services/reason-codes.js +63 -0
- package/src/services/review-watchdog.js +30 -8
- package/src/services/run-finish.js +33 -9
- package/src/services/runs.js +48 -7
- package/src/services/runtime/context-window.js +53 -0
- package/src/services/runtime/prompt.js +149 -134
- package/src/services/runtime/sandbox-policy.js +65 -0
- package/src/services/runtime/session-continuity.js +38 -0
- package/src/services/runtime/session.js +148 -4
- package/src/services/scheduler.js +9 -2
- package/src/services/system.js +50 -2
- package/src/services/task-dispatch.js +40 -4
- package/src/services/task-notify.js +13 -8
- package/src/services/wechat-trigger-schema.js +62 -0
- package/src/services/wechat.js +129 -19
- package/src/tools.js +11 -2
- package/src/wechat/channel.js +130 -26
- package/src/wechat/commands.js +13 -1
- package/src/wechat/store.js +69 -18
- package/ui/app.js +6 -2
- package/ui/i18n/en/chat.js +1 -0
- package/ui/i18n/en/nav.js +5 -0
- package/ui/i18n/en/settings.js +25 -5
- package/ui/i18n/en/tasks.js +4 -0
- package/ui/i18n/en/wechat.js +25 -3
- package/ui/i18n/zh/chat.js +1 -0
- package/ui/i18n/zh/nav.js +5 -0
- package/ui/i18n/zh/settings.js +25 -5
- package/ui/i18n/zh/tasks.js +4 -0
- package/ui/i18n/zh/wechat.js +25 -3
- package/ui/modules/api.js +23 -1
- package/ui/modules/cards.js +15 -0
- package/ui/modules/chat.js +43 -2
- package/ui/modules/dom-morph.js +14 -7
- package/ui/modules/events-board.js +73 -23
- package/ui/modules/events-click.js +11 -0
- package/ui/modules/global-pages.js +138 -10
- package/ui/modules/settings.js +51 -9
- package/ui/modules/state.js +2 -0
- package/ui/styles/chat-cards.css +28 -0
- package/ui/styles/frame.css +27 -3
- package/ui/styles/global-config.css +28 -3
- package/ui/styles/surfaces.css +2 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-team-bots",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.455",
|
|
4
4
|
"description": "Project spaces, group chats, task boards, memory and usage for teams of DSH bots",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,6 +31,9 @@
|
|
|
31
31
|
"NOTICE",
|
|
32
32
|
"LICENSE"
|
|
33
33
|
],
|
|
34
|
+
"dependencies": {
|
|
35
|
+
"@larksuiteoapi/node-sdk": "1.76.0"
|
|
36
|
+
},
|
|
34
37
|
"devDependencies": {
|
|
35
38
|
"@types/node": "26.6.6",
|
|
36
39
|
"typescript": "6.0.3"
|
package/scripts/doctor.mjs
CHANGED
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
// Diagnostics for path and permission problems. It prints the resolved layout
|
|
2
2
|
// and reports anything that would stop the service from writing to its own
|
|
3
3
|
// directories.
|
|
4
|
+
//
|
|
5
|
+
// 退出码分级(A5/DSHBOTS-329,吸收原型 dsh-superagent 守护脚本的 outcome 语义):
|
|
6
|
+
// 让 CI/定时巡检能区分「自己能修」与「必须叫人」——
|
|
7
|
+
// 0 ok:目录可写、host refs 全部存在
|
|
8
|
+
// 1 目录/权限问题(workspace/data/skill 目录缺失或不可写):多为环境可修复
|
|
9
|
+
// 2 host refs 缺失(patch 文件指向不存在的绝对路径):必须人工改 patch 文件
|
|
10
|
+
// 3 两类问题同时存在
|
|
11
|
+
// 退出码按「最高严重级」落:problems 含两类时取 3,只有一类取对应码。
|
|
4
12
|
import { accessSync, constants, existsSync, lstatSync, readFileSync, realpathSync, statSync } from 'node:fs'
|
|
5
13
|
import { spawnSync } from 'node:child_process'
|
|
6
14
|
import { homedir } from 'node:os'
|
|
@@ -83,11 +91,13 @@ function main() {
|
|
|
83
91
|
console.log('')
|
|
84
92
|
|
|
85
93
|
let problems = 0
|
|
94
|
+
let pathProblems = 0
|
|
95
|
+
let refProblems = 0
|
|
86
96
|
for (const [label, path, optional] of targets) {
|
|
87
97
|
const info = describe(path)
|
|
88
98
|
const canWrite = info.dir ? writable(info.target ?? path) : false
|
|
89
99
|
const ok = info.dir && canWrite
|
|
90
|
-
if (!ok && !optional) problems += 1
|
|
100
|
+
if (!ok && !optional) { problems += 1; pathProblems += 1 }
|
|
91
101
|
console.log(`${label.padEnd(11)} ${path}`)
|
|
92
102
|
console.log(`${''.padEnd(11)} ${info.label}${ok ? ', writable' : info.dir ? ', NOT writable' : ''}${optional && !ok ? ' (optional)' : ''}`)
|
|
93
103
|
}
|
|
@@ -105,7 +115,7 @@ function main() {
|
|
|
105
115
|
}
|
|
106
116
|
for (const ref of refs) {
|
|
107
117
|
const ok = existsSync(ref)
|
|
108
|
-
if (!ok) problems += 1
|
|
118
|
+
if (!ok) { problems += 1; refProblems += 1 }
|
|
109
119
|
console.log(`${''.padEnd(11)} ${ok ? 'ok ' : 'MISSING '} ${ref}`)
|
|
110
120
|
}
|
|
111
121
|
if (refs.some(ref => !existsSync(ref))) {
|
|
@@ -117,7 +127,8 @@ function main() {
|
|
|
117
127
|
console.log(problems === 0
|
|
118
128
|
? 'ok: all team directories exist and are writable'
|
|
119
129
|
: `${problems} problem(s); see README "故障排查"`)
|
|
120
|
-
|
|
130
|
+
// 退出码分级(A5/DSHBOTS-329):1=目录/权限、2=host refs(人工配置)、3=两类并存。
|
|
131
|
+
process.exit(problems === 0 ? 0 : pathProblems > 0 && refProblems > 0 ? 3 : refProblems > 0 ? 2 : 1)
|
|
121
132
|
}
|
|
122
133
|
|
|
123
134
|
const invokedDirectly = process.argv[1]
|
package/src/api.js
CHANGED
|
@@ -16,9 +16,10 @@ const ACTIONS = new Set([
|
|
|
16
16
|
'question_answer', 'questions_pending',
|
|
17
17
|
'sync_skills', 'skill_detail', 'toggle_skill', 'set_skill_binding', 'rollback_skill',
|
|
18
18
|
'save_price', 'reset_price',
|
|
19
|
-
'settings', 'update_settings', 'export_usage_csv', 'usage_window', 'reconcile_usage', 'outbox',
|
|
19
|
+
'settings', 'update_settings', 'update_prompt_segment', 'export_usage_csv', 'usage_window', 'reconcile_usage', 'outbox',
|
|
20
20
|
'dsh_update_info', 'upgrade_dsh', 'reboot_dsh',
|
|
21
|
-
'wechat_status', 'wechat_login', 'wechat_code', 'wechat_logout',
|
|
21
|
+
'wechat_status', 'wechat_login', 'wechat_code', 'wechat_logout', 'set_wechat_channel_enabled', 'notify_receipts', 'wechat_triggers', 'external_triggers',
|
|
22
|
+
'feishu_status', 'save_feishu_credentials', 'clear_feishu_credentials',
|
|
22
23
|
'run_command', 'cancel_command', 'terminal_state',
|
|
23
24
|
'list_secrets', 'upsert_secret', 'delete_secret', 'list_secret_requests', 'approve_secret_request', 'deny_secret_request',
|
|
24
25
|
])
|
|
@@ -189,7 +190,11 @@ export async function handleAction(service, action , payload
|
|
|
189
190
|
case 'settings':
|
|
190
191
|
return service.settingsView()
|
|
191
192
|
case 'update_settings':
|
|
192
|
-
|
|
193
|
+
// B2/DSHBOTS-325:UI 携带读取时的 settings_revision,不匹配即 409(乐观并发)。
|
|
194
|
+
return service.updateSettings(payload.patch ?? payload, actor, payload.revision)
|
|
195
|
+
case 'update_prompt_segment':
|
|
196
|
+
// 可编辑提示词段(B1/DSHBOTS-324):空文本=恢复默认;保存经预算校验并审计。
|
|
197
|
+
return service.updatePromptSegment(required(payload.segment, 'segment'), String(payload.text ?? ''), actor)
|
|
193
198
|
case 'export_usage_csv':
|
|
194
199
|
return {
|
|
195
200
|
filename: `dsh-team-usage${payload.window ? `-${payload.window}` : ''}-${new Date().toISOString().slice(0, 10)}.csv`,
|
|
@@ -215,6 +220,28 @@ export async function handleAction(service, action , payload
|
|
|
215
220
|
return service.rebootDsh()
|
|
216
221
|
case 'wechat_status':
|
|
217
222
|
return service.wechatStatus()
|
|
223
|
+
case 'set_wechat_channel_enabled':
|
|
224
|
+
// 通道页微信启停开关(DSHBOTS-334):settings 显式值落库并即时 mount/unmount。
|
|
225
|
+
return service.setWechatChannelEnabled(Boolean(payload.enabled), actor)
|
|
226
|
+
case 'feishu_status':
|
|
227
|
+
// 飞书通道状态(DSHBOTS-327):只读(phase/管理员 ou_id/bot 与 appId),无凭据明文。
|
|
228
|
+
// UI 主路径走 state 轮询里的 state.feishu,本动作供备用直查。
|
|
229
|
+
return service.feishuStatus()
|
|
230
|
+
case 'save_feishu_credentials':
|
|
231
|
+
// 通道页保存飞书凭据(DSHBOTS-334):加密落库 + 触发通道重连;响应只有脱敏视图。
|
|
232
|
+
return service.saveFeishuCredentials({ appId: payload.appId, appSecret: payload.appSecret }, actor)
|
|
233
|
+
case 'clear_feishu_credentials':
|
|
234
|
+
// 通道页清除飞书凭据(DSHBOTS-334):删除保存的凭据对并回到未绑定态。
|
|
235
|
+
return service.clearFeishuCredentials(actor)
|
|
236
|
+
case 'notify_receipts':
|
|
237
|
+
// 外发收据流水(A3/DSHBOTS-323):sent/gone 终态可追责,通道未启用时 available:false。
|
|
238
|
+
return service.notifyReceiptsView(Number(payload.limit) || 50)
|
|
239
|
+
case 'wechat_triggers':
|
|
240
|
+
// 入站触发留痕(B4-①/DSHBOTS-328):每条入站事件的处置与原因,回答「为什么没触发」。
|
|
241
|
+
return service.wechatTriggersView(Number(payload.limit) || 50)
|
|
242
|
+
case 'external_triggers':
|
|
243
|
+
// 外部触发留痕(B4-②/DSHBOTS-335):GitHub 源候选/过滤/失败流水。
|
|
244
|
+
return service.externalTriggersView(Number(payload.limit) || 50)
|
|
218
245
|
case 'wechat_login':
|
|
219
246
|
return service.wechatBeginLogin()
|
|
220
247
|
case 'wechat_code':
|
package/src/config.js
CHANGED
|
@@ -9,6 +9,25 @@ export function defaultWorkspace() {
|
|
|
9
9
|
return join(homedir(), '.dsh', 'workspace', 'team-bots')
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
+
// DSH_TEAM_GITHUB_WATCH 解析:JSON 数组 [{projectKey, repo}],非法一律 [](B4-②/DSHBOTS-335)。
|
|
13
|
+
export function parseGithubWatchEnv(raw) {
|
|
14
|
+
if (!raw) return []
|
|
15
|
+
try {
|
|
16
|
+
const parsed = JSON.parse(String(raw))
|
|
17
|
+
if (!Array.isArray(parsed)) return []
|
|
18
|
+
return parsed
|
|
19
|
+
.map(item => ({ projectKey: String(item?.projectKey ?? '').trim(), repo: String(item?.repo ?? '').trim() }))
|
|
20
|
+
.filter(item => item.projectKey && item.repo)
|
|
21
|
+
} catch {
|
|
22
|
+
return []
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export const clampGithubPollMinutes = (value) => {
|
|
27
|
+
const num = Number(value)
|
|
28
|
+
return Number.isFinite(num) && num > 0 ? Math.min(1440, Math.trunc(num)) : 0
|
|
29
|
+
}
|
|
30
|
+
|
|
12
31
|
export const bool = (value, fallback = false) => {
|
|
13
32
|
if (value === undefined || value === '') return fallback
|
|
14
33
|
return /^(1|true|yes|on)$/i.test(String(value))
|
|
@@ -58,6 +77,16 @@ export const SESSION_ROLLOVER_TURNS_RANGE = [0, 10_000]
|
|
|
58
77
|
export const SESSION_COMPACT_TURNS_KEY = 'session_compact_turns'
|
|
59
78
|
export const SESSION_COMPACT_TURNS_RANGE = [0, 10_000]
|
|
60
79
|
|
|
80
|
+
// 单轮上下文治理 P2:上下文体积判据(token)。会话当前规模 = 该会话最近一次模型调用的
|
|
81
|
+
// input+cache_read(usage_events 按调用记账、runs.session_id 归属)。压缩在「跨过 N 轮
|
|
82
|
+
// 窗口」之外还要求达到下限(瘦会话不压缩,省一次只读轮);结转在轮数阈值之外、体积达
|
|
83
|
+
// 上限也触发(胖会话不用等到 512 轮)。0 = 关闭体积判据(回到纯轮次口径)。生效链与
|
|
84
|
+
// 轮次键一致(env 显式 > settings 表保存值 > 默认,设置页暂未开放)。
|
|
85
|
+
export const SESSION_COMPACT_CTX_TOKENS_KEY = 'session_compact_ctx_tokens'
|
|
86
|
+
export const SESSION_COMPACT_CTX_TOKENS_RANGE = [0, 10_000_000]
|
|
87
|
+
export const SESSION_ROLLOVER_CTX_TOKENS_KEY = 'session_rollover_ctx_tokens'
|
|
88
|
+
export const SESSION_ROLLOVER_CTX_TOKENS_RANGE = [0, 10_000_000]
|
|
89
|
+
|
|
61
90
|
// 保存值必须是范围内的整数;非法或越界按未保存处理(回退默认),不做钳制。
|
|
62
91
|
// 空串/null(未保存)必须先于数值化判空:Number('') 是 0,会把「未保存」误判成
|
|
63
92
|
// 合法值 0(关闭)。用 Number() 而非 parseInt:parseInt('1.5') 会吞小数当 1。
|
|
@@ -127,6 +156,14 @@ export function effectiveTaskTimeBudgetMinutes(config, getSetting
|
|
|
127
156
|
return !env && stallMinutes > 0 ? stallMinutes : config.taskTimeBudgetMinutes
|
|
128
157
|
}
|
|
129
158
|
|
|
159
|
+
// 派单预算优先级分档(DSHBOTS-325):派单路径(assignFromBot 建卡/重派)漏传
|
|
160
|
+
// time_budget_minutes 时的卡级兜底档,按卡 priority 分档落库;显式值永远优先。
|
|
161
|
+
// 与全局缺省链(effectiveTaskTimeBudgetMinutes)分工:本表只管派单路径,不经派单
|
|
162
|
+
// 的直建卡仍走全局链。无效 priority 与 createTask 同口径回退 medium 档。
|
|
163
|
+
export const PRIORITY_BUDGET_MINUTES = {
|
|
164
|
+
urgent: 45, high: 45, medium: 30, low: 15, none: 15,
|
|
165
|
+
}
|
|
166
|
+
|
|
130
167
|
// 会话结转阈值生效值(DSHBOTS-145):优先级与运行时效一致——env 显式 > settings 表
|
|
131
168
|
// 保存值 > 默认 512(设置页暂未开放该字段);0 = 关闭。消费点(runtime 会话复用检查,
|
|
132
169
|
// DSHBOTS-289 起为 ensureBotBinding 复用分支)每次现算,改值对下一次会话复用生效。
|
|
@@ -144,6 +181,20 @@ export function effectiveSessionCompactTurns(config, getSetting
|
|
|
144
181
|
return !env && saved !== null ? saved : config.sessionCompactTurns
|
|
145
182
|
}
|
|
146
183
|
|
|
184
|
+
// 压缩体积下限生效值(单轮上下文治理 P2):默认 80,000 token,0 = 关闭体积判据。
|
|
185
|
+
export function effectiveSessionCompactCtxTokens(config, getSetting = () => null) {
|
|
186
|
+
const env = envExplicit('DSH_TEAM_SESSION_COMPACT_CTX_TOKENS')
|
|
187
|
+
const saved = savedInt(getSetting(SESSION_COMPACT_CTX_TOKENS_KEY), SESSION_COMPACT_CTX_TOKENS_RANGE)
|
|
188
|
+
return !env && saved !== null ? saved : config.sessionCompactCtxTokens
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
// 结转体积上限生效值(单轮上下文治理 P2):默认 150,000 token,0 = 关闭体积判据。
|
|
192
|
+
export function effectiveSessionRolloverCtxTokens(config, getSetting = () => null) {
|
|
193
|
+
const env = envExplicit('DSH_TEAM_SESSION_ROLLOVER_CTX_TOKENS')
|
|
194
|
+
const saved = savedInt(getSetting(SESSION_ROLLOVER_CTX_TOKENS_KEY), SESSION_ROLLOVER_CTX_TOKENS_RANGE)
|
|
195
|
+
return !env && saved !== null ? saved : config.sessionRolloverCtxTokens
|
|
196
|
+
}
|
|
197
|
+
|
|
147
198
|
// 验收滞留阈值生效值(DSHBOTS-194):优先级与会话结转一致——env 显式 > 保存值 >
|
|
148
199
|
// 默认 30 分钟;0 = 关闭。消费点(scheduler 验收守门、runLimitsView 透出)每次
|
|
149
200
|
// 现算,改值对下一轮扫描生效;env 标志供 UI 提示「环境变量已覆盖」。
|
|
@@ -195,6 +246,37 @@ export function effectiveUiLanguage(config, getSetting
|
|
|
195
246
|
return envValue ?? saved ?? config.uiLanguage
|
|
196
247
|
}
|
|
197
248
|
|
|
249
|
+
// ── 微信通道开关生效值(DSHBOTS-334)────────────────────────────────────────
|
|
250
|
+
// 通道页启停开关的 settings 键:'1'/'0' 为显式覆盖;未保存(空)回退服务端
|
|
251
|
+
// 注入默认(cordis.patch.yml / env,保留为初始默认)。消费点:core 挂载决策与
|
|
252
|
+
// services/wechat 的即时 mount/unmount(applyWechatChannelEnabled)。
|
|
253
|
+
export const WECHAT_CHANNEL_ENABLED_KEY = 'wechat_channel_enabled'
|
|
254
|
+
export function effectiveWechatEnabled(config, getSetting = () => null) {
|
|
255
|
+
const saved = String(getSetting(WECHAT_CHANNEL_ENABLED_KEY) ?? '').trim()
|
|
256
|
+
if (saved === '1') return true
|
|
257
|
+
if (saved === '0') return false
|
|
258
|
+
return Boolean(config.wechat?.enabled)
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
// ── 飞书凭据生效值(DSHBOTS-334)────────────────────────────────────────────
|
|
262
|
+
// 优先级:通道页保存(secrets 表加密的 AppID/Secret 对)> 服务端注入
|
|
263
|
+
// (cordis.patch.yml / env,即 config.feishu)。凭据成对生效:保存对不完整
|
|
264
|
+
// 不得与注入对混拼;两边都没有 = 不生效(通道保持 unbound 不连)。
|
|
265
|
+
// savedGetter 由 services/feishu.ts 提供(读 SecretBox 解密后的两键)。
|
|
266
|
+
export function effectiveFeishuCredentials(config, savedGetter = () => null) {
|
|
267
|
+
const savedAppId = String(savedGetter()?.appId ?? '').trim()
|
|
268
|
+
const savedSecret = String(savedGetter()?.appSecret ?? '').trim()
|
|
269
|
+
if (savedAppId && savedSecret) {
|
|
270
|
+
return { appId: savedAppId, appSecret: savedSecret, source: 'saved' }
|
|
271
|
+
}
|
|
272
|
+
const configAppId = String(config.feishu?.appId ?? '').trim()
|
|
273
|
+
const configSecret = String(config.feishu?.appSecret ?? '').trim()
|
|
274
|
+
if (configAppId && configSecret) {
|
|
275
|
+
return { appId: configAppId, appSecret: configSecret, source: 'config' }
|
|
276
|
+
}
|
|
277
|
+
return { appId: '', appSecret: '', source: 'none' }
|
|
278
|
+
}
|
|
279
|
+
|
|
198
280
|
export function resolveConfig(config = {}) {
|
|
199
281
|
const dshHome = resolve(process.env.DSH_HOME?.trim() || join(homedir(), '.dsh'))
|
|
200
282
|
const workspace = resolve(config.workspace || defaultWorkspace())
|
|
@@ -209,12 +291,22 @@ export function resolveConfig(config = {}) {
|
|
|
209
291
|
dataDir,
|
|
210
292
|
dbPath: join(dataDir, 'team.sqlite'),
|
|
211
293
|
wechatDbPath: join(dataDir, 'wechat-channel.sqlite'),
|
|
294
|
+
feishuDbPath: join(dataDir, 'feishu-channel.sqlite'),
|
|
212
295
|
// 密钥主文件:备份必须连它一起带走,缺了既有密文就再也解不开。
|
|
213
296
|
secretKeyPath: join(dataDir, 'secret.key'),
|
|
214
297
|
// 个人微信通道(腾讯 iLink 官方协议):默认关闭,扫码授权后生效。
|
|
215
298
|
wechat: {
|
|
216
299
|
enabled: bool(config.wechatEnabled ?? process.env.DSH_TEAM_WECHAT, false),
|
|
217
300
|
},
|
|
301
|
+
// 飞书机器人通道(DSHBOTS-333):默认关闭,DSH_BOTS_FEISHU=1 开启。
|
|
302
|
+
// 传输层为进程内官方 SDK(@larksuiteoapi/node-sdk):凭据 AppID/Secret 注入即连。
|
|
303
|
+
// 这里只是「服务端注入」兜底来源(cordis.patch.yml / env);生效优先级见
|
|
304
|
+
// effectiveFeishuCredentials(DSHBOTS-334:通道页保存的凭据优先)。
|
|
305
|
+
feishu: {
|
|
306
|
+
enabled: bool(config.feishuEnabled ?? process.env.DSH_BOTS_FEISHU, false),
|
|
307
|
+
appId: String(config.feishuAppId ?? process.env.DSH_BOTS_FEISHU_APP_ID ?? '').trim(),
|
|
308
|
+
appSecret: String(config.feishuAppSecret ?? process.env.DSH_BOTS_FEISHU_APP_SECRET ?? '').trim(),
|
|
309
|
+
},
|
|
218
310
|
memoryDir: join(dataDir, 'memory'),
|
|
219
311
|
messageDir: join(dataDir, 'messages'),
|
|
220
312
|
// 共享技能池固定在本机 ~/.agents,与用户其他 agent 工具共用同一目录;测试可注入临时目录。
|
|
@@ -242,6 +334,10 @@ export function resolveConfig(config = {}) {
|
|
|
242
334
|
// 闲时总结压缩窗口(DSHBOTS-286):默认每 64 轮,0 = 关闭;生效值见
|
|
243
335
|
// effectiveSessionCompactTurns(env 显式 > settings 表保存值 > 默认,设置页暂未开放)。
|
|
244
336
|
sessionCompactTurns: int(config.sessionCompactTurns ?? process.env.DSH_TEAM_SESSION_COMPACT_TURNS, 64, 0, 10_000),
|
|
337
|
+
// 上下文体积判据(单轮上下文治理 P2):压缩下限默认 80k、结转上限默认 150k token,
|
|
338
|
+
// 0 = 关闭体积判据;生效值见 effectiveSession{Compact,Rollover}CtxTokens。
|
|
339
|
+
sessionCompactCtxTokens: int(config.sessionCompactCtxTokens ?? process.env.DSH_TEAM_SESSION_COMPACT_CTX_TOKENS, 80_000, 0, 10_000_000),
|
|
340
|
+
sessionRolloverCtxTokens: int(config.sessionRolloverCtxTokens ?? process.env.DSH_TEAM_SESSION_ROLLOVER_CTX_TOKENS, 150_000, 0, 10_000_000),
|
|
245
341
|
// 验收滞留守门(DSHBOTS-194):in_review 卡静置超此分钟数 = 滞留。生效值可被
|
|
246
342
|
// 全局设置 review_idle_minutes 覆盖(effectiveReviewIdleMinutes),0 = 关闭。
|
|
247
343
|
reviewIdleMinutes: int(config.reviewIdleMinutes ?? process.env.DSH_TEAM_REVIEW_IDLE_MINUTES, 30, 0, 1440),
|
|
@@ -272,6 +368,10 @@ export function resolveConfig(config = {}) {
|
|
|
272
368
|
),
|
|
273
369
|
// 原生 Agent Teams 由 profile 层提供;这里只控制提示词与调度侧的启用状态。
|
|
274
370
|
// 缺省开启(DSHBOTS-230):默认部署即注入并行拆分引导;显式传 0/false 可关闭。
|
|
371
|
+
// GitHub 只读触发源(B4-②/DSHBOTS-335):env JSON 清单 [{projectKey, repo}],
|
|
372
|
+
// 缺省空 + 轮询 0 分钟 = 全关;非法 JSON 降级空清单(fail-closed)。
|
|
373
|
+
githubWatch: parseGithubWatchEnv(config.githubWatch ?? process.env.DSH_TEAM_GITHUB_WATCH),
|
|
374
|
+
githubPollMinutes: clampGithubPollMinutes(config.githubPollMinutes ?? process.env.DSH_TEAM_GITHUB_POLL_MINUTES),
|
|
275
375
|
agentTeam: bool(config.agentTeam ?? process.env.DSH_TEAM_AGENT_TEAM, true),
|
|
276
376
|
maxTeammates: int(config.maxTeammates ?? process.env.DSH_TEAM_MAX_TEAMMATES, 3, 1, 8),
|
|
277
377
|
// 会话使用的 agent preset:Router 会话不带写工具时,在这里指向一个受限 preset。
|
|
@@ -282,6 +382,11 @@ export function resolveConfig(config = {}) {
|
|
|
282
382
|
// 此时按现状直接报「模型不支持图片」,不做任何派生。
|
|
283
383
|
visionProxyProvider: String(config.visionProxyProvider ?? process.env.DSH_TEAM_VISION_PROXY_PROVIDER ?? '').trim(),
|
|
284
384
|
visionProxyModel: String(config.visionProxyModel ?? process.env.DSH_TEAM_VISION_PROXY_MODEL ?? '').trim(),
|
|
385
|
+
// 记忆审查专用模型(可选):memory_review 派生运行改用的小模型(provider/model),
|
|
386
|
+
// 两个都非空才启用;任一为空 = 沿用 Bot 主模型。审查提示词自包含且只产 JSON
|
|
387
|
+
// 数组,不挑模型能力,配便宜模型可再压审查成本。
|
|
388
|
+
memoryReviewProvider: String(config.memoryReviewProvider ?? process.env.DSH_TEAM_MEMORY_REVIEW_PROVIDER ?? '').trim(),
|
|
389
|
+
memoryReviewModel: String(config.memoryReviewModel ?? process.env.DSH_TEAM_MEMORY_REVIEW_MODEL ?? '').trim(),
|
|
285
390
|
// 验收自动委派(DSHBOTS-113):任务交付迁移 in_review 时自动派生子代理核验运行
|
|
286
391
|
// (与手动「子代理核验」按钮同一入口)。总监裁决不受影响:owner_bot 卡在核验运行
|
|
287
392
|
// 结束后再触发总监验收;user 卡核验结论写回评论,裁决仍归工作台 owner。
|
package/src/db-migrations.js
CHANGED
|
@@ -122,6 +122,8 @@ export function runMigrations(db) {
|
|
|
122
122
|
activateBotRunSerializationDomain(db)
|
|
123
123
|
// 任务运行豁免 bot 串行域(单 bot 多任务并行):见 exemptTaskRunsFromBotSerialization。
|
|
124
124
|
exemptTaskRunsFromBotSerialization(db)
|
|
125
|
+
// 只读治理运行豁免(session_compact / rollover_summary):见 exemptGovernanceRunsFromBotSerialization。
|
|
126
|
+
exemptGovernanceRunsFromBotSerialization(db)
|
|
125
127
|
db.exec(BINDING_INDEXES)
|
|
126
128
|
const ftsEnabled = setupFts(db)
|
|
127
129
|
recordMigration(db, 'memories_source_refs_revision')
|
|
@@ -411,6 +413,24 @@ export function exemptTaskRunsFromBotSerialization(db) {
|
|
|
411
413
|
recordMigration(db, 'task_runs_exempt_bot_serialization')
|
|
412
414
|
}
|
|
413
415
|
|
|
416
|
+
// 只读治理运行豁免 bot 串行域(单轮上下文治理 P3):session_compact / rollover_summary
|
|
417
|
+
// 由 ensureSession 在 bot 自己的运行进行中排入(startRun 路径,当前运行此刻必占串行域),
|
|
418
|
+
// 不豁免时 INSERT OR IGNORE 被 one_active_run_per_bot 部分唯一索引静默吞掉(changes=0 被
|
|
419
|
+
// 当作幂等命中,无行无事件无报错)——生产实测 session_compact 0 次执行、结转摘要 3 次
|
|
420
|
+
// 全落在索引激活(DSHBOTS-288)之前。豁免后执行侧仍按 claimKey(bot 域键)串行领取,
|
|
421
|
+
// 闲时语义由领取顺序保住;botBusy 查询口径不变(治理运行排队/执行中视为忙,消息族
|
|
422
|
+
// 照旧挂待处理队列,不与治理运行互抢)。
|
|
423
|
+
export function exemptGovernanceRunsFromBotSerialization(db) {
|
|
424
|
+
db.exec(`
|
|
425
|
+
DROP INDEX IF EXISTS one_active_run_per_bot;
|
|
426
|
+
CREATE UNIQUE INDEX IF NOT EXISTS one_active_run_per_bot
|
|
427
|
+
ON runs(bot_id, COALESCE(project_id, '~solo'))
|
|
428
|
+
WHERE status IN ('queued', 'running')
|
|
429
|
+
AND kind NOT IN ('task', 'session_compact', 'rollover_summary');
|
|
430
|
+
`)
|
|
431
|
+
recordMigration(db, 'governance_runs_exempt_bot_serialization')
|
|
432
|
+
}
|
|
433
|
+
|
|
414
434
|
// 单聊支持:runs 与 session_bindings 的 project_id 放宽为可空(项目外会话与运行),
|
|
415
435
|
// bots 增加 solo_dir。子表(run_events/usage_events/usage_reconciliation)按名字引用 runs,
|
|
416
436
|
// 「建新表→拷贝→删旧表→改回原名」后名字恢复,外键子句无需改写。
|
package/src/db.js
CHANGED
|
@@ -526,6 +526,10 @@ export class Store {
|
|
|
526
526
|
this.db.exec(sql)
|
|
527
527
|
}
|
|
528
528
|
|
|
529
|
+
// 事务纪律(B7/DSHBOTS-332):回调内只做本库写——宿主副作用(起会话/steer/微信推送/
|
|
530
|
+
// tick)一律放在事务提交之后执行,回滚不产生幽灵消息/幽灵会话;outbox 的「先落库后
|
|
531
|
+
// 同栈投递」在事务内也只发生 runs/outbox 行写入(投递的宿主动作由提交后的 tick/领取
|
|
532
|
+
// 路径执行)。tests/after-commit.test.ts 以源码扫描守门。
|
|
529
533
|
transaction(fn) {
|
|
530
534
|
this.db.exec('BEGIN IMMEDIATE')
|
|
531
535
|
try {
|