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
|
@@ -0,0 +1,247 @@
|
|
|
1
|
+
// src/wechat/format.ts —— 微信出站消息排版层(纯文本,DSHBOTS-217)
|
|
2
|
+
// 通道全部回程/回执文案在此集中格式化:分段、分隔线、缩进、关键标识前置。
|
|
3
|
+
// 只改样式不改语义(状态码、任务号、标题、指派等信息原样保留);
|
|
4
|
+
// 消费点(commands / channel / run-finish / task-notify / service.wechatReview)
|
|
5
|
+
// 只传数据不拼文案,后续调样式只动本文件。
|
|
6
|
+
// 排版一律纯文本,不用 emoji(D-211 实机验收驳回口径):状态一律写成 [状态码] 纯文字。
|
|
7
|
+
|
|
8
|
+
/** 纯文本分隔线:区分消息头与正文。 */
|
|
9
|
+
export const RULE = '———————————————'
|
|
10
|
+
|
|
11
|
+
/** 合批摘要的明细行数上限:超过只保留最旧 N 条原文,其余汇总。 */
|
|
12
|
+
export const DIGEST_DETAIL_LINES = 5
|
|
13
|
+
|
|
14
|
+
/** 帮助:固定指令一行一条,自由文本直达。 */
|
|
15
|
+
export function helpText() {
|
|
16
|
+
return [
|
|
17
|
+
'可用指令:',
|
|
18
|
+
' /? 查看本帮助',
|
|
19
|
+
' /keys 项目 key 清单',
|
|
20
|
+
' /bots 当前项目机器人清单',
|
|
21
|
+
' /states 未验收任务清单',
|
|
22
|
+
' /detail <任务号> 任务详情',
|
|
23
|
+
' /reject <任务号> <理由> 退回重做(管理员)',
|
|
24
|
+
' /tr <key> <消息> 跨项目直达(管理员)',
|
|
25
|
+
'',
|
|
26
|
+
'其余消息直接发给项目外 director 的专属工作区,回复会推送到微信。',
|
|
27
|
+
].join('\n')
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/** 未知固定指令:回一条简短可用指令提示。 */
|
|
31
|
+
export function unknownCommand() {
|
|
32
|
+
return '没有这个指令,发送 /? 查看可用指令。'
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** 写操作权限不足(非管理员)。 */
|
|
36
|
+
export function adminDenied() {
|
|
37
|
+
return '该指令仅限管理员使用。'
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** /tr 缺 key 或消息时的格式提示。 */
|
|
41
|
+
export function trHelp() {
|
|
42
|
+
return '格式:/tr <key> <消息>,如:/tr web 上线新版官网。'
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** /keys:可选项目 key 清单;当前绑定项目标注(当前)。 */
|
|
46
|
+
export function keysList(projects, boundKey = null) {
|
|
47
|
+
const list = projects ?? []
|
|
48
|
+
if (!list.length) return '当前没有可选的项目。'
|
|
49
|
+
const lines = ['项目 key:']
|
|
50
|
+
for (const project of list) {
|
|
51
|
+
const current = Boolean(boundKey) && String(project.key).toUpperCase() === String(boundKey).toUpperCase()
|
|
52
|
+
const name = project.name && project.name !== project.key ? ` ${project.name}` : ''
|
|
53
|
+
lines.push(` ${project.key}${name}${current ? '(当前)' : ''}`)
|
|
54
|
+
}
|
|
55
|
+
return lines.join('\n')
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/** /bots:当前项目机器人清单。 */
|
|
59
|
+
export function botsList(bots) {
|
|
60
|
+
const list = bots ?? []
|
|
61
|
+
if (!list.length) return '当前项目没有机器人。'
|
|
62
|
+
const lines = ['当前项目机器人:']
|
|
63
|
+
for (const bot of list) {
|
|
64
|
+
const role = bot.member_role || bot.bot_role
|
|
65
|
+
const state = bot.status && bot.status !== 'active' ? ` [${bot.status}]` : ''
|
|
66
|
+
lines.push(` ${bot.name}${role ? ` ${role}` : ''}${state}`)
|
|
67
|
+
}
|
|
68
|
+
return lines.join('\n')
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/** /states:未验收(in_review)任务清单,按项目分组。 */
|
|
72
|
+
export function statesView(projects) {
|
|
73
|
+
const lines = ['未验收的任务']
|
|
74
|
+
let any = false
|
|
75
|
+
for (const project of projects ?? []) {
|
|
76
|
+
const pending = (project.tasks ?? []).filter(task => task.status === 'in_review')
|
|
77
|
+
if (!pending.length) continue
|
|
78
|
+
any = true
|
|
79
|
+
lines.push(`【${project.name || project.key}】`)
|
|
80
|
+
for (const task of pending.slice(0, 10)) {
|
|
81
|
+
lines.push(` ${project.key}-${task.number} [${task.status}] ${task.title}`)
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return any ? lines.join('\n') : '当前没有待验收的任务。'
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/** 任务详情:卡片头 + 指派 + 最近评论(各评论空行分段,正文缩进两格)。 */
|
|
88
|
+
export function taskDetail(view) {
|
|
89
|
+
const lines = [`${view.identifier} [${view.status}] ${view.title}`]
|
|
90
|
+
lines.push(`指派 ${view.assigneeName ?? '暂未指派'}`)
|
|
91
|
+
for (const comment of (view.comments ?? []).slice(-3)) {
|
|
92
|
+
lines.push('', `— ${comment.author_type}:${comment.author_id} ${comment.created_at}`)
|
|
93
|
+
lines.push(` ${String(comment.body).slice(0, 200)}`)
|
|
94
|
+
}
|
|
95
|
+
return lines.join('\n')
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/** 可选项目清单(q 指令与直达未命中提示共用)。 */
|
|
99
|
+
export function projectList(projects) {
|
|
100
|
+
const list = projects ?? []
|
|
101
|
+
if (!list.length) return '当前没有可选的项目。'
|
|
102
|
+
const lines = ['可选的项目:']
|
|
103
|
+
for (const project of list) {
|
|
104
|
+
lines.push(` ${project.key}${project.name && project.name !== project.key ? ` ${project.name}` : ''}`)
|
|
105
|
+
}
|
|
106
|
+
return lines.join('\n')
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/** 直达连接回执:dispatch=显式 <key>: 指定;bind=自由文本首次绑定/换项目。 */
|
|
110
|
+
export function connectedReceipt(project, via) {
|
|
111
|
+
const name = project.name || project.key
|
|
112
|
+
return via === 'dispatch'
|
|
113
|
+
? `已直达【${name}】总监,之后的回复会推送到微信;直接发消息即可继续对话。`
|
|
114
|
+
: `已连接【${name}】总监,直接发消息即可,回复会推送到这里;换项目用「<key>: <消息>」。`
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
/** 项目无可定向总监。 */
|
|
118
|
+
export function noOwner(project) {
|
|
119
|
+
return `项目【${project.name || project.key}】没有可用的总监 Bot,无法直达。`
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
/** 项目外导演通道不可达(DSHBOTS-258):通道异常,语义与「需要用户选项目」不同。 */
|
|
123
|
+
export function noDirector() {
|
|
124
|
+
return '导演通道暂不可用,请稍后再试或到工作台处理。'
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/** 未选定直达项目:引导先指定一次,附项目清单。 */
|
|
128
|
+
export function needPickProject(projects) {
|
|
129
|
+
return [
|
|
130
|
+
'还没有选定直达的项目,先用「<key>: <消息>」指定一次,之后的消息就会直接发给该项目的总监。',
|
|
131
|
+
projectList(projects),
|
|
132
|
+
].join('\n')
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/** 显式 key 未命中。 */
|
|
136
|
+
export function projectNotFound(key, projects) {
|
|
137
|
+
return `没有找到项目 ${key}。${projectList(projects)}`
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/** 任务指令正文里没有合法任务号。 */
|
|
141
|
+
export function badTaskId() {
|
|
142
|
+
return `任务号格式不对:正文里没有形如 web-3 的任务号。${helpText()}`
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/** 驳回缺理由。 */
|
|
146
|
+
export function needReturnReason() {
|
|
147
|
+
return '驳回必须带理由:驳回 web-3 理由文字。'
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
/** 验收/驳回指令回执(accept | return)。 */
|
|
151
|
+
export function reviewResult(identifier, title, decision) {
|
|
152
|
+
return decision === 'accept'
|
|
153
|
+
? `${identifier}《${title}》已验收通过。`
|
|
154
|
+
: `${identifier}《${title}》已退回重做。`
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
/** 直达对话回程推送:总监回复(或失败提示)推回管理员微信;失败用 [失败] 纯文字标头。 */
|
|
158
|
+
export function chatReply(botName, body, failed = false) {
|
|
159
|
+
return `${failed ? '[失败] ' : ''}${botName}\n${RULE}\n${body}`
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
/** 提问/审批的微信短 token:取 id 末 6 位(库内唯一性由项目绑定 + pending 收敛)。 */
|
|
163
|
+
export function wechatToken(rowId) {
|
|
164
|
+
return String(rowId ?? '').slice(-6).toLowerCase()
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
* 提问转发微信(DSHBOTS-215):群聊提问卡片的微信镜像。
|
|
169
|
+
* 带短 token 与回复格式,管理员的答复经 commands 的「答 <token> …」路由回原问题。
|
|
170
|
+
* 微信出站一律纯文本、不用 emoji(D-211 实机验收驳回口径,重做卡 D-217)。
|
|
171
|
+
*/
|
|
172
|
+
export function questionCard(projectName, botName, items, token) {
|
|
173
|
+
const lines = [`【提问】${botName}(${projectName})`, RULE]
|
|
174
|
+
for (const [index, item] of (items ?? []).entries()) {
|
|
175
|
+
lines.push(`Q${index + 1}: ${item.question}`)
|
|
176
|
+
if (item.detail) lines.push(` ${item.detail}`)
|
|
177
|
+
if (Array.isArray(item.options) && item.options.length > 0) {
|
|
178
|
+
lines.push(` 选项: ${item.options.map((option, i) => `${i + 1}.${option.label}`).join(' / ')}`)
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
lines.push('', `回复「答 ${token} <选项或文字>」`)
|
|
182
|
+
if ((items ?? []).length > 1) lines.push(`多个问题用「;」分隔,如:答 ${token} 1:选项一;2:补充说明`)
|
|
183
|
+
return lines.join('\n')
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/** 审批转发微信(DSHBOTS-215):审批卡片的微信镜像,允许/拒绝经「批 <token> …」路由回原审批。 */
|
|
187
|
+
export function approvalCard(projectName, botName, toolName, reason, token) {
|
|
188
|
+
return [
|
|
189
|
+
`【审批】${botName}(${projectName})`,
|
|
190
|
+
RULE,
|
|
191
|
+
`工具: ${toolName}`,
|
|
192
|
+
`原因: ${reason}`,
|
|
193
|
+
'',
|
|
194
|
+
`回复「批 ${token} 允许」或「批 ${token} 拒绝」`,
|
|
195
|
+
].join('\n')
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
/** 答复/审批路由成功回执。 */
|
|
199
|
+
export function answerReceipt(token, summary) {
|
|
200
|
+
return `已收到答复(${token})\n${summary}`
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
/** 答复/审批路由失败提示(token 未命中、选项无法解析等)。 */
|
|
204
|
+
export function answerFailed(token, reason) {
|
|
205
|
+
return `答复无法提交(${token}):${reason}`
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
/** 答复缺少正文。 */
|
|
209
|
+
export function answerHelp() {
|
|
210
|
+
return '请按格式答复:答 <token> <选项或文字>;多个问题用「;」分隔,如:答 abc123 1:选项一;2:补充说明。'
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
/** 任务创建推送:任务号前置,指派与详情入口逐行列出。 */
|
|
214
|
+
export function taskCreated(identifier, title, assignee) {
|
|
215
|
+
return [
|
|
216
|
+
`${identifier}《${title}》已创建`,
|
|
217
|
+
`指派 ${assignee || '暂未指派'}`,
|
|
218
|
+
`发送 /detail ${identifier} 查看`,
|
|
219
|
+
].join('\n')
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
/** 任务完成推送。 */
|
|
223
|
+
export function taskDone(identifier, title) {
|
|
224
|
+
return [
|
|
225
|
+
`${identifier}《${title}》已完成`,
|
|
226
|
+
`发送 /detail ${identifier} 查看`,
|
|
227
|
+
].join('\n')
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
/** 合批摘要:总条数头 + 分隔线 + 明细原文(每条自带标识与状态),超上限截断汇总。 */
|
|
231
|
+
export function batchDigest(items) {
|
|
232
|
+
const shown = items.slice(0, DIGEST_DETAIL_LINES)
|
|
233
|
+
const rest = items.length - shown.length
|
|
234
|
+
const lines = [`任务动态 ${items.length} 条`, RULE, ...shown.map(item => item.text)]
|
|
235
|
+
if (rest > 0) lines.push(`其余 ${rest} 项`)
|
|
236
|
+
return lines.join('\n')
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
/** 管理员绑定欢迎。 */
|
|
240
|
+
export function welcomeAdmin() {
|
|
241
|
+
return '已绑定为本团队管理员\n发送 /? 查看指令'
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
/** 用户侧通用失败提示(具体错误只进日志)。 */
|
|
245
|
+
export function failureText() {
|
|
246
|
+
return '消息处理失败,稍后重试'
|
|
247
|
+
}
|
package/src/wechat/store.js
CHANGED
|
@@ -31,6 +31,7 @@ export class WechatStore {
|
|
|
31
31
|
credentials_json TEXT,
|
|
32
32
|
cursor TEXT NOT NULL DEFAULT '',
|
|
33
33
|
admin_peer_id TEXT,
|
|
34
|
+
direct_project_key TEXT,
|
|
34
35
|
updated_at TEXT NOT NULL DEFAULT ''
|
|
35
36
|
);
|
|
36
37
|
CREATE TABLE IF NOT EXISTS outbox (
|
|
@@ -49,10 +50,24 @@ export class WechatStore {
|
|
|
49
50
|
);
|
|
50
51
|
`)
|
|
51
52
|
await this.migrateOutboxColumns()
|
|
53
|
+
await this.migrateChannelStateColumns()
|
|
52
54
|
await this.secureFiles()
|
|
53
55
|
return this
|
|
54
56
|
}
|
|
55
57
|
|
|
58
|
+
/**
|
|
59
|
+
* 旧库补列迁移:直达对话(DSHBOTS-208)引入项目绑定列之前的库缺这一列。
|
|
60
|
+
* 幂等:列已存在则跳过;补列无默认值,旧行语义等价于「未绑定」。
|
|
61
|
+
*/
|
|
62
|
+
async migrateChannelStateColumns() {
|
|
63
|
+
const columns = new Set(
|
|
64
|
+
this.db.prepare('PRAGMA table_info(channel_state)').all().map(column => column.name),
|
|
65
|
+
)
|
|
66
|
+
if (!columns.has('direct_project_key')) {
|
|
67
|
+
this.db.exec('ALTER TABLE channel_state ADD COLUMN direct_project_key TEXT')
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
56
71
|
/**
|
|
57
72
|
* 旧库补列迁移:outbox 引入重试上限(attempts)与废弃标记(gave_up_at)前的库缺这两列。
|
|
58
73
|
* 幂等:列已存在则跳过;补列带默认值,旧行语义等价于「未重试过、未废弃」。
|
|
@@ -106,6 +121,19 @@ export class WechatStore {
|
|
|
106
121
|
).run(String(peerId), nowIso())
|
|
107
122
|
}
|
|
108
123
|
|
|
124
|
+
/** 直达对话(DSHBOTS-208):管理员微信会话当前绑定的项目 key(未绑定为 null)。 */
|
|
125
|
+
getDirectProjectKey() {
|
|
126
|
+
return this.getState()?.direct_project_key ?? null
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/** 绑定直达项目:`<key>: <消息>` 显式路由或自由文本成功路由后调用;空值解除绑定。 */
|
|
130
|
+
saveDirectProjectKey(key) {
|
|
131
|
+
this.db.prepare(
|
|
132
|
+
`INSERT INTO channel_state (id, direct_project_key, updated_at) VALUES (1, ?, ?)
|
|
133
|
+
ON CONFLICT(id) DO UPDATE SET direct_project_key = excluded.direct_project_key, updated_at = excluded.updated_at`,
|
|
134
|
+
).run(key ? String(key) : null, nowIso())
|
|
135
|
+
}
|
|
136
|
+
|
|
109
137
|
/** 会话凭证(contextToken/clientId):每个联系人一行,入站消息即刷新(UPSERT)。
|
|
110
138
|
* at 为该凭证最后刷新时间(epoch ms),供通道侧做过期判定。 */
|
|
111
139
|
savePeer(peerId, { contextToken, clientId, at }) {
|
|
@@ -135,7 +163,7 @@ export class WechatStore {
|
|
|
135
163
|
* 避免旧消息与旧账号的会话凭证在下次登录后外发。 */
|
|
136
164
|
clearCredentials() {
|
|
137
165
|
this.db.prepare(
|
|
138
|
-
"UPDATE channel_state SET credentials_json = NULL, cursor = '', admin_peer_id = NULL, updated_at = ? WHERE id = 1",
|
|
166
|
+
"UPDATE channel_state SET credentials_json = NULL, cursor = '', admin_peer_id = NULL, direct_project_key = NULL, updated_at = ? WHERE id = 1",
|
|
139
167
|
).run(nowIso())
|
|
140
168
|
this.db.prepare('DELETE FROM peers').run()
|
|
141
169
|
this.db.prepare('DELETE FROM outbox').run()
|
|
@@ -209,7 +237,7 @@ async function ensureMode(path, mode) {
|
|
|
209
237
|
const info = await stat(path)
|
|
210
238
|
if ((info.mode & 0o7777) === mode) return
|
|
211
239
|
await chmod(path, mode)
|
|
212
|
-
} catch (error) {
|
|
240
|
+
} catch (error ) {
|
|
213
241
|
if (error?.code !== 'ENOENT') throw error
|
|
214
242
|
}
|
|
215
243
|
}
|
package/ui/app.js
CHANGED
|
@@ -1,26 +1,28 @@
|
|
|
1
1
|
import { state, STATUS, STATUS_ORDER, PRIORITY, PROPOSAL_STATUS, COLORS, COLOR_NAMES, BOT_STATUS, RUN_STATUS, RUN_KIND, CHAT_PAGE_SIZE, CHAT_ACTIVE_TASK_LIMIT, SKILL_STATUS, MEMORY_STATUS, PROPOSAL_KIND, TERMINAL_STATUS, CREATOR_TYPE, EFFORT, FILE_POLICY, DEFAULT_FILE_POLICY, VIEW_ACTION, NAV, SOLO_NAV } from './modules/state.js'
|
|
2
2
|
import { icon } from './modules/icons.js'
|
|
3
|
-
import { applyUiScale, applyUiTheme, esc, attr, pathCode, costValue, clamp, botById, shortRefId, actorLabel, taskById, activeProject, inSoloContext, pageProject, activeBots, formatNumber, CURRENCY_SYMBOL, formatCost, timeAgo, formatTime, duration,
|
|
3
|
+
import { applyUiScale, applyUiTheme, esc, attr, pathCode, costValue, clamp, botById, shortRefId, actorLabel, taskById, activeProject, inSoloContext, pageProject, activeBots, formatNumber, CURRENCY_SYMBOL, formatCost, timeAgo, formatTime, duration, avatar, statusPill, runDot, memberRunDot, runDotHtml, MEMBER_STATUS_TEXT, memorySource, toast, filePolicyOptions } from './modules/util.js'
|
|
4
4
|
import { richText, mdPlainSummary, mdChatScope } from './modules/markdown.js'
|
|
5
5
|
import { api, loadState, markVisibleChatRead } from './modules/api.js'
|
|
6
6
|
import { t, setLanguage } from './modules/i18n.js'
|
|
7
7
|
import { typingLingerRowsHtml, applyOptimisticTyping, pruneTypingLinger } from './modules/typing-linger.js'
|
|
8
|
-
import { renderMessage, renderDirectMessagesCard, questionBannerView, approvalBannerView, toggleDesktopNotify, focusQuestionCard, focusApprovalCard, notifyNewApprovals, questionDraftOf, questionDraftSelection, questionSelectOption, notifyToggleView, notifyOn,
|
|
9
|
-
import { renderUsage, usageMode, usageViewTitle, usageTotals
|
|
8
|
+
import { renderMessage, renderDirectMessagesCard, questionBannerView, approvalBannerView, toggleDesktopNotify, focusQuestionCard, focusApprovalCard, notifyNewApprovals, questionDraftOf, questionDraftSelection, questionSelectOption, notifyToggleView, notifyOn, approvalUrgent, approvalRemainingFrom, formatApprovalCountdown, approvalProgressRatio, questionRemainingFrom, questionUrgent, formatQuestionCountdown, questionProgressRatio } from './modules/cards.js'
|
|
9
|
+
import { renderUsage, usageMode, usageViewTitle, usageTotals } from './modules/usage.js'
|
|
10
10
|
import { renderSettings, renderGlobal, renderUsageGlobal, renderUsageDomain, renderUsageSolo } from './modules/settings.js'
|
|
11
11
|
import { renderChannel, renderSecretsPage } from './modules/global-pages.js'
|
|
12
12
|
import { updateAutocomplete, moveAcSelection, closeAutocomplete, applyAutocomplete, currentDraft, pendingImagesFor, attachImageButton, composerImageStrip, resolveImageMediaType, addPendingImages, removePendingImage, thumbnailFallback, ensureComposerImageInput, parseFileUriList, insertTextAtCursor, hydrateMessageImageThumbs, ensureImageViewer, openMessageImage, closeImageViewer, openInlineImage, COMPOSER_AUTO_MAX_PX, composerPanelCap, applyComposerHeight, syncComposerBox, sendMessage, saveTaskFromForm } from './modules/composer.js'
|
|
13
13
|
import { renderTasks, renderTerminal, renderBotsOverview, renderMembers, renderSkills, renderMemory, renderEvolution, taskGroupKey, taskChildrenKey, terminalOutputText, searchMemories, currentSkillVersion, skillVersions } from './modules/tasks.js'
|
|
14
14
|
import { overlayOpen, markAppRenderPending, renderModalLayer, ensureModalRoot, noteModalScroll, flushAppRender } from './modules/modal-layer.js'
|
|
15
|
+
import { morph } from './modules/dom-morph.js'
|
|
15
16
|
import { openModal, closeModal, openTask, openSkillDetail, openTrajectory, openBot, reloadTaskModal, bindProposalForm, updateEffortOptions, updateFallbackEffortOptions, trapModalFocus, renderDirPicker, closeDirPicker, parseFallbackFields, normalizeTimeBudgetMinutes, modelOptions, effortOptions, fallbackModelOptions, renderPriceCard } from './modules/modal-forms.js'
|
|
16
17
|
import { activeTypingRuns, typingRows, chatKey, mergedChatMessages, canLoadOlder, loadOlderButton, loadOlderMessages, renderChatMembersCard, renderChat, DISPATCH_LIST_LIMIT, dispatchListNote, dispatchTaskRow, dispatchRunRow, renderSoloChat, loadSoloDetail, renderSoloConfig } from './modules/chat.js'
|
|
18
|
+
import { refreshAction } from './modules/page-shell.js'
|
|
17
19
|
import { handleBoardAction } from './modules/events-board.js'
|
|
18
20
|
import './modules/events-click.js'
|
|
19
21
|
import './modules/events-submit.js'
|
|
20
22
|
import './modules/events-misc.js'
|
|
21
23
|
// 全局一级视图集合:侧栏直达、无项目 tab(usage 的 global 模式另算,见 isGlobal)。
|
|
22
24
|
const GLOBAL_VIEWS = new Set(['global', 'bots-overview', 'channel', 'secrets'])
|
|
23
|
-
const app = document.getElementById('app')
|
|
25
|
+
const app = document.getElementById('app')
|
|
24
26
|
const UI_SCALE_KEY = 'dshb:ui-scale'
|
|
25
27
|
const UI_THEME_KEY = 'dshb:ui-theme'
|
|
26
28
|
|
|
@@ -28,7 +30,7 @@ const UI_THEME_KEY = 'dshb:ui-theme'
|
|
|
28
30
|
// 与 <details data-panel> 同一套通道(key 形如 task-group:<status>),折叠即从集合里删掉。
|
|
29
31
|
for (const status of STATUS_ORDER) state.openPanels.add(taskGroupKey(status))
|
|
30
32
|
|
|
31
|
-
if (window.matchMedia?.('(max-width: 980px)').matches) state.tree = { chats: false, bots: false }
|
|
33
|
+
if (window.matchMedia?.('(max-width: 980px)').matches) state.tree = { chats: false, bots: false }
|
|
32
34
|
const savedScale = (() => {
|
|
33
35
|
try { return Number(localStorage.getItem(UI_SCALE_KEY)) || null } catch { return null }
|
|
34
36
|
})()
|
|
@@ -49,12 +51,12 @@ setLanguage(document.documentElement.dataset.dshLanguage || 'auto')
|
|
|
49
51
|
}
|
|
50
52
|
|
|
51
53
|
// state.language(服务端 state() 顶层同源透传)与上次不一致时热切换:换字典 + 轻提示,
|
|
52
|
-
// 下次 render
|
|
54
|
+
// 下次 render 生效;首载只对齐不提示。渲染走原位补丁,文案随字典换,滚动与弹窗不受影响。
|
|
53
55
|
function syncLanguage() {
|
|
54
56
|
const language = state.data?.language
|
|
55
|
-
if (!language || language === state.uiLanguage) return
|
|
56
|
-
const first = state.uiLanguage === undefined
|
|
57
|
-
state.uiLanguage = language
|
|
57
|
+
if (!language || language === (state ).uiLanguage) return
|
|
58
|
+
const first = (state ).uiLanguage === undefined
|
|
59
|
+
;(state ).uiLanguage = language
|
|
58
60
|
setLanguage(language)
|
|
59
61
|
if (!first) {
|
|
60
62
|
toast(t('toast.languageSwitched'), 'success')
|
|
@@ -138,7 +140,7 @@ function updateTerminalDom(terminal) {
|
|
|
138
140
|
outputEl.textContent = text
|
|
139
141
|
outputEl.scrollTop = outputEl.scrollHeight
|
|
140
142
|
// 空态占位是 pre 之外的独立层,有输出时收起,避免遮住首屏内容。
|
|
141
|
-
const emptyEl = document.querySelector('.terminal-output-empty')
|
|
143
|
+
const emptyEl = document.querySelector('.terminal-output-empty')
|
|
142
144
|
if (emptyEl) emptyEl.hidden = Boolean(text)
|
|
143
145
|
}
|
|
144
146
|
}
|
|
@@ -158,7 +160,7 @@ function bootError(error) {
|
|
|
158
160
|
}
|
|
159
161
|
|
|
160
162
|
function isTyping() {
|
|
161
|
-
const el = document.activeElement
|
|
163
|
+
const el = document.activeElement
|
|
162
164
|
return el && (el.tagName === 'INPUT' || el.tagName === 'TEXTAREA' || el.isContentEditable)
|
|
163
165
|
}
|
|
164
166
|
|
|
@@ -216,10 +218,9 @@ function runKindLabel(kind) {
|
|
|
216
218
|
|
|
217
219
|
function renderShell() {
|
|
218
220
|
const data = state.data
|
|
219
|
-
const
|
|
221
|
+
const inSolo = inSoloContext()
|
|
220
222
|
// 场景分支:单聊上下文无项目域;群聊上下文 = 当前项目。
|
|
221
|
-
const project =
|
|
222
|
-
const pending = pendingProposals()
|
|
223
|
+
const project = inSolo ? null : activeProject()
|
|
223
224
|
// 跨项目待审(DSHBOTS-102):state 顶层全局口径,与当前项目解耦。
|
|
224
225
|
const pendingApprovals = data?.pendingApprovals ?? { count: 0, items: [] }
|
|
225
226
|
// 跨项目待答提问(DSHBOTS-116):与审批同口径,顶层全局聚合。
|
|
@@ -228,11 +229,12 @@ function renderShell() {
|
|
|
228
229
|
const activeTasks = Number(data?.activeTasks ?? 0)
|
|
229
230
|
const projectRunning = project?.stats?.running ?? 0
|
|
230
231
|
const tokenTotal = usageTotals('project').totalTokens ?? 0
|
|
231
|
-
// 全局一级视图(DSHBOTS-197 起含迁移落点页 通道/密钥):无项目 tab
|
|
232
|
+
// 全局一级视图(DSHBOTS-197 起含迁移落点页 通道/密钥):无项目 tab 导航,侧栏直达。四页页壳页(DSHBOTS-216)冗余 topbar 不渲染,页头由 global-head 唯一承担(总览bots 仍走 topbar);无横幅时 main-head 整块不渲染,避免空粘头残影。
|
|
232
233
|
const isGlobal = GLOBAL_VIEWS.has(state.view) || (state.view === 'usage' && usageMode() === 'global')
|
|
234
|
+
const shellGlobalPage = isGlobal && state.view !== 'bots-overview'
|
|
235
|
+
const showMainHead = !shellGlobalPage || approvalBannerView(pendingApprovals) !== '' || questionBannerView(pendingQuestions) !== ''
|
|
233
236
|
// 单聊是独立于项目的 1V1 上下文:对话/配置/技能/记忆/进化/用量共用一套导航。
|
|
234
237
|
const isSolo = state.view === 'chat' && state.chatMode === 'solo'
|
|
235
|
-
const inSolo = inSoloContext()
|
|
236
238
|
const soloBot = inSolo ? botById(state.soloBotId) : null
|
|
237
239
|
const viewTitle = isSolo
|
|
238
240
|
? (soloBot ? t('viewTitle.dispatch', { name: soloBot.name }) : t('viewTitle.dispatchPlain'))
|
|
@@ -250,7 +252,6 @@ function renderShell() {
|
|
|
250
252
|
: state.view === 'channel' ? t('viewTitle.channel')
|
|
251
253
|
: state.view === 'secrets' ? t('viewTitle.secrets')
|
|
252
254
|
: t('viewTitle.projectSettings')
|
|
253
|
-
const title = viewTitle
|
|
254
255
|
const spec = VIEW_ACTION[state.view]
|
|
255
256
|
const cardOwnsPrimary = state.view === 'evolution' && pendingProposals() > 0
|
|
256
257
|
const primary = (!project && !inSolo) || !spec ? '' : spec.submit
|
|
@@ -312,7 +313,7 @@ function renderShell() {
|
|
|
312
313
|
${state.tree.bots ? `<div class="tree-list">
|
|
313
314
|
${bots.length === 0 ? `<div class="side-empty">${t('tree.botsEmpty')}</div>` : bots.map(bot => `
|
|
314
315
|
<button class="tree-item bot-item ${state.view === 'chat' && state.chatMode === 'solo' && bot.id === state.soloBotId ? 'active' : ''}" data-action="${bot.status === 'active' ? 'solo-bot' : 'edit-bot'}" data-bot-id="${attr(bot.id)}" title="${esc(bot.name)} · ${esc(bot.role || t('common.member'))} · ${esc(bot.modelRef ?? t('common.modelUnset'))}">
|
|
315
|
-
|
|
316
|
+
${avatar(bot, 'sm')}
|
|
316
317
|
<span class="tree-item-name">${esc(bot.name)}</span>
|
|
317
318
|
${bot.openTasks > 0 ? `<span class="tree-open-count">${bot.openTasks}</span>` : ''}
|
|
318
319
|
${bot.status !== 'active' ? `<span class="tree-flag">${t('common.archived')}</span>` : ''}
|
|
@@ -327,7 +328,7 @@ function renderShell() {
|
|
|
327
328
|
</div>
|
|
328
329
|
${state.tree.archived ? `<div class="tree-list">
|
|
329
330
|
${archivedChats.length === 0 ? `<div class="side-empty">${t('tree.archivedEmpty')}</div>` : archivedChats.map(item => `
|
|
330
|
-
<button class="tree-item chat-item archived ${item.id === project?.id && !isGlobal && state.chatMode !== 'solo' ? 'active' : ''}" data-action="select-project" data-project-id="${attr(item.id)}" title="${esc(item.name)}
|
|
331
|
+
<button class="tree-item chat-item archived ${item.id === project?.id && !isGlobal && state.chatMode !== 'solo' ? 'active' : ''}" data-action="select-project" data-project-id="${attr(item.id)}" title="${esc(item.name)}">
|
|
331
332
|
<span class="chat-hash">#</span>
|
|
332
333
|
<span class="tree-item-name">${esc(item.name)}</span>
|
|
333
334
|
<span class="tree-flag">${t('common.archived')}</span>
|
|
@@ -357,20 +358,20 @@ function renderShell() {
|
|
|
357
358
|
<span class="sidebar-meta-sep">·</span>
|
|
358
359
|
<span>${t('sidebar.botsCount', { count: activeBots.length })}</span>
|
|
359
360
|
<span class="sidebar-meta-sep">·</span>
|
|
360
|
-
<span>${t('sidebar.pendingReviews', { count:
|
|
361
|
+
<span>${t('sidebar.pendingReviews', { count: pendingProposals() })}</span>
|
|
361
362
|
</div>
|
|
362
363
|
</div>
|
|
363
364
|
</aside>
|
|
364
365
|
<main class="main">
|
|
365
|
-
|
|
366
|
+
${showMainHead ? `<div class="main-head">
|
|
366
367
|
${approvalBannerView(pendingApprovals)}
|
|
367
368
|
${questionBannerView(pendingQuestions)}
|
|
368
|
-
|
|
369
|
+
${shellGlobalPage ? '' : `<header class="topbar">
|
|
369
370
|
<div class="topbar-title">
|
|
370
371
|
${eyebrow ? `<div class="topbar-eyebrow">${eyebrow}</div>` : ''}
|
|
371
|
-
<h1>${esc(
|
|
372
|
+
<h1>${esc(viewTitle)}</h1>
|
|
372
373
|
</div>
|
|
373
|
-
${isGlobal ||
|
|
374
|
+
${isGlobal || inSolo || !project ? '' : `<div class="topbar-meta">
|
|
374
375
|
<span><b>${project?.stats?.openTasks ?? 0}</b> ${project?.stats?.openTasks === 1 ? t('topbar.taskOne') : t('topbar.taskMany')}</span>
|
|
375
376
|
<span class="sep"></span>
|
|
376
377
|
<span><b>${projectRunning}</b> ${projectRunning === 1 ? t('topbar.runningOne') : t('topbar.runningMany')}</span>
|
|
@@ -379,9 +380,9 @@ function renderShell() {
|
|
|
379
380
|
</div>`}
|
|
380
381
|
<div class="topbar-actions">
|
|
381
382
|
${primary}
|
|
382
|
-
|
|
383
|
+
${refreshAction()}
|
|
383
384
|
</div>
|
|
384
|
-
</header
|
|
385
|
+
</header>`}
|
|
385
386
|
${isGlobal ? '' : `<div class="tabbar" role="tablist" aria-label="${t('topbar.mainNav')}">
|
|
386
387
|
${(inSolo ? SOLO_NAV : NAV).map(([key, label]) => {
|
|
387
388
|
const dot = tabDot(key)
|
|
@@ -391,7 +392,7 @@ function renderShell() {
|
|
|
391
392
|
return `<button class="tab ${active ? 'active' : ''}" role="tab" id="tab-${key}" aria-controls="main-content" aria-selected="${active}" tabindex="${active ? '0' : '-1'}" data-action="nav" data-view="${key}"${tabMode ? ` data-usage-mode="${tabMode}"` : ''}>${t(inSolo && key === 'chat' ? 'nav.soloChat' : 'nav.' + key)}${dot ? `<span class="red-dot" title="${t('topbar.attention')}"></span>` : ''}</button>`
|
|
392
393
|
}).join('')}
|
|
393
394
|
</div>`}
|
|
394
|
-
</div
|
|
395
|
+
</div>` : ''}
|
|
395
396
|
<section class="content" id="main-content" role="tabpanel" tabindex="-1"${isGlobal ? '' : ` aria-labelledby="tab-${state.view}"`}>
|
|
396
397
|
${renderView()}
|
|
397
398
|
</section>
|
|
@@ -400,7 +401,7 @@ function renderShell() {
|
|
|
400
401
|
}
|
|
401
402
|
|
|
402
403
|
function syncChromeHeight() {
|
|
403
|
-
const head = document.querySelector('.main-head')
|
|
404
|
+
const head = document.querySelector('.main-head')
|
|
404
405
|
if (!head) return
|
|
405
406
|
const chrome = head.offsetHeight + 48
|
|
406
407
|
document.documentElement.style.setProperty('--chrome-h', `${chrome}px`)
|
|
@@ -440,10 +441,9 @@ function panelAttrs(state, key) {
|
|
|
440
441
|
return ` data-panel="${attr(key)}"${panelOpenAttr(state, key)}`
|
|
441
442
|
}
|
|
442
443
|
|
|
443
|
-
// board-scroll-restore ——
|
|
444
|
-
//
|
|
445
|
-
//
|
|
446
|
-
// 用户拽回原点。窗口滚动仅在前后两次 render 同视图时恢复,切 tab 不携带上一视图的滚动位;
|
|
444
|
+
// board-scroll-restore —— 视图滚动位:纵向在 window 层(.main 撑高页面、body 无 overflow),
|
|
445
|
+
// 任务看板 .board 另有横向滚动,侧栏 .tree 自身纵向滚动。原位补丁(DSHBOTS-227)下三处都随节点
|
|
446
|
+
// 活着,这里的「重建前记下、重建后恢复」只在回退全量重建时兜底;窗口滚动仅在前后两次同视图时恢复。
|
|
447
447
|
// 聊天视图维持既有 savedChatScroll / chatAtBottom 逻辑不动。
|
|
448
448
|
let lastRenderedView = null
|
|
449
449
|
|
|
@@ -491,10 +491,10 @@ function render() {
|
|
|
491
491
|
return
|
|
492
492
|
}
|
|
493
493
|
state.ac = null
|
|
494
|
-
app.className = ''
|
|
495
|
-
// composer 持焦时的光标快照(DSHBOTS-123
|
|
496
|
-
// rAF
|
|
497
|
-
const activeBeforeRebuild = document.activeElement
|
|
494
|
+
if (app.className) app.className = ''
|
|
495
|
+
// composer 持焦时的光标快照(DSHBOTS-123):回退全量重建时 #composer-input 会被拆走,先记选区与
|
|
496
|
+
// 滚动,rAF 收尾恢复;原位补丁路径下节点根本没动,这份恢复是空转。
|
|
497
|
+
const activeBeforeRebuild = document.activeElement
|
|
498
498
|
const composerCaret = activeBeforeRebuild?.id === 'composer-input' ? {
|
|
499
499
|
start: activeBeforeRebuild.selectionStart ?? 0,
|
|
500
500
|
end: activeBeforeRebuild.selectionEnd ?? 0,
|
|
@@ -507,11 +507,11 @@ function render() {
|
|
|
507
507
|
// chat-scroll:render-gate —— 重建 DOM 的窗口内忽略聊天滚动事件:旧 .chat-messages 被拆走时可能补发
|
|
508
508
|
// 一次 scroll 事件,若在此窗口送达会把「重建」误判成「用户上翻」。窗口在 rAF 收尾复位。
|
|
509
509
|
state.rendering = true
|
|
510
|
-
// chat-scroll-restore:mark ——
|
|
511
|
-
// 2.8s 轮询重渲染因此不再把上翻历史的用户拽回顶部;贴底(chatAtBottom)仍走下方 rAF 自动落底。
|
|
510
|
+
// chat-scroll-restore:mark —— 非贴底时先记下消息列表滚动位置,重建后原位恢复。
|
|
512
511
|
const savedChatScroll = document.querySelector('.chat-messages')?.scrollTop ?? null
|
|
513
512
|
const savedViewScroll = captureViewScroll(lastRenderedView === state.view)
|
|
514
|
-
|
|
513
|
+
// 原位补丁(DSHBOTS-227):按身份键复用节点、只写变了的属性与文本,动画相位/焦点/滚动位随节点活下来;补不动才整页重建。
|
|
514
|
+
morph(app, renderShell())
|
|
515
515
|
// 附图缩略图:模板嵌缓存命中者,未命中的在此异步补齐(会话级缓存去重,见 hydrateMessageImageThumbs)。
|
|
516
516
|
hydrateMessageImageThumbs(app)
|
|
517
517
|
if (!state.chatAtBottom && savedChatScroll !== null) {
|
|
@@ -533,7 +533,7 @@ function render() {
|
|
|
533
533
|
// 光标续接(DSHBOTS-123):重建前持焦且已记快照时,把焦点与选区无损放回 composer。
|
|
534
534
|
if (composerCaret && composerInput) {
|
|
535
535
|
composerInput.focus()
|
|
536
|
-
try { composerInput.setSelectionRange(composerCaret.start, composerCaret.end, composerCaret.direction) } catch {}
|
|
536
|
+
try { (composerInput ).setSelectionRange(composerCaret.start, composerCaret.end, composerCaret.direction) } catch {}
|
|
537
537
|
composerInput.scrollTop = composerCaret.scrollTop
|
|
538
538
|
}
|
|
539
539
|
const messages = document.querySelector('.chat-messages')
|
|
@@ -695,7 +695,7 @@ window.addEventListener('scroll', event => {
|
|
|
695
695
|
// 顶部待审明细菜单(DSHBOTS-102):点击菜单外任意处收起;面板关着时直接返回,不额外渲染。
|
|
696
696
|
document.addEventListener('click', (event) => {
|
|
697
697
|
if (!state.approvalPanelOpen) return
|
|
698
|
-
if (event.target.closest?.('.approval-banner')) return
|
|
698
|
+
if ((event.target ).closest?.('.approval-banner')) return
|
|
699
699
|
state.approvalPanelOpen = false
|
|
700
700
|
render()
|
|
701
701
|
})
|
|
@@ -736,50 +736,54 @@ document.addEventListener('visibilitychange', () => {
|
|
|
736
736
|
// 运行行(runClockSpan 产出的占位)同一通道——只改 textContent,不重建节点。renderModalLayer
|
|
737
737
|
// 挂载/补丁后同步调用一次,占位符不会等满 1s 才补上真实时长。
|
|
738
738
|
function updateRunClocks(root = document) {
|
|
739
|
-
|
|
740
|
-
|
|
739
|
+
const overlay = overlayOpen() // 遮罩打开时底页在模糊后不可见:底页时钟跳过(DSHBOTS-210),只刷弹窗层
|
|
740
|
+
for (const el of root.querySelectorAll('.run-clock[data-started]') ) {
|
|
741
|
+
if (overlay && !el.closest('#modal-root')) continue
|
|
742
|
+
const next = duration(el.dataset.started); if (el.textContent !== next) el.textContent = next // DSHBOTS-255 等值守卫:值相同也写会替换文本节点
|
|
741
743
|
}
|
|
742
744
|
}
|
|
743
745
|
|
|
744
746
|
setInterval(() => { void poll() }, 2800)
|
|
745
747
|
setInterval(() => {
|
|
746
748
|
updateRunClocks()
|
|
749
|
+
// 遮罩打开时底页整体冻结(DSHBOTS-210):下述刷新只写 #app,而 #app 是 backdrop-filter 的输入。
|
|
750
|
+
if (overlayOpen()) return
|
|
747
751
|
// 终态气泡到期摘除与淡出刷新(DSHBOTS-150):只动气泡节点,不整页重建(不打断输入中的草稿)。
|
|
748
752
|
pruneTypingLinger()
|
|
749
753
|
// 审批倒计时局部刷新(DSHBOTS-102):只改文本与危险色,不整卡重绘(2.8s 轮询会打断跳动感)。
|
|
750
|
-
|
|
754
|
+
// 群聊卡片与顶部通知卡片共用同一张审批卡组件,都挂 .approval-clock。
|
|
755
|
+
for (const el of document.querySelectorAll('.approval-clock[data-expires]') ) {
|
|
751
756
|
const remaining = approvalRemainingFrom(el.dataset.expires)
|
|
752
|
-
|
|
753
|
-
el.textContent = el.classList.contains('approval-menu-time') ? formatApprovalRemaining(remaining) : formatApprovalCountdown(remaining)
|
|
757
|
+
el.textContent = formatApprovalCountdown(remaining)
|
|
754
758
|
el.classList.toggle('urgent', approvalUrgent(remaining))
|
|
755
759
|
}
|
|
756
760
|
// 卡片倒计时外层:图标随临期转黄(DSHBOTS-108)。
|
|
757
|
-
for (const el of document.querySelectorAll('.approval-countdown[data-expires]')) {
|
|
761
|
+
for (const el of document.querySelectorAll('.approval-countdown[data-expires]') ) {
|
|
758
762
|
el.classList.toggle('urgent', approvalUrgent(approvalRemainingFrom(el.dataset.expires)))
|
|
759
763
|
}
|
|
760
764
|
// 卡片进度条:剩余越多条越长,临期变短并转黄(DSHBOTS-108)。
|
|
761
|
-
for (const el of document.querySelectorAll('.approval-progress[data-expires]')) {
|
|
765
|
+
for (const el of document.querySelectorAll('.approval-progress[data-expires]') ) {
|
|
762
766
|
const remaining = approvalRemainingFrom(el.dataset.expires)
|
|
763
767
|
const ratio = approvalProgressRatio(remaining, el.dataset.window)
|
|
764
|
-
const fill = el.querySelector('.approval-progress-fill')
|
|
768
|
+
const fill = el.querySelector('.approval-progress-fill')
|
|
765
769
|
if (fill) fill.style.width = `${Math.round(ratio * 100)}%`
|
|
766
770
|
el.classList.toggle('urgent', approvalUrgent(remaining))
|
|
767
771
|
el.setAttribute('aria-valuenow', String(Math.round(ratio * 100)))
|
|
768
772
|
}
|
|
769
773
|
// 提问倒计时局部刷新(DSHBOTS-116):与审批同口径,只改文本与危险色,不整卡重绘。
|
|
770
|
-
for (const el of document.querySelectorAll('.question-clock[data-expires], .question-menu-time[data-expires]')) {
|
|
774
|
+
for (const el of document.querySelectorAll('.question-clock[data-expires], .question-menu-time[data-expires]') ) {
|
|
771
775
|
const remaining = questionRemainingFrom(el.dataset.expires)
|
|
772
776
|
// 卡片与顶部窄条都用同一「剩余 X 分 Y 秒」口径(提问没有审批那种「自动拒绝」语义)。
|
|
773
777
|
el.textContent = formatQuestionCountdown(remaining)
|
|
774
778
|
el.classList.toggle('urgent', questionUrgent(remaining))
|
|
775
779
|
}
|
|
776
|
-
for (const el of document.querySelectorAll('.question-countdown[data-expires]')) {
|
|
780
|
+
for (const el of document.querySelectorAll('.question-countdown[data-expires]') ) {
|
|
777
781
|
el.classList.toggle('urgent', questionUrgent(questionRemainingFrom(el.dataset.expires)))
|
|
778
782
|
}
|
|
779
|
-
for (const el of document.querySelectorAll('.question-progress[data-expires]')) {
|
|
783
|
+
for (const el of document.querySelectorAll('.question-progress[data-expires]') ) {
|
|
780
784
|
const remaining = questionRemainingFrom(el.dataset.expires)
|
|
781
785
|
const ratio = questionProgressRatio(remaining, el.dataset.window)
|
|
782
|
-
const fill = el.querySelector('.question-progress-fill')
|
|
786
|
+
const fill = el.querySelector('.question-progress-fill')
|
|
783
787
|
if (fill) fill.style.width = `${Math.round(ratio * 100)}%`
|
|
784
788
|
el.classList.toggle('urgent', questionUrgent(remaining))
|
|
785
789
|
el.setAttribute('aria-valuenow', String(Math.round(ratio * 100)))
|