dsh-team-bots 0.2.465 → 0.3.64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. package/NOTICE +5 -0
  2. package/README.md +8 -2
  3. package/docs/README.zh.md +8 -2
  4. package/docs/assets/global-config.png +0 -0
  5. package/docs/assets/global-config.zh.png +0 -0
  6. package/docs/assets/tasks.png +0 -0
  7. package/docs/assets/tasks.zh.png +0 -0
  8. package/docs/assets/usage.png +0 -0
  9. package/docs/assets/usage.zh.png +0 -0
  10. package/package.json +8 -2
  11. package/src/api.js +16 -2
  12. package/src/config.js +193 -8
  13. package/src/db-migrations.js +53 -4
  14. package/src/db.js +37 -3
  15. package/src/http.js +20 -1
  16. package/src/runtime.js +16 -1
  17. package/src/seed-bots.js +4 -0
  18. package/src/service.js +21 -2
  19. package/src/services/approvals.js +276 -8
  20. package/src/services/bot-quota.js +54 -0
  21. package/src/services/bots.js +8 -0
  22. package/src/services/chat.js +54 -5
  23. package/src/services/core.js +31 -2
  24. package/src/services/memory.js +112 -25
  25. package/src/services/model-fallback.js +55 -15
  26. package/src/services/projects.js +13 -2
  27. package/src/services/run-finish.js +44 -11
  28. package/src/services/runs.js +15 -7
  29. package/src/services/runtime/prompt.js +31 -6
  30. package/src/services/runtime/session.js +87 -25
  31. package/src/services/scheduler.js +26 -5
  32. package/src/services/system.js +162 -10
  33. package/src/services/task-dispatch.js +24 -0
  34. package/src/services/task-notify.js +18 -0
  35. package/src/services/task-review.js +102 -23
  36. package/src/services/task-runs.js +31 -3
  37. package/src/services/tasks.js +91 -3
  38. package/src/tools.js +20 -14
  39. package/ui/app.js +7 -10
  40. package/ui/i18n/en/chat.js +2 -0
  41. package/ui/i18n/en/common.js +10 -0
  42. package/ui/i18n/en/settings.js +76 -1
  43. package/ui/i18n/en/tasks.js +3 -0
  44. package/ui/i18n/zh/chat.js +2 -0
  45. package/ui/i18n/zh/common.js +10 -0
  46. package/ui/i18n/zh/settings.js +76 -1
  47. package/ui/i18n/zh/tasks.js +3 -0
  48. package/ui/modules/api.js +9 -1
  49. package/ui/modules/cards.js +6 -3
  50. package/ui/modules/chat.js +1 -1
  51. package/ui/modules/composer.js +6 -1
  52. package/ui/modules/events-board.js +48 -0
  53. package/ui/modules/events-misc.js +43 -0
  54. package/ui/modules/events-submit.js +20 -0
  55. package/ui/modules/form-validation.js +204 -0
  56. package/ui/modules/global-pages.js +8 -5
  57. package/ui/modules/modal-forms.js +4 -4
  58. package/ui/modules/modal-layer.js +4 -1
  59. package/ui/modules/page-shell.js +10 -7
  60. package/ui/modules/permissions.js +99 -0
  61. package/ui/modules/settings.js +108 -26
  62. package/ui/modules/state.js +10 -0
  63. package/ui/modules/task-menu.js +147 -0
  64. package/ui/modules/tasks.js +11 -10
  65. package/ui/modules/util.js +43 -6
  66. package/ui/styles/a11y.css +13 -0
  67. package/ui/styles/base.css +57 -11
  68. package/ui/styles/buttons.css +46 -6
  69. package/ui/styles/cards.css +90 -0
  70. package/ui/styles/chat.css +23 -2
  71. package/ui/styles/global-config.css +7 -4
  72. package/ui/styles/modal.css +28 -0
  73. package/ui/styles/settings.css +23 -1
  74. package/ui/styles/tasks.css +51 -1
  75. package/ui/styles/toast.css +18 -11
  76. package/ui/styles/usage.css +2 -0
  77. package/ui/styles/wide.css +5 -0
  78. package/docs/assets/channel-redesign.png +0 -0
  79. package/docs/assets/global-config-dark.png +0 -0
  80. package/docs/assets/global-config-light.png +0 -0
  81. package/docs/assets/global-config-light.zh.png +0 -0
  82. package/docs/assets/global-config-redesign.png +0 -0
  83. package/docs/assets/secrets-redesign.png +0 -0
  84. package/docs/assets/usage-redesign-global.png +0 -0
package/src/db.js CHANGED
@@ -505,39 +505,73 @@ export function openDatabase(path) {
505
505
  }
506
506
 
507
507
  export class Store {
508
+ // 同连接事务深度(transaction 嵌套时内层加入外层,见 transaction 实现)。
509
+
510
+ // 预编译语句缓存:热路径(调度 tick、UI 轮询、消息尾窗)反复执行同一批语句,
511
+ // 按语句文本缓存 StatementSync,免去每次调用的 SQL 解析;语句系于本连接,随 Store 一起丢弃。
512
+ // 值类型保持 any:精确标注 StatementSync 会让 all/get 摆脱 any 推断,
513
+ // 连锁暴露全项目 400+ 存量宽松类型错误,属独立任务,不在本次范围。
514
+
508
515
  constructor(db, options = {} ) {
509
516
  this.db = db
510
517
  this.ftsEnabled = options.ftsEnabled === true
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
511
532
  }
512
533
 
513
534
  all(sql, ...params) {
514
- return this.db.prepare(sql).all(...params).map(row => ({ ...row }))
535
+ return this.statement(sql).all(...params).map(row => ({ ...row }))
515
536
  }
516
537
 
517
538
  get(sql, ...params) {
518
- const row = this.db.prepare(sql).get(...params)
539
+ const row = this.statement(sql).get(...params)
519
540
  return row === undefined ? undefined : { ...row }
520
541
  }
521
542
 
522
543
  run(sql, ...params) {
523
- return this.db.prepare(sql).run(...params)
544
+ return this.statement(sql).run(...params)
524
545
  }
525
546
 
526
547
  exec(sql) {
527
548
  this.db.exec(sql)
528
549
  }
529
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
+
530
558
  // 事务纪律(B7/DSHBOTS-332):回调内只做本库写——宿主副作用(起会话/steer/微信推送/
531
559
  // tick)一律放在事务提交之后执行,回滚不产生幽灵消息/幽灵会话;outbox 的「先落库后
532
560
  // 同栈投递」在事务内也只发生 runs/outbox 行写入(投递的宿主动作由提交后的 tick/领取
533
561
  // 路径执行)。tests/after-commit.test.ts 以源码扫描守门。
534
562
  transaction(fn) {
563
+ // 同连接嵌套事务直接加入外层(吸收账本化改造需要:setTaskStatus 等统一落点可能被
564
+ // 包在外层事务里调用);仅最外层 BEGIN/COMMIT,内层失败随外层一并回滚。
565
+ if (this.txDepth > 0) return fn()
535
566
  this.db.exec('BEGIN IMMEDIATE')
567
+ this.txDepth = 1
536
568
  try {
537
569
  const result = fn()
538
570
  this.db.exec('COMMIT')
571
+ this.txDepth = 0
539
572
  return result
540
573
  } catch (error) {
574
+ this.txDepth = 0
541
575
  try { this.db.exec('ROLLBACK') } catch {}
542
576
  throw error
543
577
  }
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
- return response(JSON.stringify({ ok: true, data }), 'application/json; charset=utf-8')
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
  }
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
- this.config = config
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
@@ -1,4 +1,8 @@
1
1
  // 默认出场的总监与六个通用团队伙伴。
2
+ // 种子 reviewer 的产品默认(DSHBOTS-365):不显式指定成员的新群自动带入,验收核验
3
+ // 优先由它承接;识别只认这个固定名——用户改名或移除即失效,核验回落总监兜底。
4
+ export const REVIEWER_BOT_NAME = 'reviewer'
5
+
2
6
  export const SEED_OWNER = {
3
7
  name: 'director',
4
8
  role: '总监',
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
- this.config = config
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,6 +76,15 @@ 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
  // 目标提取(纯函数):按参数形状判别,不按工具名——宿主工具族会扩展,形状更稳。
@@ -90,6 +105,168 @@ export function toolTargetOf(arguments_) {
90
105
  // pre-execute 目标缓存上限:只记最近若干次调用的目标,防长会话里无界增长。
91
106
  const APPROVAL_TARGET_CACHE_LIMIT = 200
92
107
 
108
+ // ── 免审规则(DSHBOTS-365)──────────────────────────────────────────────────
109
+ // 结构化规则列表:主维度 path_prefix(工作区外目录前缀)/ command(命令首行前缀),
110
+ // 辅维度 bot_id / tool_name / sandbox(目标沙箱档;danger-full-access 可配、默认规则集为空
111
+ // 自然不含)。存储仿 prompt_overrides:settings 键 'approval_auto_rules' 存 JSON 数组,
112
+ // 独立编辑面(approvalRulesView / updateApprovalRules),不进 settingsView 单值键域。
113
+ export const APPROVAL_RULES_SETTING = 'approval_auto_rules'
114
+ export const APPROVAL_RULES_LIMIT = 50
115
+ // 规则可配的沙箱档:宿主 bash 族提权重试时的 sandbox_permissions 取值;空串 = 任意档。
116
+ export const APPROVAL_RULE_SANDBOXES = ['workspace-write', 'danger-full-access']
117
+
118
+ // 系统临时目录($TMPDIR):macOS 是 /var/folders/<user>/<hash>/T,名字不含 temp/tmp,
119
+ // 关键词 glob 覆盖不到——单独一行兜底;Linux 的 tmpdir() 就是 /tmp,已被覆盖就不重复一行。
120
+ const OS_TMPDIR = tmpdir().replace(/[/\\]+$/, '')
121
+
122
+ // 出厂预置默认规则(DSHBOTS-365 增量改口径):关键词 glob 三条——
123
+ // **/temp/**、**/.tmp/**、**/tmp/** 命中即免审(路径与命令同一套 glob 方言),
124
+ // 再加系统临时目录一行(未被关键词覆盖时)。预置行仍是普通规则行,owner 可自行删改。
125
+ const KEYWORD_APPROVAL_AUTO_RULES = [
126
+ { glob: '**/temp/**', key: 'temp' },
127
+ { glob: '**/.tmp/**', key: 'dot_tmp' },
128
+ { glob: '**/tmp/**', key: 'tmp' },
129
+ ]
130
+ const TMPDIR_COVERED = KEYWORD_APPROVAL_AUTO_RULES.some(item => approvalGlobMatch(item.glob, OS_TMPDIR))
131
+ export const DEFAULT_APPROVAL_AUTO_RULES = [
132
+ ...KEYWORD_APPROVAL_AUTO_RULES,
133
+ ...(TMPDIR_COVERED ? [] : [{ glob: `${OS_TMPDIR}/**`, key: 'tmpdir' }]),
134
+ ].map(item => ({
135
+ id: `arul_default_${item.key}`,
136
+ path_prefix: item.glob,
137
+ command: '',
138
+ bot_id: '',
139
+ tool_name: '',
140
+ sandbox: '',
141
+ note: '',
142
+ updated_at: nowIso(),
143
+ updated_by: 'system:preset',
144
+ }))
145
+
146
+ // 系统预置行的「出厂原样」形态:id → 可接受的路径形态(口径迭代换过形态的都列进来)。
147
+ // 迁移时按这张表认出仍是出厂样的预置行换成当前默认集合;owner 改过路径的预置行不在表内,
148
+ // 视为 owner 自有行保留。owner 自建行(id 不在这张表)同样保留。
149
+ const SYSTEM_PRESET_PATTERNS = new Map ([
150
+ ['arul_default_tmp', ['/tmp', '**/tmp/**']],
151
+ ['arul_default_private_tmp', ['/private/tmp']],
152
+ ['arul_default_var_tmp', ['/var/tmp']],
153
+ ['arul_default_tmpdir', [OS_TMPDIR, `${OS_TMPDIR}/**`]],
154
+ ['arul_default_home_dot_tmp', [join(homedir(), '.tmp').replace(/[/\\]+$/, '')]],
155
+ ['arul_default_home_tmp', [join(homedir(), 'tmp').replace(/[/\\]+$/, '')]],
156
+ ['arul_default_temp', ['**/temp/**']],
157
+ ['arul_default_dot_tmp', ['**/.tmp/**']],
158
+ ])
159
+
160
+ // settings 'approval_auto_rules' 解析:坏数据一律降级为空规则(不抛错,原卡流程兜底)。
161
+ export function parseApprovalRules(raw) {
162
+ let parsed
163
+ try {
164
+ parsed = JSON.parse(String(raw ?? ''))
165
+ } catch {
166
+ return []
167
+ }
168
+ if (!Array.isArray(parsed)) return []
169
+ return parsed.filter(item => item && typeof item === 'object')
170
+ }
171
+
172
+ // glob 方言(路径与命令共用):** 跨任意层级(含 '/')、* 跨任意字符但不跨 '/'、
173
+ // ? 单字符(不跨 '/')、其余按字面量;整串命中才算匹配。尾部 '/**' 额外允许匹配目录自身
174
+ // ('/tmp/**' 命中 '/tmp' 与 '/tmp/a/b',但不命中 '/tmpfoo')。
175
+ export function approvalGlobToRegExp(pattern) {
176
+ let text = String(pattern ?? '')
177
+ let tail = ''
178
+ if (text.endsWith('/**')) {
179
+ text = text.slice(0, -3)
180
+ tail = '(?:/.*)?'
181
+ }
182
+ let out = '^'
183
+ let index = 0
184
+ while (index < text.length) {
185
+ const char = text[index]
186
+ if (char === '*') {
187
+ const doubled = text[index + 1] === '*'
188
+ if (!doubled) {
189
+ out += '[^/]*'
190
+ index += 1
191
+ continue
192
+ }
193
+ index += 2
194
+ if (text[index] === '/') {
195
+ index += 1
196
+ out += '(?:.*/)?'
197
+ } else {
198
+ out += '.*'
199
+ }
200
+ continue
201
+ }
202
+ if (char === '?') {
203
+ out += '[^/]'
204
+ index += 1
205
+ continue
206
+ }
207
+ out += char.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
208
+ index += 1
209
+ }
210
+ return new RegExp(`${out}${tail}$`)
211
+ }
212
+
213
+ export function approvalGlobMatch(pattern, value) {
214
+ const text = String(value ?? '')
215
+ if (!String(pattern ?? '') || !text) return false
216
+ return approvalGlobToRegExp(pattern).test(text)
217
+ }
218
+
219
+ // 单条规则匹配(纯函数):目标为空不命中;主维度二选一命中即中——
220
+ // 路径规则与命令规则都用 glob 整串匹配;不含通配符的存量规则保留旧前缀语义
221
+ // (路径按目录边界、命令按词边界),口径切换不静默废掉已配规则。
222
+ // 辅维度留空 = 通配,填了必须精确相等。
223
+ export function approvalRuleMatches(rule, { botId, toolName, target, sandbox }) {
224
+ const value = String(target ?? '')
225
+ if (!value) return false
226
+ if (rule.bot_id && rule.bot_id !== botId) return false
227
+ if (rule.tool_name && rule.tool_name !== toolName) return false
228
+ if (rule.sandbox && rule.sandbox !== sandbox) return false
229
+ const pathPattern = String(rule.path_prefix ?? '').trim()
230
+ if (pathPattern && matchesRulePattern(pathPattern, value, 'path')) return true
231
+ const commandPattern = String(rule.command ?? '').trim()
232
+ if (commandPattern && matchesRulePattern(commandPattern, value, 'command')) return true
233
+ return false
234
+ }
235
+
236
+ // 含通配符 → glob;不含通配符 → 存量前缀语义(路径按目录边界、命令按词边界)。
237
+ function matchesRulePattern(pattern, value, dimension) {
238
+ if (/[*?]/.test(pattern)) return approvalGlobMatch(pattern, value)
239
+ if (dimension === 'path') return value === pattern || value.startsWith(`${pattern}/`)
240
+ return value === pattern || value.startsWith(`${pattern} `)
241
+ }
242
+
243
+ // 存量预置行迁移:仍是出厂原样的预置行换成当前默认集合(口径迭代换过形态的都算「原样」),
244
+ // owner 自建行与改过路径的预置行不动,显式清空 '[]' 依然永不回播。
245
+ // 返回迁移后的 JSON 字符串,无需迁移时返回 null。
246
+ export function migrateApprovalPresetRules(raw) {
247
+ let parsed
248
+ try {
249
+ parsed = JSON.parse(String(raw ?? ''))
250
+ } catch {
251
+ return null
252
+ }
253
+ if (!Array.isArray(parsed)) return null
254
+ const rows = parsed.filter(item => item && typeof item === 'object')
255
+ const isSystemPreset = row => {
256
+ const id = typeof row.id === 'string' ? row.id : ''
257
+ const patterns = SYSTEM_PRESET_PATTERNS.get(id)
258
+ if (!patterns || String(row.command ?? '').trim()) return false
259
+ const path = String(row.path_prefix ?? '').replace(/[/\\]+$/, '')
260
+ return patterns.some(pattern => pattern.replace(/[/\\]+$/, '') === path)
261
+ }
262
+ if (!rows.some(isSystemPreset)) return null
263
+ const firstIndex = rows.findIndex(isSystemPreset)
264
+ const kept = rows.filter(row => !isSystemPreset(row))
265
+ const before = rows.slice(0, firstIndex).filter(row => !isSystemPreset(row)).length
266
+ const presets = DEFAULT_APPROVAL_AUTO_RULES.map(rule => ({ ...rule }))
267
+ return JSON.stringify([...kept.slice(0, before), ...presets, ...kept.slice(before)])
268
+ }
269
+
93
270
  // 来源定位字段(DSHBOTS-240):审批行 → 来源群聊(项目名/KEY)+ 任务 ID/标识/标题。
94
271
  // 列表查询用 JOIN 一次取齐(approvalsPending / approvalsForProject / approvalsForBot 共用),
95
272
  // 避免逐行 N+1;缺任务时任务字段留空,不猜。
@@ -120,12 +297,14 @@ export const approvalsMethods = {
120
297
  const off = runtime.ctx.on('approval/request', (req, next) => this.handleApprovalRequest(req, next), { prepend: true })
121
298
  // approval/request 事件不带工具参数,目标取数只能从 tools/pre-execute 透传监听来:
122
299
  // 宿主先过 pre-execute 网关、gate 返回 ask 才发起审批,此刻 exec 里带着 callId/name/arguments。
123
- // 按 callId 记已提取目标(先提短串再掩码,只存小字符串),审批发起时一次性取走;超量 FIFO 驱逐。
300
+ // 按 callId 记已提取目标与目标沙箱档(DSHBOTS-365 辅维度;先提短串再掩码,只存小字符串),
301
+ // 审批发起时一次性取走;超量 FIFO 驱逐。
124
302
  const offPreExecute = runtime.ctx.on('tools/pre-execute', (exec, next) => {
125
303
  const callId = exec?.callId ? String(exec.callId) : ''
126
304
  const target = callId ? toolTargetOf(exec.arguments) : null
127
305
  if (callId && target) {
128
- this.approvalTargets.set(callId, this.maskSecretValues(target))
306
+ const sandbox = typeof exec.arguments?.sandbox_permissions === 'string' ? exec.arguments.sandbox_permissions : ''
307
+ this.approvalTargets.set(callId, { target: this.maskSecretValues(target), sandbox })
129
308
  if (this.approvalTargets.size > APPROVAL_TARGET_CACHE_LIMIT) {
130
309
  this.approvalTargets.delete(this.approvalTargets.keys().next().value)
131
310
  }
@@ -168,9 +347,11 @@ export const approvalsMethods = {
168
347
  const displayReason = req.displayReason?.zh ? this.maskSecretValues(String(req.displayReason.zh).slice(0, 2_000)) : null
169
348
  const reason = this.maskSecretValues(String(req.reason ?? '').slice(0, 2_000))
170
349
  // 本次调用的操作目标:pre-execute 阶段按 callId 记下,这里一次性取走(不留残页);没有则为 NULL,
171
- // UI 回退到从摘要正则猜测的旧口径。
350
+ // UI 回退到从摘要正则猜测的旧口径。sandbox 是目标沙箱档(免审规则辅维度,DSHBOTS-365)。
172
351
  const callId = req.callId ? String(req.callId) : null
173
- const toolTarget = callId ? (this.approvalTargets.get(callId) ?? null) : null
352
+ const cachedTarget = callId ? (this.approvalTargets.get(callId) ?? null) : null
353
+ const toolTarget = cachedTarget?.target ?? null
354
+ const targetSandbox = cachedTarget?.sandbox ?? ''
174
355
  if (callId) this.approvalTargets.delete(callId)
175
356
 
176
357
  store.run(
@@ -181,6 +362,21 @@ export const approvalsMethods = {
181
362
  createdAt, new Date(Date.parse(createdAt) + timeoutMs).toISOString(),
182
363
  )
183
364
 
365
+ // DSHBOTS-365 免审白名单:命中规则的提权请求不落待办卡、不发群聊锚点/微信转发/通知,
366
+ // 插件即时替 owner 应答 allowed-once。留痕两件套缺一不可:approvals 行 status='allowed'
367
+ // + decided_by='auto:rule:<id>'(复用 settleApproval,decided_at 同步落库),审计事件
368
+ // approval.auto_allow。每次调用一放行一结:规则每次现读,改规则即时生效,无持久授权。
369
+ // 不进 approvalPending、不挂超时 timer、不挂 abort 监听——超时与轮次中止对已决条目天然不触。
370
+ const autoRule = this.matchApprovalAutoRule({ botId: bot.id, toolName, target: toolTarget, sandbox: targetSandbox })
371
+ if (autoRule) {
372
+ this.settleApproval(approvalId, 'allowed', 'allowed-once', `auto:rule:${autoRule.id}`)
373
+ this.audit(
374
+ { type: 'system', id: 'system' }, 'approval.auto_allow', 'approval', approvalId,
375
+ { ruleId: autoRule.id, toolName, botId: bot.id, target: toolTarget },
376
+ )
377
+ return 'allowed-once'
378
+ }
379
+
184
380
  // 卡片锚点:群聊落 messages(kind=approval),单聊落 solo_messages(DSHBOTS-218)。
185
381
  // 状态渲染时查 approvals 表,消息体只是纯文本兜底,不承载状态。
186
382
  const summary = displayReason || reason || '请求执行需要授权的操作'
@@ -225,16 +421,22 @@ export const approvalsMethods = {
225
421
  },
226
422
 
227
423
  // 统一结算:清定时器、出 pending 表、写终态。hostAnswer 非空才向宿主应答(abort 分支不答)。
424
+ // 写库容错:结算可能由轮次取消的 abort 监听或超时定时器在插件重载(store.close())之后
425
+ // 迟到触发——曾在 abort 分发里裸抛 statement has been finalized,把整个 dsh 宿主打成 fatal 退出。
228
426
  settleApproval(approvalId, status, hostAnswer, decidedBy) {
229
427
  const pending = this.approvalPending?.get(approvalId)
230
428
  if (pending) {
231
429
  clearTimeout(pending.timer)
232
430
  this.approvalPending.delete(approvalId)
233
431
  }
234
- this.store.run(
235
- 'UPDATE approvals SET status = ?, decided_by = ?, decided_at = ? WHERE id = ? AND status = ?',
236
- status, decidedBy, nowIso(), approvalId, 'pending',
237
- )
432
+ try {
433
+ this.store.run(
434
+ 'UPDATE approvals SET status = ?, decided_by = ?, decided_at = ? WHERE id = ? AND status = ?',
435
+ status, decidedBy, nowIso(), approvalId, 'pending',
436
+ )
437
+ } catch (error ) {
438
+ this.logger?.warn?.('dsh-team: 审批结算写库失败(插件可能已重载): %s', error?.message ?? error)
439
+ }
238
440
  if (pending && hostAnswer) pending.resolve(hostAnswer)
239
441
  },
240
442
 
@@ -252,6 +454,72 @@ export const approvalsMethods = {
252
454
  return this.approvalView(this.store.get('SELECT * FROM approvals WHERE id = ?', approvalId))
253
455
  },
254
456
 
457
+ // 免审规则取数(DSHBOTS-365):每次现读现解析——无缓存,改规则对下一次提权请求即时生效。
458
+ approvalRulesView() {
459
+ return parseApprovalRules(this.store.setting(APPROVAL_RULES_SETTING, ''))
460
+ },
461
+
462
+ // 免审规则匹配入口:按规则表顺序首中即返(表序即优先级)。目标为空(无 callId 缓存)
463
+ // 一律不命中,保守回落原卡流程。
464
+ matchApprovalAutoRule(input) {
465
+ const target = String(input.target ?? '')
466
+ if (!target) return null
467
+ for (const rule of this.approvalRulesView()) {
468
+ if (approvalRuleMatches(rule, input)) return rule
469
+ }
470
+ return null
471
+ },
472
+
473
+ // 免审规则保存(DSHBOTS-365):独立编辑面(仿 updatePromptSegment 先例),仅 type=user
474
+ // 可写——bot 写免审规则必须被拒,维持「bot 不能自批」边界。整表替换(UI 全量收集后提交),
475
+ // 逐条校验:主维度至少一项、路径前缀必须是绝对路径、sandbox 档枚举收口、bot 必须存在。
476
+ // 保存即审计;id 复用已有(编辑保 id),新条目发 arul_*。
477
+ async updateApprovalRules(rulesInput, actor = this.actor()) {
478
+ if (actor?.type !== 'user') throw forbidden('仅工作台 owner 可配置审批免审规则,bot 不能自批')
479
+ if (!Array.isArray(rulesInput)) throw badRequest('免审规则必须是数组')
480
+ if (rulesInput.length > APPROVAL_RULES_LIMIT) throw badRequest(`免审规则最多 ${APPROVAL_RULES_LIMIT} 条`)
481
+ const knownIds = new Set(this.approvalRulesView().map(rule => rule.id))
482
+ const usedIds = new Set ()
483
+ const rules = rulesInput.map((raw, index) => {
484
+ const item = raw && typeof raw === 'object' ? raw : {}
485
+ const label = `第 ${index + 1} 条规则`
486
+ const pathPrefix = String(item.path_prefix ?? '').trim().replace(/\/+$/, '')
487
+ const command = String(item.command ?? '').trim().split('\n')[0].trim().slice(0, 200)
488
+ if (!pathPrefix && !command) throw badRequest(`${label}缺少路径规则或命令规则(至少填一项)`)
489
+ // 路径规则:绝对路径,或含通配符的 glob(关键词规则如 **/tmp/** 不必是绝对路径)。
490
+ if (pathPrefix && !pathPrefix.startsWith('/') && !/[*?]/.test(pathPrefix)) {
491
+ throw badRequest(`${label}路径规则必须是以 / 开头的绝对路径或含通配符的 glob`)
492
+ }
493
+ if (pathPrefix.length > 500) throw badRequest(`${label}路径规则超长(上限 500 字符)`)
494
+ const botId = String(item.bot_id ?? '').trim()
495
+ if (botId && !this.store.get('SELECT id FROM bots WHERE id = ?', botId)) throw badRequest(`${label}限定的 Bot 不存在`)
496
+ const sandbox = String(item.sandbox ?? '').trim()
497
+ if (sandbox && !APPROVAL_RULE_SANDBOXES.includes(sandbox)) {
498
+ throw badRequest(`${label}沙箱档必须是 ${APPROVAL_RULE_SANDBOXES.join('/')} 或留空`)
499
+ }
500
+ // id 复用已有(编辑保 id);新条目或输入撞 id(重复行)一律发新 id,保证表内 id 唯一。
501
+ let ruleId = item.id && knownIds.has(String(item.id)) && !usedIds.has(String(item.id)) ? String(item.id) : id('arul')
502
+ usedIds.add(ruleId)
503
+ return {
504
+ id: ruleId,
505
+ path_prefix: pathPrefix,
506
+ command,
507
+ bot_id: botId,
508
+ tool_name: String(item.tool_name ?? '').trim().slice(0, 100),
509
+ sandbox,
510
+ note: String(item.note ?? '').trim().slice(0, 200),
511
+ updated_at: nowIso(),
512
+ updated_by: `${actor.type}:${actor.id}`,
513
+ }
514
+ })
515
+ this.store.setSetting(APPROVAL_RULES_SETTING, JSON.stringify(rules))
516
+ this.audit(actor, 'approval_rules.update', 'settings', APPROVAL_RULES_SETTING, {
517
+ count: rules.length,
518
+ rules: rules.map(rule => ({ id: rule.id, path_prefix: rule.path_prefix, command: rule.command, sandbox: rule.sandbox })),
519
+ })
520
+ return this.approvalRulesView()
521
+ },
522
+
255
523
  // 目标展示形:绝对路径落在项目工作区内且剩余段非空、不含空白时收成相对路径(chip 少占宽);
256
524
  // 命令、带空白的路径或库外路径原样返回。title 层恒用原始值,鼠标悬停可见全貌。
257
525
  toolTargetDisplay(target) {
@@ -97,6 +97,17 @@ export function quotaRouteFor(bot , primary , fallback ) {
97
97
  return { mode: 'wait' , provider: primary.provider, resetAt: primary.resetAt }
98
98
  }
99
99
 
100
+ // 更严的一条额度记录(DSHBOTS-358):耗尽状态优先,其次恢复时间更晚者。
101
+ // Bot 换 provider 时用于合并旧键与新键的记录,避免迁移把正在生效的墙抹掉。
102
+ function stricterQuotaRow(a , b ) {
103
+ const aExhausted = quotaRowState(a).exhausted
104
+ const bExhausted = quotaRowState(b).exhausted
105
+ if (aExhausted !== bExhausted) return aExhausted ? a : b
106
+ const aAt = a?.reset_at ? Date.parse(a.reset_at) : 0
107
+ const bAt = b?.reset_at ? Date.parse(b.reset_at) : 0
108
+ return aAt >= bAt ? a : b
109
+ }
110
+
100
111
  export const botQuotaMethods = {
101
112
  // 单套 provider 的额度状态视图。provider 为空(bot 未配主模型)时视为无限制。
102
113
  botQuotaState(botId , provider ) {
@@ -223,6 +234,49 @@ export const botQuotaMethods = {
223
234
  return quotaRouteFor(bot, primary, fallback)
224
235
  },
225
236
 
237
+ // 换 provider 时迁移额度记录(DSHBOTS-358):额度墙按 (bot, provider) 存,
238
+ // Bot 改用别的 provider 后旧键会成孤儿(永远查不到、也永远清不掉)。
239
+ // 迁移口径:目标 provider 无记录 → 直接改键;目标已有记录 → 保留更严的一条(不抹掉
240
+ // 正在生效的墙),删掉旧键。仅 provider 真变才动,并落一条操作日志。
241
+ migrateBotQuotaProvider(botId , fromProvider , toProvider , actor = this.actor()) {
242
+ if (!botId || !fromProvider || !toProvider || fromProvider === toProvider) return null
243
+ const oldRow = this.store.get('SELECT * FROM bot_quota WHERE bot_id = ? AND provider = ?', botId, fromProvider)
244
+ const newRow = this.store.get('SELECT * FROM bot_quota WHERE bot_id = ? AND provider = ?', botId, toProvider)
245
+ if (!oldRow && !newRow) {
246
+ this.audit(actor, 'bot.quota_provider_changed', 'bot', botId, {
247
+ from: fromProvider, to: toProvider, migrated: false,
248
+ })
249
+ return null
250
+ }
251
+ const now = nowIso()
252
+ this.store.transaction(() => {
253
+ if (oldRow) {
254
+ if (!newRow) {
255
+ this.store.run(
256
+ 'UPDATE bot_quota SET provider = ?, updated_at = ? WHERE bot_id = ? AND provider = ?',
257
+ toProvider, now, botId, fromProvider,
258
+ )
259
+ } else {
260
+ const keep = stricterQuotaRow(oldRow, newRow)
261
+ if (keep === oldRow) {
262
+ this.store.run(
263
+ `UPDATE bot_quota SET state = ?, exhausted_at = ?, reset_at = ?, reset_source = ?, released_at = NULL,
264
+ released_by = NULL, error_code = ?, error_message = ?, updated_at = ?
265
+ WHERE bot_id = ? AND provider = ?`,
266
+ keep.state, keep.exhausted_at, keep.reset_at, keep.reset_source,
267
+ keep.error_code ?? null, keep.error_message ?? null, now, botId, toProvider,
268
+ )
269
+ }
270
+ this.store.run('DELETE FROM bot_quota WHERE bot_id = ? AND provider = ?', botId, fromProvider)
271
+ }
272
+ }
273
+ this.audit(actor, 'bot.quota_provider_changed', 'bot', botId, {
274
+ from: fromProvider, to: toProvider, migrated: Boolean(oldRow),
275
+ })
276
+ })
277
+ return this.botQuotaState(botId, toProvider)
278
+ },
279
+
226
280
  // 解析 bot 标识(id 或 name),供 director 工具按名字解除。
227
281
  resolveBotForQuota(input ) {
228
282
  const raw = String(input ?? '').trim()
@@ -288,6 +288,14 @@ export const botsMethods = {
288
288
  fields.push('provider = ?', 'model = ?', 'effort = ?', 'updated_at = ?')
289
289
  values.push(provider, model, effort, nowIso())
290
290
  this.store.run(`UPDATE bots SET ${fields.join(', ')} WHERE id = ?`, ...values, botId)
291
+ // DSHBOTS-358:provider 真变时迁移该 bot 的额度记录——额度墙按 (bot, provider) 存,
292
+ // 改 provider 后旧键会成孤儿。迁移保留更严的一条,不抹掉正在生效的墙。
293
+ if (provider !== bot.provider) {
294
+ this.migrateBotQuotaProvider(botId, bot.provider, provider, actor)
295
+ }
296
+ if (fallbackProvider !== bot.fallback_provider) {
297
+ this.migrateBotQuotaProvider(botId, bot.fallback_provider, fallbackProvider, actor)
298
+ }
291
299
  if (!snapshotUnchanged) {
292
300
  const version = (Number(bot.current_revision) || 0) + 1
293
301
  this.store.run(