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/runtime.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { defineMethods } from './services/mixin.js'
|
|
2
|
+
import { applyRuntimeSettingOverrides } from './config.js'
|
|
2
3
|
import { promptMethods } from './services/runtime/prompt.js'
|
|
3
4
|
import { sessionMethods } from './services/runtime/session.js'
|
|
4
5
|
import { trajectoryMethods } from './services/runtime/trajectory.js'
|
|
@@ -7,7 +8,21 @@ import { lifecycleMethods } from './services/runtime/lifecycle.js'
|
|
|
7
8
|
export class DshRuntime {
|
|
8
9
|
constructor({ ctx, config, store, logger = console , mask = null }) {
|
|
9
10
|
this.ctx = ctx
|
|
10
|
-
|
|
11
|
+
// config 存活覆盖视图(与 TeamService 同款):workerPreset/routerPreset 等
|
|
12
|
+
// 运行参数经全局设置改值后,下一次会话创建即用新值,无需重启。
|
|
13
|
+
this.baseConfig = config
|
|
14
|
+
this.configCache = null
|
|
15
|
+
this.configCacheRev = -1
|
|
16
|
+
Object.defineProperty(this, 'config', {
|
|
17
|
+
get() {
|
|
18
|
+
const rev = Number(this.store?.setting?.('settings_revision', '0')) || 0
|
|
19
|
+
if (this.configCache && this.configCacheRev === rev) return this.configCache
|
|
20
|
+
this.configCache = applyRuntimeSettingOverrides(this.baseConfig, key => this.store?.setting(key))
|
|
21
|
+
this.configCacheRev = rev
|
|
22
|
+
return this.configCache
|
|
23
|
+
},
|
|
24
|
+
configurable: true,
|
|
25
|
+
})
|
|
11
26
|
this.store = store
|
|
12
27
|
this.logger = logger
|
|
13
28
|
// 密钥掩码钩子:service 层注入,轨迹等落库内容在写入前先脱敏。
|
package/src/seed-bots.js
CHANGED
package/src/service.js
CHANGED
|
@@ -3,7 +3,7 @@ import { execFileSync, spawn } from 'node:child_process'
|
|
|
3
3
|
import { createRequire } from 'node:module'
|
|
4
4
|
import { dirname, extname, join, resolve, sep } from 'node:path'
|
|
5
5
|
import { homedir } from 'node:os'
|
|
6
|
-
import { effectiveRunLimits, RUN_LIMIT_RANGES, RUN_TIMEOUT_KEY, STALL_WATCHDOG_KEY } from './config.js'
|
|
6
|
+
import { effectiveRunLimits, RUN_LIMIT_RANGES, RUN_TIMEOUT_KEY, STALL_WATCHDOG_KEY, applyRuntimeSettingOverrides } from './config.js'
|
|
7
7
|
import { AppError, badRequest, conflict, forbidden, hotUpgradeUnsupported, notFound } from './errors.js'
|
|
8
8
|
import { assertInside, botWorkspaceDir, botsHome, ensureDirResilient, ensureExternalDir, ensureProjectWorkspace, ensureSkillRoot, projectDir, SLUG_MAX } from './paths.js'
|
|
9
9
|
import { runUsageTotals, usageSnapshot } from './usage.js'
|
|
@@ -54,7 +54,22 @@ export { FILE_POLICIES, FILE_POLICY_LABELS } from './services/file-policy.js'
|
|
|
54
54
|
export class TeamService {
|
|
55
55
|
constructor({ store, config, logger = console }) {
|
|
56
56
|
this.store = store
|
|
57
|
-
|
|
57
|
+
// config 是存活覆盖视图(全局设置「运行参数」卡):settings 表保存值在 env 未
|
|
58
|
+
// 显式时覆盖启动默认,所有 this.config.* 读点即时生效,无需改各消费点。
|
|
59
|
+
// 按 settings_revision 缓存:保存一次才重算,调度热路径零开销。
|
|
60
|
+
this.baseConfig = config
|
|
61
|
+
this.configCache = null
|
|
62
|
+
this.configCacheRev = -1
|
|
63
|
+
Object.defineProperty(this, 'config', {
|
|
64
|
+
get() {
|
|
65
|
+
const rev = Number(this.store?.setting?.('settings_revision', '0')) || 0
|
|
66
|
+
if (this.configCache && this.configCacheRev === rev) return this.configCache
|
|
67
|
+
this.configCache = applyRuntimeSettingOverrides(this.baseConfig, key => this.store?.setting(key))
|
|
68
|
+
this.configCacheRev = rev
|
|
69
|
+
return this.configCache
|
|
70
|
+
},
|
|
71
|
+
configurable: true,
|
|
72
|
+
})
|
|
58
73
|
this.logger = logger
|
|
59
74
|
this.runtime = null
|
|
60
75
|
this.localUserId = 'user_local'
|
|
@@ -69,6 +84,10 @@ export class TeamService {
|
|
|
69
84
|
// 同一指纹跨运行只点名一次,重复只记 run_event,不重复插群消息。
|
|
70
85
|
this.readAuditAlerted = new Map()
|
|
71
86
|
this.lastMaintenanceAt = 0
|
|
87
|
+
// 最近一次全量调度拍的时间戳(空载门 tickIdleGate 的基准;0 = 首拍必全量)。
|
|
88
|
+
this.lastFullTickAt = 0
|
|
89
|
+
// state 轮询版本短路缓存(system.state):单槽存最近一次组装的 key/版本/时间。
|
|
90
|
+
this.stateCache = null
|
|
72
91
|
this.wechat = null
|
|
73
92
|
// GitHub 触发源的 gh 执行钩子(B4-②/DSHBOTS-335):生产用 spawnSync('gh', ...),
|
|
74
93
|
// 测试注入桩替换;未设置时走真实 gh CLI。
|
|
@@ -2,8 +2,14 @@
|
|
|
2
2
|
// 认领 session_bindings 命中的 bot 会话:绑定到项目的走群聊卡片;绑定为单聊(kind='solo'、
|
|
3
3
|
// project_id 为空)的走单聊卡片(DSHBOTS-218);其余 next() 透传(人类会话审批继续走 Web UI)。
|
|
4
4
|
// 决策权仅用户(type=user)持有,bot 一律 forbidden 不能自批;pending 之外拒绝重复应答,动作写审计。
|
|
5
|
+
// DSHBOTS-365 免审白名单:命中规则的提权请求不落待办卡,插件在认领入口即时替 owner 应答
|
|
6
|
+
// allowed-once;approvals 行照落(status='allowed'、decided_by='auto:rule:<id>')+ 审计事件
|
|
7
|
+
// approval.auto_allow,免审不免留痕。规则存 settings 'approval_auto_rules'(JSON 数组,仿
|
|
8
|
+
// prompt_overrides 独立编辑面先例,不进 settingsView 单值键域),仅 type=user 可写。
|
|
5
9
|
// 注意:本域自管迁移(db.js 已贴 800 行上限,一行不加),手法与 db.js 的 addColumn/recordMigration 一致。
|
|
6
10
|
import { badRequest, conflict, forbidden, notFound } from '../errors.js'
|
|
11
|
+
import { homedir, tmpdir } from 'node:os'
|
|
12
|
+
import { join } from 'node:path'
|
|
7
13
|
import { id, nowIso } from '../util.js'
|
|
8
14
|
import { effectiveApprovalTimeoutMs } from '../config.js'
|
|
9
15
|
import { botInActiveProject } from './questions.js'
|
|
@@ -70,19 +76,32 @@ export function ensureApprovalSchema(store) {
|
|
|
70
76
|
store.run(
|
|
71
77
|
"UPDATE approvals SET status = 'timeout' WHERE status = 'pending'",
|
|
72
78
|
)
|
|
79
|
+
// 出厂预置默认免审规则(DSHBOTS-365 增量):仅键未初始化(null)时播种一次;非-null
|
|
80
|
+
// 一律不动——'[]' 是 owner 显式清空,永不回播;重复执行幂等,不做回填迁移。
|
|
81
|
+
if (store.setting(APPROVAL_RULES_SETTING) === null) {
|
|
82
|
+
store.setSetting(APPROVAL_RULES_SETTING, JSON.stringify(DEFAULT_APPROVAL_AUTO_RULES))
|
|
83
|
+
}
|
|
84
|
+
// 存量预置行迁移(口径改 glob):仍是出厂原样的预置行替换为三条关键词 glob;owner 自建或
|
|
85
|
+
// 改过的行不动,显式清空([])不回播。迁移后预置行都带通配符,重复执行不再命中。
|
|
86
|
+
const migrated = migrateApprovalPresetRules(store.setting(APPROVAL_RULES_SETTING))
|
|
87
|
+
if (migrated) store.setSetting(APPROVAL_RULES_SETTING, migrated)
|
|
73
88
|
}
|
|
74
89
|
|
|
75
90
|
// 目标提取(纯函数):按参数形状判别,不按工具名——宿主工具族会扩展,形状更稳。
|
|
76
91
|
// bash 类取 command 首行(超长截 120 字符,chip 只需要可辨认的意图);
|
|
77
92
|
// edit/write/read 类取 file_path 原样(绝对路径入库,展示层再收成工作区相对形)。
|
|
93
|
+
// 路径位参数名按常见形状收口:file_path 优先,path/target_dir/dir/directory/cwd/workdir 兜底
|
|
94
|
+
// (免审不因工具换了参数名就永远提不到目标 → 永远落卡)。
|
|
95
|
+
const TOOL_TARGET_PATH_KEYS = ['file_path', 'path', 'target_dir', 'dir', 'directory', 'cwd', 'workdir']
|
|
78
96
|
export function toolTargetOf(arguments_) {
|
|
79
97
|
if (!arguments_ || typeof arguments_ !== 'object') return null
|
|
80
98
|
if (typeof arguments_.command === 'string') {
|
|
81
99
|
const firstLine = arguments_.command.trim().split('\n')[0].trim()
|
|
82
100
|
return firstLine ? firstLine.slice(0, 120) : null
|
|
83
101
|
}
|
|
84
|
-
|
|
85
|
-
|
|
102
|
+
for (const key of TOOL_TARGET_PATH_KEYS) {
|
|
103
|
+
const value = arguments_[key]
|
|
104
|
+
if (typeof value === 'string' && value.trim()) return value.trim()
|
|
86
105
|
}
|
|
87
106
|
return null
|
|
88
107
|
}
|
|
@@ -90,6 +109,173 @@ export function toolTargetOf(arguments_) {
|
|
|
90
109
|
// pre-execute 目标缓存上限:只记最近若干次调用的目标,防长会话里无界增长。
|
|
91
110
|
const APPROVAL_TARGET_CACHE_LIMIT = 200
|
|
92
111
|
|
|
112
|
+
// ── 免审规则(DSHBOTS-365)──────────────────────────────────────────────────
|
|
113
|
+
// 结构化规则列表:主维度 path_prefix(工作区外目录前缀)/ command(命令首行前缀),
|
|
114
|
+
// 辅维度 bot_id / tool_name / sandbox(目标沙箱档;danger-full-access 可配、默认规则集为空
|
|
115
|
+
// 自然不含)。存储仿 prompt_overrides:settings 键 'approval_auto_rules' 存 JSON 数组,
|
|
116
|
+
// 独立编辑面(approvalRulesView / updateApprovalRules),不进 settingsView 单值键域。
|
|
117
|
+
export const APPROVAL_RULES_SETTING = 'approval_auto_rules'
|
|
118
|
+
export const APPROVAL_RULES_LIMIT = 50
|
|
119
|
+
// 规则可配的沙箱档:宿主 bash 族提权重试时的 sandbox_permissions 取值;空串 = 任意档。
|
|
120
|
+
export const APPROVAL_RULE_SANDBOXES = ['workspace-write', 'danger-full-access']
|
|
121
|
+
|
|
122
|
+
// 系统临时目录($TMPDIR):macOS 是 /var/folders/<user>/<hash>/T,名字不含 temp/tmp,
|
|
123
|
+
// 关键词 glob 覆盖不到——单独一行兜底;Linux 的 tmpdir() 就是 /tmp,已被覆盖就不重复一行。
|
|
124
|
+
const OS_TMPDIR = tmpdir().replace(/[/\\]+$/, '')
|
|
125
|
+
|
|
126
|
+
// 出厂预置默认规则(DSHBOTS-365 增量改口径):关键词 glob 三条——
|
|
127
|
+
// **/temp/**、**/.tmp/**、**/tmp/** 命中即免审(路径与命令同一套 glob 方言),
|
|
128
|
+
// 再加系统临时目录一行(未被关键词覆盖时)。预置行仍是普通规则行,owner 可自行删改。
|
|
129
|
+
const KEYWORD_APPROVAL_AUTO_RULES = [
|
|
130
|
+
{ glob: '**/temp/**', key: 'temp' },
|
|
131
|
+
{ glob: '**/.tmp/**', key: 'dot_tmp' },
|
|
132
|
+
{ glob: '**/tmp/**', key: 'tmp' },
|
|
133
|
+
]
|
|
134
|
+
const TMPDIR_COVERED = KEYWORD_APPROVAL_AUTO_RULES.some(item => approvalGlobMatch(item.glob, OS_TMPDIR))
|
|
135
|
+
export const DEFAULT_APPROVAL_AUTO_RULES = [
|
|
136
|
+
...KEYWORD_APPROVAL_AUTO_RULES,
|
|
137
|
+
...(TMPDIR_COVERED ? [] : [{ glob: `${OS_TMPDIR}/**`, key: 'tmpdir' }]),
|
|
138
|
+
].map(item => ({
|
|
139
|
+
id: `arul_default_${item.key}`,
|
|
140
|
+
path_prefix: item.glob,
|
|
141
|
+
command: '',
|
|
142
|
+
bot_id: '',
|
|
143
|
+
tool_name: '',
|
|
144
|
+
sandbox: '',
|
|
145
|
+
note: '',
|
|
146
|
+
updated_at: nowIso(),
|
|
147
|
+
updated_by: 'system:preset',
|
|
148
|
+
}))
|
|
149
|
+
|
|
150
|
+
// 系统预置行的「出厂原样」形态:id → 可接受的路径形态(口径迭代换过形态的都列进来)。
|
|
151
|
+
// 迁移时按这张表认出仍是出厂样的预置行换成当前默认集合;owner 改过路径的预置行不在表内,
|
|
152
|
+
// 视为 owner 自有行保留。owner 自建行(id 不在这张表)同样保留。
|
|
153
|
+
const SYSTEM_PRESET_PATTERNS = new Map ([
|
|
154
|
+
['arul_default_tmp', ['/tmp', '**/tmp/**']],
|
|
155
|
+
['arul_default_private_tmp', ['/private/tmp']],
|
|
156
|
+
['arul_default_var_tmp', ['/var/tmp']],
|
|
157
|
+
['arul_default_tmpdir', [OS_TMPDIR, `${OS_TMPDIR}/**`]],
|
|
158
|
+
['arul_default_home_dot_tmp', [join(homedir(), '.tmp').replace(/[/\\]+$/, '')]],
|
|
159
|
+
['arul_default_home_tmp', [join(homedir(), 'tmp').replace(/[/\\]+$/, '')]],
|
|
160
|
+
['arul_default_temp', ['**/temp/**']],
|
|
161
|
+
['arul_default_dot_tmp', ['**/.tmp/**']],
|
|
162
|
+
])
|
|
163
|
+
|
|
164
|
+
// settings 'approval_auto_rules' 解析:坏数据一律降级为空规则(不抛错,原卡流程兜底)。
|
|
165
|
+
export function parseApprovalRules(raw) {
|
|
166
|
+
let parsed
|
|
167
|
+
try {
|
|
168
|
+
parsed = JSON.parse(String(raw ?? ''))
|
|
169
|
+
} catch {
|
|
170
|
+
return []
|
|
171
|
+
}
|
|
172
|
+
if (!Array.isArray(parsed)) return []
|
|
173
|
+
return parsed.filter(item => item && typeof item === 'object')
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
// glob 方言(路径与命令共用):** 跨任意层级(含 '/')、* 跨任意字符但不跨 '/'、
|
|
177
|
+
// ? 单字符(不跨 '/')、其余按字面量;整串命中才算匹配。尾部 '/**' 额外允许匹配目录自身
|
|
178
|
+
// ('/tmp/**' 命中 '/tmp' 与 '/tmp/a/b',但不命中 '/tmpfoo')。
|
|
179
|
+
export function approvalGlobToRegExp(pattern) {
|
|
180
|
+
let text = String(pattern ?? '')
|
|
181
|
+
let tail = ''
|
|
182
|
+
if (text.endsWith('/**')) {
|
|
183
|
+
text = text.slice(0, -3)
|
|
184
|
+
tail = '(?:/.*)?'
|
|
185
|
+
}
|
|
186
|
+
let out = '^'
|
|
187
|
+
let index = 0
|
|
188
|
+
while (index < text.length) {
|
|
189
|
+
const char = text[index]
|
|
190
|
+
if (char === '*') {
|
|
191
|
+
const doubled = text[index + 1] === '*'
|
|
192
|
+
if (!doubled) {
|
|
193
|
+
out += '[^/]*'
|
|
194
|
+
index += 1
|
|
195
|
+
continue
|
|
196
|
+
}
|
|
197
|
+
index += 2
|
|
198
|
+
if (text[index] === '/') {
|
|
199
|
+
index += 1
|
|
200
|
+
out += '(?:.*/)?'
|
|
201
|
+
} else {
|
|
202
|
+
out += '.*'
|
|
203
|
+
}
|
|
204
|
+
continue
|
|
205
|
+
}
|
|
206
|
+
if (char === '?') {
|
|
207
|
+
out += '[^/]'
|
|
208
|
+
index += 1
|
|
209
|
+
continue
|
|
210
|
+
}
|
|
211
|
+
out += char.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
|
212
|
+
index += 1
|
|
213
|
+
}
|
|
214
|
+
return new RegExp(`${out}${tail}$`)
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
export function approvalGlobMatch(pattern, value) {
|
|
218
|
+
const text = String(value ?? '')
|
|
219
|
+
if (!String(pattern ?? '') || !text) return false
|
|
220
|
+
return approvalGlobToRegExp(pattern).test(text)
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
// 单条规则匹配(纯函数):目标为空不命中;主维度二选一命中即中——
|
|
224
|
+
// 路径规则与命令规则都用 glob 整串匹配;不含通配符的存量规则保留旧前缀语义
|
|
225
|
+
// (路径按目录边界、命令按词边界),口径切换不静默废掉已配规则。
|
|
226
|
+
// 辅维度留空 = 通配,填了必须精确相等。
|
|
227
|
+
export function approvalRuleMatches(rule, { botId, toolName, target, sandbox }) {
|
|
228
|
+
const value = String(target ?? '')
|
|
229
|
+
if (!value) return false
|
|
230
|
+
if (rule.bot_id && rule.bot_id !== botId) return false
|
|
231
|
+
if (rule.tool_name && rule.tool_name !== toolName) return false
|
|
232
|
+
if (rule.sandbox && rule.sandbox !== sandbox) return false
|
|
233
|
+
const pathPattern = String(rule.path_prefix ?? '').trim()
|
|
234
|
+
if (pathPattern && matchesRulePattern(pathPattern, value, 'path')) return true
|
|
235
|
+
const commandPattern = String(rule.command ?? '').trim()
|
|
236
|
+
if (commandPattern && matchesRulePattern(commandPattern, value, 'command')) return true
|
|
237
|
+
return false
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
// 含通配符 → glob;不含通配符 → 存量前缀语义(路径按目录边界、命令按词边界)。
|
|
241
|
+
// 路径维度支持 ~ 开头:~ 与 ~/… 在匹配时展开为当前用户家目录(规则按字面存储,跨机器可移植)。
|
|
242
|
+
function matchesRulePattern(pattern, value, dimension) {
|
|
243
|
+
if (dimension === 'path' && (pattern === '~' || pattern.startsWith('~/'))) {
|
|
244
|
+
const home = homedir().replace(/[/\\]+$/, '')
|
|
245
|
+
pattern = pattern === '~' ? home : `${home}${pattern.slice(1)}`
|
|
246
|
+
}
|
|
247
|
+
if (/[*?]/.test(pattern)) return approvalGlobMatch(pattern, value)
|
|
248
|
+
if (dimension === 'path') return value === pattern || value.startsWith(`${pattern}/`)
|
|
249
|
+
return value === pattern || value.startsWith(`${pattern} `)
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
// 存量预置行迁移:仍是出厂原样的预置行换成当前默认集合(口径迭代换过形态的都算「原样」),
|
|
253
|
+
// owner 自建行与改过路径的预置行不动,显式清空 '[]' 依然永不回播。
|
|
254
|
+
// 返回迁移后的 JSON 字符串,无需迁移时返回 null。
|
|
255
|
+
export function migrateApprovalPresetRules(raw) {
|
|
256
|
+
let parsed
|
|
257
|
+
try {
|
|
258
|
+
parsed = JSON.parse(String(raw ?? ''))
|
|
259
|
+
} catch {
|
|
260
|
+
return null
|
|
261
|
+
}
|
|
262
|
+
if (!Array.isArray(parsed)) return null
|
|
263
|
+
const rows = parsed.filter(item => item && typeof item === 'object')
|
|
264
|
+
const isSystemPreset = row => {
|
|
265
|
+
const id = typeof row.id === 'string' ? row.id : ''
|
|
266
|
+
const patterns = SYSTEM_PRESET_PATTERNS.get(id)
|
|
267
|
+
if (!patterns || String(row.command ?? '').trim()) return false
|
|
268
|
+
const path = String(row.path_prefix ?? '').replace(/[/\\]+$/, '')
|
|
269
|
+
return patterns.some(pattern => pattern.replace(/[/\\]+$/, '') === path)
|
|
270
|
+
}
|
|
271
|
+
if (!rows.some(isSystemPreset)) return null
|
|
272
|
+
const firstIndex = rows.findIndex(isSystemPreset)
|
|
273
|
+
const kept = rows.filter(row => !isSystemPreset(row))
|
|
274
|
+
const before = rows.slice(0, firstIndex).filter(row => !isSystemPreset(row)).length
|
|
275
|
+
const presets = DEFAULT_APPROVAL_AUTO_RULES.map(rule => ({ ...rule }))
|
|
276
|
+
return JSON.stringify([...kept.slice(0, before), ...presets, ...kept.slice(before)])
|
|
277
|
+
}
|
|
278
|
+
|
|
93
279
|
// 来源定位字段(DSHBOTS-240):审批行 → 来源群聊(项目名/KEY)+ 任务 ID/标识/标题。
|
|
94
280
|
// 列表查询用 JOIN 一次取齐(approvalsPending / approvalsForProject / approvalsForBot 共用),
|
|
95
281
|
// 避免逐行 N+1;缺任务时任务字段留空,不猜。
|
|
@@ -120,12 +306,14 @@ export const approvalsMethods = {
|
|
|
120
306
|
const off = runtime.ctx.on('approval/request', (req, next) => this.handleApprovalRequest(req, next), { prepend: true })
|
|
121
307
|
// approval/request 事件不带工具参数,目标取数只能从 tools/pre-execute 透传监听来:
|
|
122
308
|
// 宿主先过 pre-execute 网关、gate 返回 ask 才发起审批,此刻 exec 里带着 callId/name/arguments。
|
|
123
|
-
// 按 callId
|
|
309
|
+
// 按 callId 记已提取目标与目标沙箱档(DSHBOTS-365 辅维度;先提短串再掩码,只存小字符串),
|
|
310
|
+
// 审批发起时一次性取走;超量 FIFO 驱逐。
|
|
124
311
|
const offPreExecute = runtime.ctx.on('tools/pre-execute', (exec, next) => {
|
|
125
312
|
const callId = exec?.callId ? String(exec.callId) : ''
|
|
126
313
|
const target = callId ? toolTargetOf(exec.arguments) : null
|
|
127
314
|
if (callId && target) {
|
|
128
|
-
|
|
315
|
+
const sandbox = typeof exec.arguments?.sandbox_permissions === 'string' ? exec.arguments.sandbox_permissions : ''
|
|
316
|
+
this.approvalTargets.set(callId, { target: this.maskSecretValues(target), sandbox })
|
|
129
317
|
if (this.approvalTargets.size > APPROVAL_TARGET_CACHE_LIMIT) {
|
|
130
318
|
this.approvalTargets.delete(this.approvalTargets.keys().next().value)
|
|
131
319
|
}
|
|
@@ -168,9 +356,11 @@ export const approvalsMethods = {
|
|
|
168
356
|
const displayReason = req.displayReason?.zh ? this.maskSecretValues(String(req.displayReason.zh).slice(0, 2_000)) : null
|
|
169
357
|
const reason = this.maskSecretValues(String(req.reason ?? '').slice(0, 2_000))
|
|
170
358
|
// 本次调用的操作目标:pre-execute 阶段按 callId 记下,这里一次性取走(不留残页);没有则为 NULL,
|
|
171
|
-
// UI 回退到从摘要正则猜测的旧口径。
|
|
359
|
+
// UI 回退到从摘要正则猜测的旧口径。sandbox 是目标沙箱档(免审规则辅维度,DSHBOTS-365)。
|
|
172
360
|
const callId = req.callId ? String(req.callId) : null
|
|
173
|
-
const
|
|
361
|
+
const cachedTarget = callId ? (this.approvalTargets.get(callId) ?? null) : null
|
|
362
|
+
const toolTarget = cachedTarget?.target ?? null
|
|
363
|
+
const targetSandbox = cachedTarget?.sandbox ?? ''
|
|
174
364
|
if (callId) this.approvalTargets.delete(callId)
|
|
175
365
|
|
|
176
366
|
store.run(
|
|
@@ -181,6 +371,21 @@ export const approvalsMethods = {
|
|
|
181
371
|
createdAt, new Date(Date.parse(createdAt) + timeoutMs).toISOString(),
|
|
182
372
|
)
|
|
183
373
|
|
|
374
|
+
// DSHBOTS-365 免审白名单:命中规则的提权请求不落待办卡、不发群聊锚点/微信转发/通知,
|
|
375
|
+
// 插件即时替 owner 应答 allowed-once。留痕两件套缺一不可:approvals 行 status='allowed'
|
|
376
|
+
// + decided_by='auto:rule:<id>'(复用 settleApproval,decided_at 同步落库),审计事件
|
|
377
|
+
// approval.auto_allow。每次调用一放行一结:规则每次现读,改规则即时生效,无持久授权。
|
|
378
|
+
// 不进 approvalPending、不挂超时 timer、不挂 abort 监听——超时与轮次中止对已决条目天然不触。
|
|
379
|
+
const autoRule = this.matchApprovalAutoRule({ botId: bot.id, toolName, target: toolTarget, sandbox: targetSandbox })
|
|
380
|
+
if (autoRule) {
|
|
381
|
+
this.settleApproval(approvalId, 'allowed', 'allowed-once', `auto:rule:${autoRule.id}`)
|
|
382
|
+
this.audit(
|
|
383
|
+
{ type: 'system', id: 'system' }, 'approval.auto_allow', 'approval', approvalId,
|
|
384
|
+
{ ruleId: autoRule.id, toolName, botId: bot.id, target: toolTarget },
|
|
385
|
+
)
|
|
386
|
+
return 'allowed-once'
|
|
387
|
+
}
|
|
388
|
+
|
|
184
389
|
// 卡片锚点:群聊落 messages(kind=approval),单聊落 solo_messages(DSHBOTS-218)。
|
|
185
390
|
// 状态渲染时查 approvals 表,消息体只是纯文本兜底,不承载状态。
|
|
186
391
|
const summary = displayReason || reason || '请求执行需要授权的操作'
|
|
@@ -225,16 +430,22 @@ export const approvalsMethods = {
|
|
|
225
430
|
},
|
|
226
431
|
|
|
227
432
|
// 统一结算:清定时器、出 pending 表、写终态。hostAnswer 非空才向宿主应答(abort 分支不答)。
|
|
433
|
+
// 写库容错:结算可能由轮次取消的 abort 监听或超时定时器在插件重载(store.close())之后
|
|
434
|
+
// 迟到触发——曾在 abort 分发里裸抛 statement has been finalized,把整个 dsh 宿主打成 fatal 退出。
|
|
228
435
|
settleApproval(approvalId, status, hostAnswer, decidedBy) {
|
|
229
436
|
const pending = this.approvalPending?.get(approvalId)
|
|
230
437
|
if (pending) {
|
|
231
438
|
clearTimeout(pending.timer)
|
|
232
439
|
this.approvalPending.delete(approvalId)
|
|
233
440
|
}
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
441
|
+
try {
|
|
442
|
+
this.store.run(
|
|
443
|
+
'UPDATE approvals SET status = ?, decided_by = ?, decided_at = ? WHERE id = ? AND status = ?',
|
|
444
|
+
status, decidedBy, nowIso(), approvalId, 'pending',
|
|
445
|
+
)
|
|
446
|
+
} catch (error ) {
|
|
447
|
+
this.logger?.warn?.('dsh-team: 审批结算写库失败(插件可能已重载): %s', error?.message ?? error)
|
|
448
|
+
}
|
|
238
449
|
if (pending && hostAnswer) pending.resolve(hostAnswer)
|
|
239
450
|
},
|
|
240
451
|
|
|
@@ -252,6 +463,88 @@ export const approvalsMethods = {
|
|
|
252
463
|
return this.approvalView(this.store.get('SELECT * FROM approvals WHERE id = ?', approvalId))
|
|
253
464
|
},
|
|
254
465
|
|
|
466
|
+
// 免审规则取数(DSHBOTS-365):每次现读现解析——无缓存,改规则对下一次提权请求即时生效。
|
|
467
|
+
approvalRulesView() {
|
|
468
|
+
return parseApprovalRules(this.store.setting(APPROVAL_RULES_SETTING, ''))
|
|
469
|
+
},
|
|
470
|
+
|
|
471
|
+
// 免审规则匹配入口:按规则表顺序首中即返(表序即优先级)。目标为空(无 callId 缓存)
|
|
472
|
+
// 一律不命中,保守回落原卡流程。
|
|
473
|
+
matchApprovalAutoRule(input) {
|
|
474
|
+
const target = String(input.target ?? '')
|
|
475
|
+
if (!target) return null
|
|
476
|
+
for (const rule of this.approvalRulesView()) {
|
|
477
|
+
if (approvalRuleMatches(rule, input)) return rule
|
|
478
|
+
}
|
|
479
|
+
return null
|
|
480
|
+
},
|
|
481
|
+
|
|
482
|
+
// 免审规则保存(DSHBOTS-365):独立编辑面(仿 updatePromptSegment 先例),仅 type=user
|
|
483
|
+
// 可写——bot 写免审规则必须被拒,维持「bot 不能自批」边界。整表替换(UI 全量收集后提交),
|
|
484
|
+
// 逐条校验:主维度至少一项、路径前缀必须是绝对路径、sandbox 档枚举收口、bot 必须存在。
|
|
485
|
+
// 保存即审计;id 复用已有(编辑保 id),新条目发 arul_*。
|
|
486
|
+
async updateApprovalRules(rulesInput, actor = this.actor()) {
|
|
487
|
+
if (actor?.type !== 'user') throw forbidden('仅工作台 owner 可配置审批免审规则,bot 不能自批')
|
|
488
|
+
if (!Array.isArray(rulesInput)) throw badRequest('免审规则必须是数组')
|
|
489
|
+
if (rulesInput.length > APPROVAL_RULES_LIMIT) throw badRequest(`免审规则最多 ${APPROVAL_RULES_LIMIT} 条`)
|
|
490
|
+
const knownIds = new Set(this.approvalRulesView().map(rule => rule.id))
|
|
491
|
+
const usedIds = new Set ()
|
|
492
|
+
const rules = rulesInput.map((raw, index) => {
|
|
493
|
+
const item = raw && typeof raw === 'object' ? raw : {}
|
|
494
|
+
const label = `第 ${index + 1} 条规则`
|
|
495
|
+
const pathPrefix = String(item.path_prefix ?? '').trim().replace(/\/+$/, '')
|
|
496
|
+
const command = String(item.command ?? '').trim().split('\n')[0].trim().slice(0, 200)
|
|
497
|
+
if (!pathPrefix && !command) throw badRequest(`${label}缺少路径规则或命令规则(至少填一项)`)
|
|
498
|
+
// 路径规则:绝对路径、~ 开头的家目录路径(~/…,匹配时展开),或含通配符的 glob
|
|
499
|
+
// (关键词规则如 **/tmp/** 不必是绝对路径)。
|
|
500
|
+
if (pathPrefix && !pathPrefix.startsWith('/') && !pathPrefix.startsWith('~') && !/[*?]/.test(pathPrefix)) {
|
|
501
|
+
throw badRequest(`${label}路径规则必须是以 / 开头的绝对路径、~ 开头的家目录路径或含通配符的 glob`)
|
|
502
|
+
}
|
|
503
|
+
if (pathPrefix.length > 500) throw badRequest(`${label}路径规则超长(上限 500 字符)`)
|
|
504
|
+
const botId = String(item.bot_id ?? '').trim()
|
|
505
|
+
if (botId && !this.store.get('SELECT id FROM bots WHERE id = ?', botId)) throw badRequest(`${label}限定的 Bot 不存在`)
|
|
506
|
+
const sandbox = String(item.sandbox ?? '').trim()
|
|
507
|
+
if (sandbox && !APPROVAL_RULE_SANDBOXES.includes(sandbox)) {
|
|
508
|
+
throw badRequest(`${label}沙箱档必须是 ${APPROVAL_RULE_SANDBOXES.join('/')} 或留空`)
|
|
509
|
+
}
|
|
510
|
+
// id 复用已有(编辑保 id);新条目或输入撞 id(重复行)一律发新 id,保证表内 id 唯一。
|
|
511
|
+
let ruleId = item.id && knownIds.has(String(item.id)) && !usedIds.has(String(item.id)) ? String(item.id) : id('arul')
|
|
512
|
+
usedIds.add(ruleId)
|
|
513
|
+
return {
|
|
514
|
+
id: ruleId,
|
|
515
|
+
path_prefix: pathPrefix,
|
|
516
|
+
command,
|
|
517
|
+
bot_id: botId,
|
|
518
|
+
tool_name: String(item.tool_name ?? '').trim().slice(0, 100),
|
|
519
|
+
sandbox,
|
|
520
|
+
note: String(item.note ?? '').trim().slice(0, 200),
|
|
521
|
+
updated_at: nowIso(),
|
|
522
|
+
updated_by: `${actor.type}:${actor.id}`,
|
|
523
|
+
}
|
|
524
|
+
})
|
|
525
|
+
this.store.setSetting(APPROVAL_RULES_SETTING, JSON.stringify(rules))
|
|
526
|
+
// 推进 settings_revision:免审规则存 settings 表但不进 stateVersion 签名的任何表列,
|
|
527
|
+
// 不 bump 的话保存后客户端轮询命中 unchanged 短路,规则列表最长 60s 才刷出来。
|
|
528
|
+
this.store.setSetting('settings_revision', String(this.settingsRevision() + 1))
|
|
529
|
+
// 追溯放行:发起时未命中而落卡的 pending 审批,保存规则后立刻重判一遍——命中即按同口径
|
|
530
|
+
// allowed-once 放行并留痕,「先见卡、后补规则」不再要求重跑流程。沙箱档不入 approvals 表,
|
|
531
|
+
// 限档规则(sandbox 非空)拿空档冒充命中不稳,不参与追溯。
|
|
532
|
+
const pendingRows = this.store.all("SELECT id, bot_id, tool_name, tool_target FROM approvals WHERE status = 'pending'") ?? []
|
|
533
|
+
for (const pendingRow of pendingRows) {
|
|
534
|
+
const hit = this.matchApprovalAutoRule({ botId: pendingRow.bot_id, toolName: pendingRow.tool_name, target: pendingRow.tool_target, sandbox: '' })
|
|
535
|
+
if (!hit) continue
|
|
536
|
+
this.settleApproval(pendingRow.id, 'allowed', 'allowed-once', `auto:rule:${hit.id}`)
|
|
537
|
+
this.audit(actor, 'approval.auto_allow', 'approval', pendingRow.id, {
|
|
538
|
+
ruleId: hit.id, retroactive: true, toolName: pendingRow.tool_name, botId: pendingRow.bot_id, target: pendingRow.tool_target,
|
|
539
|
+
})
|
|
540
|
+
}
|
|
541
|
+
this.audit(actor, 'approval_rules.update', 'settings', APPROVAL_RULES_SETTING, {
|
|
542
|
+
count: rules.length,
|
|
543
|
+
rules: rules.map(rule => ({ id: rule.id, path_prefix: rule.path_prefix, command: rule.command, sandbox: rule.sandbox })),
|
|
544
|
+
})
|
|
545
|
+
return this.approvalRulesView()
|
|
546
|
+
},
|
|
547
|
+
|
|
255
548
|
// 目标展示形:绝对路径落在项目工作区内且剩余段非空、不含空白时收成相对路径(chip 少占宽);
|
|
256
549
|
// 命令、带空白的路径或库外路径原样返回。title 层恒用原始值,鼠标悬停可见全貌。
|
|
257
550
|
toolTargetDisplay(target) {
|
package/src/services/bots.js
CHANGED
|
@@ -58,6 +58,9 @@ export const botsMethods = {
|
|
|
58
58
|
const instructions = text(input.instructions, 12_000)
|
|
59
59
|
const color = COLORS.includes(input.color) ? input.color : 'blue'
|
|
60
60
|
const filePolicy = normalizeFilePolicy(input.filePolicy)
|
|
61
|
+
// Bot 级 agent preset 覆盖:空 = 跟随全局(DSH_TEAM_WORKER_PRESET 生效链);
|
|
62
|
+
// 自由短串,不在此校验存在性——宿主侧 defaultAgentPreset 只选可用 preset,写错回落 standard。
|
|
63
|
+
const agentPreset = input.agentPreset !== undefined ? text(input.agentPreset, 80) : ''
|
|
61
64
|
// 先建目录再建号:目录建不出来就别留下一个单聊必然失败的 bot 行。
|
|
62
65
|
// 这里预建的是占位候选;并发同名时权威 solo_dir 在事务内重算,输家目录提交后补建。
|
|
63
66
|
const placeholder = this.soloDirFor(name, botId)
|
|
@@ -75,11 +78,11 @@ export const botsMethods = {
|
|
|
75
78
|
try {
|
|
76
79
|
this.store.run(
|
|
77
80
|
`INSERT INTO bots(id, name, role, instructions, color, provider, model, effort,
|
|
78
|
-
fallback_provider, fallback_model, fallback_effort, file_policy, solo_dir,
|
|
81
|
+
fallback_provider, fallback_model, fallback_effort, file_policy, agent_preset, solo_dir,
|
|
79
82
|
status, current_revision, created_at, updated_at)
|
|
80
|
-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'active', 1, ?, ?)`,
|
|
83
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'active', 1, ?, ?)`,
|
|
81
84
|
botId, name, role, instructions, color, provider, model, effort,
|
|
82
|
-
fallbackProvider, fallbackModel, fallbackEffort, filePolicy, soloDir, createdAt, createdAt,
|
|
85
|
+
fallbackProvider, fallbackModel, fallbackEffort, filePolicy, agentPreset, soloDir, createdAt, createdAt,
|
|
83
86
|
)
|
|
84
87
|
break
|
|
85
88
|
} catch (error ) {
|
|
@@ -232,6 +235,11 @@ export const botsMethods = {
|
|
|
232
235
|
const filePolicy = normalizeFilePolicy(patch.filePolicy)
|
|
233
236
|
if (filePolicy !== bot.file_policy) changes.file_policy = filePolicy
|
|
234
237
|
}
|
|
238
|
+
// Bot 级 agent preset 覆盖(空 = 跟随全局):自由短串,不校验存在性(宿主侧安全回落)。
|
|
239
|
+
if (patch.agentPreset !== undefined) {
|
|
240
|
+
const agentPreset = text(patch.agentPreset, 80)
|
|
241
|
+
if (agentPreset !== (bot.agent_preset ?? '')) changes.agent_preset = agentPreset
|
|
242
|
+
}
|
|
235
243
|
if (patch.status !== undefined) {
|
|
236
244
|
if (!['active', 'paused', 'archived'].includes(patch.status)) throw badRequest('Bot 状态无效')
|
|
237
245
|
changes.status = patch.status
|
|
@@ -362,6 +370,7 @@ export const botsMethods = {
|
|
|
362
370
|
)
|
|
363
371
|
return {
|
|
364
372
|
...bot,
|
|
373
|
+
agentPreset: bot.agent_preset ?? '',
|
|
365
374
|
modelRef: bot.provider && bot.model ? `${bot.provider}/${bot.model}` : null,
|
|
366
375
|
fallbackModelRef: bot.fallback_provider && bot.fallback_model ? `${bot.fallback_provider}/${bot.fallback_model}` : null,
|
|
367
376
|
fallbackConfigured: Boolean(bot.fallback_provider && bot.fallback_model),
|
package/src/services/core.js
CHANGED
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
// 本文件只放方法体,方法挂到 TeamService 原型上(见 src/service.js 的 defineMethods 调用),
|
|
4
4
|
// 因此方法体内的 this 与拆分前完全一致。
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { validateRuntimeSettingValue, RUNTIME_SETTING_DEFS, RUNTIME_SETTING_KEYS, runtimeSettingsView as runtimeSettingsRows,
|
|
7
|
+
effectiveReviewIdleMinutes, effectiveRunLimits, envExplicit, RUN_LIMIT_RANGES, RUN_TIMEOUT_KEY, STALL_WATCHDOG_KEY, APPROVAL_TIMEOUT_KEY, QUESTION_TIMEOUT_KEY, REVIEW_TIMEOUT_KEY, UI_LANGUAGE_KEY, UI_LANGUAGE_VALUES, REVIEW_AUTO_CLOSE_KEY, REVIEW_ESCALATE_KEY, REVIEW_ESCALATE_RANGE, REVIEW_IDLE_MINUTES_KEY, REVIEW_IDLE_MINUTES_RANGE } from '../config.js'
|
|
7
8
|
import { badRequest, conflict, notFound } from '../errors.js'
|
|
8
9
|
import { ensureDirResilient, ensureSkillRoot } from '../paths.js'
|
|
9
10
|
import { seedModelPrices } from '../pricing.js'
|
|
@@ -19,6 +20,7 @@ import { ensureTaskSandboxSchema } from './task-sandbox-schema.js'
|
|
|
19
20
|
import { ensureWechatTriggerSchema } from './wechat-trigger-schema.js'
|
|
20
21
|
import { ensureExternalTriggerSchema } from './external-trigger-schema.js'
|
|
21
22
|
import { PROMPT_SEGMENT_DEFAULTS, PROMPT_SEGMENT_MAX_CHARS, PROMPT_TRIO_BUDGET, parsePromptOverrides, promptOverridesHash, taskGuidanceTrioLength } from './runtime/prompt.js'
|
|
23
|
+
import { effectiveReviewTimeoutMinutes } from './runtime/session.js'
|
|
22
24
|
import { id, jsonParse, nowIso } from '../util.js'
|
|
23
25
|
|
|
24
26
|
|
|
@@ -213,8 +215,11 @@ export const coreMethods = {
|
|
|
213
215
|
'memory_review', 'chat_memory_review',
|
|
214
216
|
RUN_TIMEOUT_KEY, STALL_WATCHDOG_KEY,
|
|
215
217
|
APPROVAL_TIMEOUT_KEY, QUESTION_TIMEOUT_KEY,
|
|
218
|
+
REVIEW_TIMEOUT_KEY,
|
|
216
219
|
UI_LANGUAGE_KEY,
|
|
217
220
|
REVIEW_IDLE_MINUTES_KEY, REVIEW_AUTO_CLOSE_KEY, REVIEW_ESCALATE_KEY,
|
|
221
|
+
// 运行参数目录(全局设置「运行参数」卡):所有运行期 DSH_TEAM_* 变量的可配置键域。
|
|
222
|
+
...RUNTIME_SETTING_KEYS,
|
|
218
223
|
]
|
|
219
224
|
const values = {}
|
|
220
225
|
for (const key of keys) values[key] = this.store.setting(key, '')
|
|
@@ -233,6 +238,9 @@ export const coreMethods = {
|
|
|
233
238
|
runTimeoutEnv: limits.runTimeoutEnv,
|
|
234
239
|
stallTimeoutEnv: limits.stallTimeoutEnv,
|
|
235
240
|
reviewIdleMinutes,
|
|
241
|
+
// 验收分档时效(DSHBOTS-364):默认 0 = 关闭分档、跟随全局;设置页随行回显。
|
|
242
|
+
reviewTimeoutMinutes: effectiveReviewTimeoutMinutes(key => this.store.setting(key)),
|
|
243
|
+
reviewTimeoutEnv: envExplicit('DSH_TEAM_REVIEW_TIMEOUT_MINUTES'),
|
|
236
244
|
}
|
|
237
245
|
},
|
|
238
246
|
updateSettings(patch, actor = this.actor(), expectedRevision = undefined) {
|
|
@@ -312,6 +320,14 @@ export const coreMethods = {
|
|
|
312
320
|
if (!UI_LANGUAGE_VALUES.includes(raw)) throw badRequest(`${UI_LANGUAGE_KEY} 必须是 ${UI_LANGUAGE_VALUES.join('/')}`)
|
|
313
321
|
values[UI_LANGUAGE_KEY] = raw
|
|
314
322
|
}
|
|
323
|
+
// 运行参数目录通用校验:空串 = 清除保存值回默认;非空按 kind 校验并规范化落库。
|
|
324
|
+
for (const def of RUNTIME_SETTING_DEFS) {
|
|
325
|
+
const value = values[def.key]
|
|
326
|
+
if (value === undefined || value === '') continue
|
|
327
|
+
const check = validateRuntimeSettingValue(def, value)
|
|
328
|
+
if (!check.ok) throw badRequest(`运行参数 ${def.key}(${def.env}):${check.error}`)
|
|
329
|
+
values[def.key] = check.normalized
|
|
330
|
+
}
|
|
315
331
|
this.store.transaction(() => {
|
|
316
332
|
for (const [key, value] of Object.entries(values)) this.store.setSetting(key, value)
|
|
317
333
|
// 乐观并发令牌随保存推进(B2/DSHBOTS-325):settings_revision 不是 settingsView 键,
|
|
@@ -330,6 +346,13 @@ export const coreMethods = {
|
|
|
330
346
|
return this.settingsView()
|
|
331
347
|
},
|
|
332
348
|
|
|
349
|
+
// 运行参数目录展示视图(全局设置「运行参数」卡):每条 env 的保存值/生效值/默认值/
|
|
350
|
+
// env 覆盖标志。effective 取自存活覆盖视图,与所有消费点同源。
|
|
351
|
+
runtimeSettingsView() {
|
|
352
|
+
// default 列必须取启动配置(baseConfig),不能取覆盖视图,否则「默认值」列会跟着保存值变。
|
|
353
|
+
return { rows: runtimeSettingsRows(this.baseConfig ?? this.config, key => this.store.setting(key)) }
|
|
354
|
+
},
|
|
355
|
+
|
|
333
356
|
// 可编辑提示词段(B1/DSHBOTS-324):只读视图。defaultChanged = 覆盖保存时的内置默认
|
|
334
357
|
// 指纹与当前默认不一致(升级改了默认文本),UI 据此给「保留我的文本 / 恢复新默认」取舍。
|
|
335
358
|
promptSegmentsView() {
|
|
@@ -389,7 +412,9 @@ export const coreMethods = {
|
|
|
389
412
|
start() {
|
|
390
413
|
if (this.started) return
|
|
391
414
|
this.started = true
|
|
392
|
-
|
|
415
|
+
// 周期拍走空载门:空闲时降频为一次索引计数,有工作立即恢复全量拍;
|
|
416
|
+
// 事件唤醒(各入队路径的 void this.tick())不经此门。
|
|
417
|
+
this.timer = setInterval(() => void this.tickIdleGate(), this.config.schedulerIntervalMs)
|
|
393
418
|
this.timer.unref?.()
|
|
394
419
|
setTimeout(() => void this.tick(), 300).unref?.()
|
|
395
420
|
},
|
|
@@ -397,6 +422,10 @@ export const coreMethods = {
|
|
|
397
422
|
if (this.timer) clearInterval(this.timer)
|
|
398
423
|
this.timer = null
|
|
399
424
|
this.started = false
|
|
425
|
+
// 在途审批定时器一并清空:abort 监听由宿主信号持有无法摘除(迟到结算已由
|
|
426
|
+
// settleApproval 容错),但停机后不得再由自身定时器主动触发写库。
|
|
427
|
+
for (const pending of this.approvalPending?.values() ?? []) clearTimeout(pending.timer)
|
|
428
|
+
this.approvalPending?.clear()
|
|
400
429
|
void this.wechat?.stop()
|
|
401
430
|
void this.feishu?.stop()
|
|
402
431
|
},
|