dsh-team-bots 0.2.289 → 0.2.347
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/README.md +60 -122
- package/docs/README.zh.md +61 -123
- 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/tasks.png +0 -0
- package/docs/assets/tasks.zh.png +0 -0
- package/docs/assets/usage-redesign-global.png +0 -0
- package/docs/assets/usage.png +0 -0
- package/docs/assets/usage.zh.png +0 -0
- package/package.json +17 -5
- package/scripts/doctor.mjs +4 -4
- package/src/api.js +6 -3
- package/src/botmsg.js +1 -1
- package/src/config.js +18 -8
- package/src/db-migrations.js +76 -9
- package/src/db.js +28 -2
- package/src/http.js +22 -3
- package/src/paths.js +32 -1
- package/src/pricing.js +2 -2
- package/src/runtime.js +1 -1
- package/src/secrets.js +4 -4
- package/src/service.js +14 -5
- package/src/services/approvals.js +109 -24
- package/src/services/backoff.js +34 -0
- package/src/services/bot-quota.js +242 -0
- package/src/services/bots.js +35 -6
- package/src/services/chat.js +15 -9
- package/src/services/core.js +33 -5
- package/src/services/hygiene.js +8 -4
- package/src/services/locale.js +17 -0
- package/src/services/memory.js +112 -1
- package/src/services/message-images.js +3 -3
- package/src/services/notify.js +169 -0
- package/src/services/projects.js +119 -10
- package/src/services/proposals.js +2 -3
- package/src/services/questions.js +75 -32
- package/src/services/review-watchdog.js +261 -30
- package/src/services/run-finish.js +186 -17
- package/src/services/runs.js +42 -13
- package/src/services/runtime/lifecycle.js +3 -1
- package/src/services/runtime/model-restore.js +5 -5
- package/src/services/runtime/prompt.js +106 -45
- package/src/services/runtime/session.js +38 -14
- package/src/services/runtime/trajectory.js +1 -1
- package/src/services/scheduler.js +146 -19
- package/src/services/secrets.js +1 -1
- package/src/services/system.js +23 -6
- package/src/services/task-dispatch.js +315 -0
- package/src/services/task-notify.js +55 -11
- package/src/services/task-runs.js +179 -0
- package/src/services/task-stage.js +4 -0
- package/src/services/tasks.js +51 -399
- package/src/services/terminal.js +2 -2
- package/src/services/vision-proxy.js +3 -3
- package/src/services/wechat.js +228 -7
- package/src/services/workspace-groups.js +4 -3
- package/src/skill-parse.js +1 -1
- package/src/skills.js +1 -1
- package/src/tools.js +275 -6
- package/src/updater.js +52 -0
- package/src/usage-reconcile.js +1 -1
- package/src/usage.js +52 -11
- package/src/wechat/channel.js +14 -20
- package/src/wechat/commands.js +129 -81
- package/src/wechat/format.js +247 -0
- package/src/wechat/store.js +30 -2
- package/ui/app.js +57 -53
- package/ui/i18n/en/chat.js +140 -0
- package/ui/i18n/en/common.js +187 -0
- package/ui/i18n/en/nav.js +89 -0
- package/ui/i18n/en/settings.js +352 -0
- package/ui/i18n/en/tasks.js +229 -0
- package/ui/i18n/en/usage.js +141 -0
- package/ui/i18n/en/wechat.js +23 -0
- package/ui/i18n/en.js +17 -237
- package/ui/i18n/zh/chat.js +140 -0
- package/ui/i18n/zh/common.js +187 -0
- package/ui/i18n/zh/nav.js +89 -0
- package/ui/i18n/zh/settings.js +352 -0
- package/ui/i18n/zh/tasks.js +229 -0
- package/ui/i18n/zh/usage.js +141 -0
- package/ui/i18n/zh/wechat.js +23 -0
- package/ui/i18n/zh.js +17 -236
- package/ui/modules/api.js +4 -3
- package/ui/modules/bot-quota.js +27 -0
- package/ui/modules/cards.js +96 -58
- package/ui/modules/chat.js +28 -30
- package/ui/modules/composer.js +41 -37
- package/ui/modules/dom-morph.js +292 -0
- package/ui/modules/events-board.js +22 -22
- package/ui/modules/events-click.js +100 -68
- package/ui/modules/events-misc.js +34 -34
- package/ui/modules/events-submit.js +28 -28
- package/ui/modules/global-pages.js +125 -116
- package/ui/modules/i18n.js +0 -5
- package/ui/modules/icons.js +0 -1
- package/ui/modules/markdown.js +1 -1
- package/ui/modules/modal-forms.js +196 -203
- package/ui/modules/modal-layer.js +6 -9
- package/ui/modules/page-shell.js +62 -0
- package/ui/modules/settings.js +211 -198
- package/ui/modules/solo-archive.js +0 -4
- package/ui/modules/state.js +57 -50
- package/ui/modules/tasks.js +167 -171
- package/ui/modules/typing-linger.js +1 -4
- package/ui/modules/usage.js +65 -78
- package/ui/modules/util.js +92 -25
- package/ui/styles/avatars.css +14 -0
- package/ui/styles/cards.css +49 -0
- package/ui/styles/chat-cards.css +17 -21
- package/ui/styles/global-config.css +56 -2
- package/ui/styles/modal.css +13 -0
- package/ui/styles/usage.css +3 -61
- package/CONTRIBUTING.md +0 -20
- package/docs/assets/usage-dark.png +0 -0
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
// DSHBOTS-32 群聊审批:宿主 approval/request waterfall 的插件侧应答器。
|
|
2
|
-
//
|
|
3
|
-
//
|
|
2
|
+
// 认领 session_bindings 命中的 bot 会话:绑定到项目的走群聊卡片;绑定为单聊(kind='solo'、
|
|
3
|
+
// project_id 为空)的走单聊卡片(DSHBOTS-218);其余 next() 透传(人类会话审批继续走 Web UI)。
|
|
4
|
+
// 决策权仅用户(type=user)持有,bot 一律 forbidden 不能自批;pending 之外拒绝重复应答,动作写审计。
|
|
4
5
|
// 注意:本域自管迁移(db.js 已贴 800 行上限,一行不加),手法与 db.js 的 addColumn/recordMigration 一致。
|
|
5
6
|
import { badRequest, conflict, forbidden, notFound } from '../errors.js'
|
|
6
7
|
import { id, nowIso } from '../util.js'
|
|
8
|
+
import { columnNotNull, rebuildTable } from '../db-migrations.js'
|
|
7
9
|
|
|
8
|
-
|
|
9
|
-
|
|
10
|
+
// project_id 可空:单聊会话没有项目归属(DSHBOTS-218),卡片锚点改落 solo_messages。
|
|
11
|
+
const APPROVALS_TABLE_DDL = `
|
|
10
12
|
id TEXT PRIMARY KEY,
|
|
11
|
-
project_id TEXT
|
|
13
|
+
project_id TEXT REFERENCES projects(id) ON DELETE CASCADE,
|
|
12
14
|
run_id TEXT,
|
|
13
15
|
bot_id TEXT NOT NULL,
|
|
14
16
|
session_id TEXT,
|
|
@@ -22,7 +24,9 @@ CREATE TABLE IF NOT EXISTS approvals (
|
|
|
22
24
|
decided_at TEXT,
|
|
23
25
|
created_at TEXT NOT NULL,
|
|
24
26
|
expires_at TEXT NOT NULL
|
|
25
|
-
|
|
27
|
+
`
|
|
28
|
+
const APPROVALS_DDL = `
|
|
29
|
+
CREATE TABLE IF NOT EXISTS approvals (${APPROVALS_TABLE_DDL});
|
|
26
30
|
CREATE INDEX IF NOT EXISTS approvals_status_idx ON approvals(status, created_at);
|
|
27
31
|
CREATE INDEX IF NOT EXISTS approvals_project_idx ON approvals(project_id, created_at);
|
|
28
32
|
`
|
|
@@ -31,6 +35,12 @@ CREATE INDEX IF NOT EXISTS approvals_project_idx ON approvals(project_id, create
|
|
|
31
35
|
// 重启清理也在此——宿主侧请求随进程消失,不可能再被应答,库里残留的 pending 一律置 timeout。
|
|
32
36
|
export function ensureApprovalSchema(store) {
|
|
33
37
|
store.exec(APPROVALS_DDL)
|
|
38
|
+
// 旧库 approvals.project_id 是 NOT NULL(群聊专用时期),单聊会话无处归属:重建放宽为可空。
|
|
39
|
+
if (columnNotNull(store.db, 'approvals', 'project_id')) {
|
|
40
|
+
rebuildTable(store.db, 'approvals', `CREATE TABLE approvals (${APPROVALS_TABLE_DDL})`)
|
|
41
|
+
store.exec('CREATE INDEX IF NOT EXISTS approvals_status_idx ON approvals(status, created_at)')
|
|
42
|
+
store.exec('CREATE INDEX IF NOT EXISTS approvals_project_idx ON approvals(project_id, created_at)')
|
|
43
|
+
}
|
|
34
44
|
const messageColumns = store.all('PRAGMA table_info(messages)').map(column => column.name)
|
|
35
45
|
if (!messageColumns.includes('kind')) {
|
|
36
46
|
store.exec("ALTER TABLE messages ADD COLUMN kind TEXT NOT NULL DEFAULT 'text'")
|
|
@@ -78,6 +88,20 @@ export function toolTargetOf(arguments_) {
|
|
|
78
88
|
// pre-execute 目标缓存上限:只记最近若干次调用的目标,防长会话里无界增长。
|
|
79
89
|
const APPROVAL_TARGET_CACHE_LIMIT = 200
|
|
80
90
|
|
|
91
|
+
// 来源定位字段(DSHBOTS-240):审批行 → 来源群聊(项目名/KEY)+ 任务 ID/标识/标题。
|
|
92
|
+
// 列表查询用 JOIN 一次取齐(approvalsPending / approvalsForProject / approvalsForBot 共用),
|
|
93
|
+
// 避免逐行 N+1;缺任务时任务字段留空,不猜。
|
|
94
|
+
function approvalSourceFields(row) {
|
|
95
|
+
const key = row.project_key ?? ''
|
|
96
|
+
return {
|
|
97
|
+
projectName: row.project_name ?? '',
|
|
98
|
+
projectKey: key,
|
|
99
|
+
taskId: row.task_id ?? null,
|
|
100
|
+
taskIdentifier: row.task_id ? `${row.task_project_key ?? key ?? 'T'}-${row.task_number}` : null,
|
|
101
|
+
taskTitle: row.task_title ?? null,
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
|
|
81
105
|
export const approvalsMethods = {
|
|
82
106
|
// 由 core.attachRuntime 调用:注册宿主事件。runtime.ctx 不存在(测试桩)时跳过注册,
|
|
83
107
|
// 但 pending Map 无条件初始化——handleApprovalRequest 直调(测试)也依赖它。
|
|
@@ -115,19 +139,22 @@ export const approvalsMethods = {
|
|
|
115
139
|
}, 'dsh-team: approval request binding')
|
|
116
140
|
},
|
|
117
141
|
|
|
118
|
-
// waterfall 监听器:命中 bot
|
|
142
|
+
// waterfall 监听器:命中 bot 会话且绑定到项目才认领走群聊卡片;单聊会话(kind='solo'、
|
|
143
|
+
// project_id 为空)由工作台单聊卡片承接(DSHBOTS-218);其余(未绑定、bot 间私信)透传。
|
|
119
144
|
async handleApprovalRequest(req, next) {
|
|
120
145
|
const sessionId = req?.agent?.session?.id
|
|
121
146
|
// bindingOfSession 在 DshRuntime 原型上,服务层拿不到 this 绑定,这里直查同款 SQL。
|
|
122
147
|
const binding = sessionId
|
|
123
148
|
? this.store.get('SELECT * FROM session_bindings WHERE session_id = ?', sessionId)
|
|
124
149
|
: undefined
|
|
125
|
-
if (!binding
|
|
150
|
+
if (!binding) return next()
|
|
126
151
|
|
|
127
152
|
const store = this.store
|
|
153
|
+
const isSolo = binding.kind === 'solo' && !binding.project_id
|
|
154
|
+
if (!binding.project_id && !isSolo) return next()
|
|
128
155
|
const bot = store.get('SELECT * FROM bots WHERE id = ?', binding.bot_id)
|
|
129
|
-
const project = store.get('SELECT * FROM projects WHERE id = ?', binding.project_id)
|
|
130
|
-
if (!bot || !project) return next()
|
|
156
|
+
const project = isSolo ? null : store.get('SELECT * FROM projects WHERE id = ?', binding.project_id)
|
|
157
|
+
if (!bot || (!isSolo && !project)) return next()
|
|
131
158
|
|
|
132
159
|
const run = store.get('SELECT id FROM runs WHERE session_id = ? ORDER BY queued_at DESC LIMIT 1', sessionId)
|
|
133
160
|
const timeoutMs = this.config.approvalTimeoutMs
|
|
@@ -146,20 +173,39 @@ export const approvalsMethods = {
|
|
|
146
173
|
store.run(
|
|
147
174
|
`INSERT INTO approvals(id, project_id, run_id, bot_id, session_id, tool_name, call_id, reason, display_reason, tool_target, status, created_at, expires_at)
|
|
148
175
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending', ?, ?)`,
|
|
149
|
-
approvalId, project
|
|
176
|
+
approvalId, project?.id ?? null, run?.id ?? null, bot.id, sessionId,
|
|
150
177
|
toolName, callId, reason, displayReason, toolTarget,
|
|
151
178
|
createdAt, new Date(Date.parse(createdAt) + timeoutMs).toISOString(),
|
|
152
179
|
)
|
|
153
180
|
|
|
154
|
-
//
|
|
155
|
-
|
|
181
|
+
// 卡片锚点:群聊落 messages(kind=approval),单聊落 solo_messages(DSHBOTS-218)。
|
|
182
|
+
// 状态渲染时查 approvals 表,消息体只是纯文本兜底,不承载状态。
|
|
156
183
|
const summary = displayReason || reason || '请求执行需要授权的操作'
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
184
|
+
const anchorBody = `【审批请求】${bot.name} 请求使用 ${toolName}:${summary}`
|
|
185
|
+
if (isSolo) {
|
|
186
|
+
this.insertSoloMessage?.({
|
|
187
|
+
botId: bot.id, senderType: 'system', senderId: 'system',
|
|
188
|
+
body: anchorBody, runId: run?.id ?? null, createdAt, kind: 'approval', approvalId,
|
|
189
|
+
})
|
|
190
|
+
} else {
|
|
191
|
+
const group = this.groupOf(project.id)
|
|
192
|
+
store.run(
|
|
193
|
+
`INSERT INTO messages(id, project_id, group_chat_id, sender_type, sender_id, body, mentions_json, kind, approval_id, created_at)
|
|
194
|
+
VALUES (?, ?, ?, 'system', ?, ?, '[]', 'approval', ?, ?)`,
|
|
195
|
+
id('msg'), project.id, group?.id ?? null, bot.id, anchorBody, approvalId, createdAt,
|
|
196
|
+
)
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
// DSHBOTS-215 问答回路:审批转发微信管理员(通道可用时)。只推纯文本镜像,
|
|
200
|
+
// 状态仍由群卡片/工作台承载;管理员决定经「批 <token> 允许|拒绝」路由回本条目。
|
|
201
|
+
// 单聊没有项目语境,不转发(微信侧只服务项目管理者)。
|
|
202
|
+
if (project) {
|
|
203
|
+
try {
|
|
204
|
+
this.wechatApproval?.(project, { id: approvalId, bot_name: bot.name, tool_name: toolName, reason: summary })
|
|
205
|
+
} catch (error ) {
|
|
206
|
+
this.logger?.warn?.('dsh-team: 微信审批转发失败: %s', error?.message ?? error)
|
|
207
|
+
}
|
|
208
|
+
}
|
|
163
209
|
|
|
164
210
|
return new Promise(resolve => {
|
|
165
211
|
this.approvalPending ??= new Map()
|
|
@@ -221,33 +267,72 @@ export const approvalsMethods = {
|
|
|
221
267
|
...row,
|
|
222
268
|
botName: bot?.name ?? 'Bot',
|
|
223
269
|
tool_target_display: row.tool_target ? this.toolTargetDisplay(row.tool_target) : null,
|
|
270
|
+
// 会话归属(DSHBOTS-218):单聊审批没有项目,UI 据此显示来源列并决定跳转目标。
|
|
271
|
+
scope: row.project_id ? 'project' : 'solo',
|
|
224
272
|
remainingMs: row.status === 'pending' ? Math.max(0, expiresAt - Date.now()) : 0,
|
|
225
273
|
}
|
|
226
274
|
},
|
|
227
275
|
|
|
228
276
|
// state 视图的待审批条目:pending 在前(按创建时间倒序),已决的跟在后面供卡片回显结果。
|
|
277
|
+
// 来源定位字段同 approvalsPending(DSHBOTS-240):桌面通知与顶部通知共用同一套取数口径。
|
|
229
278
|
approvalsForProject(projectId) {
|
|
230
279
|
const rows = this.store.all(
|
|
231
|
-
`SELECT
|
|
232
|
-
|
|
280
|
+
`SELECT a.*, p.name AS project_name, p.key AS project_key,
|
|
281
|
+
t.id AS task_id, t.number AS task_number, t.title AS task_title, tp.key AS task_project_key
|
|
282
|
+
FROM approvals a
|
|
283
|
+
LEFT JOIN projects p ON p.id = a.project_id
|
|
284
|
+
LEFT JOIN runs r ON r.id = a.run_id
|
|
285
|
+
LEFT JOIN tasks t ON t.id = r.task_id
|
|
286
|
+
LEFT JOIN projects tp ON tp.id = t.project_id
|
|
287
|
+
WHERE a.project_id = ?
|
|
288
|
+
ORDER BY CASE a.status WHEN 'pending' THEN 0 ELSE 1 END, a.created_at DESC LIMIT 30`,
|
|
233
289
|
projectId,
|
|
234
290
|
)
|
|
235
|
-
return rows.map(row => this.approvalView(row))
|
|
291
|
+
return rows.map(row => ({ ...this.approvalView(row), ...approvalSourceFields(row) }))
|
|
292
|
+
},
|
|
293
|
+
|
|
294
|
+
// 单聊视图的待审批条目(DSHBOTS-218):口径与 approvalsForProject 一致,按 bot 取项目外条目。
|
|
295
|
+
approvalsForBot(botId) {
|
|
296
|
+
const rows = this.store.all(
|
|
297
|
+
`SELECT a.*, p.name AS project_name, p.key AS project_key,
|
|
298
|
+
t.id AS task_id, t.number AS task_number, t.title AS task_title, tp.key AS task_project_key
|
|
299
|
+
FROM approvals a
|
|
300
|
+
LEFT JOIN projects p ON p.id = a.project_id
|
|
301
|
+
LEFT JOIN runs r ON r.id = a.run_id
|
|
302
|
+
LEFT JOIN tasks t ON t.id = r.task_id
|
|
303
|
+
LEFT JOIN projects tp ON tp.id = t.project_id
|
|
304
|
+
WHERE a.project_id IS NULL AND a.bot_id = ?
|
|
305
|
+
ORDER BY CASE a.status WHEN 'pending' THEN 0 ELSE 1 END, a.created_at DESC LIMIT 30`,
|
|
306
|
+
botId,
|
|
307
|
+
)
|
|
308
|
+
return rows.map(row => ({ ...this.approvalView(row), ...approvalSourceFields(row) }))
|
|
236
309
|
},
|
|
237
310
|
|
|
238
311
|
// 全局待审视图(DSHBOTS-102):跨项目聚合 status='pending',按创建时间倒序。
|
|
239
312
|
// count 是全库 pending 总数(徽标口径,已决一律不计),items 最多 50 条供顶部入口列明细。
|
|
240
313
|
// 明细带项目名,用户不在该项目群聊页也能看到「谁、在哪个项目、要什么、还剩多久」。
|
|
314
|
+
// scope 区分项目群聊 / 单聊(DSHBOTS-218):顶部入口据此决定点击后跳哪个会话。
|
|
315
|
+
// 来源定位(DSHBOTS-240):额外带项目 key 与任务标识/标题——顶部跨会话审批通知要让
|
|
316
|
+
// owner 不跳转就能判断「该批谁」。run_id → runs.task_id → tasks 两次主键连接,缺任务留空。
|
|
241
317
|
approvalsPending(limit = 50) {
|
|
242
318
|
const rows = this.store.all(
|
|
243
|
-
`SELECT a.*, p.name AS project_name
|
|
319
|
+
`SELECT a.*, p.name AS project_name, p.key AS project_key,
|
|
320
|
+
t.id AS task_id, t.number AS task_number, t.title AS task_title, tp.key AS task_project_key
|
|
321
|
+
FROM approvals a
|
|
322
|
+
LEFT JOIN projects p ON p.id = a.project_id
|
|
323
|
+
LEFT JOIN runs r ON r.id = a.run_id
|
|
324
|
+
LEFT JOIN tasks t ON t.id = r.task_id
|
|
325
|
+
LEFT JOIN projects tp ON tp.id = t.project_id
|
|
244
326
|
WHERE a.status = 'pending' ORDER BY a.created_at DESC LIMIT ?`,
|
|
245
327
|
limit,
|
|
246
328
|
)
|
|
247
329
|
const count = Number(this.store.get("SELECT COUNT(*) AS count FROM approvals WHERE status = 'pending'")?.count ?? 0)
|
|
248
330
|
return {
|
|
249
331
|
count,
|
|
250
|
-
items: rows.map(row => ({
|
|
332
|
+
items: rows.map(row => ({
|
|
333
|
+
...this.approvalView(row),
|
|
334
|
+
...approvalSourceFields(row),
|
|
335
|
+
})),
|
|
251
336
|
}
|
|
252
337
|
},
|
|
253
338
|
}
|
package/src/services/backoff.js
CHANGED
|
@@ -90,3 +90,37 @@ export function needsSynthesizedBackoff(error) {
|
|
|
90
90
|
if (isQuotaExhausted(error)) return false
|
|
91
91
|
return isRateLimitError(error) && !(Number(error?.retryAfterMs) > 0)
|
|
92
92
|
}
|
|
93
|
+
|
|
94
|
+
// ── 网络瞬态失败(DSHBOTS-266)──────────────────────────────────────────────
|
|
95
|
+
// provider 网络抖动(连接重置/超时/5xx 等)是过性失败:退避后重打大概率自愈,
|
|
96
|
+
// 直接常规失败转 blocked 等 owner 手动重试是误伤。判定只接住限流/额度分类漏掉的
|
|
97
|
+
// 过性错误——优先级:额度耗尽 > 限流码 > 瞬态(429 仍走限流路径吃服务端 retry_after)。
|
|
98
|
+
// 正则参考 dsh-superagent-prototype executor/dsh.ts 的 PASSING(去掉 429 与 rate limit:
|
|
99
|
+
// 那两个信号归限流分类,瞬态不抢)。错误码与错误正文双重匹配,任一命中即可。
|
|
100
|
+
// 数字锚点只对数字设界:HTTP_503 / status 502 命中,1408 / 75038 之类的长数字不误伤。
|
|
101
|
+
export const TRANSIENT_PATTERN = /(ECONNRESET|ECONNREFUSED|ETIMEDOUT|EAI_AGAIN|EPIPE|UND_ERR|socket hang up|fetch failed|overloaded|(?<!\d)408(?!\d)|(?<!\d)50[0-4](?!\d))/i
|
|
102
|
+
|
|
103
|
+
// 瞬态退避时长:15s / 30s / 60s(15s × 2^(n-1),attempt 缺失或非法按 1 计)。
|
|
104
|
+
// 比限流链(1min 起步)短——网络抖动通常秒级自愈;重试上限复用 MAX_RATE_LIMIT_RETRIES=3。
|
|
105
|
+
export function transientBackoffMs(attempt) {
|
|
106
|
+
const n = Math.max(1, Number(attempt) || 1)
|
|
107
|
+
return 15_000 * 2 ** (n - 1)
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
// 这次失败是不是网络瞬态。限流码与额度耗尽先排除(各自走既有路径)。
|
|
111
|
+
export function isTransientNetworkError(error) {
|
|
112
|
+
if (isRateLimitError(error)) return false
|
|
113
|
+
if (isQuotaExhausted(error)) return false
|
|
114
|
+
return TRANSIENT_PATTERN.test(`${String(error?.code ?? '')} ${String(error?.message ?? '')}`)
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
// 瞬态失败且 provider 没给可用的 Retry-After → 需要合成指数退避(真 Retry-After 优先)。
|
|
118
|
+
export function needsTransientBackoff(error) {
|
|
119
|
+
return isTransientNetworkError(error) && !(Number(error?.retryAfterMs) > 0)
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
// 这次失败是否进「退避等待 → plan_retry 到期派生」既有重试链(限流或网络瞬态)。
|
|
123
|
+
export function isRetryChainError(error) {
|
|
124
|
+
if (isQuotaExhausted(error)) return false
|
|
125
|
+
return isRateLimitError(error) || isTransientNetworkError(error)
|
|
126
|
+
}
|
|
@@ -0,0 +1,242 @@
|
|
|
1
|
+
// src/services/bot-quota.ts —— Bot 额度墙状态域(DSHBOTS-241)
|
|
2
|
+
// provider 额度墙(已达限额)是 bot 级状态:主 provider 耗尽时,耗尽期内的新任务派发
|
|
3
|
+
// 直接走备用模型(备用 provider 同样耗尽则排队等待),恢复时间过后自动回主模型。
|
|
4
|
+
// 状态按 (bot, provider) 存:主备 provider 是两套额度,互相不能顶替。
|
|
5
|
+
// 方法挂在 TeamService 原型上(见 src/service.ts 的 defineMethods 调用)。
|
|
6
|
+
|
|
7
|
+
import { badRequest, forbidden, notFound } from '../errors.js'
|
|
8
|
+
import { nowIso, text } from '../util.js'
|
|
9
|
+
|
|
10
|
+
// 解析失败时的保守等待窗口:与网关「5 小时使用上限」同口径。
|
|
11
|
+
// 选保守等待而非「立即可用」:后者会让新任务继续撞同一堵墙;需要提前恢复时走人工解除入口。
|
|
12
|
+
export const QUOTA_DEFAULT_RESET_MS = 5 * 60 * 60_000
|
|
13
|
+
|
|
14
|
+
// 解析出的恢复时长上界:超过视为不可信文案(防把「30 天」之类当成重置窗口)。
|
|
15
|
+
const QUOTA_MAX_RESET_MS = 30 * 24 * 60 * 60_000
|
|
16
|
+
|
|
17
|
+
// 绝对时刻:reset at 2026-11-02 15:17:01 / 额度将于 2026-11-02 15:17 恢复。
|
|
18
|
+
const ABSOLUTE_TIME = /(\d{4})[-/](\d{1,2})[-/](\d{1,2})[ T](\d{1,2}):(\d{2})(?::(\d{2}))?/g
|
|
19
|
+
// 同段须命中恢复语义关键词,避免把请求体里的其它时间戳误判为重置时间。
|
|
20
|
+
const RESET_KEYWORD = /(reset|resets|resetting|retry|available|恢复|重置)/i
|
|
21
|
+
// 时长:X 小时 / X minutes / Xh。
|
|
22
|
+
const DURATION = /(\d+(?:\.\d+)?)\s*(小时|个小时|分钟|分|秒|hours?|hrs?|hr|h|minutes?|mins?|min|m|seconds?|secs?|sec|s)\b/gi
|
|
23
|
+
const UNIT_MS = {
|
|
24
|
+
小时: 60 * 60_000,
|
|
25
|
+
个小时: 60 * 60_000,
|
|
26
|
+
分钟: 60_000,
|
|
27
|
+
分: 60_000,
|
|
28
|
+
秒: 1_000,
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function pad(value ) {
|
|
32
|
+
return value.padStart(2, '0')
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
function clampResetMs(ms ) {
|
|
36
|
+
if (!Number.isFinite(ms) || ms <= 0 || ms > QUOTA_MAX_RESET_MS) return null
|
|
37
|
+
return Math.round(ms)
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function unitMs(unit ) {
|
|
41
|
+
const lower = unit.toLowerCase()
|
|
42
|
+
if (UNIT_MS[unit]) return UNIT_MS[unit]
|
|
43
|
+
if (lower === 'h' || lower === 'hr' || lower === 'hrs' || lower === 'hour' || lower === 'hours') return 60 * 60_000
|
|
44
|
+
if (lower === 'm' || lower === 'min' || lower === 'mins' || lower === 'minute' || lower === 'minutes') return 60_000
|
|
45
|
+
return 1_000
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
// 从额度耗尽反馈消息里解析恢复时长(毫秒)。解析不出返回 null。
|
|
49
|
+
// 支持两种口径:绝对时刻(reset at YYYY-MM-DD HH:mm[:ss])与相对时长(5 小时 / 15 minutes),
|
|
50
|
+
// 且该段必须含恢复语义关键词;已过期或超过 30 天的结果视为无效。
|
|
51
|
+
export function parseQuotaResetMs(message , nowMs = Date.now()) {
|
|
52
|
+
const body = String(message ?? '')
|
|
53
|
+
if (!body) return null
|
|
54
|
+
for (const segment of body.split(/[。;;!!??\n]+/)) {
|
|
55
|
+
if (!RESET_KEYWORD.test(segment)) continue
|
|
56
|
+
const absolute = ABSOLUTE_TIME.exec(segment)
|
|
57
|
+
if (absolute) {
|
|
58
|
+
ABSOLUTE_TIME.lastIndex = 0
|
|
59
|
+
const [, year, month, day, hour, minute, second] = absolute
|
|
60
|
+
const ms = Date.parse(`${year}-${pad(month)}-${pad(day)}T${pad(hour)}:${minute}:${pad(second ?? '0')}`)
|
|
61
|
+
const delta = clampResetMs(ms - nowMs)
|
|
62
|
+
if (delta) return delta
|
|
63
|
+
}
|
|
64
|
+
let match
|
|
65
|
+
DURATION.lastIndex = 0
|
|
66
|
+
while ((match = DURATION.exec(segment))) {
|
|
67
|
+
const delta = clampResetMs(Number(match[1]) * unitMs(match[2]))
|
|
68
|
+
if (delta) return delta
|
|
69
|
+
}
|
|
70
|
+
DURATION.lastIndex = 0
|
|
71
|
+
}
|
|
72
|
+
return null
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
// 读状态时的惰性判定:reset_at 已过即视为已自动恢复(不落库回填,下次派发自然回主模型)。
|
|
76
|
+
function quotaRowState(row , nowMs = Date.now()) {
|
|
77
|
+
if (!row) return { exhausted: false, state: 'ok' }
|
|
78
|
+
const resetAt = row.reset_at ?? null
|
|
79
|
+
const resetMs = resetAt ? Date.parse(resetAt) : NaN
|
|
80
|
+
const exhausted = row.state === 'exhausted' && (!resetAt || Number.isFinite(resetMs) && resetMs > nowMs)
|
|
81
|
+
return { exhausted: Boolean(exhausted), state: exhausted ? ('exhausted' ) : ('ok' ) }
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
// 额度耗尽派发路由:主 provider 未耗尽 → primary;主耗尽且备用可用 → fallback;
|
|
85
|
+
// 主耗尽且无可用备用 → wait(留 queued,等恢复后自动回主模型)。
|
|
86
|
+
export function quotaRouteFor(bot , primary , fallback ) {
|
|
87
|
+
if (!primary?.exhausted) return { mode: 'primary' }
|
|
88
|
+
if (bot?.fallback_provider && bot?.fallback_model && !fallback?.exhausted) {
|
|
89
|
+
return {
|
|
90
|
+
mode: 'fallback' ,
|
|
91
|
+
provider: bot.fallback_provider,
|
|
92
|
+
model: bot.fallback_model,
|
|
93
|
+
effort: bot.fallback_effort || null,
|
|
94
|
+
ref: `${bot.fallback_provider}/${bot.fallback_model}`,
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return { mode: 'wait' , provider: primary.provider, resetAt: primary.resetAt }
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
export const botQuotaMethods = {
|
|
101
|
+
// 单套 provider 的额度状态视图。provider 为空(bot 未配主模型)时视为无限制。
|
|
102
|
+
botQuotaState(botId , provider ) {
|
|
103
|
+
if (!botId || !provider) return null
|
|
104
|
+
const row = this.store.get('SELECT * FROM bot_quota WHERE bot_id = ? AND provider = ?', botId, provider)
|
|
105
|
+
const effective = quotaRowState(row)
|
|
106
|
+
return {
|
|
107
|
+
provider,
|
|
108
|
+
state: effective.state,
|
|
109
|
+
exhausted: effective.exhausted,
|
|
110
|
+
exhaustedAt: row?.exhausted_at ?? null,
|
|
111
|
+
resetAt: row?.reset_at ?? null,
|
|
112
|
+
resetSource: row?.reset_source ?? null,
|
|
113
|
+
errorCode: row?.error_code ?? null,
|
|
114
|
+
errorMessage: row?.error_message ?? null,
|
|
115
|
+
releasedAt: row?.released_at ?? null,
|
|
116
|
+
releasedBy: row?.released_by ?? null,
|
|
117
|
+
}
|
|
118
|
+
},
|
|
119
|
+
|
|
120
|
+
// 记录撞墙:恢复时间优先取反馈自带的 retryAfterMs,其次解析消息正文,最后保守兜底。
|
|
121
|
+
recordBotQuotaExhaustion({ botId, provider, errorCode = null, errorMessage = '', retryAfterMs = null }) {
|
|
122
|
+
if (!botId || !provider) return null
|
|
123
|
+
const retry = Number(retryAfterMs)
|
|
124
|
+
const parsed = Number.isFinite(retry) && retry > 0 ? null : parseQuotaResetMs(errorMessage)
|
|
125
|
+
const resetMs = Number.isFinite(retry) && retry > 0 ? Math.round(retry) : parsed ?? QUOTA_DEFAULT_RESET_MS
|
|
126
|
+
const resetSource = Number.isFinite(retry) && retry > 0 ? 'retry-after' : parsed ? 'message' : 'default'
|
|
127
|
+
const now = nowIso()
|
|
128
|
+
const resetAt = new Date(Date.now() + resetMs).toISOString()
|
|
129
|
+
this.store.transaction(() => {
|
|
130
|
+
this.store.run(
|
|
131
|
+
`INSERT INTO bot_quota(bot_id, provider, state, exhausted_at, reset_at, reset_source, released_at, released_by, error_code, error_message, updated_at)
|
|
132
|
+
VALUES (?, ?, 'exhausted', ?, ?, ?, NULL, NULL, ?, ?, ?)
|
|
133
|
+
ON CONFLICT(bot_id, provider) DO UPDATE SET
|
|
134
|
+
state = 'exhausted', exhausted_at = excluded.exhausted_at, reset_at = excluded.reset_at,
|
|
135
|
+
reset_source = excluded.reset_source, released_at = NULL, released_by = NULL,
|
|
136
|
+
error_code = excluded.error_code, error_message = excluded.error_message, updated_at = excluded.updated_at`,
|
|
137
|
+
botId,
|
|
138
|
+
provider,
|
|
139
|
+
now,
|
|
140
|
+
resetAt,
|
|
141
|
+
resetSource,
|
|
142
|
+
errorCode ?? null,
|
|
143
|
+
text(errorMessage ?? '', 2_000),
|
|
144
|
+
now,
|
|
145
|
+
)
|
|
146
|
+
this.audit({ type: 'system', id: 'system' }, 'bot.quota_exhausted', 'bot', botId, {
|
|
147
|
+
provider,
|
|
148
|
+
resetAt,
|
|
149
|
+
resetSource,
|
|
150
|
+
errorCode: errorCode ?? null,
|
|
151
|
+
})
|
|
152
|
+
})
|
|
153
|
+
return this.botQuotaState(botId, provider)
|
|
154
|
+
},
|
|
155
|
+
|
|
156
|
+
// 手动解除:立即恢复派发(不等自动恢复)。限工作台 owner(user)或项目总监(director bot)。
|
|
157
|
+
releaseBotQuota(botId , actor = this.actor()) {
|
|
158
|
+
const bot = this.botRow(botId)
|
|
159
|
+
this.assertQuotaReleaseActor(actor)
|
|
160
|
+
const rows = this.store.all('SELECT * FROM bot_quota WHERE bot_id = ?', botId)
|
|
161
|
+
const cleared = rows.filter(row => quotaRowState(row).exhausted).map(row => row.provider)
|
|
162
|
+
const now = nowIso()
|
|
163
|
+
const releasedBy = `${actor.type}:${actor.id}`
|
|
164
|
+
this.store.transaction(() => {
|
|
165
|
+
for (const row of rows) {
|
|
166
|
+
this.store.run(
|
|
167
|
+
`UPDATE bot_quota SET state = 'ok', reset_at = NULL, released_at = ?, released_by = ?, updated_at = ?
|
|
168
|
+
WHERE bot_id = ? AND provider = ?`,
|
|
169
|
+
now,
|
|
170
|
+
releasedBy,
|
|
171
|
+
now,
|
|
172
|
+
botId,
|
|
173
|
+
row.provider,
|
|
174
|
+
)
|
|
175
|
+
}
|
|
176
|
+
this.audit(actor, 'bot.quota_released', 'bot', botId, { providers: cleared })
|
|
177
|
+
})
|
|
178
|
+
void this.tick()
|
|
179
|
+
return this.botView(bot)
|
|
180
|
+
},
|
|
181
|
+
|
|
182
|
+
assertQuotaReleaseActor(actor ) {
|
|
183
|
+
if (actor?.type === 'user') return
|
|
184
|
+
if (actor?.type === 'bot') {
|
|
185
|
+
const director = this.store.get(
|
|
186
|
+
"SELECT 1 AS ok FROM projects WHERE owner_bot_id = ? AND status = 'active' LIMIT 1",
|
|
187
|
+
actor.id,
|
|
188
|
+
)
|
|
189
|
+
if (director) return
|
|
190
|
+
}
|
|
191
|
+
throw forbidden('只有工作台 owner 或项目总监可以解除额度耗尽')
|
|
192
|
+
},
|
|
193
|
+
|
|
194
|
+
// bot 级额度视图(botView/system.state 共用)。
|
|
195
|
+
botQuotaView(bot ) {
|
|
196
|
+
const primary = bot?.provider ? this.botQuotaState(bot.id, bot.provider) : null
|
|
197
|
+
const fallback = bot?.fallback_provider ? this.botQuotaState(bot.id, bot.fallback_provider) : null
|
|
198
|
+
return {
|
|
199
|
+
exhausted: Boolean(primary?.exhausted),
|
|
200
|
+
primary: primary
|
|
201
|
+
? {
|
|
202
|
+
provider: primary.provider,
|
|
203
|
+
exhausted: primary.exhausted,
|
|
204
|
+
resetAt: primary.resetAt,
|
|
205
|
+
resetSource: primary.resetSource,
|
|
206
|
+
exhaustedAt: primary.exhaustedAt,
|
|
207
|
+
errorCode: primary.errorCode,
|
|
208
|
+
releasedAt: primary.releasedAt,
|
|
209
|
+
releasedBy: primary.releasedBy,
|
|
210
|
+
}
|
|
211
|
+
: null,
|
|
212
|
+
fallback: fallback
|
|
213
|
+
? { provider: fallback.provider, exhausted: fallback.exhausted, resetAt: fallback.resetAt }
|
|
214
|
+
: null,
|
|
215
|
+
}
|
|
216
|
+
},
|
|
217
|
+
|
|
218
|
+
// 派发路由:主 provider 耗尽时走备用模型;无可用备用则排队等待。
|
|
219
|
+
quotaRoutingForBot(bot ) {
|
|
220
|
+
if (!bot) return { mode: 'primary' }
|
|
221
|
+
const primary = this.botQuotaState(bot.id, bot.provider)
|
|
222
|
+
const fallback = bot.fallback_provider ? this.botQuotaState(bot.id, bot.fallback_provider) : null
|
|
223
|
+
return quotaRouteFor(bot, primary, fallback)
|
|
224
|
+
},
|
|
225
|
+
|
|
226
|
+
// 解析 bot 标识(id 或 name),供 director 工具按名字解除。
|
|
227
|
+
resolveBotForQuota(input ) {
|
|
228
|
+
const raw = String(input ?? '').trim()
|
|
229
|
+
if (!raw) throw badRequest('缺少 Bot 标识')
|
|
230
|
+
const bot = this.store.get('SELECT * FROM bots WHERE id = ? OR name = ?', raw, raw)
|
|
231
|
+
if (!bot) throw notFound('Bot 不存在')
|
|
232
|
+
return bot
|
|
233
|
+
},
|
|
234
|
+
|
|
235
|
+
// director 工具入口:经 ownerContextFor 复用会话绑定与项目归属校验。
|
|
236
|
+
releaseBotQuotaFromBot(sessionId , input ) {
|
|
237
|
+
const { actor } = this.ownerContextFor(sessionId)
|
|
238
|
+
const bot = this.resolveBotForQuota(input)
|
|
239
|
+
return this.releaseBotQuota(bot.id, actor)
|
|
240
|
+
},
|
|
241
|
+
}
|
|
242
|
+
|
package/src/services/bots.js
CHANGED
|
@@ -13,6 +13,9 @@ export const COLORS = ['blue', 'teal', 'violet', 'amber', 'coral', 'pink', 'gree
|
|
|
13
13
|
|
|
14
14
|
export const botNamePattern = /^[\p{L}\p{N}_-]{1,24}$/u
|
|
15
15
|
|
|
16
|
+
// 像素块头像种子(DSHBOTS-221):客户端 roll 生成的随机短串,落库驱动同 seed 同图渲染。
|
|
17
|
+
export const avatarSeedPattern = /^[\w-]{1,64}$/
|
|
18
|
+
|
|
16
19
|
// solo_dir 唯一冲突时事务内重生成候选的 INSERT 尝试上限。
|
|
17
20
|
const SOLO_DIR_INSERT_ATTEMPTS = 5
|
|
18
21
|
|
|
@@ -55,7 +58,7 @@ export const botsMethods = {
|
|
|
55
58
|
const placeholder = this.soloDirFor(name, botId)
|
|
56
59
|
try {
|
|
57
60
|
await this.ensureBotDir(placeholder)
|
|
58
|
-
} catch (error) {
|
|
61
|
+
} catch (error ) {
|
|
59
62
|
throw badRequest(`单聊工作区创建失败:${error.message}`)
|
|
60
63
|
}
|
|
61
64
|
let soloDir = placeholder
|
|
@@ -74,7 +77,7 @@ export const botsMethods = {
|
|
|
74
77
|
fallbackProvider, fallbackModel, fallbackEffort, filePolicy, soloDir, createdAt, createdAt,
|
|
75
78
|
)
|
|
76
79
|
break
|
|
77
|
-
} catch (error) {
|
|
80
|
+
} catch (error ) {
|
|
78
81
|
const column = uniqueColumn(error)
|
|
79
82
|
// 并发输掉名称查重的请求在这里拿到与名称预检一致的 conflict,而非裸 SQLITE 错误。
|
|
80
83
|
if (column === 'bots.name') throw conflict('Bot 名称已存在')
|
|
@@ -100,13 +103,32 @@ export const botsMethods = {
|
|
|
100
103
|
if (soloDir !== placeholder) {
|
|
101
104
|
try {
|
|
102
105
|
await this.ensureBotDir(soloDir)
|
|
103
|
-
} catch (error) {
|
|
106
|
+
} catch (error ) {
|
|
104
107
|
this.logger.warn?.(`单聊目录 ${soloDir} 补建失败:${error.message}`)
|
|
105
108
|
}
|
|
106
109
|
}
|
|
107
110
|
return this.botView(this.botRow(botId))
|
|
108
111
|
},
|
|
109
112
|
|
|
113
|
+
// 建 bot 申请入口(DSHBOTS-229):总监代团队申请新 bot,复用 createBot 的名称/唯一/模型校验与审计。
|
|
114
|
+
// 不绕过任何既有校验;新 bot 不自动入项目,需另走 addProjectMember。
|
|
115
|
+
async createBotFromBot(sessionId, input) {
|
|
116
|
+
const { actor } = this.ownerContextFor(sessionId)
|
|
117
|
+
const payload = input ?? {}
|
|
118
|
+
return this.createBot({
|
|
119
|
+
name: payload.name,
|
|
120
|
+
role: payload.role,
|
|
121
|
+
instructions: payload.instructions,
|
|
122
|
+
provider: payload.provider,
|
|
123
|
+
model: payload.model,
|
|
124
|
+
effort: payload.effort,
|
|
125
|
+
fallbackProvider: payload.fallbackProvider,
|
|
126
|
+
fallbackModel: payload.fallbackModel,
|
|
127
|
+
fallbackEffort: payload.fallbackEffort,
|
|
128
|
+
color: payload.color,
|
|
129
|
+
filePolicy: payload.filePolicy,
|
|
130
|
+
}, actor)
|
|
131
|
+
},
|
|
110
132
|
// 单聊目录名:优先用名字的 slug,纯中文名回退到 bot-<id 末 6 位>;冲突时追加序号。
|
|
111
133
|
// 目录名要过 safeSlug(长度上限 48),追加序号时按后缀长度截断基础名。
|
|
112
134
|
soloDirFor(name, botId) {
|
|
@@ -140,7 +162,7 @@ export const botsMethods = {
|
|
|
140
162
|
// 回填是启动期的兜底:单个 bot 目录建不出来只告警,不拖垮整个启动。
|
|
141
163
|
try {
|
|
142
164
|
await this.ensureBotDir(dir)
|
|
143
|
-
} catch (error) {
|
|
165
|
+
} catch (error ) {
|
|
144
166
|
this.logger.warn?.(`单聊目录 ${dir} 创建失败:${error.message}`)
|
|
145
167
|
}
|
|
146
168
|
}
|
|
@@ -149,7 +171,7 @@ export const botsMethods = {
|
|
|
149
171
|
const bot = this.botRow(botId)
|
|
150
172
|
// removed 是移除追踪的终态:档案与历史仍可读,但不再接受任何修改(含 status 复活)。
|
|
151
173
|
if (bot.status === 'removed') throw badRequest('该 Bot 已移除追踪,不能再修改')
|
|
152
|
-
const changes
|
|
174
|
+
const changes = {}
|
|
153
175
|
if (patch.name !== undefined) {
|
|
154
176
|
const name = text(patch.name, 40).replace(/\s+/g, '')
|
|
155
177
|
if (!botNamePattern.test(name)) throw badRequest('Bot 名称格式无效')
|
|
@@ -160,6 +182,12 @@ export const botsMethods = {
|
|
|
160
182
|
if (patch.role !== undefined) changes.role = text(patch.role, 24)
|
|
161
183
|
if (patch.instructions !== undefined) changes.instructions = text(patch.instructions, 12_000)
|
|
162
184
|
if (patch.color !== undefined && COLORS.includes(patch.color)) changes.color = patch.color
|
|
185
|
+
// 像素块头像:null/空串 = 关闭(回落首字母/首字头像);非空须为安全短串(roll 随机生成)。
|
|
186
|
+
if (patch.avatarSeed !== undefined) {
|
|
187
|
+
const seed = patch.avatarSeed === null ? '' : String(patch.avatarSeed).trim()
|
|
188
|
+
if (seed && !avatarSeedPattern.test(seed)) throw badRequest('头像种子格式无效')
|
|
189
|
+
changes.avatar_seed = seed || null
|
|
190
|
+
}
|
|
163
191
|
if (patch.filePolicy !== undefined) {
|
|
164
192
|
const filePolicy = normalizeFilePolicy(patch.filePolicy)
|
|
165
193
|
if (filePolicy !== bot.file_policy) changes.file_policy = filePolicy
|
|
@@ -241,7 +269,7 @@ export const botsMethods = {
|
|
|
241
269
|
},
|
|
242
270
|
// 移除追踪(DSHBOTS-193):已归档 Bot 的软移除——bots.status 落 removed 终态,
|
|
243
271
|
// 工作台列表不再展示;运行记录、单聊消息、版本、记忆与单聊工作区目录全部保留。
|
|
244
|
-
async removeBotTracking(botId, input = {}, actor = this.actor()) {
|
|
272
|
+
async removeBotTracking(botId, input = {} , actor = this.actor()) {
|
|
245
273
|
const bot = this.botRow(botId)
|
|
246
274
|
if (bot.status !== 'archived') throw badRequest('Bot 未归档,先归档再移除追踪')
|
|
247
275
|
if (String(input.confirmName ?? '').trim() !== bot.name) throw badRequest('确认名称与 Bot 名称不一致,已拒绝移除')
|
|
@@ -287,6 +315,7 @@ export const botsMethods = {
|
|
|
287
315
|
modelRef: bot.provider && bot.model ? `${bot.provider}/${bot.model}` : null,
|
|
288
316
|
fallbackModelRef: bot.fallback_provider && bot.fallback_model ? `${bot.fallback_provider}/${bot.fallback_model}` : null,
|
|
289
317
|
fallbackConfigured: Boolean(bot.fallback_provider && bot.fallback_model),
|
|
318
|
+
quota: this.botQuotaView(bot),
|
|
290
319
|
soloDir: bot.solo_dir ?? null,
|
|
291
320
|
soloWorkspace: bot.solo_dir ? join(this.config.workspace, '_the_bots', bot.solo_dir) : null,
|
|
292
321
|
memoryCount: Number(memoryCount),
|