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
package/src/api.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { AppError } from './errors.js'
|
|
2
2
|
import { exportUsageCsv } from './usage-reconcile.js'
|
|
3
3
|
|
|
4
|
-
const ACTIONS
|
|
4
|
+
const ACTIONS = new Set([
|
|
5
5
|
'health', 'state', 'messages_page', 'models', 'bot_detail',
|
|
6
6
|
'create_bot', 'update_bot', 'archive_bot', 'rollback_bot', 'remove_bot_tracking',
|
|
7
|
+
'release_bot_quota',
|
|
7
8
|
'create_project', 'update_project', 'archive_project', 'reopen_project', 'remove_project_tracking', 'browse_dirs',
|
|
8
9
|
'mark_chat_read',
|
|
9
10
|
'add_member', 'remove_member',
|
|
@@ -22,7 +23,7 @@ const ACTIONS = new Set([
|
|
|
22
23
|
'list_secrets', 'upsert_secret', 'delete_secret', 'list_secret_requests', 'approve_secret_request', 'deny_secret_request',
|
|
23
24
|
])
|
|
24
25
|
|
|
25
|
-
export async function handleAction(service, action, payload
|
|
26
|
+
export async function handleAction(service, action , payload = {}, actor ) {
|
|
26
27
|
if (!ACTIONS.has(action)) throw new AppError('UNKNOWN_ACTION', `未知操作 ${action}`, 404)
|
|
27
28
|
switch (action) {
|
|
28
29
|
case 'health':
|
|
@@ -50,6 +51,8 @@ export async function handleAction(service, action, payload = {}, actor) {
|
|
|
50
51
|
)
|
|
51
52
|
case 'rollback_bot':
|
|
52
53
|
return service.rollbackBot(required(payload.botId, 'botId'), required(payload.revisionId, 'revisionId'), actor)
|
|
54
|
+
case 'release_bot_quota':
|
|
55
|
+
return service.releaseBotQuota(required(payload.botId, 'botId'), actor)
|
|
53
56
|
case 'create_project':
|
|
54
57
|
return service.createProject(payload, actor)
|
|
55
58
|
case 'update_project':
|
|
@@ -241,7 +244,7 @@ export async function handleAction(service, action, payload = {}, actor) {
|
|
|
241
244
|
}
|
|
242
245
|
}
|
|
243
246
|
|
|
244
|
-
function required(value, name)
|
|
247
|
+
function required (value , name ) {
|
|
245
248
|
if (value === undefined || value === null || String(value).trim() === '') {
|
|
246
249
|
throw new AppError('BAD_REQUEST', `缺少参数 ${name}`, 400)
|
|
247
250
|
}
|
package/src/botmsg.js
CHANGED
|
@@ -45,7 +45,7 @@ function describeHit(row, body) {
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
// 幂等写入:UNIQUE(project_id, from_bot_id, request_id) 命中时返回现有行且不覆盖任何字段。
|
|
48
|
-
export function upsertBotMessage(store, { projectId, fromBotId, toBotId, requestId, text, originSessionId = null, originKind = null, originTaskId = null, now }) {
|
|
48
|
+
export function upsertBotMessage(store, { projectId, fromBotId, toBotId, requestId, text, originSessionId = null, originKind = null, originTaskId = null, now } ) {
|
|
49
49
|
const safeRequestId = sanitizeRequestId(requestId)
|
|
50
50
|
if (String(text ?? '').trim() === '') throw new Error('text is required')
|
|
51
51
|
const body = truncateText(text)
|
package/src/config.js
CHANGED
|
@@ -29,10 +29,15 @@ export const RUN_LIMIT_RANGES = {
|
|
|
29
29
|
[STALL_WATCHDOG_KEY]: [0, 360],
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
// ── 验收滞留守门(DSHBOTS-194
|
|
32
|
+
// ── 验收滞留守门(DSHBOTS-194 / DSHBOTS-235)───────────────────────────────
|
|
33
33
|
// in_review 任务超阈值分钟无新评论且无关联 run 活动 = 验收滞留;0 = 关闭守门。
|
|
34
34
|
export const REVIEW_IDLE_MINUTES_KEY = 'review_idle_minutes'
|
|
35
35
|
export const REVIEW_IDLE_MINUTES_RANGE = [0, 1440]
|
|
36
|
+
// 三档自动收口(DSHBOTS-235):总开关(默认开,0 = 关闭自动 accept/return,只提醒)
|
|
37
|
+
// 与二次催办倍数(滞留超 阈值×倍数 升级语气再催一次,默认 2)。
|
|
38
|
+
export const REVIEW_AUTO_CLOSE_KEY = 'review_auto_close'
|
|
39
|
+
export const REVIEW_ESCALATE_KEY = 'review_idle_escalate_multiple'
|
|
40
|
+
export const REVIEW_ESCALATE_RANGE = [2, 10]
|
|
36
41
|
|
|
37
42
|
// ── 会话结转(DSHBOTS-145)─────────────────────────────────────────────────
|
|
38
43
|
// 同一绑定会话累计运行轮数超过阈值后结转:先排一次 bot 自写交接摘要,摘要就绪后
|
|
@@ -70,7 +75,7 @@ const parseExtList = (value) => {
|
|
|
70
75
|
// 里已含 env/注入解析结果,env 显式时直接采用;run*Env/stall*Env 标志供 UI 提示
|
|
71
76
|
// 「环境变量已覆盖」。消费点(runtime 运行启动、service.reapStalledRuns)每次
|
|
72
77
|
// 现算,新值对之后启动的运行生效,进行中不追溯。
|
|
73
|
-
export function effectiveRunLimits(config, getSetting
|
|
78
|
+
export function effectiveRunLimits(config, getSetting = () => null) {
|
|
74
79
|
const runEnv = envExplicit('DSH_TEAM_RUN_TIMEOUT_MS')
|
|
75
80
|
const stallEnv = envExplicit('DSH_TEAM_STALL_TIMEOUT_MS')
|
|
76
81
|
const runSaved = savedInt(getSetting(RUN_TIMEOUT_KEY), RUN_LIMIT_RANGES[RUN_TIMEOUT_KEY])
|
|
@@ -88,7 +93,7 @@ export function effectiveRunLimits(config, getSetting = () => null) {
|
|
|
88
93
|
// 兜底 20(看门狗未配置与配 0 关闭同值,预算不得变 0/无限)。消费点(createTask
|
|
89
94
|
// 建档、assignTask 给存量 NULL 卡补挂)每次现算,改值对之后建档/派发的卡生效。
|
|
90
95
|
export const TASK_TIME_BUDGET_FALLBACK_MINUTES = 20
|
|
91
|
-
export function effectiveTaskTimeBudgetMinutes(config, getSetting
|
|
96
|
+
export function effectiveTaskTimeBudgetMinutes(config, getSetting = () => null) {
|
|
92
97
|
const env = envExplicit('DSH_TEAM_TASK_TIME_BUDGET_MINUTES')
|
|
93
98
|
const stallMinutes = Math.round(effectiveRunLimits(config, getSetting).stallTimeoutMs / 60_000)
|
|
94
99
|
return !env && stallMinutes > 0 ? stallMinutes : config.taskTimeBudgetMinutes
|
|
@@ -97,7 +102,7 @@ export function effectiveTaskTimeBudgetMinutes(config, getSetting = () => null)
|
|
|
97
102
|
// 会话结转阈值生效值(DSHBOTS-145):优先级与运行时效一致——env 显式 > 页面保存值 >
|
|
98
103
|
// 默认 256;0 = 关闭。消费点(runtime.ensureSession 复用检查)每次现算,改值对
|
|
99
104
|
// 下一次会话复用生效。
|
|
100
|
-
export function effectiveSessionRolloverTurns(config, getSetting
|
|
105
|
+
export function effectiveSessionRolloverTurns(config, getSetting = () => null) {
|
|
101
106
|
const env = envExplicit('DSH_TEAM_SESSION_ROLLOVER_TURNS')
|
|
102
107
|
const saved = savedInt(getSetting(SESSION_ROLLOVER_TURNS_KEY), SESSION_ROLLOVER_TURNS_RANGE)
|
|
103
108
|
return !env && saved !== null ? saved : config.sessionRolloverTurns
|
|
@@ -106,7 +111,7 @@ export function effectiveSessionRolloverTurns(config, getSetting = () => null) {
|
|
|
106
111
|
// 验收滞留阈值生效值(DSHBOTS-194):优先级与会话结转一致——env 显式 > 保存值 >
|
|
107
112
|
// 默认 30 分钟;0 = 关闭。消费点(scheduler 验收守门、runLimitsView 透出)每次
|
|
108
113
|
// 现算,改值对下一轮扫描生效;env 标志供 UI 提示「环境变量已覆盖」。
|
|
109
|
-
export function effectiveReviewIdleMinutes(config, getSetting
|
|
114
|
+
export function effectiveReviewIdleMinutes(config, getSetting = () => null) {
|
|
110
115
|
const env = envExplicit('DSH_TEAM_REVIEW_IDLE_MINUTES')
|
|
111
116
|
const saved = savedInt(getSetting(REVIEW_IDLE_MINUTES_KEY), REVIEW_IDLE_MINUTES_RANGE)
|
|
112
117
|
return {
|
|
@@ -119,6 +124,10 @@ export function effectiveReviewIdleMinutes(config, getSetting = () => null) {
|
|
|
119
124
|
// 单聊会话各自独立结转,互不串档;单聊(无项目)用 'solo' 占位。
|
|
120
125
|
export const rolloverSummaryKey = (botId, projectId) => `rollover_summary:${botId}:${projectId ?? 'solo'}`
|
|
121
126
|
|
|
127
|
+
// 结转摘要的待注入目标会话键(DSHBOTS-213):结转开新会话时记录新会话 id,摘要只允许被
|
|
128
|
+
// 该目标会话的提示词消费,防止被其他会话的普通轮次提前清零。
|
|
129
|
+
export const rolloverPendingKey = (botId, projectId) => `rollover_pending:${botId}:${projectId ?? 'solo'}`
|
|
130
|
+
|
|
122
131
|
// ── UI 语言(DSHBOTS-162)─────────────────────────────────────────────────
|
|
123
132
|
// 全局配置页语言下拉:auto = 跟随 DSH 宿主设定(缺省),zh/en = 显式覆盖。
|
|
124
133
|
// env DSH_TEAM_UI_LANGUAGE 可覆盖页面保存值(不强制)。
|
|
@@ -139,14 +148,14 @@ const savedUiLanguage = (value) => {
|
|
|
139
148
|
|
|
140
149
|
// UI 语言生效值:env 显式合法值 > 页面保存值 > 默认。'auto' 语义 = 跟随 DSH 宿主,
|
|
141
150
|
// 交 resolveDshUiLanguage 三级兜底(loader → patch 文件 → navigator)。
|
|
142
|
-
export function effectiveUiLanguage(config, getSetting
|
|
151
|
+
export function effectiveUiLanguage(config, getSetting = () => null) {
|
|
143
152
|
const envRaw = String(process.env.DSH_TEAM_UI_LANGUAGE ?? '').trim().toLowerCase()
|
|
144
153
|
const envValue = UI_LANGUAGE_VALUES.includes(envRaw) ? envRaw : null
|
|
145
154
|
const saved = savedUiLanguage(getSetting(UI_LANGUAGE_KEY))
|
|
146
155
|
return envValue ?? saved ?? config.uiLanguage
|
|
147
156
|
}
|
|
148
157
|
|
|
149
|
-
export function resolveConfig(config
|
|
158
|
+
export function resolveConfig(config = {}) {
|
|
150
159
|
const dshHome = resolve(process.env.DSH_HOME?.trim() || join(homedir(), '.dsh'))
|
|
151
160
|
const workspace = resolve(config.workspace || defaultWorkspace())
|
|
152
161
|
const dataDir = resolve(
|
|
@@ -217,7 +226,8 @@ export function resolveConfig(config = {}) {
|
|
|
217
226
|
512 * 1024, 0, 5 * 1024 * 1024,
|
|
218
227
|
),
|
|
219
228
|
// 原生 Agent Teams 由 profile 层提供;这里只控制提示词与调度侧的启用状态。
|
|
220
|
-
|
|
229
|
+
// 缺省开启(DSHBOTS-230):默认部署即注入并行拆分引导;显式传 0/false 可关闭。
|
|
230
|
+
agentTeam: bool(config.agentTeam ?? process.env.DSH_TEAM_AGENT_TEAM, true),
|
|
221
231
|
maxTeammates: int(config.maxTeammates ?? process.env.DSH_TEAM_MAX_TEAMMATES, 3, 1, 8),
|
|
222
232
|
// 会话使用的 agent preset:Router 会话不带写工具时,在这里指向一个受限 preset。
|
|
223
233
|
routerPreset: String(config.routerPreset ?? process.env.DSH_TEAM_ROUTER_PRESET ?? '').trim(),
|
package/src/db-migrations.js
CHANGED
|
@@ -39,7 +39,8 @@ export const RUNS_DDL = `
|
|
|
39
39
|
usage_cache_write INTEGER NOT NULL DEFAULT 0,
|
|
40
40
|
usage_output INTEGER NOT NULL DEFAULT 0,
|
|
41
41
|
usage_cost REAL,
|
|
42
|
-
cancel_requested INTEGER NOT NULL DEFAULT 0
|
|
42
|
+
cancel_requested INTEGER NOT NULL DEFAULT 0,
|
|
43
|
+
merged_messages TEXT
|
|
43
44
|
`
|
|
44
45
|
|
|
45
46
|
export const RUNS_INDEXES = `
|
|
@@ -58,16 +59,19 @@ export const BINDINGS_DDL = `
|
|
|
58
59
|
project_id TEXT REFERENCES projects(id) ON DELETE CASCADE,
|
|
59
60
|
kind TEXT NOT NULL DEFAULT 'project',
|
|
60
61
|
task_id TEXT REFERENCES tasks(id) ON DELETE CASCADE,
|
|
61
|
-
created_at TEXT NOT NULL
|
|
62
|
+
created_at TEXT NOT NULL,
|
|
63
|
+
alias INTEGER NOT NULL DEFAULT 0
|
|
62
64
|
`
|
|
63
65
|
|
|
66
|
+
// alias=1 是会话结转/失效替换后保留的授权别名:旧 session id 仍解析到同 bot/项目/车道,
|
|
67
|
+
// 但不再作为活跃绑定参与「每 bot 每项目每车道一个会话」的唯一约束。
|
|
64
68
|
const BINDING_INDEXES = `
|
|
65
69
|
CREATE UNIQUE INDEX IF NOT EXISTS one_project_binding
|
|
66
|
-
ON session_bindings(bot_id, project_id, kind) WHERE task_id IS NULL AND project_id IS NOT NULL;
|
|
70
|
+
ON session_bindings(bot_id, project_id, kind) WHERE task_id IS NULL AND project_id IS NOT NULL AND alias = 0;
|
|
67
71
|
CREATE UNIQUE INDEX IF NOT EXISTS one_task_binding
|
|
68
|
-
ON session_bindings(bot_id, project_id, kind, task_id) WHERE task_id IS NOT NULL;
|
|
72
|
+
ON session_bindings(bot_id, project_id, kind, task_id) WHERE task_id IS NOT NULL AND alias = 0;
|
|
69
73
|
CREATE UNIQUE INDEX IF NOT EXISTS one_solo_binding
|
|
70
|
-
ON session_bindings(bot_id) WHERE kind = 'solo' AND project_id IS NULL AND task_id IS NULL;
|
|
74
|
+
ON session_bindings(bot_id) WHERE kind = 'solo' AND project_id IS NULL AND task_id IS NULL AND alias = 0;
|
|
71
75
|
CREATE INDEX IF NOT EXISTS session_bindings_task_idx ON session_bindings(task_id);
|
|
72
76
|
`
|
|
73
77
|
|
|
@@ -102,8 +106,10 @@ export function runMigrations(db) {
|
|
|
102
106
|
migrateProposals(db)
|
|
103
107
|
migrateUsageEvents(db)
|
|
104
108
|
migrateSoloSupport(db)
|
|
109
|
+
migrateSoloMessageCards(db)
|
|
105
110
|
migrateSoloDirUnique(db)
|
|
106
111
|
migrateMessages(db)
|
|
112
|
+
migrateSessionBindingAlias(db)
|
|
107
113
|
db.exec(BINDING_INDEXES)
|
|
108
114
|
const ftsEnabled = setupFts(db)
|
|
109
115
|
recordMigration(db, 'memories_source_refs_revision')
|
|
@@ -127,6 +133,18 @@ export function runMigrations(db) {
|
|
|
127
133
|
recordMigration(db, 'bots_fallback_model')
|
|
128
134
|
recordMigration(db, 'runs_model_override')
|
|
129
135
|
recordMigration(db, 'chat_reads')
|
|
136
|
+
recordMigration(db, 'solo_message_cards')
|
|
137
|
+
recordMigration(db, 'bots_avatar_seed')
|
|
138
|
+
recordMigration(db, 'runs_merged_messages')
|
|
139
|
+
recordMigration(db, 'session_binding_alias')
|
|
140
|
+
migrateBotQuota(db)
|
|
141
|
+
// 验收守门索引(DSHBOTS-235):扫描按 task_id 关联查 task_comments / runs,
|
|
142
|
+
// 旧库无对应索引时每卡全表扫;对新库空转(SCHEMA 已建)。
|
|
143
|
+
db.exec(`
|
|
144
|
+
CREATE INDEX IF NOT EXISTS runs_task_idx ON runs(task_id);
|
|
145
|
+
CREATE INDEX IF NOT EXISTS task_comments_task_idx ON task_comments(task_id);
|
|
146
|
+
`)
|
|
147
|
+
recordMigration(db, 'review_watchdog_indexes')
|
|
130
148
|
return { ftsEnabled }
|
|
131
149
|
}
|
|
132
150
|
|
|
@@ -155,6 +173,8 @@ function migrateBots(db) {
|
|
|
155
173
|
addColumn(db, 'bots', 'fallback_provider', 'TEXT')
|
|
156
174
|
addColumn(db, 'bots', 'fallback_model', 'TEXT')
|
|
157
175
|
addColumn(db, 'bots', 'fallback_effort', 'TEXT')
|
|
176
|
+
// bots.avatar_seed:像素块头像(identicon)种子;NULL = 首字母/首字头像,非空 = 像素块头像。
|
|
177
|
+
addColumn(db, 'bots', 'avatar_seed', 'TEXT')
|
|
158
178
|
}
|
|
159
179
|
|
|
160
180
|
// run.mode 区分写入型与只读型运行:同一项目同时只允许一个写运行,只读运行可并行。
|
|
@@ -170,6 +190,8 @@ function migrateRuns(db) {
|
|
|
170
190
|
addColumn(db, 'runs', 'model_provider', 'TEXT')
|
|
171
191
|
addColumn(db, 'runs', 'model_model', 'TEXT')
|
|
172
192
|
addColumn(db, 'runs', 'model_effort', 'TEXT')
|
|
193
|
+
// 入站消息合批(DSHBOTS-231):领取时同通道排队消息被合并进来,存被合并消息的 id 列表(JSON)。
|
|
194
|
+
addColumn(db, 'runs', 'merged_messages', 'TEXT')
|
|
173
195
|
db.exec(`UPDATE runs SET mode = 'read' WHERE kind IN ('chat', 'review', 'handle') AND mode = 'write'`)
|
|
174
196
|
}
|
|
175
197
|
|
|
@@ -241,6 +263,19 @@ function migrateSessionBindings(db) {
|
|
|
241
263
|
rebuildTable(db, 'session_bindings', `CREATE TABLE session_bindings (${BINDINGS_DDL})`)
|
|
242
264
|
}
|
|
243
265
|
|
|
266
|
+
// 会话绑定授权别名(DSHBOTS-256):旧库补 alias 列并把三条部分唯一索引收窄到 alias=0,
|
|
267
|
+
// 否则旧绑定行会让新活跃绑定插不进去(旧索引不认 alias,同 bot/项目/车道仍判重)。
|
|
268
|
+
// 仅在首次补列时重建索引;新库建表已带 alias 与收窄索引,已迁移库不重复 drop/create。
|
|
269
|
+
function migrateSessionBindingAlias(db) {
|
|
270
|
+
const hadAlias = columnsOf(db, 'session_bindings').includes('alias')
|
|
271
|
+
addColumn(db, 'session_bindings', 'alias', 'INTEGER NOT NULL DEFAULT 0')
|
|
272
|
+
if (hadAlias) return
|
|
273
|
+
db.exec('DROP INDEX IF EXISTS one_project_binding')
|
|
274
|
+
db.exec('DROP INDEX IF EXISTS one_task_binding')
|
|
275
|
+
db.exec('DROP INDEX IF EXISTS one_solo_binding')
|
|
276
|
+
db.exec(BINDING_INDEXES)
|
|
277
|
+
}
|
|
278
|
+
|
|
244
279
|
// 单聊支持:runs 与 session_bindings 的 project_id 放宽为可空(项目外会话与运行),
|
|
245
280
|
// bots 增加 solo_dir。子表(run_events/usage_events/usage_reconciliation)按名字引用 runs,
|
|
246
281
|
// 「建新表→拷贝→删旧表→改回原名」后名字恢复,外键子句无需改写。
|
|
@@ -257,20 +292,50 @@ function migrateSoloSupport(db) {
|
|
|
257
292
|
}
|
|
258
293
|
}
|
|
259
294
|
|
|
260
|
-
function columnNotNull(db, table, column) {
|
|
295
|
+
export function columnNotNull(db, table, column) {
|
|
261
296
|
const info = db.prepare(`PRAGMA table_info(${table})`).all().find(row => row.name === column)
|
|
262
297
|
return Boolean(info?.notnull)
|
|
263
298
|
}
|
|
264
299
|
|
|
300
|
+
// 单聊卡片锚点(DSHBOTS-218):solo_messages 增加 kind/question_id/approval_id 三列,
|
|
301
|
+
// 让单聊会话也能挂提问卡与审批卡(状态仍查 questions/approvals 表)。
|
|
302
|
+
function migrateSoloMessageCards(db) {
|
|
303
|
+
addColumn(db, 'solo_messages', 'kind', "TEXT NOT NULL DEFAULT 'text'")
|
|
304
|
+
addColumn(db, 'solo_messages', 'question_id', 'TEXT')
|
|
305
|
+
addColumn(db, 'solo_messages', 'approval_id', 'TEXT')
|
|
306
|
+
}
|
|
307
|
+
|
|
265
308
|
// 单聊目录唯一:新库建表时 solo_dir 就带 UNIQUE,老库是 addColumn 补的列,没有唯一约束,
|
|
266
309
|
// 两个 bot 可能指向同一个工作目录互相覆盖。补一个部分唯一索引把这种状态挡住。
|
|
267
310
|
// 老库里若已有重复目录名,这里不改名:改名等于把 bot 指向另一个工作目录,比缺约束更难收拾,
|
|
268
311
|
// 只告警让使用者自己改名或合并。
|
|
312
|
+
// bot 额度墙状态(DSHBOTS-241):新库由 SCHEMA 建表,这里只对旧库补建。
|
|
313
|
+
function migrateBotQuota(db) {
|
|
314
|
+
if (!columnsOf(db, 'bots').includes('fallback_model')) return
|
|
315
|
+
db.exec(`
|
|
316
|
+
CREATE TABLE IF NOT EXISTS bot_quota (
|
|
317
|
+
bot_id TEXT NOT NULL REFERENCES bots(id) ON DELETE CASCADE,
|
|
318
|
+
provider TEXT NOT NULL,
|
|
319
|
+
state TEXT NOT NULL DEFAULT 'ok',
|
|
320
|
+
exhausted_at TEXT,
|
|
321
|
+
reset_at TEXT,
|
|
322
|
+
reset_source TEXT,
|
|
323
|
+
released_at TEXT,
|
|
324
|
+
released_by TEXT,
|
|
325
|
+
error_code TEXT,
|
|
326
|
+
error_message TEXT,
|
|
327
|
+
updated_at TEXT NOT NULL,
|
|
328
|
+
PRIMARY KEY(bot_id, provider)
|
|
329
|
+
);
|
|
330
|
+
`)
|
|
331
|
+
recordMigration(db, 'bot_quota')
|
|
332
|
+
}
|
|
333
|
+
|
|
269
334
|
function migrateSoloDirUnique(db) {
|
|
270
335
|
if (!columnsOf(db, 'bots').includes('solo_dir')) return
|
|
271
336
|
try {
|
|
272
337
|
db.exec('CREATE UNIQUE INDEX IF NOT EXISTS bots_solo_dir_unique ON bots(solo_dir) WHERE solo_dir IS NOT NULL')
|
|
273
|
-
} catch (error) {
|
|
338
|
+
} catch (error ) {
|
|
274
339
|
console.warn(`dsh-team: 单聊目录存在重复,bots.solo_dir 唯一索引未创建:${error.message}`)
|
|
275
340
|
}
|
|
276
341
|
}
|
|
@@ -282,7 +347,9 @@ function migrateMessages(db) {
|
|
|
282
347
|
}
|
|
283
348
|
|
|
284
349
|
// 全量重建一张表:原名表数据拷入 <name>_new 后删除原名表,再把新表改回原名。
|
|
285
|
-
|
|
350
|
+
// 导出给自管迁移域(questions/approvals)复用:它们的表体定义在本域之外,
|
|
351
|
+
// 放宽 project_id 可空性(单聊会话无项目归属)同样只能走重建。
|
|
352
|
+
export function rebuildTable(db, name, createSql) {
|
|
286
353
|
const columns = db.prepare(`PRAGMA table_info(${name})`).all().map(row => row.name)
|
|
287
354
|
db.exec('PRAGMA foreign_keys = OFF')
|
|
288
355
|
try {
|
|
@@ -293,7 +360,7 @@ function rebuildTable(db, name, createSql) {
|
|
|
293
360
|
db.exec(`DROP TABLE ${name}`)
|
|
294
361
|
db.exec(`ALTER TABLE ${name}_new RENAME TO ${name}`)
|
|
295
362
|
db.exec('COMMIT')
|
|
296
|
-
} catch (error) {
|
|
363
|
+
} catch (error ) {
|
|
297
364
|
try { db.exec('ROLLBACK') } catch {}
|
|
298
365
|
throw error
|
|
299
366
|
} finally {
|
package/src/db.js
CHANGED
|
@@ -8,7 +8,7 @@ import { nowIso } from './util.js'
|
|
|
8
8
|
// RUNS_DDL/RUNS_INDEXES/BINDINGS_DDL 在新库建表(下方 SCHEMA)与旧库迁移重建间共用,防两处漂移。
|
|
9
9
|
import { runMigrations, RUNS_DDL, RUNS_INDEXES, BINDINGS_DDL } from './db-migrations.js'
|
|
10
10
|
|
|
11
|
-
const RUNS_COLUMNS = 'id, project_id, bot_id, task_id, parent_run_id, kind, mode, trigger_type, trigger_ref, status, attempt, idempotency_key, session_id, model_provider, model_model, model_effort, error_code, error_message, retry_after_ms, output, artifacts, queued_at, started_at, ended_at, last_progress_at, usage_input, usage_cache_read, usage_cache_write, usage_output, usage_cost, cancel_requested'
|
|
11
|
+
const RUNS_COLUMNS = 'id, project_id, bot_id, task_id, parent_run_id, kind, mode, trigger_type, trigger_ref, status, attempt, idempotency_key, session_id, model_provider, model_model, model_effort, error_code, error_message, retry_after_ms, output, artifacts, queued_at, started_at, ended_at, last_progress_at, usage_input, usage_cache_read, usage_cache_write, usage_output, usage_cost, cancel_requested, merged_messages'
|
|
12
12
|
|
|
13
13
|
const BINDING_COLUMNS = 'session_id, bot_id, project_id, kind, task_id, created_at'
|
|
14
14
|
|
|
@@ -31,6 +31,7 @@ CREATE TABLE IF NOT EXISTS bots (
|
|
|
31
31
|
role TEXT NOT NULL DEFAULT '',
|
|
32
32
|
instructions TEXT NOT NULL DEFAULT '',
|
|
33
33
|
color TEXT NOT NULL DEFAULT 'blue',
|
|
34
|
+
avatar_seed TEXT,
|
|
34
35
|
provider TEXT,
|
|
35
36
|
model TEXT,
|
|
36
37
|
effort TEXT,
|
|
@@ -45,6 +46,24 @@ CREATE TABLE IF NOT EXISTS bots (
|
|
|
45
46
|
updated_at TEXT NOT NULL
|
|
46
47
|
);
|
|
47
48
|
|
|
49
|
+
-- bot_quota:bot 的 provider 额度墙状态,按 (bot, provider) 各存一套——主备 provider
|
|
50
|
+
-- 是两套独立额度,互不顶替。state: exhausted(耗尽期内)→ ok(人工解除或恢复后)。
|
|
51
|
+
-- reset_at 由反馈消息解析或保守兜底得出;读状态时按当前时刻惰性判定,不落库回填。
|
|
52
|
+
CREATE TABLE IF NOT EXISTS bot_quota (
|
|
53
|
+
bot_id TEXT NOT NULL REFERENCES bots(id) ON DELETE CASCADE,
|
|
54
|
+
provider TEXT NOT NULL,
|
|
55
|
+
state TEXT NOT NULL DEFAULT 'ok',
|
|
56
|
+
exhausted_at TEXT,
|
|
57
|
+
reset_at TEXT,
|
|
58
|
+
reset_source TEXT,
|
|
59
|
+
released_at TEXT,
|
|
60
|
+
released_by TEXT,
|
|
61
|
+
error_code TEXT,
|
|
62
|
+
error_message TEXT,
|
|
63
|
+
updated_at TEXT NOT NULL,
|
|
64
|
+
PRIMARY KEY(bot_id, provider)
|
|
65
|
+
);
|
|
66
|
+
|
|
48
67
|
CREATE TABLE IF NOT EXISTS bot_revisions (
|
|
49
68
|
id TEXT PRIMARY KEY,
|
|
50
69
|
bot_id TEXT NOT NULL REFERENCES bots(id) ON DELETE CASCADE,
|
|
@@ -114,6 +133,11 @@ CREATE TABLE IF NOT EXISTS solo_messages (
|
|
|
114
133
|
sender_id TEXT NOT NULL,
|
|
115
134
|
body TEXT NOT NULL,
|
|
116
135
|
run_id TEXT,
|
|
136
|
+
-- 卡片锚点:kind=question/approval 时 question_id/approval_id 指向 questions/approvals 行,
|
|
137
|
+
-- 卡片状态渲染时查那张表(与群聊 messages.kind/question_id/approval_id 同口径)。
|
|
138
|
+
kind TEXT NOT NULL DEFAULT 'text',
|
|
139
|
+
question_id TEXT,
|
|
140
|
+
approval_id TEXT,
|
|
117
141
|
created_at TEXT NOT NULL
|
|
118
142
|
);
|
|
119
143
|
|
|
@@ -453,6 +477,8 @@ CREATE TABLE IF NOT EXISTS secret_requests (
|
|
|
453
477
|
CREATE INDEX IF NOT EXISTS secret_requests_status_idx ON secret_requests(status, created_at DESC);
|
|
454
478
|
|
|
455
479
|
${RUNS_INDEXES}
|
|
480
|
+
CREATE INDEX IF NOT EXISTS runs_task_idx ON runs(task_id);
|
|
481
|
+
CREATE INDEX IF NOT EXISTS task_comments_task_idx ON task_comments(task_id);
|
|
456
482
|
CREATE INDEX IF NOT EXISTS messages_project_idx ON messages(project_id, created_at DESC);
|
|
457
483
|
CREATE INDEX IF NOT EXISTS solo_messages_bot_idx ON solo_messages(bot_id, created_at DESC);
|
|
458
484
|
CREATE INDEX IF NOT EXISTS tasks_project_idx ON tasks(project_id, status, updated_at DESC);
|
|
@@ -478,7 +504,7 @@ export function openDatabase(path) {
|
|
|
478
504
|
}
|
|
479
505
|
|
|
480
506
|
export class Store {
|
|
481
|
-
constructor(db, options = {}) {
|
|
507
|
+
constructor(db, options = {} ) {
|
|
482
508
|
this.db = db
|
|
483
509
|
this.ftsEnabled = options.ftsEnabled === true
|
|
484
510
|
}
|
package/src/http.js
CHANGED
|
@@ -63,7 +63,7 @@ export const OFFICIAL_UI_SWITCH_ROWS = [
|
|
|
63
63
|
]
|
|
64
64
|
|
|
65
65
|
// ui/styles.css 组件域拆分(DSHBOTS-160):5626 行巨石按 Section 域拆到 ui/styles/*.css,
|
|
66
|
-
// 每文件 <800 行。本表是拼接顺序的唯一真源(线上 installHttp 与 scripts/dev-server.
|
|
66
|
+
// 每文件 <800 行。本表是拼接顺序的唯一真源(线上 installHttp 与 scripts/dev-server.mjs
|
|
67
67
|
// 共用同一 readUiStyles),顺序即层叠语义——base 的变量声明在最前、wide 的媒体覆盖在
|
|
68
68
|
// 后,不得重排。
|
|
69
69
|
export const UI_STYLE_PARTS = [
|
|
@@ -105,7 +105,7 @@ const response = (body, type, status = 200, extra = {}) => new Response(body, {
|
|
|
105
105
|
},
|
|
106
106
|
})
|
|
107
107
|
|
|
108
|
-
export function installHttp(ctx, service, logger
|
|
108
|
+
export function installHttp(ctx, service, logger = console) {
|
|
109
109
|
const disposers = []
|
|
110
110
|
const route = (path, methods, handler, requestBody = 'buffered') => {
|
|
111
111
|
disposers.push(ctx.connection.fetch.register({
|
|
@@ -171,10 +171,13 @@ export function installHttp(ctx, service, logger = console) {
|
|
|
171
171
|
route('/api/dsh-team/modules/usage.js', ['GET'], moduleScript('usage.js'))
|
|
172
172
|
route('/api/dsh-team/modules/settings.js', ['GET'], moduleScript('settings.js'))
|
|
173
173
|
route('/api/dsh-team/modules/global-pages.js', ['GET'], moduleScript('global-pages.js'))
|
|
174
|
+
route('/api/dsh-team/modules/page-shell.js', ['GET'], moduleScript('page-shell.js'))
|
|
174
175
|
route('/api/dsh-team/modules/composer.js', ['GET'], moduleScript('composer.js'))
|
|
175
176
|
route('/api/dsh-team/modules/tasks.js', ['GET'], moduleScript('tasks.js'))
|
|
176
177
|
route('/api/dsh-team/modules/modal-layer.js', ['GET'], moduleScript('modal-layer.js'))
|
|
178
|
+
route('/api/dsh-team/modules/dom-morph.js', ['GET'], moduleScript('dom-morph.js'))
|
|
177
179
|
route('/api/dsh-team/modules/modal-forms.js', ['GET'], moduleScript('modal-forms.js'))
|
|
180
|
+
route('/api/dsh-team/modules/bot-quota.js', ['GET'], moduleScript('bot-quota.js'))
|
|
178
181
|
route('/api/dsh-team/modules/chat.js', ['GET'], moduleScript('chat.js'))
|
|
179
182
|
route('/api/dsh-team/modules/solo-archive.js', ['GET'], moduleScript('solo-archive.js'))
|
|
180
183
|
route('/api/dsh-team/modules/events-board.js', ['GET'], moduleScript('events-board.js'))
|
|
@@ -183,6 +186,22 @@ export function installHttp(ctx, service, logger = console) {
|
|
|
183
186
|
route('/api/dsh-team/modules/events-misc.js', ['GET'], moduleScript('events-misc.js'))
|
|
184
187
|
route('/api/dsh-team/i18n/zh.js', ['GET'], i18nDict('zh.js'))
|
|
185
188
|
route('/api/dsh-team/i18n/en.js', ['GET'], i18nDict('en.js'))
|
|
189
|
+
// DSHBOTS-233:词表按域拆分后,聚合入口(zh.js/en.js)相对导入域切片,
|
|
190
|
+
// 域切片同为浏览器模块图一环,沿用同一精确注册口径。
|
|
191
|
+
route('/api/dsh-team/i18n/zh/common.js', ['GET'], i18nDict('zh/common.js'))
|
|
192
|
+
route('/api/dsh-team/i18n/en/common.js', ['GET'], i18nDict('en/common.js'))
|
|
193
|
+
route('/api/dsh-team/i18n/zh/nav.js', ['GET'], i18nDict('zh/nav.js'))
|
|
194
|
+
route('/api/dsh-team/i18n/en/nav.js', ['GET'], i18nDict('en/nav.js'))
|
|
195
|
+
route('/api/dsh-team/i18n/zh/chat.js', ['GET'], i18nDict('zh/chat.js'))
|
|
196
|
+
route('/api/dsh-team/i18n/en/chat.js', ['GET'], i18nDict('en/chat.js'))
|
|
197
|
+
route('/api/dsh-team/i18n/zh/tasks.js', ['GET'], i18nDict('zh/tasks.js'))
|
|
198
|
+
route('/api/dsh-team/i18n/en/tasks.js', ['GET'], i18nDict('en/tasks.js'))
|
|
199
|
+
route('/api/dsh-team/i18n/zh/usage.js', ['GET'], i18nDict('zh/usage.js'))
|
|
200
|
+
route('/api/dsh-team/i18n/en/usage.js', ['GET'], i18nDict('en/usage.js'))
|
|
201
|
+
route('/api/dsh-team/i18n/zh/settings.js', ['GET'], i18nDict('zh/settings.js'))
|
|
202
|
+
route('/api/dsh-team/i18n/en/settings.js', ['GET'], i18nDict('en/settings.js'))
|
|
203
|
+
route('/api/dsh-team/i18n/zh/wechat.js', ['GET'], i18nDict('zh/wechat.js'))
|
|
204
|
+
route('/api/dsh-team/i18n/en/wechat.js', ['GET'], i18nDict('en/wechat.js'))
|
|
186
205
|
route('/api/dsh-team/styles.css', ['GET'], styles)
|
|
187
206
|
route('/api/dsh-team/fonts/inter-400.woff2', ['GET'], font('400'))
|
|
188
207
|
route('/api/dsh-team/fonts/inter-500.woff2', ['GET'], font('500'))
|
|
@@ -253,7 +272,7 @@ export function installHttp(ctx, service, logger = console) {
|
|
|
253
272
|
const action = String(body?.action ?? '')
|
|
254
273
|
const payload = body?.payload && typeof body.payload === 'object' ? body.payload : {}
|
|
255
274
|
const actor = { type: 'user', id: service.localUserId }
|
|
256
|
-
const data = await handleAction(service, action, payload, actor)
|
|
275
|
+
const data = await handleAction(service, action , payload, actor)
|
|
257
276
|
return response(JSON.stringify({ ok: true, data }), 'application/json; charset=utf-8')
|
|
258
277
|
} catch (error) {
|
|
259
278
|
return errorResponse(error)
|
package/src/paths.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { lstat, mkdir, realpath, rm } from 'node:fs/promises'
|
|
1
|
+
import { lstat, mkdir, realpath, rm, writeFile } from 'node:fs/promises'
|
|
2
2
|
import { isAbsolute, join, relative, resolve, sep } from 'node:path'
|
|
3
3
|
|
|
4
4
|
export class PathError extends Error {
|
|
@@ -129,3 +129,34 @@ export function assertInside(root, path) {
|
|
|
129
129
|
if (!within(target, resolve(root))) throw new PathError('路径不在允许的工作区内')
|
|
130
130
|
return target
|
|
131
131
|
}
|
|
132
|
+
|
|
133
|
+
// DSHBOTS-225 临时文件纪律:bot 名 → 临时目录名的安全化。
|
|
134
|
+
// 路径分隔符、Windows 保留字符与控制字符替换为 '-',空白归一为 '-',去前导点
|
|
135
|
+
// (防隐藏目录)与首尾连字符,截断到 64;净化后为空回退 'bot'。
|
|
136
|
+
export function sanitizeTmpBotDirName(name, fallback = 'bot') {
|
|
137
|
+
const safe = String(name ?? '')
|
|
138
|
+
.trim()
|
|
139
|
+
.replace(/[/\\:*?"<>|\x00-\x1f]/g, '-')
|
|
140
|
+
.replace(/\s+/g, '-')
|
|
141
|
+
.replace(/^[\s.-]+|[\s.-]+$/g, '')
|
|
142
|
+
.slice(0, 64)
|
|
143
|
+
return safe || fallback
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
// DSHBOTS-225 临时文件纪律:项目工作区统一临时区 .tmp/bots/。
|
|
147
|
+
// .tmp/.gitignore 写 "*"(整个 .tmp 不入 git)——ignore 文件自包含在项目工作区内,
|
|
148
|
+
// 不碰仓库根 .gitignore;只在缺失时写入(wx),不覆盖用户自定义内容。
|
|
149
|
+
// 每个成员 bot 一个 .tmp/bots/{安全化 bot 名}/ 子目录。调用方负责 try/catch 降级。
|
|
150
|
+
export async function ensureBotTmpDirs(projectDir, botNames = []) {
|
|
151
|
+
const tmpRoot = join(projectDir, '.tmp')
|
|
152
|
+
await ensureDirResilient(tmpRoot)
|
|
153
|
+
await writeFile(join(tmpRoot, '.gitignore'), '*\n', { flag: 'wx' }).catch((error) => {
|
|
154
|
+
if (error?.code !== 'EEXIST') throw error
|
|
155
|
+
})
|
|
156
|
+
const botsRoot = join(tmpRoot, 'bots')
|
|
157
|
+
await ensureDirResilient(botsRoot)
|
|
158
|
+
for (const name of botNames) {
|
|
159
|
+
await ensureDirResilient(join(botsRoot, sanitizeTmpBotDirName(name)))
|
|
160
|
+
}
|
|
161
|
+
return botsRoot
|
|
162
|
+
}
|
package/src/pricing.js
CHANGED
|
@@ -17,7 +17,7 @@ const num = (value, fallback = 0) => {
|
|
|
17
17
|
const first = (...values) => values.find(value => value !== undefined && value !== null && value !== '')
|
|
18
18
|
|
|
19
19
|
// 接受两种写法:简写 hit/miss/out,或全称 inputPerMtok/cacheReadPerMtok/outputPerMtok。
|
|
20
|
-
export function normalizePriceEntry(raw = {}) {
|
|
20
|
+
export function normalizePriceEntry(raw = {} ) {
|
|
21
21
|
const model = String(first(raw.model, raw.id, raw.name, '') ?? '').trim()
|
|
22
22
|
if (!model) return null
|
|
23
23
|
return {
|
|
@@ -43,7 +43,7 @@ function parseEnv(value) {
|
|
|
43
43
|
|
|
44
44
|
// 优先级:插件配置 config.modelPrices > 环境变量 DSH_TEAM_MODEL_PRICES(JSON) > 内置默认。
|
|
45
45
|
// 显式配置空数组 = 关闭默认价格(成本显示未配置)。
|
|
46
|
-
export function resolveModelPrices(config = {}, env = process.env) {
|
|
46
|
+
export function resolveModelPrices(config = {} , env = process.env) {
|
|
47
47
|
const source = Array.isArray(config.modelPrices) && !config.modelPrices.disabled
|
|
48
48
|
? config.modelPrices
|
|
49
49
|
: (parseEnv(env.DSH_TEAM_MODEL_PRICES) ?? DEFAULT_MODEL_PRICES)
|
package/src/runtime.js
CHANGED
|
@@ -5,7 +5,7 @@ import { trajectoryMethods } from './services/runtime/trajectory.js'
|
|
|
5
5
|
import { lifecycleMethods } from './services/runtime/lifecycle.js'
|
|
6
6
|
|
|
7
7
|
export class DshRuntime {
|
|
8
|
-
constructor({ ctx, config, store, logger = console, mask = null }) {
|
|
8
|
+
constructor({ ctx, config, store, logger = console , mask = null }) {
|
|
9
9
|
this.ctx = ctx
|
|
10
10
|
this.config = config
|
|
11
11
|
this.store = store
|
package/src/secrets.js
CHANGED
|
@@ -54,7 +54,7 @@ export function isShellIdentifier(name) {
|
|
|
54
54
|
export class SecretBox {
|
|
55
55
|
#key
|
|
56
56
|
|
|
57
|
-
constructor({ keyFile, keyHex, requireExisting = false } = {}) {
|
|
57
|
+
constructor({ keyFile, keyHex, requireExisting = false } = {} ) {
|
|
58
58
|
if (keyHex !== undefined) {
|
|
59
59
|
this.#key = decodeKeyHex(keyHex, 'keyHex')
|
|
60
60
|
} else if (keyFile !== undefined) {
|
|
@@ -89,7 +89,7 @@ export class SecretBox {
|
|
|
89
89
|
const decipher = createDecipheriv('aes-256-gcm', this.#key, Buffer.from(String(valueIv), 'base64'))
|
|
90
90
|
decipher.setAuthTag(Buffer.from(String(valueTag), 'base64'))
|
|
91
91
|
return Buffer.concat([decipher.update(Buffer.from(String(valueEnc), 'base64')), decipher.final()]).toString('utf8')
|
|
92
|
-
} catch (error) {
|
|
92
|
+
} catch (error ) {
|
|
93
93
|
throw new Error(`解密失败(密文或认证标签不匹配): ${error.message}`)
|
|
94
94
|
}
|
|
95
95
|
}
|
|
@@ -100,7 +100,7 @@ export class SecretBox {
|
|
|
100
100
|
* tightened to 0600; if the mode is still too wide afterwards (or cannot be
|
|
101
101
|
* changed at all), the caller is told the file is unsafe to read.
|
|
102
102
|
*/
|
|
103
|
-
export function enforceSecretKeyFilePermissions(keyFile, io
|
|
103
|
+
export function enforceSecretKeyFilePermissions(keyFile, io = { chmod: chmodSync, stat: statSync }) {
|
|
104
104
|
const mode = io.stat(keyFile).mode & 0o777
|
|
105
105
|
if ((mode & 0o077) === 0) return
|
|
106
106
|
try {
|
|
@@ -185,7 +185,7 @@ async function ensureGitignore(workspaceDir) {
|
|
|
185
185
|
let current = null
|
|
186
186
|
try {
|
|
187
187
|
current = await readFile(gitignorePath, 'utf8')
|
|
188
|
-
} catch (error) {
|
|
188
|
+
} catch (error ) {
|
|
189
189
|
if (error?.code !== 'ENOENT') throw error
|
|
190
190
|
}
|
|
191
191
|
if (current !== null && current.split(/\r?\n/).some(line => GITIGNORE_TEAM_FORMS.has(line.trim()))) return
|
package/src/service.js
CHANGED
|
@@ -18,16 +18,22 @@ import { clampNumber, jsonParse, nowIso, parseDisabledSkills, parseMentions, pro
|
|
|
18
18
|
import { parseWriteScopes, readWriteScopes, writeScopesOverlap } from './services/write-scopes.js'
|
|
19
19
|
import { normalizeFilePolicy } from './services/file-policy.js'
|
|
20
20
|
import { defineMethods } from './services/mixin.js'
|
|
21
|
+
import { reviewResult } from './wechat/format.js'
|
|
21
22
|
import { botsMethods } from './services/bots.js'
|
|
22
23
|
import { projectsMethods } from './services/projects.js'
|
|
23
24
|
import { chatMethods } from './services/chat.js'
|
|
24
25
|
import { tasksMethods } from './services/tasks.js'
|
|
26
|
+
import { taskDispatchMethods } from './services/task-dispatch.js'
|
|
27
|
+
import { taskRunMethods } from './services/task-runs.js'
|
|
25
28
|
import { taskNotifyMethods } from './services/task-notify.js'
|
|
29
|
+
import { notifyMethods } from './services/notify.js'
|
|
26
30
|
import { taskReviewMethods } from './services/task-review.js'
|
|
31
|
+
import { reviewWatchdogMethods } from './services/review-watchdog.js'
|
|
27
32
|
import { runsMethods } from './services/runs.js'
|
|
28
33
|
import { runFinishMethods } from './services/run-finish.js'
|
|
29
34
|
import { hygieneMethods } from './services/hygiene.js'
|
|
30
35
|
import { modelFallbackMethods } from './services/model-fallback.js'
|
|
36
|
+
import { botQuotaMethods } from './services/bot-quota.js'
|
|
31
37
|
import { schedulerMethods } from './services/scheduler.js'
|
|
32
38
|
import { memoryMethods } from './services/memory.js'
|
|
33
39
|
import { secretsMethods } from './services/secrets.js'
|
|
@@ -44,7 +50,7 @@ export { WRITE_SCOPE_MAX, WRITE_SCOPE_MAX_LEN, parseWriteScopes, readWriteScopes
|
|
|
44
50
|
export { FILE_POLICIES, FILE_POLICY_LABELS } from './services/file-policy.js'
|
|
45
51
|
|
|
46
52
|
export class TeamService {
|
|
47
|
-
constructor({ store, config, logger = console
|
|
53
|
+
constructor({ store, config, logger = console }) {
|
|
48
54
|
this.store = store
|
|
49
55
|
this.config = config
|
|
50
56
|
this.logger = logger
|
|
@@ -67,15 +73,13 @@ export class TeamService {
|
|
|
67
73
|
this.terminalActive = new Map()
|
|
68
74
|
}
|
|
69
75
|
|
|
70
|
-
/** 微信管理员指令:按 <key-N>
|
|
76
|
+
/** 微信管理员指令:按 <key-N> 定位并验收/退回任务。回执排版集中在 wechat/format.js(DSHBOTS-211)。 */
|
|
71
77
|
async wechatReview(identifier, { decision, comment }) {
|
|
72
78
|
await this.initialize()
|
|
73
79
|
if (!['accept', 'return'].includes(decision)) throw badRequest('验收结果只能是 accept 或 return')
|
|
74
80
|
const { project, task } = this.resolveTaskByIdentifier(identifier)
|
|
75
81
|
const view = await this.applyReview(task, project, decision, comment, { type: 'user', id: this.localUserId })
|
|
76
|
-
return
|
|
77
|
-
? `任务 ${identifier}《${view.title}》已验收通过。`
|
|
78
|
-
: `任务 ${identifier}《${view.title}》已退回重做。`
|
|
82
|
+
return reviewResult(identifier, view.title, decision)
|
|
79
83
|
}
|
|
80
84
|
}
|
|
81
85
|
|
|
@@ -86,12 +90,17 @@ defineMethods(TeamService.prototype, [
|
|
|
86
90
|
projectsMethods,
|
|
87
91
|
chatMethods,
|
|
88
92
|
tasksMethods,
|
|
93
|
+
taskDispatchMethods,
|
|
94
|
+
taskRunMethods,
|
|
89
95
|
taskNotifyMethods,
|
|
96
|
+
notifyMethods,
|
|
90
97
|
taskReviewMethods,
|
|
98
|
+
reviewWatchdogMethods,
|
|
91
99
|
runsMethods,
|
|
92
100
|
runFinishMethods,
|
|
93
101
|
hygieneMethods,
|
|
94
102
|
modelFallbackMethods,
|
|
103
|
+
botQuotaMethods,
|
|
95
104
|
schedulerMethods,
|
|
96
105
|
memoryMethods,
|
|
97
106
|
secretsMethods,
|