dsh-team-bots 0.2.364 → 0.2.393
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 +12 -2
- package/docs/README.zh.md +12 -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/index.js +2 -0
- package/package.json +1 -1
- package/src/config.js +55 -10
- package/src/db-migrations.js +144 -9
- package/src/paths.js +12 -0
- package/src/services/approvals.js +12 -2
- package/src/services/core.js +2 -1
- package/src/services/notify.js +24 -8
- package/src/services/questions.js +16 -3
- package/src/services/run-finish.js +18 -3
- package/src/services/runs.js +369 -34
- package/src/services/runtime/prompt.js +106 -89
- package/src/services/runtime/session.js +260 -72
- package/src/services/scheduler.js +26 -118
- package/src/services/task-dispatch.js +39 -0
- package/src/services/task-review.js +10 -0
- package/src/services/task-runs.js +46 -14
- package/src/services/wechat.js +23 -21
- package/src/subagent-ledger.js +165 -0
- package/src/wechat/commands.js +3 -1
- package/ui/app.js +4 -14
- package/ui/i18n/en/chat.js +11 -11
- package/ui/i18n/en/common.js +0 -12
- package/ui/i18n/en/nav.js +0 -4
- package/ui/i18n/en/settings.js +14 -9
- package/ui/i18n/en/tasks.js +0 -1
- package/ui/i18n/en/usage.js +4 -7
- package/ui/i18n/zh/chat.js +11 -11
- package/ui/i18n/zh/common.js +0 -12
- package/ui/i18n/zh/nav.js +0 -4
- package/ui/i18n/zh/settings.js +13 -9
- package/ui/i18n/zh/tasks.js +0 -1
- package/ui/i18n/zh/usage.js +4 -7
- package/ui/modules/cards.js +19 -5
- package/ui/modules/composer.js +16 -3
- package/ui/modules/i18n.js +10 -0
- package/ui/modules/modal-forms.js +15 -8
- package/ui/modules/settings.js +9 -0
- package/ui/modules/util.js +0 -2
- package/ui/styles/frame.css +0 -28
- package/ui/styles/wide.css +0 -3
package/README.md
CHANGED
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
|
|
5
5
|
`dsh-team-bots` is a DSH plugin that turns one workspace into a team: project group chats, a task board, write-scope parallel scheduling, shared memory and skills, approval cards, usage and cost, and a personal WeChat channel. Every run keeps its trajectory, duration, token count and cost.
|
|
6
6
|
|
|
7
|
+

|
|
8
|
+
|
|
7
9
|
## Requirements
|
|
8
10
|
|
|
9
11
|
- Node.js ≥ 22.19
|
|
@@ -38,7 +40,7 @@ The first visit exchanges the current startup token for a 30-day login cookie. A
|
|
|
38
40
|
|
|
39
41
|
### Group chats and dispatch
|
|
40
42
|
|
|
41
|
-
Every project is a group chat. A bot can also be addressed one-to-one in a dispatch view.
|
|
43
|
+
Every project is a group chat. A bot can also be addressed one-to-one in a dispatch view. All traffic for one bot — task dispatch, group chat, direct message, one-to-one chat — lands on a single control-plane session, and that bot runs one task at a time; different bots still run in parallel.
|
|
42
44
|
|
|
43
45
|
### Task board
|
|
44
46
|
|
|
@@ -58,7 +60,15 @@ When a bot asks for a tool approval, a secret, or an answer, the workspace shows
|
|
|
58
60
|
|
|
59
61
|
### Usage and cost
|
|
60
62
|
|
|
61
|
-
The usage page breaks the numbers down by model, bot and project, exports CSV, and reads model prices from configuration.
|
|
63
|
+
The usage page breaks the numbers down by model, bot and project, exports CSV, and reads model prices from configuration.
|
|
64
|
+
|
|
65
|
+

|
|
66
|
+
|
|
67
|
+
### Workspace settings
|
|
68
|
+
|
|
69
|
+
Run limits (timeout abort, no-progress watchdog, review idle threshold), budgets and retention windows are set per workspace, together with the interface preferences and the local DSH paths.
|
|
70
|
+
|
|
71
|
+

|
|
62
72
|
|
|
63
73
|
### Terminal, channels, secrets
|
|
64
74
|
|
package/docs/README.zh.md
CHANGED
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
|
|
5
5
|
`dsh-team-bots` 是一个 DSH 插件,把一个工作区变成一支团队:项目群聊、任务板、写范围并行调度、共享记忆与技能、审批卡、用量与成本,以及个人微信通道。每次运行都留下轨迹、时长、token 数与成本。
|
|
6
6
|
|
|
7
|
+

|
|
8
|
+
|
|
7
9
|
## 运行前提
|
|
8
10
|
|
|
9
11
|
- Node.js ≥ 22.19
|
|
@@ -38,7 +40,7 @@ http://<host>:<port>/api/dsh-team/ui 团队工作台本身
|
|
|
38
40
|
|
|
39
41
|
### 群聊与调度
|
|
40
42
|
|
|
41
|
-
每个项目是一个群聊;单个 Bot
|
|
43
|
+
每个项目是一个群聊;单个 Bot 也可以被单独一对一调度。同一个 bot 的全部流量——任务派发、群聊、私信、单聊——都落到它唯一的一条控制面会话上,同一 bot 同时只跑一条运行,不同 bot 之间照旧并行。
|
|
42
44
|
|
|
43
45
|
### 任务板
|
|
44
46
|
|
|
@@ -58,7 +60,15 @@ Bot 要工具审批、要密钥或要人回答时,工作台在聊天里出一
|
|
|
58
60
|
|
|
59
61
|
### 用量与成本
|
|
60
62
|
|
|
61
|
-
用量页按模型、按 Bot、按项目拆分,可导出 CSV
|
|
63
|
+
用量页按模型、按 Bot、按项目拆分,可导出 CSV,模型价格来自配置。
|
|
64
|
+
|
|
65
|
+

|
|
66
|
+
|
|
67
|
+
### 工作台设置
|
|
68
|
+
|
|
69
|
+
运行限制(超时中止、无进展看门狗、验收滞留阈值)、预算与保留天数按工作区设置,和界面偏好、本机 DSH 路径放在一起。
|
|
70
|
+
|
|
71
|
+

|
|
62
72
|
|
|
63
73
|
### 终端、通道与密钥
|
|
64
74
|
|
|
Binary file
|
|
Binary file
|
package/docs/assets/tasks.png
CHANGED
|
Binary file
|
package/docs/assets/tasks.zh.png
CHANGED
|
Binary file
|
package/docs/assets/usage.png
CHANGED
|
Binary file
|
package/docs/assets/usage.zh.png
CHANGED
|
Binary file
|
package/index.js
CHANGED
|
@@ -4,6 +4,7 @@ import { installHttp } from './src/http.js'
|
|
|
4
4
|
import { DshRuntime } from './src/runtime.js'
|
|
5
5
|
import { TeamService } from './src/service.js'
|
|
6
6
|
import { installSkillProvider } from './src/skills.js'
|
|
7
|
+
import { installSubagentLedger } from './src/subagent-ledger.js'
|
|
7
8
|
import { installTeamTools } from './src/tools.js'
|
|
8
9
|
|
|
9
10
|
export const name = 'dsh-team-bots'
|
|
@@ -22,6 +23,7 @@ export function apply(ctx, config = {}) {
|
|
|
22
23
|
service.attachRuntime(runtime)
|
|
23
24
|
runtime.attach()
|
|
24
25
|
installTeamTools(ctx, service)
|
|
26
|
+
installSubagentLedger(ctx, store, logger)
|
|
25
27
|
installSkillProvider(ctx, resolved, logger, store)
|
|
26
28
|
installHttp(ctx, service, logger)
|
|
27
29
|
|
package/package.json
CHANGED
package/src/config.js
CHANGED
|
@@ -24,9 +24,15 @@ const int = (value, fallback, min, max) => {
|
|
|
24
24
|
// 设置键沿用 settings 表的 snake_case;范围单位为分钟,与页面保存校验一致。
|
|
25
25
|
export const RUN_TIMEOUT_KEY = 'run_timeout_minutes'
|
|
26
26
|
export const STALL_WATCHDOG_KEY = 'stall_watchdog_minutes'
|
|
27
|
+
// 审批等待/提问转接超时(DSHBOTS-309):分钟整数 [1,60],默认 10 分钟(原 3 分钟,
|
|
28
|
+
// owner 2026-11-07 拍板上调);空串/越界/非法回退默认,优先级与运行时效同款。
|
|
29
|
+
export const APPROVAL_TIMEOUT_KEY = 'approval_timeout_minutes'
|
|
30
|
+
export const QUESTION_TIMEOUT_KEY = 'question_timeout_minutes'
|
|
27
31
|
export const RUN_LIMIT_RANGES = {
|
|
28
32
|
[RUN_TIMEOUT_KEY]: [1, 360],
|
|
29
33
|
[STALL_WATCHDOG_KEY]: [0, 360],
|
|
34
|
+
[APPROVAL_TIMEOUT_KEY]: [1, 60],
|
|
35
|
+
[QUESTION_TIMEOUT_KEY]: [1, 60],
|
|
30
36
|
}
|
|
31
37
|
|
|
32
38
|
// ── 验收滞留守门(DSHBOTS-194 / DSHBOTS-235)───────────────────────────────
|
|
@@ -39,12 +45,19 @@ export const REVIEW_AUTO_CLOSE_KEY = 'review_auto_close'
|
|
|
39
45
|
export const REVIEW_ESCALATE_KEY = 'review_idle_escalate_multiple'
|
|
40
46
|
export const REVIEW_ESCALATE_RANGE = [2, 10]
|
|
41
47
|
|
|
42
|
-
// ──
|
|
48
|
+
// ── 会话结转与闲时压缩(DSHBOTS-145 / DSHBOTS-286)─────────────────────────
|
|
43
49
|
// 同一绑定会话累计运行轮数超过阈值后结转:先排一次 bot 自写交接摘要,摘要就绪后
|
|
44
|
-
//
|
|
50
|
+
// 旧绑定 alias 化并开新会话,摘要注入新会话首条对话提示词。0 = 关闭(阈值不生效)。
|
|
51
|
+
// 结转阈值默认 512(DSHBOTS-286 由 256 上调);alias 会话不重复结转。
|
|
45
52
|
export const SESSION_ROLLOVER_TURNS_KEY = 'session_rollover_turns'
|
|
46
53
|
export const SESSION_ROLLOVER_TURNS_RANGE = [0, 10_000]
|
|
47
54
|
|
|
55
|
+
// 每 N 轮闲时总结压缩(DSHBOTS-286):轮次口径与结转一致(runs 按 session_id
|
|
56
|
+
// COUNT(*));跨越 N 的倍数且会话闲时入队 kind='session_compact' 总结运行,
|
|
57
|
+
// 忙时推后、跨窗口合批。压缩 ≠ 结转(留原会话)。0 = 关闭。
|
|
58
|
+
export const SESSION_COMPACT_TURNS_KEY = 'session_compact_turns'
|
|
59
|
+
export const SESSION_COMPACT_TURNS_RANGE = [0, 10_000]
|
|
60
|
+
|
|
48
61
|
// 保存值必须是范围内的整数;非法或越界按未保存处理(回退默认),不做钳制。
|
|
49
62
|
// 空串/null(未保存)必须先于数值化判空:Number('') 是 0,会把「未保存」误判成
|
|
50
63
|
// 合法值 0(关闭)。用 Number() 而非 parseInt:parseInt('1.5') 会吞小数当 1。
|
|
@@ -88,6 +101,21 @@ export function effectiveRunLimits(config, getSetting
|
|
|
88
101
|
}
|
|
89
102
|
}
|
|
90
103
|
|
|
104
|
+
// 审批/提问等待生效值(DSHBOTS-309):优先级与 effectiveRunLimits 同款——env 显式
|
|
105
|
+
//(resolveConfig 已烘进 config.*TimeoutMs)> settings 保存分钟数 > 默认 300_000。
|
|
106
|
+
// 消费点(approvals/questions 落库 expires_at 时)每次现算,改值对新条目生效。
|
|
107
|
+
export function effectiveApprovalTimeoutMs(config, getSetting = () => null) {
|
|
108
|
+
const env = envExplicit('DSH_TEAM_APPROVAL_TIMEOUT_MS')
|
|
109
|
+
const saved = savedInt(getSetting(APPROVAL_TIMEOUT_KEY), RUN_LIMIT_RANGES[APPROVAL_TIMEOUT_KEY])
|
|
110
|
+
return !env && saved !== null ? saved * 60_000 : config.approvalTimeoutMs
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
export function effectiveQuestionTimeoutMs(config, getSetting = () => null) {
|
|
114
|
+
const env = envExplicit('DSH_TEAM_QUESTION_TIMEOUT_MS')
|
|
115
|
+
const saved = savedInt(getSetting(QUESTION_TIMEOUT_KEY), RUN_LIMIT_RANGES[QUESTION_TIMEOUT_KEY])
|
|
116
|
+
return !env && saved !== null ? saved * 60_000 : config.questionTimeoutMs
|
|
117
|
+
}
|
|
118
|
+
|
|
91
119
|
// ── 任务卡缺省时间预算(DSHBOTS-198)────────────────────────────────────────
|
|
92
120
|
// 产品规则:每张任务卡必有预算。缺省链 = env 显式 > 无进展看门狗(分钟)生效值 >
|
|
93
121
|
// 兜底 20(看门狗未配置与配 0 关闭同值,预算不得变 0/无限)。消费点(createTask
|
|
@@ -99,15 +127,23 @@ export function effectiveTaskTimeBudgetMinutes(config, getSetting
|
|
|
99
127
|
return !env && stallMinutes > 0 ? stallMinutes : config.taskTimeBudgetMinutes
|
|
100
128
|
}
|
|
101
129
|
|
|
102
|
-
// 会话结转阈值生效值(DSHBOTS-145):优先级与运行时效一致——env 显式 >
|
|
103
|
-
// 默认
|
|
104
|
-
//
|
|
130
|
+
// 会话结转阈值生效值(DSHBOTS-145):优先级与运行时效一致——env 显式 > settings 表
|
|
131
|
+
// 保存值 > 默认 512(设置页暂未开放该字段);0 = 关闭。消费点(runtime 会话复用检查,
|
|
132
|
+
// DSHBOTS-289 起为 ensureBotBinding 复用分支)每次现算,改值对下一次会话复用生效。
|
|
105
133
|
export function effectiveSessionRolloverTurns(config, getSetting = () => null) {
|
|
106
134
|
const env = envExplicit('DSH_TEAM_SESSION_ROLLOVER_TURNS')
|
|
107
135
|
const saved = savedInt(getSetting(SESSION_ROLLOVER_TURNS_KEY), SESSION_ROLLOVER_TURNS_RANGE)
|
|
108
136
|
return !env && saved !== null ? saved : config.sessionRolloverTurns
|
|
109
137
|
}
|
|
110
138
|
|
|
139
|
+
// 闲时压缩窗口生效值(DSHBOTS-286):优先级与结转一致——env 显式 > settings 表保存值 >
|
|
140
|
+
// 默认 64(设置页暂未开放该字段);0 = 关闭。消费点(runtime 会话复用检查)每次现算。
|
|
141
|
+
export function effectiveSessionCompactTurns(config, getSetting = () => null) {
|
|
142
|
+
const env = envExplicit('DSH_TEAM_SESSION_COMPACT_TURNS')
|
|
143
|
+
const saved = savedInt(getSetting(SESSION_COMPACT_TURNS_KEY), SESSION_COMPACT_TURNS_RANGE)
|
|
144
|
+
return !env && saved !== null ? saved : config.sessionCompactTurns
|
|
145
|
+
}
|
|
146
|
+
|
|
111
147
|
// 验收滞留阈值生效值(DSHBOTS-194):优先级与会话结转一致——env 显式 > 保存值 >
|
|
112
148
|
// 默认 30 分钟;0 = 关闭。消费点(scheduler 验收守门、runLimitsView 透出)每次
|
|
113
149
|
// 现算,改值对下一轮扫描生效;env 标志供 UI 提示「环境变量已覆盖」。
|
|
@@ -128,6 +164,10 @@ export const rolloverSummaryKey = (botId, projectId) => `rollover_summary:${botI
|
|
|
128
164
|
// 该目标会话的提示词消费,防止被其他会话的普通轮次提前清零。
|
|
129
165
|
export const rolloverPendingKey = (botId, projectId) => `rollover_pending:${botId}:${projectId ?? 'solo'}`
|
|
130
166
|
|
|
167
|
+
// 闲时压缩的窗口标记键(DSHBOTS-286):按会话隔离,值 = 已被压缩运行覆盖到的轮数
|
|
168
|
+
// (窗口下界)。忙时推后依赖「标记不动」,闲时跨越窗口才入队并推进标记。
|
|
169
|
+
export const sessionCompactMarkerKey = (sessionId) => `session_compact_marker:${sessionId}`
|
|
170
|
+
|
|
131
171
|
// ── UI 语言(DSHBOTS-162)─────────────────────────────────────────────────
|
|
132
172
|
// 全局配置页语言下拉:auto = 跟随 DSH 宿主设定(缺省),zh/en = 显式覆盖。
|
|
133
173
|
// env DSH_TEAM_UI_LANGUAGE 可覆盖页面保存值(不强制)。
|
|
@@ -196,8 +236,12 @@ export function resolveConfig(config = {}) {
|
|
|
196
236
|
),
|
|
197
237
|
// 会话结转阈值(DSHBOTS-145):0 = 关闭;「轮次」口径 = runs 表按 session_id 的
|
|
198
238
|
// COUNT(*)(不限 status——失败运行的提示词同样已进会话历史,count-all 才与真实
|
|
199
|
-
//
|
|
200
|
-
|
|
239
|
+
// 增长一致)。生效值可被 settings 表 session_rollover_turns 覆盖(env 显式 > 表值 > 默认,
|
|
240
|
+
// 设置页暂未开放该字段,见 effectiveSessionRolloverTurns)。
|
|
241
|
+
sessionRolloverTurns: int(config.sessionRolloverTurns ?? process.env.DSH_TEAM_SESSION_ROLLOVER_TURNS, 512, 0, 10_000),
|
|
242
|
+
// 闲时总结压缩窗口(DSHBOTS-286):默认每 64 轮,0 = 关闭;生效值见
|
|
243
|
+
// effectiveSessionCompactTurns(env 显式 > settings 表保存值 > 默认,设置页暂未开放)。
|
|
244
|
+
sessionCompactTurns: int(config.sessionCompactTurns ?? process.env.DSH_TEAM_SESSION_COMPACT_TURNS, 64, 0, 10_000),
|
|
201
245
|
// 验收滞留守门(DSHBOTS-194):in_review 卡静置超此分钟数 = 滞留。生效值可被
|
|
202
246
|
// 全局设置 review_idle_minutes 覆盖(effectiveReviewIdleMinutes),0 = 关闭。
|
|
203
247
|
reviewIdleMinutes: int(config.reviewIdleMinutes ?? process.env.DSH_TEAM_REVIEW_IDLE_MINUTES, 30, 0, 1440),
|
|
@@ -212,9 +256,10 @@ export function resolveConfig(config = {}) {
|
|
|
212
256
|
dmArchiveDays: int(config.dmArchiveDays ?? process.env.DSH_TEAM_DM_ARCHIVE_DAYS, 7, 0, 3650),
|
|
213
257
|
dmKeepRecent: int(config.dmKeepRecent ?? process.env.DSH_TEAM_DM_KEEP_RECENT, 100, 0, 10_000),
|
|
214
258
|
// 宿主审批请求在群聊条目上的等待时长:到时向宿主回 rejected、条目置 timeout。
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
259
|
+
// 默认 5 分钟(DSHBOTS-313 终调:3→10(D-309)→5),settings approval_timeout_minutes 可调。
|
|
260
|
+
approvalTimeoutMs: int(config.approvalTimeoutMs ?? process.env.DSH_TEAM_APPROVAL_TIMEOUT_MS, 300_000, 5_000, 3_600_000),
|
|
261
|
+
// 提问转接超时(DSHBOTS-116):与审批同默认 5 分钟(DSHBOTS-313 同步终调),最短 5s、最长 1 小时。
|
|
262
|
+
questionTimeoutMs: int(config.questionTimeoutMs ?? process.env.DSH_TEAM_QUESTION_TIMEOUT_MS, 300_000, 5_000, 3_600_000),
|
|
218
263
|
// 一次性密钥运行时文件(<dataDir>/secrets-runtime/<projectId>.env)的存活窗口:
|
|
219
264
|
// 批准后生成,项目下一条 task 运行结束或窗口到期先到即焚,再次使用需重新批准。
|
|
220
265
|
secretsRuntimeTtlMs: int(config.secretsRuntimeTtlMs ?? process.env.DSH_TEAM_SECRETS_TTL_MS, 30 * 60_000, 1_000, 24 * 60 * 60_000),
|
package/src/db-migrations.js
CHANGED
|
@@ -52,26 +52,28 @@ export const RUNS_INDEXES = `
|
|
|
52
52
|
CREATE INDEX IF NOT EXISTS runs_bot_status_idx
|
|
53
53
|
ON runs(bot_id, COALESCE(ended_at, queued_at) DESC);
|
|
54
54
|
`
|
|
55
|
+
// 注意:one_active_run_per_bot(同 bot 同时至多一条 queued/running,DSHBOTS-285/ADR §2.3)
|
|
56
|
+
// 不放在这里——它的激活与 §5.2-2 入站路由收敛同车(见 activateBotRunSerialization 注释)。
|
|
55
57
|
|
|
56
58
|
export const BINDINGS_DDL = `
|
|
57
59
|
session_id TEXT PRIMARY KEY,
|
|
58
60
|
bot_id TEXT NOT NULL REFERENCES bots(id) ON DELETE CASCADE,
|
|
59
61
|
project_id TEXT REFERENCES projects(id) ON DELETE CASCADE,
|
|
60
|
-
kind TEXT NOT NULL DEFAULT '
|
|
62
|
+
kind TEXT NOT NULL DEFAULT 'bot',
|
|
61
63
|
task_id TEXT REFERENCES tasks(id) ON DELETE CASCADE,
|
|
62
64
|
created_at TEXT NOT NULL,
|
|
63
65
|
alias INTEGER NOT NULL DEFAULT 0
|
|
64
66
|
`
|
|
65
67
|
|
|
66
|
-
//
|
|
67
|
-
//
|
|
68
|
+
// 库与绑定收敛(DSHBOTS-285,ADR §4.1):活跃绑定收敛为 kind='bot' 控制面绑定,
|
|
69
|
+
// 旧 task/project/dm/solo 四道唯一索引删除;task_id 列保留仅供历史行解析。
|
|
70
|
+
// 会话域三分(DSHBOTS-299):唯一性放宽为每 (bot, project) 一条——solo 域是
|
|
71
|
+
// project_id NULL,SQLite 唯一索引对 NULL 判互异,须 COALESCE 归一后才保住
|
|
72
|
+
// 「每 bot 一条 solo 绑定」;项目维度则恢复多项目 owner bot 的项目间隔离。
|
|
73
|
+
// 新库建表(db.js SCHEMA)与旧库迁移重建共用同一段 DDL,避免两处定义漂移。
|
|
68
74
|
const BINDING_INDEXES = `
|
|
69
|
-
CREATE UNIQUE INDEX IF NOT EXISTS
|
|
70
|
-
ON session_bindings(bot_id, project_id,
|
|
71
|
-
CREATE UNIQUE INDEX IF NOT EXISTS one_task_binding
|
|
72
|
-
ON session_bindings(bot_id, project_id, kind, task_id) WHERE task_id IS NOT NULL AND alias = 0;
|
|
73
|
-
CREATE UNIQUE INDEX IF NOT EXISTS one_solo_binding
|
|
74
|
-
ON session_bindings(bot_id) WHERE kind = 'solo' AND project_id IS NULL AND task_id IS NULL AND alias = 0;
|
|
75
|
+
CREATE UNIQUE INDEX IF NOT EXISTS one_bot_binding
|
|
76
|
+
ON session_bindings(bot_id, COALESCE(project_id, '~solo')) WHERE kind = 'bot' AND alias = 0;
|
|
75
77
|
CREATE INDEX IF NOT EXISTS session_bindings_task_idx ON session_bindings(task_id);
|
|
76
78
|
`
|
|
77
79
|
|
|
@@ -110,6 +112,16 @@ export function runMigrations(db) {
|
|
|
110
112
|
migrateSoloDirUnique(db)
|
|
111
113
|
migrateMessages(db)
|
|
112
114
|
migrateSessionBindingAlias(db)
|
|
115
|
+
migrateSessionBindingBotConvergence(db)
|
|
116
|
+
migrateSessionBindingProjectScope(db)
|
|
117
|
+
// one_active_run_per_bot 激活(DSHBOTS-289,ADR §5.2-2):控制面会话收敛(上迁移)+
|
|
118
|
+
// 争用口径 A(enqueue 家族 bot 忙时挂待处理队列不落 runs 行)同车后激活——存量串行化
|
|
119
|
+
// (同 bot 多条 queued/running 只留最早一条,其余 canceled)+ 建 bot 级部分唯一索引。
|
|
120
|
+
activateBotRunSerialization(db)
|
|
121
|
+
// DSHBOTS-308:串行域收窄为 (bot, 工作区),见 activateBotRunSerializationDomain。
|
|
122
|
+
activateBotRunSerializationDomain(db)
|
|
123
|
+
// 任务运行豁免 bot 串行域(单 bot 多任务并行):见 exemptTaskRunsFromBotSerialization。
|
|
124
|
+
exemptTaskRunsFromBotSerialization(db)
|
|
113
125
|
db.exec(BINDING_INDEXES)
|
|
114
126
|
const ftsEnabled = setupFts(db)
|
|
115
127
|
recordMigration(db, 'memories_source_refs_revision')
|
|
@@ -276,6 +288,129 @@ function migrateSessionBindingAlias(db) {
|
|
|
276
288
|
db.exec(BINDING_INDEXES)
|
|
277
289
|
}
|
|
278
290
|
|
|
291
|
+
// 库与绑定收敛(DSHBOTS-285,ADR §4.1/§5.2-1):四车道收敛为每 bot 单条 kind='bot' 控制面绑定。
|
|
292
|
+
// 索引部分无条件幂等(drop 旧三索引 + 建 one_bot_binding / one_active_run_per_bot);
|
|
293
|
+
// 数据部分记入 schema_migrations 账本只跑一次——中间版本(本卡已合、路由未收敛)的运行时会
|
|
294
|
+
// 按需重建四车道,若每次开库都重跑 alias 化会把重建出来的车道会话反复作废。
|
|
295
|
+
// 回退口径(ADR §7.2):旧版本代码不含本迁移,alias 化后的旧道按需重建,历史 session id 仍可解析。
|
|
296
|
+
// 冗余是有意兜底(DSHBOTS-288 备案,红线变异 M3/M4 存活的定性):
|
|
297
|
+
// - one_bot_binding 双重建(本迁移内 CREATE + runMigrations 末尾 BINDING_INDEXES):两条路径
|
|
298
|
+
// (收敛迁移、表重建后的兜底)各自独立到达时都保证索引在,删任一处不红不等于它是死代码;
|
|
299
|
+
// - 账本守卫的价值不在 UPDATE 幂等(UPDATE 重跑天然命中 0 行),而在挡住上述中间版本
|
|
300
|
+
// 「运行时重建四车道 → 下次开库又被 alias 化作废」的循环;路由收敛合入后该窗口关闭,
|
|
301
|
+
// 守卫转为纯防御留存。
|
|
302
|
+
function migrateSessionBindingBotConvergence(db) {
|
|
303
|
+
db.exec(`
|
|
304
|
+
DROP INDEX IF EXISTS one_project_binding;
|
|
305
|
+
DROP INDEX IF EXISTS one_task_binding;
|
|
306
|
+
DROP INDEX IF EXISTS one_solo_binding;
|
|
307
|
+
CREATE UNIQUE INDEX IF NOT EXISTS one_bot_binding
|
|
308
|
+
ON session_bindings(bot_id, COALESCE(project_id, '~solo')) WHERE kind = 'bot' AND alias = 0;
|
|
309
|
+
`)
|
|
310
|
+
const ledger = db.prepare(
|
|
311
|
+
"SELECT 1 FROM schema_migrations WHERE name = 'session_binding_bot_convergence'",
|
|
312
|
+
).get()
|
|
313
|
+
if (ledger) return
|
|
314
|
+
// 每 bot 复用其最新一条 project 活跃绑定转为 kind='bot'(session_id 是主键,转行即复用会话);
|
|
315
|
+
// 无 project 会话的 bot(仅 task/dm/solo 道)不在库里造假 session,留待运行期 ensureBotBinding 新建。
|
|
316
|
+
db.exec(`
|
|
317
|
+
UPDATE session_bindings SET kind = 'bot'
|
|
318
|
+
WHERE alias = 0 AND kind = 'project'
|
|
319
|
+
AND session_id = (
|
|
320
|
+
SELECT p.session_id FROM session_bindings p
|
|
321
|
+
WHERE p.bot_id = session_bindings.bot_id AND p.alias = 0 AND p.kind = 'project'
|
|
322
|
+
ORDER BY p.created_at DESC, p.session_id DESC LIMIT 1
|
|
323
|
+
)
|
|
324
|
+
`)
|
|
325
|
+
db.exec(
|
|
326
|
+
"UPDATE session_bindings SET alias = 1 WHERE alias = 0 AND kind IN ('task', 'project', 'dm', 'solo')",
|
|
327
|
+
)
|
|
328
|
+
recordMigration(db, 'session_binding_bot_convergence')
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
// 会话域三分(DSHBOTS-299):one_bot_binding 唯一索引从 UNIQUE(bot_id) 放宽为
|
|
332
|
+
// UNIQUE(bot_id, COALESCE(project_id,'~solo'))——每 (bot, project) 一条控制面绑定,
|
|
333
|
+
// solo 域(project_id NULL)经 COALESCE 归一后仍每 bot 唯一。SQLite 的同名
|
|
334
|
+
// CREATE UNIQUE INDEX IF NOT EXISTS 在旧列集索引已存在时不会重建,必须先 DROP
|
|
335
|
+
// 再建;账本守卫只重建一次,此后每次开库只空转。旧索引每 bot 全局一条,新索引
|
|
336
|
+
// 在其基础上只放宽跨项目维度,存量数据不可能违反新索引,重建必成功。
|
|
337
|
+
function migrateSessionBindingProjectScope(db) {
|
|
338
|
+
const ledger = db.prepare(
|
|
339
|
+
"SELECT 1 FROM schema_migrations WHERE name = 'session_binding_project_scope'",
|
|
340
|
+
).get()
|
|
341
|
+
if (ledger) return
|
|
342
|
+
db.exec(`
|
|
343
|
+
DROP INDEX IF EXISTS one_bot_binding;
|
|
344
|
+
CREATE UNIQUE INDEX IF NOT EXISTS one_bot_binding
|
|
345
|
+
ON session_bindings(bot_id, COALESCE(project_id, '~solo')) WHERE kind = 'bot' AND alias = 0;
|
|
346
|
+
`)
|
|
347
|
+
recordMigration(db, 'session_binding_project_scope')
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
// one_active_run_per_bot(同 bot 同时至多一条 queued/running,ADR §2.3):机制在本卡(DSHBOTS-285)
|
|
351
|
+
// 完整落地,但激活必须与 §5.2-2 入站路由收敛同车——现行运行时仍是「同 bot 多条 queued 领取时
|
|
352
|
+
// 合批」(scheduler.coalesceQueuedRuns)与四车道并行,先建索引会让 enqueue 家族直接撞唯一约束
|
|
353
|
+
// (实测全量 1540 例红 68,全部为 UNIQUE constraint failed: runs.bot_id)。步骤 2 把合批改为
|
|
354
|
+
// 入队合并后,在 runMigrations 里调用本函数激活;本函数自身幂等,可重复执行。
|
|
355
|
+
export function activateBotRunSerialization(db) {
|
|
356
|
+
// 存量运行串行化(ADR §2.3):同 bot 多条 queued/running 只保留最早一条,其余置 canceled。
|
|
357
|
+
// 被收掉的均为未启动的排队运行,消息与运行留痕不丢(同 scheduler 合批的 MERGED 口径)。
|
|
358
|
+
db.prepare(
|
|
359
|
+
`UPDATE runs SET status = 'canceled', ended_at = ?, error_code = 'BOT_SERIALIZATION',
|
|
360
|
+
error_message = '库与绑定收敛(DSHBOTS-285):同 bot 活跃运行串行化,本条不再单独执行'
|
|
361
|
+
WHERE status IN ('queued', 'running')
|
|
362
|
+
AND queued_at > (
|
|
363
|
+
SELECT MIN(r2.queued_at) FROM runs r2
|
|
364
|
+
WHERE r2.bot_id = runs.bot_id AND r2.status IN ('queued', 'running')
|
|
365
|
+
)`,
|
|
366
|
+
).run(nowIso())
|
|
367
|
+
db.exec(`
|
|
368
|
+
CREATE UNIQUE INDEX IF NOT EXISTS one_active_run_per_bot
|
|
369
|
+
ON runs(bot_id) WHERE status IN ('queued', 'running');
|
|
370
|
+
`)
|
|
371
|
+
recordMigration(db, 'bot_run_serialization')
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
// 串行域收窄(DSHBOTS-308,owner 拍板同一 bot 跨工作区并行):one_active_run_per_bot 从
|
|
375
|
+
// bot 全局收窄为 (bot, 工作区) 域,solo 域归一口径与 one_bot_binding 的 COALESCE 一致。
|
|
376
|
+
// 同名索引列集已变,IF NOT EXISTS 不替换旧列集,须 DROP 再建;与 activateBotRunSerialization
|
|
377
|
+
// 同为函数级幂等且必须排其后——前者每次开库可能重建出 bot 级旧索引,靠本函数收口到域级。
|
|
378
|
+
export function activateBotRunSerializationDomain(db) {
|
|
379
|
+
// 存量按域分桶重做串行化:每 (bot, 域) 桶只留最早一条(queued_at, rowid),其余取消留痕。
|
|
380
|
+
db.prepare(
|
|
381
|
+
`UPDATE runs SET status = 'canceled', ended_at = ?, error_code = 'SERIALIZATION_DOMAIN',
|
|
382
|
+
error_message = '串行域收窄(DSHBOTS-308):同 bot 活跃运行按 (bot, 工作区) 域串行化,本条不再单独执行'
|
|
383
|
+
WHERE status IN ('queued', 'running')
|
|
384
|
+
AND rowid <> (
|
|
385
|
+
SELECT r2.rowid FROM runs r2
|
|
386
|
+
WHERE r2.status IN ('queued', 'running')
|
|
387
|
+
AND r2.bot_id = runs.bot_id
|
|
388
|
+
AND COALESCE(r2.project_id, '~solo') = COALESCE(runs.project_id, '~solo')
|
|
389
|
+
ORDER BY r2.queued_at, r2.rowid LIMIT 1
|
|
390
|
+
)`,
|
|
391
|
+
).run(nowIso())
|
|
392
|
+
db.exec(`
|
|
393
|
+
DROP INDEX IF EXISTS one_active_run_per_bot;
|
|
394
|
+
CREATE UNIQUE INDEX IF NOT EXISTS one_active_run_per_bot
|
|
395
|
+
ON runs(bot_id, COALESCE(project_id, '~solo')) WHERE status IN ('queued', 'running');
|
|
396
|
+
`)
|
|
397
|
+
recordMigration(db, 'bot_run_serialization_domain')
|
|
398
|
+
}
|
|
399
|
+
|
|
400
|
+
// 任务运行豁免 bot 串行域(单 bot 多任务并行):one_active_run_per_bot 加 kind <> 'task'
|
|
401
|
+
// 谓词——施工运行不再受「同 (bot, 工作区) 至多一条活跃运行」约束,可多卡并行;任务维度的
|
|
402
|
+
// 重复由 one_active_run_per_task 兜底,写安全由调度器写范围闸门兜底。review/handle(owner_task)
|
|
403
|
+
// 与消息族照旧串行。不追改存量(历史串行取消行为不回滚)。
|
|
404
|
+
export function exemptTaskRunsFromBotSerialization(db) {
|
|
405
|
+
db.exec(`
|
|
406
|
+
DROP INDEX IF EXISTS one_active_run_per_bot;
|
|
407
|
+
CREATE UNIQUE INDEX IF NOT EXISTS one_active_run_per_bot
|
|
408
|
+
ON runs(bot_id, COALESCE(project_id, '~solo'))
|
|
409
|
+
WHERE status IN ('queued', 'running') AND kind <> 'task';
|
|
410
|
+
`)
|
|
411
|
+
recordMigration(db, 'task_runs_exempt_bot_serialization')
|
|
412
|
+
}
|
|
413
|
+
|
|
279
414
|
// 单聊支持:runs 与 session_bindings 的 project_id 放宽为可空(项目外会话与运行),
|
|
280
415
|
// bots 增加 solo_dir。子表(run_events/usage_events/usage_reconciliation)按名字引用 runs,
|
|
281
416
|
// 「建新表→拷贝→删旧表→改回原名」后名字恢复,外键子句无需改写。
|
package/src/paths.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { homedir } from 'node:os'
|
|
1
2
|
import { lstat, mkdir, realpath, rm, writeFile } from 'node:fs/promises'
|
|
2
3
|
import { isAbsolute, join, relative, resolve, sep } from 'node:path'
|
|
3
4
|
|
|
@@ -118,6 +119,17 @@ export async function botWorkspaceDir(workspaceRoot, soloDir) {
|
|
|
118
119
|
return targetReal
|
|
119
120
|
}
|
|
120
121
|
|
|
122
|
+
// DSHBOTS-282 展示层路径:home 前缀的绝对路径转 ~/ 形式(隐私友好+展示简洁)。
|
|
123
|
+
// 只用于提示词/文本输出层;一切真实路径解析/读写消费原始绝对路径,不经本函数。
|
|
124
|
+
// 非 home 前缀路径原样返回;home 参数仅供测试注入,生产调用不传。
|
|
125
|
+
export function displayPath(path, home = homedir()) {
|
|
126
|
+
if (path === null || path === undefined) return ''
|
|
127
|
+
const raw = String(path)
|
|
128
|
+
if (!raw) return ''
|
|
129
|
+
if (raw === home) return '~'
|
|
130
|
+
return raw.startsWith(`${home}${sep}`) ? `~${raw.slice(home.length)}` : raw
|
|
131
|
+
}
|
|
132
|
+
|
|
121
133
|
export function relativeWorkspacePath(workspaceRoot, absolutePath) {
|
|
122
134
|
const rel = relative(workspaceRoot, absolutePath)
|
|
123
135
|
if (rel.startsWith('..') || isAbsolute(rel)) throw new PathError('工作区路径越界')
|
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
// 注意:本域自管迁移(db.js 已贴 800 行上限,一行不加),手法与 db.js 的 addColumn/recordMigration 一致。
|
|
6
6
|
import { badRequest, conflict, forbidden, notFound } from '../errors.js'
|
|
7
7
|
import { id, nowIso } from '../util.js'
|
|
8
|
+
import { effectiveApprovalTimeoutMs } from '../config.js'
|
|
9
|
+
import { botInActiveProject } from './questions.js'
|
|
8
10
|
import { columnNotNull, rebuildTable } from '../db-migrations.js'
|
|
9
11
|
|
|
10
12
|
// project_id 可空:单聊会话没有项目归属(DSHBOTS-218),卡片锚点改落 solo_messages。
|
|
@@ -150,14 +152,15 @@ export const approvalsMethods = {
|
|
|
150
152
|
if (!binding) return next()
|
|
151
153
|
|
|
152
154
|
const store = this.store
|
|
153
|
-
|
|
155
|
+
// DSHBOTS-294:与 questions.ts 同款——solo 判定按「无 project 上下文的控制面会话」。
|
|
156
|
+
const isSolo = !binding.project_id && (binding.kind === 'solo' || (binding.kind === 'bot' && !botInActiveProject(store, binding.bot_id)))
|
|
154
157
|
if (!binding.project_id && !isSolo) return next()
|
|
155
158
|
const bot = store.get('SELECT * FROM bots WHERE id = ?', binding.bot_id)
|
|
156
159
|
const project = isSolo ? null : store.get('SELECT * FROM projects WHERE id = ?', binding.project_id)
|
|
157
160
|
if (!bot || (!isSolo && !project)) return next()
|
|
158
161
|
|
|
159
162
|
const run = store.get('SELECT id FROM runs WHERE session_id = ? ORDER BY queued_at DESC LIMIT 1', sessionId)
|
|
160
|
-
const timeoutMs = this.config.
|
|
163
|
+
const timeoutMs = effectiveApprovalTimeoutMs(this.config, key => this.store.setting(key))
|
|
161
164
|
const createdAt = nowIso()
|
|
162
165
|
const approvalId = id('apr')
|
|
163
166
|
const toolName = String(req.toolName ?? 'tool').slice(0, 100)
|
|
@@ -263,10 +266,17 @@ export const approvalsMethods = {
|
|
|
263
266
|
approvalView(row) {
|
|
264
267
|
const bot = this.store.get('SELECT name FROM bots WHERE id = ?', row.bot_id)
|
|
265
268
|
const expiresAt = Date.parse(row.expires_at)
|
|
269
|
+
// 来源群聊标识(DSHBOTS-312):approvalView 单行路径(decide 等)也带 project_key/name,
|
|
270
|
+
// 与列表 JOIN 口径一致——行里已带(列表查询 JOIN 产物)则不重查。
|
|
271
|
+
const source = row.project_key !== undefined ? row : (row.project_id
|
|
272
|
+
? this.store.get('SELECT key AS project_key, name AS project_name FROM projects WHERE id = ?', row.project_id) ?? {}
|
|
273
|
+
: {})
|
|
266
274
|
return {
|
|
267
275
|
...row,
|
|
268
276
|
botName: bot?.name ?? 'Bot',
|
|
269
277
|
tool_target_display: row.tool_target ? this.toolTargetDisplay(row.tool_target) : null,
|
|
278
|
+
projectKey: source.project_key ?? null,
|
|
279
|
+
projectName: source.project_name ?? null,
|
|
270
280
|
// 会话归属(DSHBOTS-218):单聊审批没有项目,UI 据此显示来源列并决定跳转目标。
|
|
271
281
|
scope: row.project_id ? 'project' : 'solo',
|
|
272
282
|
remainingMs: row.status === 'pending' ? Math.max(0, expiresAt - Date.now()) : 0,
|
package/src/services/core.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// 本文件只放方法体,方法挂到 TeamService 原型上(见 src/service.js 的 defineMethods 调用),
|
|
4
4
|
// 因此方法体内的 this 与拆分前完全一致。
|
|
5
5
|
|
|
6
|
-
import { effectiveReviewIdleMinutes, effectiveRunLimits, RUN_LIMIT_RANGES, RUN_TIMEOUT_KEY, STALL_WATCHDOG_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'
|
|
6
|
+
import { effectiveReviewIdleMinutes, effectiveRunLimits, RUN_LIMIT_RANGES, RUN_TIMEOUT_KEY, STALL_WATCHDOG_KEY, APPROVAL_TIMEOUT_KEY, QUESTION_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
7
|
import { badRequest, notFound } from '../errors.js'
|
|
8
8
|
import { ensureDirResilient, ensureSkillRoot } from '../paths.js'
|
|
9
9
|
import { seedModelPrices } from '../pricing.js'
|
|
@@ -167,6 +167,7 @@ export const coreMethods = {
|
|
|
167
167
|
'retention_usage_days', 'retention_run_event_days', 'retention_message_days',
|
|
168
168
|
'memory_review', 'chat_memory_review',
|
|
169
169
|
RUN_TIMEOUT_KEY, STALL_WATCHDOG_KEY,
|
|
170
|
+
APPROVAL_TIMEOUT_KEY, QUESTION_TIMEOUT_KEY,
|
|
170
171
|
UI_LANGUAGE_KEY,
|
|
171
172
|
REVIEW_IDLE_MINUTES_KEY, REVIEW_AUTO_CLOSE_KEY, REVIEW_ESCALATE_KEY,
|
|
172
173
|
]
|
package/src/services/notify.js
CHANGED
|
@@ -18,8 +18,10 @@ import { text } from '../util.js'
|
|
|
18
18
|
export const RUN_PARTNER_NOTICE_CAP = 3
|
|
19
19
|
export const PARTNER_NOTICE_DAILY_CAP = 5
|
|
20
20
|
|
|
21
|
-
// ── 滞留阈值兜底(DSHBOTS-280
|
|
21
|
+
// ── 滞留阈值兜底(DSHBOTS-280;DSHBOTS-295 扩待执行宽档):四态三档梯度 ──────
|
|
22
22
|
// 只提醒不自动处置:不自动关单、不自动转状态、不重派,验收与解阻由项目总监闭环(DSHBOTS-281 口径)。
|
|
23
|
+
// 三档梯度(D-295):待执行 72h 宽档 / in_review 24h / blocked 48h。
|
|
24
|
+
export const STALE_PENDING_HOURS = 72
|
|
23
25
|
export const STALE_REVIEW_HOURS = 24
|
|
24
26
|
export const STALE_BLOCKED_HOURS = 48
|
|
25
27
|
export const STALE_CARD_NOTICE_PREFIX = '【滞留提醒】'
|
|
@@ -27,22 +29,32 @@ export const STALE_CARD_NOTICE_PREFIX = '【滞留提醒】'
|
|
|
27
29
|
// 滞留判定(纯函数,供 scheduler 扫描与守门测试共用;阈值内/外两向可测)。
|
|
28
30
|
// 基准时间 = tasks.updated_at:blocked 无专门「进入 blocked」时间戳列,用 updated_at 近似
|
|
29
31
|
// ——转 blocked 走 updateTask 必刷 updated_at,其后任何卡面更新同样只推迟提醒,不会漏报。
|
|
32
|
+
// 待执行态锚(D-295 调查):tasks 表无 'pending' 状态(TASK_STATUSES =
|
|
33
|
+
// backlog/todo/in_progress/blocked/in_review/done/canceled,tasks.ts),实际待执行态
|
|
34
|
+
// = 'backlog'(立卡未派、无 assignee——没人派)与 'todo'(已派未领——没人领),与
|
|
35
|
+
// system.ts pendingRows ['todo','backlog'] 同口径;两态共用 72h 宽档。
|
|
36
|
+
const STALE_PENDING_STATUSES = new Set(['backlog', 'todo'])
|
|
30
37
|
export function staleCardHit({ status, updated_at, now = Date.now() } = {} ) {
|
|
31
|
-
if (status !== 'in_review' && status !== 'blocked') return null
|
|
38
|
+
if (status !== 'in_review' && status !== 'blocked' && !STALE_PENDING_STATUSES.has(status)) return null
|
|
32
39
|
const baseMs = updated_at ? new Date(updated_at).getTime() : NaN
|
|
33
40
|
if (!Number.isFinite(baseMs)) return null
|
|
34
41
|
const hours = (now - baseMs) / 3_600_000
|
|
35
|
-
const threshold = status === 'in_review'
|
|
42
|
+
const threshold = status === 'in_review'
|
|
43
|
+
? STALE_REVIEW_HOURS
|
|
44
|
+
: status === 'blocked' ? STALE_BLOCKED_HOURS : STALE_PENDING_HOURS
|
|
36
45
|
return hours > threshold ? { status, hours, threshold } : null
|
|
37
46
|
}
|
|
38
47
|
|
|
39
48
|
// D-269 口径文案 = 原因(滞留时长+阈值)+ 点名总监的处置方向(DSHBOTS-281:处置归项目
|
|
40
|
-
// 总监自行闭环,不写「owner 可改/可用」转接话术;blocked
|
|
49
|
+
// 总监自行闭环,不写「owner 可改/可用」转接话术;blocked 侧重派即自动重置死线窗口;
|
|
50
|
+
// 待执行 D-295:派发/推进/合并/取消都是总监动作——team_assign_task,不转接 owner)。
|
|
41
51
|
export function staleCardNoticeBody({ identifier, status, hours } = {} ) {
|
|
42
52
|
const idle = Math.floor(hours)
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
53
|
+
if (status === 'in_review')
|
|
54
|
+
return `${STALE_CARD_NOTICE_PREFIX}${identifier} 待验收已滞留 ${idle} 小时(阈值 ${STALE_REVIEW_HOURS}h):待总监验收收口(accept/return)。`
|
|
55
|
+
if (status === 'blocked')
|
|
56
|
+
return `${STALE_CARD_NOTICE_PREFIX}${identifier} 受阻已滞留 ${idle} 小时(阈值 ${STALE_BLOCKED_HOURS}h):待总监解阻/收口(重派即自动重置死线窗口)。`
|
|
57
|
+
return `${STALE_CARD_NOTICE_PREFIX}${identifier} 待执行已滞留 ${idle} 小时(阈值 ${STALE_PENDING_HOURS}h):待总监派发或推进(team_assign_task 派发/合并/取消)。`
|
|
46
58
|
}
|
|
47
59
|
|
|
48
60
|
export const notifyMethods = {
|
|
@@ -144,8 +156,12 @@ export const notifyMethods = {
|
|
|
144
156
|
body: notice,
|
|
145
157
|
mentions: [target.id],
|
|
146
158
|
})
|
|
159
|
+
// DSHBOTS-293 旧车道残留修复 → DSHBOTS-299 会话域三分:活跃绑定按 (bot, project)
|
|
160
|
+
// 各一条,这里按通知发起所在项目解析目标 bot 的对应控制面绑定——目标 bot 在该项目
|
|
161
|
+
// 尚无绑定时查空,照旧降级群聊流(chat_run 唤醒后自然建绑定),不再吸走其他项目的
|
|
162
|
+
// 控制面会话(IS 兼容项目外通知的 NULL 维度)。
|
|
147
163
|
const binding = this.store.get(
|
|
148
|
-
"SELECT * FROM session_bindings WHERE bot_id = ? AND
|
|
164
|
+
"SELECT * FROM session_bindings WHERE bot_id = ? AND kind = 'bot' AND alias = 0 AND project_id IS ?",
|
|
149
165
|
target.id,
|
|
150
166
|
project.id,
|
|
151
167
|
)
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
// 注意:本域自管迁移(db.js 已贴 800 行上限,一行不加),手法与 approvals.js 一致。
|
|
8
8
|
import { badRequest, conflict, forbidden, notFound } from '../errors.js'
|
|
9
9
|
import { id, jsonParse, nowIso, text as textValue } from '../util.js'
|
|
10
|
+
import { effectiveQuestionTimeoutMs } from '../config.js'
|
|
10
11
|
import { columnNotNull, rebuildTable } from '../db-migrations.js'
|
|
11
12
|
|
|
12
13
|
// project_id 可空:单聊会话没有项目归属(DSHBOTS-218),卡片锚点改落 solo_messages。
|
|
@@ -83,6 +84,15 @@ function cleanQuestionItem(item) {
|
|
|
83
84
|
return cleaned
|
|
84
85
|
}
|
|
85
86
|
|
|
87
|
+
// DSHBOTS-294:该 bot 是否仍有活跃项目语境(成员或总监)。无语境的控制面会话按单聊承接。
|
|
88
|
+
export function botInActiveProject(store, botId) {
|
|
89
|
+
if (!botId) return false
|
|
90
|
+
return Boolean(
|
|
91
|
+
store.get("SELECT 1 AS ok FROM project_members m JOIN projects p ON p.id = m.project_id WHERE m.member_type = 'bot' AND m.member_id = ? AND p.status = 'active' LIMIT 1", botId)
|
|
92
|
+
?? store.get("SELECT 1 AS ok FROM projects WHERE owner_bot_id = ? AND status = 'active' LIMIT 1", botId),
|
|
93
|
+
)
|
|
94
|
+
}
|
|
95
|
+
|
|
86
96
|
export const questionsMethods = {
|
|
87
97
|
// 由 core.attachRuntime 调用:注册宿主事件。runtime.ctx 不存在(测试桩)时跳过注册,
|
|
88
98
|
// 但 pending Map 无条件初始化——handleQuestionRequest 直调(测试)也依赖它。
|
|
@@ -117,7 +127,10 @@ export const questionsMethods = {
|
|
|
117
127
|
if (!binding) return next()
|
|
118
128
|
|
|
119
129
|
const store = this.store
|
|
120
|
-
|
|
130
|
+
// DSHBOTS-294:四车道收敛后 solo 判定改按「无 project 上下文的控制面会话」——
|
|
131
|
+
// kind='bot' 且绑定无 project、该 bot 亦无活跃项目关系(成员或总监;历史 kind='solo'
|
|
132
|
+
// alias 行保持命中)才由工作台单聊卡片承接;有项目语境照旧走项目流,owner 闸门不回退。
|
|
133
|
+
const isSolo = !binding.project_id && (binding.kind === 'solo' || (binding.kind === 'bot' && !botInActiveProject(store, binding.bot_id)))
|
|
121
134
|
if (!binding.project_id && !isSolo) return next()
|
|
122
135
|
const bot = store.get('SELECT * FROM bots WHERE id = ?', binding.bot_id)
|
|
123
136
|
const project = isSolo ? null : store.get('SELECT * FROM projects WHERE id = ?', binding.project_id)
|
|
@@ -138,7 +151,7 @@ export const questionsMethods = {
|
|
|
138
151
|
if (items.length === 0) return next()
|
|
139
152
|
|
|
140
153
|
const run = store.get('SELECT id FROM runs WHERE session_id = ? ORDER BY queued_at DESC LIMIT 1', sessionId)
|
|
141
|
-
const timeoutMs = this.config.
|
|
154
|
+
const timeoutMs = effectiveQuestionTimeoutMs(this.config, key => this.store.setting(key))
|
|
142
155
|
const createdAt = nowIso()
|
|
143
156
|
const questionId = id('qst')
|
|
144
157
|
const callId = req.wait?.callId ? String(req.wait.callId) : null
|
|
@@ -319,7 +332,7 @@ export const questionsMethods = {
|
|
|
319
332
|
// 会话归属(DSHBOTS-218):单聊提问没有项目,UI 据此显示来源列并决定跳转目标。
|
|
320
333
|
scope: row.project_id ? 'project' : 'solo',
|
|
321
334
|
remainingMs: row.status === 'pending'
|
|
322
|
-
? Math.max(0, (Number.isFinite(expiresAt) ? expiresAt : Date.parse(row.created_at) + this.config.
|
|
335
|
+
? Math.max(0, (Number.isFinite(expiresAt) ? expiresAt : Date.parse(row.created_at) + effectiveQuestionTimeoutMs(this.config, key => this.store.setting(key))) - Date.now())
|
|
323
336
|
: 0,
|
|
324
337
|
}
|
|
325
338
|
},
|