dsh-team-bots 0.2.465 → 0.3.64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. package/NOTICE +5 -0
  2. package/README.md +8 -2
  3. package/docs/README.zh.md +8 -2
  4. package/docs/assets/global-config.png +0 -0
  5. package/docs/assets/global-config.zh.png +0 -0
  6. package/docs/assets/tasks.png +0 -0
  7. package/docs/assets/tasks.zh.png +0 -0
  8. package/docs/assets/usage.png +0 -0
  9. package/docs/assets/usage.zh.png +0 -0
  10. package/package.json +8 -2
  11. package/src/api.js +16 -2
  12. package/src/config.js +193 -8
  13. package/src/db-migrations.js +53 -4
  14. package/src/db.js +37 -3
  15. package/src/http.js +20 -1
  16. package/src/runtime.js +16 -1
  17. package/src/seed-bots.js +4 -0
  18. package/src/service.js +21 -2
  19. package/src/services/approvals.js +276 -8
  20. package/src/services/bot-quota.js +54 -0
  21. package/src/services/bots.js +8 -0
  22. package/src/services/chat.js +54 -5
  23. package/src/services/core.js +31 -2
  24. package/src/services/memory.js +112 -25
  25. package/src/services/model-fallback.js +55 -15
  26. package/src/services/projects.js +13 -2
  27. package/src/services/run-finish.js +44 -11
  28. package/src/services/runs.js +15 -7
  29. package/src/services/runtime/prompt.js +31 -6
  30. package/src/services/runtime/session.js +87 -25
  31. package/src/services/scheduler.js +26 -5
  32. package/src/services/system.js +162 -10
  33. package/src/services/task-dispatch.js +24 -0
  34. package/src/services/task-notify.js +18 -0
  35. package/src/services/task-review.js +102 -23
  36. package/src/services/task-runs.js +31 -3
  37. package/src/services/tasks.js +91 -3
  38. package/src/tools.js +20 -14
  39. package/ui/app.js +7 -10
  40. package/ui/i18n/en/chat.js +2 -0
  41. package/ui/i18n/en/common.js +10 -0
  42. package/ui/i18n/en/settings.js +76 -1
  43. package/ui/i18n/en/tasks.js +3 -0
  44. package/ui/i18n/zh/chat.js +2 -0
  45. package/ui/i18n/zh/common.js +10 -0
  46. package/ui/i18n/zh/settings.js +76 -1
  47. package/ui/i18n/zh/tasks.js +3 -0
  48. package/ui/modules/api.js +9 -1
  49. package/ui/modules/cards.js +6 -3
  50. package/ui/modules/chat.js +1 -1
  51. package/ui/modules/composer.js +6 -1
  52. package/ui/modules/events-board.js +48 -0
  53. package/ui/modules/events-misc.js +43 -0
  54. package/ui/modules/events-submit.js +20 -0
  55. package/ui/modules/form-validation.js +204 -0
  56. package/ui/modules/global-pages.js +8 -5
  57. package/ui/modules/modal-forms.js +4 -4
  58. package/ui/modules/modal-layer.js +4 -1
  59. package/ui/modules/page-shell.js +10 -7
  60. package/ui/modules/permissions.js +99 -0
  61. package/ui/modules/settings.js +108 -26
  62. package/ui/modules/state.js +10 -0
  63. package/ui/modules/task-menu.js +147 -0
  64. package/ui/modules/tasks.js +11 -10
  65. package/ui/modules/util.js +43 -6
  66. package/ui/styles/a11y.css +13 -0
  67. package/ui/styles/base.css +57 -11
  68. package/ui/styles/buttons.css +46 -6
  69. package/ui/styles/cards.css +90 -0
  70. package/ui/styles/chat.css +23 -2
  71. package/ui/styles/global-config.css +7 -4
  72. package/ui/styles/modal.css +28 -0
  73. package/ui/styles/settings.css +23 -1
  74. package/ui/styles/tasks.css +51 -1
  75. package/ui/styles/toast.css +18 -11
  76. package/ui/styles/usage.css +2 -0
  77. package/ui/styles/wide.css +5 -0
  78. package/docs/assets/channel-redesign.png +0 -0
  79. package/docs/assets/global-config-dark.png +0 -0
  80. package/docs/assets/global-config-light.png +0 -0
  81. package/docs/assets/global-config-light.zh.png +0 -0
  82. package/docs/assets/global-config-redesign.png +0 -0
  83. package/docs/assets/secrets-redesign.png +0 -0
  84. package/docs/assets/usage-redesign-global.png +0 -0
@@ -17,8 +17,14 @@ function usagePanelSlots(panels, order) {
17
17
  }
18
18
 
19
19
  // 分组导航:只列当前视图真实存在的分组,避免死锚点。
20
+ // tab 分页:state.pageTab 失效(切视图/分组动态消失)时回落第一项。
21
+ function activeTab(items) {
22
+ const ids = items.map(item => item.id)
23
+ return ids.includes(state.pageTab) ? state.pageTab : ids[0]
24
+ }
25
+
20
26
  function usageNav(items) {
21
- return pageNav(items, t('usage.navLabel'))
27
+ return pageNav(items, t('usage.navLabel'), activeTab(items))
22
28
  }
23
29
 
24
30
  function renderUsageGlobal() {
@@ -54,13 +60,14 @@ function renderUsageGlobal() {
54
60
  unpriced > 0 ? `<div class="note warn-note">${t('usage.unpricedNote', { count: unpriced })}</div>` : '',
55
61
  Number(reconciliation?.mismatched ?? 0) > 0 ? `<div class="usage-note">${t('次运行的用量记录对不上,数据可能不完整。', { count: Number(reconciliation.mismatched) })}</div>` : '',
56
62
  ].join('')
63
+ const navItems = [
64
+ { id: 'u-overview', label: t('usage.overview') },
65
+ { id: 'u-distribution', label: t('usage.distTitle') },
66
+ { id: 'u-price', label: t('usage.priceTitle') },
67
+ ]
57
68
  return pageShell(
58
69
  usagePageHead(usage, t('usage.headGlobalHint')),
59
- usageNav([
60
- { id: 'u-overview', label: t('usage.overview') },
61
- { id: 'u-distribution', label: t('usage.distTitle') },
62
- { id: 'u-price', label: t('usage.priceTitle') },
63
- ]),
70
+ usageNav(navItems),
64
71
  [
65
72
  usageSection('01', 'u-overview', t('usage.overview'), t('usage.overviewGlobalDesc', { window: windowText }),
66
73
  slot('full', `${overviewNotes}${usageMetricCards(totals, t('usage.scopeGlobal'), usage)}`)),
@@ -77,6 +84,7 @@ function renderUsageGlobal() {
77
84
  </div>`),
78
85
  usageSection('03', 'u-price', t('usage.priceTitle'), t('usage.priceDesc'), slot('full', renderPriceCard())),
79
86
  ],
87
+ activeTab(navItems),
80
88
  )
81
89
  }
82
90
 
@@ -124,7 +132,7 @@ function renderUsageDomain() {
124
132
  </div>`),
125
133
  `<button class="btn small" data-action="usage-clear-drill">${icon('close')}${t('usage.clearDrill')}</button>`))
126
134
  }
127
- return pageShell(usagePageHead(usage, t('usage.headDomainHint'), t('usage.scopeDomain')), usageNav(nav), sections)
135
+ return pageShell(usagePageHead(usage, t('usage.headDomainHint'), t('usage.scopeDomain')), usageNav(nav), sections, activeTab(nav))
128
136
  }
129
137
 
130
138
  // 单聊「用量」tab:本 bot 汇总 + 本 bot 分模型,内容严格限本 bot。
@@ -144,13 +152,14 @@ function renderUsageSolo() {
144
152
  unpriced > 0 ? `<div class="note warn-note">${t('usage.unpricedNote', { count: unpriced })}</div>` : '',
145
153
  usage.solo && tier ? '' : `<div class="usage-note">${t('该 Bot 的单聊明细暂不可用。')}</div>`,
146
154
  ].join('')
155
+ const navItems = [
156
+ { id: 'u-overview', label: t('usage.overview') },
157
+ { id: 'u-distribution', label: t('usage.distTitle') },
158
+ { id: 'u-runs', label: t('usage.runDetailTitle') },
159
+ ]
147
160
  return pageShell(
148
161
  usagePageHead(usage, t('usage.headSoloHint'), t('usage.scopeSolo')),
149
- usageNav([
150
- { id: 'u-overview', label: t('usage.overview') },
151
- { id: 'u-distribution', label: t('usage.distTitle') },
152
- { id: 'u-runs', label: t('usage.runDetailTitle') },
153
- ]),
162
+ usageNav(navItems),
154
163
  [
155
164
  usageSection('01', 'u-overview', t('usage.overview'), t('usage.overviewSoloDesc', { window: windowText }),
156
165
  slot('full', `${overviewNotes}${usageMetricCards(totals, t('usage.scopeSolo'), usage)}`)),
@@ -162,6 +171,7 @@ function renderUsageSolo() {
162
171
  ${runs.length === 0 ? `<div class="faint">${t('usage.soloRunsEmpty')}</div>` : `<div class="run-list">${runs.map(usageRunRow).join('')}</div>`}
163
172
  </div>`)),
164
173
  ],
174
+ activeTab(navItems),
165
175
  )
166
176
  }
167
177
 
@@ -182,6 +192,7 @@ function renderRunLimitsCard() {
182
192
  const envNames = [
183
193
  limits.runTimeoutEnv ? 'DSH_TEAM_RUN_TIMEOUT_MS' : '',
184
194
  limits.stallTimeoutEnv ? 'DSH_TEAM_STALL_TIMEOUT_MS' : '',
195
+ limits.reviewTimeoutEnv ? 'DSH_TEAM_REVIEW_TIMEOUT_MINUTES' : '',
185
196
  ].filter(Boolean).join(' / ')
186
197
  const stallText = limits.stallTimeoutMinutes === 0
187
198
  ? t('global.stallOff')
@@ -191,6 +202,9 @@ function renderRunLimitsCard() {
191
202
  const savedQuestion = settings.question_timeout_minutes ?? ''
192
203
  const approvalValue = savedApproval !== '' ? savedApproval : '10'
193
204
  const questionValue = savedQuestion !== '' ? savedQuestion : '10'
205
+ // 验收分档时效(DSHBOTS-364):'0'(关闭分档、跟随全局)合法,不能 || 短路。
206
+ const savedReviewTimeout = settings.review_timeout_minutes ?? ''
207
+ const reviewTimeoutValue = savedReviewTimeout !== '' ? savedReviewTimeout : String(limits.reviewTimeoutMinutes ?? 0)
194
208
  return `
195
209
  <div class="card form-card g-card">
196
210
  <div class="card-head"><h3>${t('global.cardRunLimits')}</h3><span class="meta">${t('global.runLimitsCurrent', { timeout: limits.runTimeoutMinutes ?? 120, stall: stallText })}</span></div>
@@ -204,6 +218,8 @@ function renderRunLimitsCard() {
204
218
  </div>
205
219
  <div class="field-row">
206
220
  <div class="field"><label id="settings-review-idle-label" for="settings-review-idle">${t('global.reviewIdleLabel')}</label><input class="input mono" style="text-align:right" type="number" min="0" max="1440" id="settings-review-idle" name="review_idle_minutes" value="${attr(reviewIdleValue)}"></div>
221
+ <div class="field"><label id="settings-review-timeout-label" for="settings-review-timeout">${t('global.reviewTimeoutLabel')}</label><input class="input mono" style="text-align:right" type="number" min="0" max="60" id="settings-review-timeout" name="review_timeout_minutes" value="${attr(reviewTimeoutValue)}"></div>
222
+ </div>
207
223
  <div class="field"><label id="settings-review-auto-close-label" for="settings-review-auto-close">${t('global.reviewAutoCloseLabel')}</label>
208
224
  <select class="select" id="settings-review-auto-close" name="review_auto_close">
209
225
  <option value="1" ${settings.review_auto_close === '1' ? 'selected' : ''}>${t('global.on')}</option>
@@ -211,9 +227,9 @@ function renderRunLimitsCard() {
211
227
  <option value="0" ${settings.review_auto_close === '0' ? 'selected' : ''}>${t('global.off')}</option>
212
228
  </select>
213
229
  </div>
214
- </div>
215
230
  <div class="hint">${t('global.runLimitsHint1')}</div>
216
231
  <div class="hint">${t('global.reviewIdleHint')}</div>
232
+ <div class="hint">${t('global.reviewTimeoutHint')}</div>
217
233
  <div class="hint">${t('新值只对之后启动的运行生效,进行中的运行不追溯。')}</div>
218
234
  ${envNames ? `<div class="hint">${t('global.runLimitsEnv', { names: envNames })}</div>` : ''}
219
235
  <div class="btn-row" style="margin-top:12px">
@@ -222,6 +238,70 @@ function renderRunLimitsCard() {
222
238
  </div>`
223
239
  }
224
240
 
241
+
242
+ // 全局配置页「运行参数」卡:所有运行期 DSH_TEAM_* 环境变量的页面化配置。
243
+ // 行数据来自 state.data.runtimeSettings(后端 runtimeSettingsView,与全部消费点同源);
244
+ // 优先级 env 显式 > 页面保存值 > 启动默认。空输入 = 清除保存值回默认。
245
+ const RUNTIME_SETTING_GROUP_LABELS = {
246
+ sched: 'global.rsGroupSched',
247
+ limits: 'global.rsGroupLimits',
248
+ session: 'global.rsGroupSession',
249
+ chat: 'global.rsGroupChat',
250
+ ops: 'global.rsGroupOps',
251
+ review: 'global.rsGroupReview',
252
+ models: 'global.rsGroupModels',
253
+ }
254
+ function runtimeSettingInput(row ) {
255
+ const saved = String(row.saved ?? '')
256
+ const value = saved !== '' ? saved : String(row.default ?? '')
257
+ if (row.kind === 'bool') {
258
+ const cur = saved !== '' ? saved : (String(row.default) === 'true' ? '1' : '0')
259
+ const sel = (v ) => (cur === v ? ' selected' : '')
260
+ return `<select class="select" data-runtime-setting="${attr(String(row.key))}">
261
+ <option value="">${esc(t('global.rsFollowDefault'))}</option>
262
+ <option value="1"${sel('1')}>${esc(t('global.on'))}</option>
263
+ <option value="0"${sel('0')}>${esc(t('global.off'))}</option>
264
+ </select>`
265
+ }
266
+ if (row.kind === 'json') {
267
+ return `<textarea class="textarea mono" rows="2" data-runtime-setting="${attr(String(row.key))}" placeholder='[{"projectKey":"KEY","repo":"owner/repo"}]'>${esc(value)}</textarea>`
268
+ }
269
+ const min = row.min !== undefined && row.min !== null ? ` min="${attr(String(row.min))}"` : ''
270
+ const max = row.max !== undefined && row.max !== null ? ` max="${attr(String(row.max))}"` : ''
271
+ const type = row.kind === 'int' ? 'number' : 'text'
272
+ return `<input class="input mono${row.kind === 'int' ? '' : ''}" style="text-align:right" type="${type}"${min}${max} data-runtime-setting="${attr(String(row.key))}" value="${attr(value)}">`
273
+ }
274
+ function renderRuntimeSettingsCard() {
275
+ const rows = state.data?.runtimeSettings?.rows ?? []
276
+ if (!rows.length) return ''
277
+ const groups = new Map ()
278
+ for (const row of rows) {
279
+ const list = groups.get(String(row.group)) ?? []
280
+ list.push(row)
281
+ groups.set(String(row.group), list)
282
+ }
283
+ const envOverridden = rows.filter(row => row.envExplicit).map(row => String(row.env))
284
+ return `
285
+ <div class="card form-card g-card">
286
+ <div class="card-head"><h3>${t('global.rsCardTitle')}</h3><span class="meta">${t('global.rsCardMeta')}</span></div>
287
+ <div class="hint">${t('global.rsHint')}</div>
288
+ ${[...groups.entries()].map(([group, list]) => `
289
+ <div class="card-head" style="margin-top:8px"><h4>${esc(t(RUNTIME_SETTING_GROUP_LABELS[group] ?? 'global.rsGroupOps'))}</h4></div>
290
+ <div class="field-row">
291
+ ${list.map(row => `
292
+ <div class="field">
293
+ <label>${esc(t('global.rs.' + row.key))} <span class="mono faint">${esc(String(row.env))}</span></label>
294
+ ${runtimeSettingInput(row)}
295
+ <div class="hint">${esc(t('global.rsEffective', { value: String(row.effective), def: String(row.default) }))}</div>
296
+ </div>`).join('')}
297
+ </div>`).join('')}
298
+ ${envOverridden.length ? `<div class="hint">${t('global.runLimitsEnv', { names: envOverridden.join(' / ') })}</div>` : ''}
299
+ <div class="btn-row" style="margin-top:12px">
300
+ <button class="btn small" type="button" data-action="save-runtime-settings">${t('global.rsSave')}</button>
301
+ </div>
302
+ </div>`
303
+ }
304
+
225
305
  // 团队指令段(B1/DSHBOTS-324):四段可编辑提示词的查看与编辑。
226
306
  // defaultChanged 徽标提示「内置默认已升级」;保存即经后端预算校验(拆卡三段 ≤1200),
227
307
  // 改动只对之后启动的会话生效(identity 段随会话冻结,进行中会话不唤醒)。
@@ -307,10 +387,10 @@ function dshPathsCard() {
307
387
  return `
308
388
  <div class="card form-card g-card">
309
389
  <div class="card-head"><h3>${t('global.cardDshPaths')}</h3><span class="meta">${t('global.readonly')}</span></div>
310
- <div class="path-row"><span>${t('global.pathDshHome')}</span>${pathCode(paths.dshHome ?? '~/.dsh')}${copyPath(paths.dshHome ?? '')}</div>
390
+ <div class="path-row"><span>${t('global.pathDshHome')}</span>${pathCode(tildePath(paths.dshHome ?? '~/.dsh'))}${copyPath(paths.dshHome ?? '')}</div>
311
391
  <div class="path-row"><span>${t('global.pathWorkspace')}</span>${pathCode(tildePath(paths.workspace))}${copyPath(paths.workspace)}</div>
312
- <div class="path-row"><span>${t('global.pathSkills')}</span>${pathCode(paths.skillRoot)}${copyPath(paths.skillRoot)}</div>
313
- <div class="path-row"><span>${t('global.pathData')}</span>${pathCode(paths.dataDir)}${copyPath(paths.dataDir)}</div>
392
+ <div class="path-row"><span>${t('global.pathSkills')}</span>${pathCode(tildePath(paths.skillRoot))}${copyPath(paths.skillRoot)}</div>
393
+ <div class="path-row"><span>${t('global.pathData')}</span>${pathCode(tildePath(paths.dataDir))}${copyPath(paths.dataDir)}</div>
314
394
  </div>`
315
395
  }
316
396
 
@@ -363,7 +443,7 @@ function renderSettings() {
363
443
  <div class="field"><label id="settings-description-label" for="settings-description">${t("项目描述")}</label><textarea class="textarea" id="settings-description" name="description">${esc(project.description || '')}</textarea></div>
364
444
  <div class="field-row">
365
445
  <div class="field"><label id="settings-owner-label" for="settings-owner">${t("总监")} Bot</label><select class="select" id="settings-owner" name="ownerBotId">${members.map(bot => `<option value="${attr(bot.id)}" ${bot.id === project.owner_bot_id ? 'selected' : ''}>${esc(bot.name)}</option>`).join('')}</select></div>
366
- <div class="field"><label id="settings-reply-mode-label" for="settings-reply-mode">${t("群聊回复模式")}</label><select class="select" id="settings-reply-mode" name="replyMode"><option value="owner_first" ${project.group?.reply_mode !== 'everyone' ? 'selected' : ''}>${t("总监优先")}</option><option value="everyone" ${project.group?.reply_mode === 'everyone' ? 'selected' : ''}>${t("全员响应")}</option></select></div>
446
+ <div class="field"><label id="settings-reply-mode-label" for="settings-reply-mode">${t("群聊回复模式")}</label><select class="select" id="settings-reply-mode" name="replyMode"><option value="owner_first" ${project.group?.reply_mode !== 'everyone' && project.group?.reply_mode !== 'mentioned_only' ? 'selected' : ''}>${t("总监优先")}</option><option value="everyone" ${project.group?.reply_mode === 'everyone' ? 'selected' : ''}>${t("全员响应")}</option><option value="mentioned_only" ${project.group?.reply_mode === 'mentioned_only' ? 'selected' : ''}>${t("仅被点名")}</option></select></div>
367
447
  </div>
368
448
  </div>
369
449
  <div class="card form-card" style="margin-top:12px">
@@ -393,7 +473,7 @@ function renderSettings() {
393
473
  <div class="dir-picker" id="dir-picker-settings-production" hidden></div>
394
474
  </div>
395
475
  <div class="path-row"><span>${t("当前生效")}</span>${pathCode(tildePath(project.workspace_path))}${copyPath(project.workspace_path)}</div>
396
- <div class="path-row"><span>${t("管理数据")}</span>${pathCode(project.data_path ?? '')}${copyPath(project.data_path ?? '')}</div>
476
+ <div class="path-row"><span>${t("管理数据")}</span>${pathCode(tildePath(project.data_path ?? ''))}${copyPath(project.data_path ?? '')}</div>
397
477
  </div>
398
478
  <div class="card form-card" style="margin-top:12px">
399
479
  <div class="card-head"><h3>${t("项目状态")}</h3>${project.status === 'active' ? `<span class="pill green">${t("运行中")}</span>` : `<span class="pill amber">${t("已归档")}</span>`}</div>
@@ -425,14 +505,15 @@ function renderGlobal() {
425
505
  const notify = notifyToggleView()
426
506
  // 明暗偏好读内存态(非服务端设置):三档跟随/日间/夜间,与调色板正交。
427
507
  const colorSchemePref = state.colorSchemePref || 'auto'
508
+ const navItems = [
509
+ { id: 'g-pref', label: t('global.groupPref') },
510
+ { id: 'g-runtime', label: t('global.groupRuntime') },
511
+ { id: 'g-prompts', label: t('global.groupPrompts') },
512
+ { id: 'g-about', label: t('global.groupAbout') },
513
+ ]
428
514
  return pageShell(
429
515
  pageHead('GLOBAL CONFIGURATION', t('global.title'), t('global.desc'), refreshAction()),
430
- pageNav([
431
- { id: 'g-pref', label: t('global.groupPref') },
432
- { id: 'g-runtime', label: t('global.groupRuntime') },
433
- { id: 'g-prompts', label: t('global.groupPrompts') },
434
- { id: 'g-about', label: t('global.groupAbout') },
435
- ], t('global.navLabel')),
516
+ pageNav(navItems, t('global.navLabel'), activeTab(navItems)),
436
517
  [
437
518
  pageSection({
438
519
  index: '01', id: 'g-pref', title: t('global.groupPref'), desc: t('global.groupPrefDesc'),
@@ -492,7 +573,7 @@ function renderGlobal() {
492
573
  }),
493
574
  pageSection({
494
575
  index: '02', id: 'g-runtime', title: t('global.groupRuntime'), desc: t('global.groupRuntimeDesc'),
495
- body: `${slot('half', renderRunLimitsCard())}${slot('half', renderOpsCard())}`,
576
+ body: `${slot('half', renderRunLimitsCard())}${slot('half', renderOpsCard())}${slot('full', renderRuntimeSettingsCard())}`,
496
577
  }),
497
578
  pageSection({
498
579
  index: '03', id: 'g-prompts', title: t('global.groupPrompts'), desc: t('global.groupPromptsDesc'),
@@ -503,7 +584,8 @@ function renderGlobal() {
503
584
  body: `${slot('half', dshPathsCard())}${slot('half', dshServiceCard())}`,
504
585
  }),
505
586
  ],
587
+ activeTab(navItems),
506
588
  )
507
589
  }
508
590
 
509
- export { renderUsageGlobal, renderUsageDomain, renderUsageSolo, renderRunLimitsCard, renderOpsCard, renderPromptSegmentsCard, renderSettings, currentScale, renderGlobal }
591
+ export { renderUsageGlobal, renderUsageDomain, renderUsageSolo, renderRunLimitsCard, renderOpsCard, renderRuntimeSettingsCard, renderPromptSegmentsCard, renderSettings, currentScale, renderGlobal }
@@ -59,6 +59,9 @@ export const state = {
59
59
  theme: 'dsh',
60
60
  // 明暗偏好三态:auto=跟随宿主/系统,light=日间,dark=夜间(与调色板 theme 正交)。
61
61
  colorSchemePref: 'auto',
62
+ // 控制台页(用量/密钥/全局配置)tab 分页容器的激活分组 id;
63
+ // 失效值(切视图或分组动态消失)由各页回落第一项,自愈。支持 ?tab= 深链。
64
+ pageTab: params.get('tab'),
62
65
  tree: { chats: true, bots: true, archived: false },
63
66
  // 群聊已读水位:`<projectId>:<最新消息时间>`,用于避免重复上报已读。
64
67
  markedRead: null,
@@ -97,6 +100,13 @@ export const BOT_STATUS = keyed('botStatus.', ['active', 'paused', 'archived'])
97
100
  export const RUN_STATUS = keyed('runStatus.', ['queued', 'running', 'succeeded', 'failed', 'canceled'])
98
101
  // 调度页「正在调度」列表用的运行类型名;未知 kind 直接显示原值,不静默吞掉。
99
102
  export const RUN_KIND = keyed('runKind.', ['task_run', 'owner_task_run', 'solo_chat_run', 'chat_run', 'dm_run', 'dm_reply', 'memory_review'])
103
+ // 运行状态/种类的渲染标签(与上面枚举同源):表内有键走 t(),表外原样回落。
104
+ export function runStatusLabel(status ) {
105
+ return RUN_STATUS[status] ? t('runStatus.' + status) : status
106
+ }
107
+ export function runKindLabel(kind ) {
108
+ return RUN_KIND[kind] ? t('runKind.' + kind) : kind
109
+ }
100
110
  // 聊天历史分片大小:与后端 messagesPage 的默认/上限一致(state 轮询同口径)。
101
111
  export const CHAT_PAGE_SIZE = 200
102
112
  // 群聊右栏「活跃任务」列表显示上限:标题右侧计数仍显示项目在办任务总数,超出部分用「还有 N 条」提示。
@@ -0,0 +1,147 @@
1
+ // ui/modules/task-menu.ts —— 任务卡上下文菜单(DSHBOTS-367):键盘跨列移动的通路。
2
+ // 入口:卡片聚焦后按菜单键(ContextMenu)/ Shift+F10,或触屏长按(contextmenu 事件)。
3
+ // 菜单列出目标列,选中即 transition_task——与鼠标拖拽落列走同一后端动作。
4
+ import { STATUS_ORDER } from './state.js'
5
+ import { api } from './api.js'
6
+ import { t } from './i18n.js'
7
+ import { attr, esc, taskById, toast } from './util.js'
8
+ import { refresh } from '../app.js'
9
+
10
+ // 看板列名 → 词典键(字面量键才在英文界面有对应文案)。
11
+ const STATUS_LABEL_KEYS = {
12
+ backlog: 'status.backlog',
13
+ todo: 'status.todo',
14
+ in_progress: 'status.in_progress',
15
+ blocked: 'status.blocked',
16
+ in_review: 'status.in_review',
17
+ done: 'status.done',
18
+ canceled: 'status.canceled',
19
+ }
20
+
21
+ function statusLabel(status) {
22
+ const key = STATUS_LABEL_KEYS[status]
23
+ return key ? t(key) : String(status ?? '')
24
+ }
25
+
26
+ // ===== task-menu:start —— 纯逻辑标记块(tests/task-a11y.test.js 抽取断言)=====
27
+ // 目标列清单:排除当前列,其余列都是可选的移动目标。
28
+ function moveTargets(statusOrder, current) {
29
+ return (statusOrder ?? []).filter(status => status !== current)
30
+ }
31
+ // ===== task-menu:end =====
32
+
33
+ function menuMarkup(task) {
34
+ const items = moveTargets(STATUS_ORDER, task?.status).map(status => (
35
+ `<button type="button" class="task-menu-item" role="menuitem" data-move-status="${attr(status)}">${esc(statusLabel(status))}</button>`
36
+ )).join('')
37
+ const label = t('task.moveMenuLabel')
38
+ return `<div class="task-menu" role="menu" aria-label="${attr(label)}">
39
+ <div class="task-menu-title">${esc(label)}</div>${items}</div>`
40
+ }
41
+
42
+ let menuEl = null
43
+ let menuTaskId = ''
44
+ // 菜单锚点:开菜单时的那张任务卡。开菜单时焦点已移到菜单项上,卡片不再持焦,
45
+ // 关闭后要还焦只能靠记住的锚点(查 :focus 必空——焦点已被菜单抢走)。
46
+ let menuAnchor = null
47
+
48
+ function ensureRoot() {
49
+ let root = document.getElementById('task-menu-root')
50
+ if (!root) {
51
+ root = document.createElement('div')
52
+ root.id = 'task-menu-root'
53
+ document.body.appendChild(root)
54
+ }
55
+ return root
56
+ }
57
+
58
+ export function closeTaskMenu(restoreFocus = false) {
59
+ const root = document.getElementById('task-menu-root')
60
+ if (root) root.innerHTML = ''
61
+ menuEl = null
62
+ menuTaskId = ''
63
+ const anchor = menuAnchor
64
+ menuAnchor = null
65
+ if (restoreFocus && anchor) {
66
+ try { anchor.focus() } catch {}
67
+ }
68
+ }
69
+
70
+ export function openTaskMenu(task, anchor) {
71
+ if (!task) return
72
+ closeTaskMenu()
73
+ const root = ensureRoot()
74
+ root.innerHTML = menuMarkup(task)
75
+ menuEl = root.firstElementChild
76
+ menuTaskId = String(task.id ?? '')
77
+ menuAnchor = anchor ?? null
78
+ const rect = anchor?.getBoundingClientRect?.()
79
+ if (menuEl && rect) {
80
+ const top = Math.min(rect.bottom + 6, window.innerHeight - 260)
81
+ const left = Math.min(rect.left, window.innerWidth - 240)
82
+ menuEl.style.top = `${Math.max(8, top)}px`
83
+ menuEl.style.left = `${Math.max(8, left)}px`
84
+ }
85
+ const first = menuEl?.querySelector('.task-menu-item')
86
+ if (first) first.focus()
87
+ }
88
+
89
+ // 从事件目标定位任务卡并开菜单:找不到卡或卡不在数据里就不开。
90
+ export function openTaskMenuForElement(el) {
91
+ const card = (el )?.closest?.('.task-card')
92
+ if (!card) return false
93
+ const task = taskById(card.dataset.taskId)
94
+ if (!task) return false
95
+ openTaskMenu(task, card)
96
+ return true
97
+ }
98
+
99
+ async function moveTask(taskId, status) {
100
+ try {
101
+ await api('transition_task', { taskId, status })
102
+ await refresh()
103
+ toast(`${t('任务已移动到')} ${statusLabel(status)}`, 'success')
104
+ } catch (error ) {
105
+ toast(error?.message || String(error), 'error')
106
+ }
107
+ }
108
+
109
+ // 菜单项点击:移动任务并收起菜单。
110
+ document.addEventListener('click', event => {
111
+ const item = (event.target ).closest?.('.task-menu-item')
112
+ if (item) {
113
+ event.preventDefault()
114
+ const status = item.dataset.moveStatus
115
+ const taskId = menuTaskId
116
+ closeTaskMenu()
117
+ if (status && taskId) void moveTask(taskId, status)
118
+ return
119
+ }
120
+ if (menuEl && !menuEl.contains(event.target )) closeTaskMenu()
121
+ })
122
+
123
+ // 菜单内键盘导航:上下键移动、Esc 关闭并把焦点还给卡片。
124
+ document.addEventListener('keydown', event => {
125
+ if (!menuEl) return
126
+ if (event.key === 'Escape') {
127
+ event.preventDefault()
128
+ closeTaskMenu(true)
129
+ return
130
+ }
131
+ if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') return
132
+ const items = Array.from(menuEl.querySelectorAll('.task-menu-item'))
133
+ if (!items.length) return
134
+ event.preventDefault()
135
+ const index = items.indexOf(document.activeElement )
136
+ const next = event.key === 'ArrowDown' ? (index + 1) % items.length : (index - 1 + items.length) % items.length
137
+ items[next]?.focus()
138
+ })
139
+
140
+ // 长按 / 右键:触屏长按会派发 contextmenu,鼠标右键同理——都开同一张卡菜单。
141
+ document.addEventListener('contextmenu', event => {
142
+ const card = (event.target ).closest?.('.task-card')
143
+ if (!card) return
144
+ if (!openTaskMenuForElement(card)) return
145
+ event.preventDefault()
146
+ })
147
+
@@ -4,6 +4,7 @@ import { activeProject, actorLabel, attr, avatar, botById, canaryText, duration,
4
4
  import { api } from './api.js'
5
5
  import { t } from './i18n.js'
6
6
  import { isPreviewableText, deliverableFileUrl } from './file-preview.js'
7
+ import { renderApprovalPermissionsCard } from './permissions.js'
7
8
  import { refresh, startTerminalPoll, panelAttrs, render, noProject } from '../app.js'
8
9
 
9
10
  // task-sort:start —— 任务面板排序的纯逻辑(tests/task-sort.test.js 按本标记块抽取断言)。
@@ -230,6 +231,7 @@ function renderTaskCard(task, options = {}) {
230
231
  tags.push(task.review_target === 'owner_bot' ? t('task.reviewOwner') : t('task.reviewYou'))
231
232
  // 核验可见性(DSHBOTS-113):自动/手动核验的状态标记——未核验/失败亮出,防止静默漏审。
232
233
  if (task.reviewStatus === 'pending') tags.push(t('task.reviewPending'))
234
+ else if (task.reviewStatus === 'skipped') tags.push(t('task.reviewSkipped'))
233
235
  else if (task.reviewStatus !== 'done') tags.push(t('task.reviewUnverified'))
234
236
  }
235
237
  for (const label of task.labels ?? []) tags.push(label)
@@ -240,7 +242,7 @@ function renderTaskCard(task, options = {}) {
240
242
  const blockedNames = Array.isArray(task.blockedByNames) ? task.blockedByNames : []
241
243
  const depsBlocked = task.depsSatisfied === false && blockedNames.length > 0
242
244
  const depsTitle = `${t("被")} ${blockedNames.length} ${t("个任务阻塞:")}${blockedNames.join(t("、"))}`
243
- return `<article class="task-card${isRunning ? ' running' : ''}${depth > 0 ? ' task-child' : ''}" draggable="true" data-task-id="${attr(task.id)}" data-action="open-task">
245
+ return `<article class="task-card${isRunning ? ' running' : ''}${depth > 0 ? ' task-child' : ''}" draggable="true" tabindex="0" data-task-id="${attr(task.id)}" data-action="open-task">
244
246
  ${taskStatusIcon(task)}
245
247
  ${taskPriorityIcon(task)}
246
248
  <div class="task-card-top">
@@ -263,11 +265,10 @@ function renderTaskCard(task, options = {}) {
263
265
  }
264
266
  // task-card:end
265
267
 
266
- // 任务父子层级(DSHBOTS-58 第二笔,依赖后端 D-59 落库的 parent_task_id):
267
- // 分组内按 parent_task_id 组树——子任务挂到父行下方、容器左缩进一级,父行可折叠子行;
268
- // 展开态记在 state.openPanels,key 形如 task-children:<taskId>(与 <details data-panel> 同一套 key 口径)。
269
- // 只有父任务也在本组可见时才挂成子级:父被搜索/筛选掉、或父在别的状态分组时,
270
- // 子任务回到本组顶层,避免任务因为层级关系在看板上凭空消失。
268
+ // 任务父子层级(DSHBOTS-58 第二笔,依赖后端 D-59 落库的 parent_task_id):分组内按 parent_task_id 组树——
269
+ // 子任务挂到父行下方、容器左缩进一级,父行可折叠子行;展开态记在 state.openPanels,key 形如
270
+ // task-children:<taskId>(与 <details data-panel> 同一套 key 口径)。父任务被搜索/筛选掉或不在本组时,
271
+ // 子任务回到本组顶层,避免任务因层级关系在看板上凭空消失。
271
272
  function taskChildrenKey(taskId) {
272
273
  return `task-children:${taskId}`
273
274
  }
@@ -378,8 +379,7 @@ function renderBots() {
378
379
  return `
379
380
  ${bots.length === 0 ? `<div class="empty-state">
380
381
  <div class="empty-symbol">${icon('bot')}</div><h3>${t("还没有")} Bot</h3><p>${t("至少创建一个 Bot 才能运行项目群聊和任务。")}</p>
381
- <button class="btn" data-action="new-bot">${icon('plus')}${t("新建")} Bot</button>
382
- </div>` : `<div class="grid bots">
382
+ <button class="btn" data-action="new-bot">${icon('plus')}${t("新建")} Bot</button></div>` : `<div class="grid bots">
383
383
  ${bots.map(bot => `<article class="card bot-card">
384
384
  <div class="bot-card-head">
385
385
  ${avatar(bot, 'lg')}
@@ -453,6 +453,7 @@ function renderBotsOverview() {
453
453
  ${proposalsSection}
454
454
  <div class="section-head"><h3>${t("全部")} Bots</h3><button class="btn" data-action="new-bot">${icon('plus')}${t("新建")} Bot</button></div>
455
455
  ${renderBots()}
456
+ ${renderApprovalPermissionsCard()}
456
457
  `
457
458
  }
458
459
 
@@ -524,7 +525,7 @@ function renderSkills() {
524
525
  </div>
525
526
  </div>
526
527
  <div class="card-head" style="margin-bottom:10px"><h3>${t("共享技能池")}</h3></div>
527
- <div class="path-row plain" style="margin-bottom:14px"><span>${t("技能根目录")}</span><code>${esc(state.data.paths.skillRoot)}/skills</code><button class="btn icon small" data-action="copy" data-copy="${attr(state.data.paths.skillRoot + '/skills')}">${icon('copy')}</button></div>
528
+ <div class="path-row plain" style="margin-bottom:14px"><span>${t("技能根目录")}</span><code>${esc(tildePath(state.data.paths.skillRoot))}/skills</code><button class="btn icon small" data-action="copy" data-copy="${attr(state.data.paths.skillRoot + '/skills')}">${icon('copy')}</button></div>
528
529
  <div class="card list-card">
529
530
  ${skills.length === 0 ? `<div class="empty-state" style="border:0"><div class="empty-symbol">${icon('spark')}</div><h3>${t("技能池为空")}</h3><p>${t("在技能根目录放置技能文件,或提交一个技能提案并审批。")}</p></div>` : skills.map(skill => {
530
531
  const off = disabledSet.has(skill.slug)
@@ -546,7 +547,7 @@ function renderSkills() {
546
547
  </div>
547
548
  ${project ? `<div class="card-head" style="margin-top:24px"><h3>${t("当前项目技能")}</h3></div>
548
549
  <div class="section-head"><p>${t("从项目目录(设了生产目录以生产目录为准,见下方实际路径)的")} <code>.agents</code>${t("、")}<code>.claude</code>${t("、")}<code>.codex</code> ${t("三个根扫描发现;同名技能按")} .agents &gt; .claude &gt; .codex ${t("去重。这些技能只在当前项目可用,且优先于同名共享技能。")}</p></div>
549
- ${(state.data.paths.projectSkillRoots ?? []).map(root => `<div class="path-row plain" style="margin-bottom:6px"><span style="text-transform:none">${esc(root.root)}</span><code>${esc(root.path)}/skills</code><button class="btn icon small" data-action="copy" data-copy="${attr(root.path + '/skills')}">${icon('copy')}</button></div>`).join('')}
550
+ ${(state.data.paths.projectSkillRoots ?? []).map(root => `<div class="path-row plain" style="margin-bottom:6px"><span style="text-transform:none">${esc(root.root)}</span><code>${esc(tildePath(root.path))}/skills</code><button class="btn icon small" data-action="copy" data-copy="${attr(root.path + '/skills')}">${icon('copy')}</button></div>`).join('')}
550
551
  <div class="card list-card">
551
552
  ${projectSkills.length === 0 ? `<div class="empty-state" style="border:0"><div class="empty-symbol">${icon('spark')}</div><h3>${t("项目内没有技能")}</h3><p>${t("在项目目录的 .agents、.claude 或 .codex 下放置")} skills/&lt;${t("技能名")}&gt;/SKILL.md ${t("即可。")}</p></div>` : projectSkills.map(skill => {
552
553
  const off = disabledSet.has(skill.name)
@@ -2,6 +2,10 @@ import { state, STATUS, RUN_STATUS, FILE_POLICY, DEFAULT_FILE_POLICY } from './s
2
2
  import { t } from './i18n.js'
3
3
 
4
4
  const toastRoot = document.getElementById('toast-root')
5
+ // 驻留时长与退场兜底。退场动画本身由 CSS 的 --motion-base 决定,兜底必须比它长,
6
+ // 否则动画没跑完节点就被删掉。
7
+ const TOAST_TTL_MS = 3600
8
+ const TOAST_EXIT_TIMEOUT_MS = 400
5
9
  export function applyUiScale(value) {
6
10
  const scale = Math.min(1.4, Math.max(1, Number(value) || 1))
7
11
  document.documentElement.style.setProperty('--ui-scale', String(scale))
@@ -246,17 +250,29 @@ export function filePolicyOptions(current) {
246
250
  return Object.entries(FILE_POLICY).map(([id, label]) => `<option value="${attr(id)}" ${value === id ? 'selected' : ''}>${esc(label)}</option>`).join('')
247
251
  }
248
252
 
253
+ async function dismissToast(el) {
254
+ el.setAttribute('data-closing', '')
255
+ // 减弱动效下全局把时长压到 0.001ms,过渡可能压根不产生;精简 DOM 桩也没有这个 API。
256
+ // 两种情况都直接删——不能等一个永远不来的 transitionend 把节点留在 DOM 里。
257
+ const animations = el.getAnimations?.() ?? []
258
+ if (animations.length > 0) {
259
+ await Promise.race([
260
+ Promise.allSettled(animations.map((a) => a.finished)),
261
+ new Promise((resolve) => setTimeout(resolve, TOAST_EXIT_TIMEOUT_MS)),
262
+ ])
263
+ }
264
+ el.remove()
265
+ }
266
+
249
267
  export function toast(message, type = '') {
250
268
  const el = document.createElement('div')
251
269
  el.className = `toast ${type}`
252
270
  el.textContent = message
271
+ // 错误要打断播报:role=alert 自带 assertive + atomic,也是动态插入节点唯一可靠的
272
+ // 播报方式——插入之后再设 aria-live,读屏普遍不认。其余仍走容器的 polite。
273
+ if (type === 'error') el.setAttribute('role', 'alert')
253
274
  toastRoot.appendChild(el)
254
- setTimeout(() => {
255
- el.style.opacity = '0'
256
- el.style.transform = 'translateY(5px)'
257
- el.style.transition = 'opacity .2s, transform .2s'
258
- setTimeout(() => el.remove(), 220)
259
- }, 3600)
275
+ setTimeout(() => dismissToast(el), TOAST_TTL_MS)
260
276
  }
261
277
 
262
278
  // 提案展示辅助(DSHBOTS-223 自 tasks.ts 迁入,tasks.ts 触及 800 行铁律):
@@ -293,3 +309,24 @@ export function proposalPreview(proposal) {
293
309
  return JSON.stringify(payload, null, 2)
294
310
  }
295
311
 
312
+
313
+ // ===== overlay-inert:start —— 纯逻辑标记块(tests/task-a11y.test.js 抽取断言)=====
314
+ // 遮罩期间背景是否应置 inert:弹窗或图片查看器任一开着就锁背景。
315
+ function backgroundInert(modalOpen, viewerOpen) {
316
+ return Boolean(modalOpen || viewerOpen)
317
+ }
318
+ // ===== overlay-inert:end =====
319
+
320
+ // #app 置 inert:遮罩打开期间背景不可聚焦、不可点击、读屏也读不到。
321
+ // 背景滚动不靠改 html/body 的 overflow(会顶掉页面滚动条、造成横向抖动),
322
+ // 而是让遮罩自身成为不可滚动的滚动容器并 contain 滚动链(见 modal.css)。
323
+ export function setAppInert(inert) {
324
+ const app = document.getElementById('app')
325
+ if (app) (app ).inert = Boolean(inert)
326
+ }
327
+
328
+ // 当前是否该锁背景:弹窗开着或图片查看器开着。
329
+ export function overlayInertState() {
330
+ const viewer = document.getElementById('image-viewer')
331
+ return backgroundInert(Boolean(state?.modal), Boolean(viewer && !viewer.hidden))
332
+ }
@@ -35,3 +35,16 @@
35
35
  outline: none;
36
36
  }
37
37
 
38
+
39
+ /* 视觉隐藏但读屏可读(DSHBOTS-367):表单错误的礼貌播报区挂这个类。 */
40
+ .visually-hidden {
41
+ position: absolute;
42
+ width: 1px;
43
+ height: 1px;
44
+ margin: -1px;
45
+ padding: 0;
46
+ overflow: hidden;
47
+ clip-path: inset(50%);
48
+ white-space: nowrap;
49
+ border: 0;
50
+ }