dsh-team-bots 0.2.395 → 0.2.455
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/package.json +4 -1
- package/scripts/doctor.mjs +14 -3
- package/src/api.js +30 -3
- package/src/config.js +105 -0
- package/src/db-migrations.js +20 -0
- package/src/db.js +4 -0
- package/src/feishu/channel.js +702 -0
- package/src/feishu/commands.js +20 -0
- package/src/feishu/format.js +56 -0
- package/src/feishu/index.js +19 -0
- package/src/feishu/store.js +205 -0
- package/src/service.js +7 -0
- package/src/services/bots.js +42 -0
- package/src/services/chat.js +6 -4
- package/src/services/core.js +153 -8
- package/src/services/external-trigger-schema.js +61 -0
- package/src/services/feishu.js +181 -0
- package/src/services/github-source.js +157 -0
- package/src/services/memory.js +122 -34
- package/src/services/projects.js +2 -0
- package/src/services/reason-codes.js +63 -0
- package/src/services/review-watchdog.js +30 -8
- package/src/services/run-finish.js +33 -9
- package/src/services/runs.js +48 -7
- package/src/services/runtime/context-window.js +53 -0
- package/src/services/runtime/prompt.js +149 -134
- package/src/services/runtime/sandbox-policy.js +65 -0
- package/src/services/runtime/session-continuity.js +38 -0
- package/src/services/runtime/session.js +148 -4
- package/src/services/scheduler.js +9 -2
- package/src/services/system.js +50 -2
- package/src/services/task-dispatch.js +40 -4
- package/src/services/task-notify.js +13 -8
- package/src/services/wechat-trigger-schema.js +62 -0
- package/src/services/wechat.js +129 -19
- package/src/tools.js +11 -2
- package/src/wechat/channel.js +130 -26
- package/src/wechat/commands.js +13 -1
- package/src/wechat/store.js +69 -18
- package/ui/app.js +6 -2
- package/ui/i18n/en/chat.js +1 -0
- package/ui/i18n/en/nav.js +5 -0
- package/ui/i18n/en/settings.js +25 -5
- package/ui/i18n/en/tasks.js +4 -0
- package/ui/i18n/en/wechat.js +25 -3
- package/ui/i18n/zh/chat.js +1 -0
- package/ui/i18n/zh/nav.js +5 -0
- package/ui/i18n/zh/settings.js +25 -5
- package/ui/i18n/zh/tasks.js +4 -0
- package/ui/i18n/zh/wechat.js +25 -3
- package/ui/modules/api.js +23 -1
- package/ui/modules/cards.js +15 -0
- package/ui/modules/chat.js +43 -2
- package/ui/modules/dom-morph.js +14 -7
- package/ui/modules/events-board.js +73 -23
- package/ui/modules/events-click.js +11 -0
- package/ui/modules/global-pages.js +138 -10
- package/ui/modules/settings.js +51 -9
- package/ui/modules/state.js +2 -0
- package/ui/styles/chat-cards.css +28 -0
- package/ui/styles/frame.css +27 -3
- package/ui/styles/global-config.css +28 -3
- package/ui/styles/surfaces.css +2 -0
package/ui/modules/dom-morph.js
CHANGED
|
@@ -49,19 +49,26 @@ function morphDescriptor(el) {
|
|
|
49
49
|
// entries 按 fresh 顺序给出落位方案(live=null 即需要插入新节点);removals 是没人认领的 live 节点。
|
|
50
50
|
function planChildren(liveItems, freshItems) {
|
|
51
51
|
const free = liveItems.map(item => ({ ...item, taken: false }))
|
|
52
|
+
// 同键可能落在多个节点上(记忆卡的 approve/reject/edit/delete 四个按钮共用
|
|
53
|
+
// data-memory-id):按键分桶、配对时逐个认领,而不是只认第一个把其余当陌生人。
|
|
52
54
|
const byKey = new Map()
|
|
53
55
|
for (const item of free) {
|
|
54
|
-
if (!item.key
|
|
55
|
-
byKey.
|
|
56
|
+
if (!item.key) continue
|
|
57
|
+
const bucket = byKey.get(item.key)
|
|
58
|
+
if (bucket) bucket.push(item)
|
|
59
|
+
else byKey.set(item.key, [item])
|
|
56
60
|
}
|
|
57
61
|
const entries = freshItems.map(fresh => ({ live: null, fresh }))
|
|
58
|
-
//
|
|
62
|
+
// 第一轮:身份键配对,同键按出现顺序一对一认领(标签不一致即不是同一身份,交给插入 + 删除)
|
|
59
63
|
for (const entry of entries) {
|
|
60
64
|
if (!entry.fresh.key) continue
|
|
61
|
-
const
|
|
62
|
-
if (
|
|
63
|
-
|
|
64
|
-
|
|
65
|
+
const bucket = byKey.get(entry.fresh.key)
|
|
66
|
+
if (!bucket) continue
|
|
67
|
+
const index = bucket.findIndex(item => !item.taken && item.tag === entry.fresh.tag)
|
|
68
|
+
if (index >= 0) {
|
|
69
|
+
bucket[index].taken = true
|
|
70
|
+
entry.live = bucket[index]
|
|
71
|
+
bucket.splice(index, 1)
|
|
65
72
|
}
|
|
66
73
|
}
|
|
67
74
|
// 第二轮:无键节点按同位置配对(模板结构没变即整树原位复用)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { state } from './state.js'
|
|
2
2
|
import { t } from './i18n.js'
|
|
3
3
|
import { activeProject, applyUiScale, applyUiTheme, toast } from './util.js'
|
|
4
|
-
import { api, loadState } from './api.js'
|
|
4
|
+
import { api, loadState, mergeSettingsDraft } from './api.js'
|
|
5
5
|
import { sendMessage } from './composer.js'
|
|
6
6
|
import { closeModal, openBot, openModal, openTask, openTrajectory } from './modal-forms.js'
|
|
7
7
|
import { loadOlderMessages, loadSoloDetail } from './chat.js'
|
|
@@ -10,6 +10,39 @@ import { toggleDesktopNotify } from './cards.js'
|
|
|
10
10
|
import { usageMode } from './usage.js'
|
|
11
11
|
import { UI_SCALE_KEY, UI_THEME_KEY, syncLanguage, refresh, startWechatPoll, stopWechatPoll, bootError, render, chatContextPending, beginChatPending, endChatPending, init } from '../app.js'
|
|
12
12
|
|
|
13
|
+
// 设置保存 + 409 冲突三方合并(B2/DSHBOTS-325):key→inputId 映射驱动 patch 采集。
|
|
14
|
+
// 冲突时静默接管 api 错误:重取最新设置后,对方未动字段的用户草稿贴回表单(编辑不丢),
|
|
15
|
+
// 双改字段以服务端为准并点名提示复核;无用户改动即纯刷新提示。
|
|
16
|
+
async function saveSettingsWithMerge(inputIds, successToast) {
|
|
17
|
+
const value = id => (document.getElementById(id) )?.value ?? ''
|
|
18
|
+
const patch = {}
|
|
19
|
+
for (const [key, id] of Object.entries(inputIds)) patch[key] = value(id)
|
|
20
|
+
const baseSettings = state.data?.settings ?? {}
|
|
21
|
+
try {
|
|
22
|
+
await api('update_settings', { ...patch, revision: state.data?.settingsRevision }, { quiet: true })
|
|
23
|
+
await loadState(state.projectId)
|
|
24
|
+
toast(successToast, 'success')
|
|
25
|
+
} catch (error ) {
|
|
26
|
+
if (error?.code !== 'CONFLICT') {
|
|
27
|
+
toast(error?.message || String(error), 'error')
|
|
28
|
+
return
|
|
29
|
+
}
|
|
30
|
+
await loadState(state.projectId)
|
|
31
|
+
const { merged, conflicts } = mergeSettingsDraft(baseSettings, patch, state.data?.settings ?? {})
|
|
32
|
+
for (const [key, value] of Object.entries(merged)) {
|
|
33
|
+
const input = document.getElementById(inputIds[key])
|
|
34
|
+
if (input) input.value = String(value)
|
|
35
|
+
}
|
|
36
|
+
if (conflicts.length) {
|
|
37
|
+
toast(`${t("配置已被他人修改,以下字段双方都改过、以最新保存为准,请复核:")}${conflicts.join('、')}`, 'error')
|
|
38
|
+
} else if (Object.keys(merged).length) {
|
|
39
|
+
toast(t("配置已被他人修改:你的改动未与对方冲突,已合并回表单,请重新保存"), 'error')
|
|
40
|
+
} else {
|
|
41
|
+
toast(t("配置已被他人修改,本次没有待保存的改动"), 'error')
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
13
46
|
export async function handleBoardAction(action, target) {
|
|
14
47
|
switch (action) {
|
|
15
48
|
case 'retry-boot':
|
|
@@ -85,26 +118,28 @@ export async function handleBoardAction(action, target) {
|
|
|
85
118
|
break
|
|
86
119
|
}
|
|
87
120
|
case 'save-settings': {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
toast(t("系统设置已保存"), 'success')
|
|
121
|
+
await saveSettingsWithMerge(
|
|
122
|
+
{
|
|
123
|
+
budget_currency: 'settings-currency',
|
|
124
|
+
memory_review: 'settings-memory-review',
|
|
125
|
+
global_token_budget: 'settings-global-token-budget',
|
|
126
|
+
global_cost_budget: 'settings-global-cost-budget',
|
|
127
|
+
retention_usage_days: 'settings-retention-usage',
|
|
128
|
+
retention_run_event_days: 'settings-retention-run',
|
|
129
|
+
retention_message_days: 'settings-retention-message',
|
|
130
|
+
},
|
|
131
|
+
t("系统设置已保存"),
|
|
132
|
+
)
|
|
101
133
|
break
|
|
102
134
|
}
|
|
103
135
|
// 界面语言(DSHBOTS-162):保存后 loadState 拿回新的 state.language,
|
|
104
136
|
// 由既有 syncLanguage 热切换(换字典 + toast.languageSwitched + render),无需重启。
|
|
105
137
|
case 'save-ui-language': {
|
|
106
138
|
const value = (document.getElementById('settings-ui-language') )?.value ?? 'auto'
|
|
107
|
-
|
|
139
|
+
// revision 仅在有值时携带(无 state 数据的旧环境回退无令牌形态)。
|
|
140
|
+
const languagePatch = { ui_language: value }
|
|
141
|
+
if (Number.isFinite(Number(state.data?.settingsRevision))) languagePatch.revision = state.data?.settingsRevision
|
|
142
|
+
await api('update_settings', languagePatch)
|
|
108
143
|
await loadState(state.projectId)
|
|
109
144
|
// poll() 只取数不切语言(ui/app.js:620-642),热切换必须由保存动作自己触发(DSHBOTS-162 R1)。
|
|
110
145
|
syncLanguage()
|
|
@@ -112,15 +147,30 @@ export async function handleBoardAction(action, target) {
|
|
|
112
147
|
break
|
|
113
148
|
}
|
|
114
149
|
case 'save-run-limits': {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
150
|
+
await saveSettingsWithMerge(
|
|
151
|
+
{
|
|
152
|
+
run_timeout_minutes: 'settings-run-timeout',
|
|
153
|
+
stall_watchdog_minutes: 'settings-stall-watchdog',
|
|
154
|
+
review_idle_minutes: 'settings-review-idle',
|
|
155
|
+
review_auto_close: 'settings-review-auto-close',
|
|
156
|
+
},
|
|
157
|
+
t("运行时效已保存"),
|
|
158
|
+
)
|
|
159
|
+
break
|
|
160
|
+
}
|
|
161
|
+
// 团队指令段(B1/DSHBOTS-324):保存/恢复默认;预算校验在后端,失败经 api 报错 toast。
|
|
162
|
+
case 'save-prompt-segment': {
|
|
163
|
+
const segment = target.dataset.segment
|
|
164
|
+
const text = (document.getElementById(`prompt-seg-${segment}`) )?.value ?? ''
|
|
165
|
+
await api('update_prompt_segment', { segment, text })
|
|
166
|
+
await loadState(state.projectId)
|
|
167
|
+
toast(t("团队指令已保存,新会话生效"), 'success')
|
|
168
|
+
break
|
|
169
|
+
}
|
|
170
|
+
case 'reset-prompt-segment': {
|
|
171
|
+
await api('update_prompt_segment', { segment: target.dataset.segment, text: '' })
|
|
122
172
|
await loadState(state.projectId)
|
|
123
|
-
toast(t("
|
|
173
|
+
toast(t("已恢复默认指令"), 'success')
|
|
124
174
|
break
|
|
125
175
|
}
|
|
126
176
|
case 'reconcile-usage': {
|
|
@@ -85,6 +85,17 @@ document.addEventListener('click', async (event) => {
|
|
|
85
85
|
state.approvalPanelOpen = !state.approvalPanelOpen
|
|
86
86
|
render()
|
|
87
87
|
break
|
|
88
|
+
case 'toggle-collapse':
|
|
89
|
+
// 连续系统通知折叠行(B8/DSHBOTS-336):展开态按组键进 state.expandedCollapses(跨轮询持久)。
|
|
90
|
+
{
|
|
91
|
+
const key = target.dataset.group
|
|
92
|
+
if (key) {
|
|
93
|
+
if (state.expandedCollapses.has(key)) state.expandedCollapses.delete(key)
|
|
94
|
+
else state.expandedCollapses.add(key)
|
|
95
|
+
render()
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
break
|
|
88
99
|
case 'focus-approval': {
|
|
89
100
|
// 点明细跳到对应项目群聊并滚动到该审批卡(复用 focusApprovalCard)。
|
|
90
101
|
const item = (state.data?.pendingApprovals?.items ?? []).find(entry => entry.id === target.dataset.approvalId)
|
|
@@ -1,26 +1,39 @@
|
|
|
1
1
|
import { state } from './state.js'
|
|
2
2
|
import { icon } from './icons.js'
|
|
3
3
|
import { t } from './i18n.js'
|
|
4
|
-
import { attr, esc, formatTime } from './util.js'
|
|
4
|
+
import { attr, esc, formatTime, toast } from './util.js'
|
|
5
5
|
import { pageHead, pageNav, pageSection, pageShell, refreshAction, slot } from './page-shell.js'
|
|
6
6
|
|
|
7
|
-
//
|
|
7
|
+
// 微信通道卡(自配置页迁入):绑定状态、扫码授权、验证码与退出;
|
|
8
|
+
// DSHBOTS-334 加启停开关——停用态渲染开关卡(不再靠服务端注入才能启用)。
|
|
8
9
|
function wechatCard() {
|
|
9
10
|
const wechat = state.data.wechat ?? { enabled: false, phase: 'disabled' }
|
|
10
|
-
if (!wechat.enabled) return ''
|
|
11
11
|
const phaseText = {
|
|
12
12
|
disabled: t("未启用"), unbound: t("未绑定"), connecting: t("连接中"), connected: t("已连接"),
|
|
13
13
|
reconnecting: t("重连中"), needs_reauth: t("凭证失效"), scanning: t("待扫码"),
|
|
14
14
|
verification: t("待输验证码"),
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
// 停用态:只渲染开关卡(无绑定交互),恢复入口常驻。
|
|
17
|
+
if (!wechat.enabled) {
|
|
18
|
+
return `
|
|
19
|
+
<div class="card form-card g-card wechat-card" id="wechat-card">
|
|
20
|
+
<div class="wechat-status">
|
|
21
|
+
<span class="pill">${phaseText.disabled}</span>
|
|
22
|
+
</div>
|
|
23
|
+
<div class="hint">${t("通道已停用,启用后可扫码绑定管理员微信接收推送。")}</div>
|
|
24
|
+
<div class="btn-row" style="margin-top:12px">
|
|
25
|
+
<button class="btn small" type="button" data-action="wechat-toggle" data-next="1">${t("启用通道")}</button>
|
|
26
|
+
</div>
|
|
27
|
+
</div>`
|
|
28
|
+
}
|
|
17
29
|
const pillClass = wechat.phase === 'connected' ? 'green' : ['needs_reauth'].includes(wechat.phase) ? 'amber' : ''
|
|
30
|
+
const auth = state.wechatAuth
|
|
18
31
|
return `
|
|
19
32
|
<div class="card form-card g-card wechat-card" id="wechat-card">
|
|
20
33
|
<div class="wechat-card-main">
|
|
21
34
|
<div class="wechat-status">
|
|
22
35
|
<span class="pill ${pillClass}">${phaseText[wechat.phase] ?? wechat.phase}</span>
|
|
23
|
-
${wechat.adminPeerId ? `<span class="wechat-admin">${t("管理员")} <strong>${esc(String(wechat.adminPeerId)
|
|
36
|
+
${wechat.adminPeerId ? `<span class="wechat-admin" title="${attr(wechat.adminPeerId)}">${t("管理员")} <strong>${esc(String(wechat.adminPeerId))}</strong></span>` : ''}
|
|
24
37
|
</div>
|
|
25
38
|
${wechat.error ? `<div class="hint" style="color:var(--coral,#e5484d)">${esc(wechat.error)}</div>` : ''}
|
|
26
39
|
${wechat.phase === 'verification' || auth?.verification ? `
|
|
@@ -32,13 +45,65 @@ function wechatCard() {
|
|
|
32
45
|
${['connected', 'reconnecting', 'connecting'].includes(wechat.phase)
|
|
33
46
|
? `<button class="btn small danger" type="button" data-action="wechat-logout">${t("退出绑定")}</button>`
|
|
34
47
|
: `<button class="btn small" type="button" data-action="wechat-login">${t("扫码绑定")}</button>`}
|
|
48
|
+
<button class="btn small danger" type="button" data-action="wechat-toggle" data-next="0">${t("停用通道")}</button>
|
|
35
49
|
</div>
|
|
36
|
-
<div class="hint">${t("微信扫码授权 ClawBot;确认后自动绑定授权者为管理员,任务完成主动推送。")}</div>
|
|
37
50
|
</div>
|
|
38
51
|
${auth?.qrSvg ? `<div class="wechat-qr">${auth.qrSvg}</div>` : ''}
|
|
39
52
|
</div>`
|
|
40
53
|
}
|
|
41
54
|
|
|
55
|
+
// 飞书通道卡(DSHBOTS-334 改可交互):未绑定态给 AppID/AppSecret 输入 + 保存即连;
|
|
56
|
+
// 已配置态显示脱敏 AppID(前 8 位+…)与清除按钮(服务端注入来源无清除)。
|
|
57
|
+
// 飞书无扫码流程:绑定只认应用凭据,生效优先级 = 通道页保存 > 服务端注入。
|
|
58
|
+
const maskAppId = (value) => {
|
|
59
|
+
const raw = String(value ?? '')
|
|
60
|
+
return raw.length > 8 ? `${raw.slice(0, 8)}…` : raw
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
function feishuCard() {
|
|
64
|
+
const feishu = state.data?.feishu ?? { enabled: false, phase: 'disabled' }
|
|
65
|
+
if (!feishu.enabled) return ''
|
|
66
|
+
// 相位口径与 src/feishu/channel.ts 一致:ready=已连接、unbound=未绑定、conflict=连接冲突。
|
|
67
|
+
// 'connected' 是同义别名(对齐 cindy 口径),两者都渲染「已连接」。
|
|
68
|
+
const phaseText = {
|
|
69
|
+
disabled: t("未启用"), unbound: t("未绑定"), ready: t("已连接"), connected: t("已连接"),
|
|
70
|
+
reconnecting: t("重连中"), conflict: t("连接冲突"),
|
|
71
|
+
}
|
|
72
|
+
const pillClass = ['ready', 'connected'].includes(feishu.phase) ? 'green' : feishu.phase === 'conflict' ? 'amber' : ''
|
|
73
|
+
const creds = feishu.credentials ?? { source: 'none', appIdMasked: null }
|
|
74
|
+
return `
|
|
75
|
+
<div class="card form-card g-card feishu-card" id="feishu-card">
|
|
76
|
+
<div class="feishu-status">
|
|
77
|
+
<span class="pill ${pillClass}">${phaseText[feishu.phase] ?? feishu.phase}</span>
|
|
78
|
+
${feishu.adminOuId ? `<span class="feishu-admin" title="${attr(feishu.adminOuId)}">${t("管理员")} <strong>${esc(String(feishu.adminOuId))}</strong></span>` : ''}
|
|
79
|
+
</div>
|
|
80
|
+
${feishu.phase === 'conflict' ? `<div class="hint feishu-conflict">${t("检测到连接冲突:同一 App ID 在多处登录(exceed_conn_limit),请先退出其他实例。")}</div>` : ''}
|
|
81
|
+
${feishu.error ? `<div class="hint feishu-error">${esc(feishu.error)}</div>` : ''}
|
|
82
|
+
${feishu.phase === 'unbound' ? `
|
|
83
|
+
<form data-form="feishu-credentials">
|
|
84
|
+
<div class="field-row">
|
|
85
|
+
<div class="field"><label for="feishu-app-id">${t("App ID")}</label><input class="input mono" id="feishu-app-id" name="appId" autocomplete="off" placeholder="${t("飞书应用的 App ID")}"></div>
|
|
86
|
+
</div>
|
|
87
|
+
<div class="field-row">
|
|
88
|
+
<div class="field"><label for="feishu-app-secret">${t("App Secret")}</label><input class="input mono" id="feishu-app-secret" name="appSecret" type="password" autocomplete="new-password" placeholder="${t("保存后不再回显")}"></div>
|
|
89
|
+
</div>
|
|
90
|
+
<div class="btn-row"><button class="btn small" type="submit">${t("保存并连接")}</button></div>
|
|
91
|
+
</form>` : ''}
|
|
92
|
+
${feishu.phase !== 'unbound' && creds.source !== 'none' ? `
|
|
93
|
+
<div class="feishu-status feishu-cred">
|
|
94
|
+
<span class="pill">${t("凭据已配置")}</span>
|
|
95
|
+
<span class="mono">${esc(String(creds.appIdMasked ?? ''))}</span>
|
|
96
|
+
${creds.source === 'saved'
|
|
97
|
+
? `<button class="btn small danger" type="button" data-action="feishu-clear-credentials">${t("清除凭据")}</button>`
|
|
98
|
+
: `<span class="faint">${t("服务端注入")}</span>`}
|
|
99
|
+
</div>` : ''}
|
|
100
|
+
<div class="feishu-meta">
|
|
101
|
+
${feishu.botId ? `<span>${t("机器人 ID")} <span class="mono">${esc(String(feishu.botId))}</span></span>` : ''}
|
|
102
|
+
${feishu.appId ? `<span>${t("App ID")} <span class="mono">${esc(maskAppId(feishu.appId))}</span></span>` : ''}
|
|
103
|
+
</div>
|
|
104
|
+
</div>`
|
|
105
|
+
}
|
|
106
|
+
|
|
42
107
|
// 密钥待审请求卡:Bot 发起的密钥请求,批准时填写密钥值。
|
|
43
108
|
function secretRequestsCard(requests) {
|
|
44
109
|
if (requests.length === 0) return `<div class="faint">${t("暂无待审请求。")}</div>`
|
|
@@ -113,13 +178,22 @@ function secretAddCard(projects) {
|
|
|
113
178
|
// 通道页:微信等外部消息通道的绑定与状态。
|
|
114
179
|
export function renderChannel() {
|
|
115
180
|
const card = wechatCard()
|
|
181
|
+
const feishu = feishuCard()
|
|
116
182
|
return pageShell(
|
|
117
183
|
pageHead('CHANNELS', t('viewTitle.channel'), t('channel.desc'), refreshAction()),
|
|
118
184
|
'',
|
|
119
|
-
[
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
185
|
+
[
|
|
186
|
+
pageSection({
|
|
187
|
+
index: '01', id: 'c-wechat', title: t('channel.sectionWechat'), desc: t('channel.sectionWechatDesc'),
|
|
188
|
+
// 停用态也渲染开关卡(DSHBOTS-334):启停入口常驻,不再依赖服务端注入。
|
|
189
|
+
body: slot('full', card),
|
|
190
|
+
}),
|
|
191
|
+
// 飞书未启用时整段不渲染(不显示死卡);启用后凭据可在卡内配置(DSHBOTS-334)。
|
|
192
|
+
...(feishu ? [pageSection({
|
|
193
|
+
index: '02', id: 'c-feishu', title: t('channel.sectionFeishu'), desc: t('channel.sectionFeishuDesc'),
|
|
194
|
+
body: slot('full', feishu),
|
|
195
|
+
})] : []),
|
|
196
|
+
],
|
|
123
197
|
)
|
|
124
198
|
}
|
|
125
199
|
|
|
@@ -153,3 +227,57 @@ export function renderSecretsPage() {
|
|
|
153
227
|
],
|
|
154
228
|
)
|
|
155
229
|
}
|
|
230
|
+
|
|
231
|
+
// 飞书凭据交互(DSHBOTS-334):卡模块内自注册监听(同 events-board 委托先例,不经
|
|
232
|
+
// events-submit/events-click 的通用 switch)。app/api 走动态 import 的命名空间调用——
|
|
233
|
+
// 本模块被单测直接加载时不必拉起整个应用模块图(app.js 含启动副作用)。
|
|
234
|
+
document.addEventListener('submit', async (event) => {
|
|
235
|
+
const form = (event.target ).closest?.('form[data-form="feishu-credentials"]')
|
|
236
|
+
if (!form) return
|
|
237
|
+
event.preventDefault()
|
|
238
|
+
const appId = String(form.querySelector?.('[name="appId"]')?.value ?? '').trim()
|
|
239
|
+
const appSecret = String(form.querySelector?.('[name="appSecret"]')?.value ?? '').trim()
|
|
240
|
+
try {
|
|
241
|
+
if (!appId || !appSecret) throw new Error(t("请输入 App ID 与 App Secret"))
|
|
242
|
+
const apiMod = await import('./api.js')
|
|
243
|
+
await apiMod.api('save_feishu_credentials', { appId, appSecret }, { quiet: true })
|
|
244
|
+
const appMod = await import('../app.js')
|
|
245
|
+
await appMod.refresh({ quiet: true })
|
|
246
|
+
toast(t("飞书凭据已保存,正在重连"), 'success')
|
|
247
|
+
} catch (error) {
|
|
248
|
+
toast((error )?.message || String(error), 'error')
|
|
249
|
+
}
|
|
250
|
+
})
|
|
251
|
+
|
|
252
|
+
document.addEventListener('click', async (event) => {
|
|
253
|
+
const target = (event.target ).closest?.('[data-action="feishu-clear-credentials"]')
|
|
254
|
+
if (!target) return
|
|
255
|
+
if (!globalThis.confirm?.(t("清除后飞书通道将断开并回到未绑定。确认清除?"))) return
|
|
256
|
+
try {
|
|
257
|
+
const apiMod = await import('./api.js')
|
|
258
|
+
await apiMod.api('clear_feishu_credentials', {}, { quiet: true })
|
|
259
|
+
const appMod = await import('../app.js')
|
|
260
|
+
await appMod.refresh({ quiet: true })
|
|
261
|
+
toast(t("已清除飞书凭据,通道回到未绑定"), 'success')
|
|
262
|
+
} catch (error) {
|
|
263
|
+
toast((error )?.message || String(error), 'error')
|
|
264
|
+
}
|
|
265
|
+
})
|
|
266
|
+
|
|
267
|
+
// 微信通道启停开关(DSHBOTS-334):切换即调 set_wechat_channel_enabled(服务端
|
|
268
|
+
// 即时 mount/unmount),停用前确认。
|
|
269
|
+
document.addEventListener('click', async (event) => {
|
|
270
|
+
const target = (event.target ).closest?.('[data-action="wechat-toggle"]')
|
|
271
|
+
if (!target) return
|
|
272
|
+
const next = target.dataset?.next === '1'
|
|
273
|
+
if (!next && !globalThis.confirm?.(t("停用后微信通道立即断开且不再推送。确认停用?"))) return
|
|
274
|
+
try {
|
|
275
|
+
const apiMod = await import('./api.js')
|
|
276
|
+
await apiMod.api('set_wechat_channel_enabled', { enabled: next }, { quiet: true })
|
|
277
|
+
const appMod = await import('../app.js')
|
|
278
|
+
await appMod.refresh({ quiet: true })
|
|
279
|
+
toast(next ? t("微信通道已启用") : t("微信通道已停用"), 'success')
|
|
280
|
+
} catch (error) {
|
|
281
|
+
toast((error )?.message || String(error), 'error')
|
|
282
|
+
}
|
|
283
|
+
})
|
package/ui/modules/settings.js
CHANGED
|
@@ -179,7 +179,6 @@ function renderRunLimitsCard() {
|
|
|
179
179
|
const stallValue = savedStall !== '' ? savedStall : String(limits.stallTimeoutMinutes ?? 30)
|
|
180
180
|
// 验收滞留阈值(DSHBOTS-235):未保存回填生效值;'0'(关闭守门)同样合法不短路。
|
|
181
181
|
const reviewIdleValue = savedReviewIdle !== '' ? savedReviewIdle : String(limits.reviewIdleMinutes ?? 30)
|
|
182
|
-
const autoCloseOn = savedAutoClose !== '0'
|
|
183
182
|
const envNames = [
|
|
184
183
|
limits.runTimeoutEnv ? 'DSH_TEAM_RUN_TIMEOUT_MS' : '',
|
|
185
184
|
limits.stallTimeoutEnv ? 'DSH_TEAM_STALL_TIMEOUT_MS' : '',
|
|
@@ -207,8 +206,9 @@ function renderRunLimitsCard() {
|
|
|
207
206
|
<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>
|
|
208
207
|
<div class="field"><label id="settings-review-auto-close-label" for="settings-review-auto-close">${t('global.reviewAutoCloseLabel')}</label>
|
|
209
208
|
<select class="select" id="settings-review-auto-close" name="review_auto_close">
|
|
210
|
-
<option value="1" ${
|
|
211
|
-
<option value="
|
|
209
|
+
<option value="1" ${settings.review_auto_close === '1' ? 'selected' : ''}>${t('global.on')}</option>
|
|
210
|
+
<option value="observe" ${settings.review_auto_close === 'observe' ? 'selected' : ''}>${t('global.observe')}</option>
|
|
211
|
+
<option value="0" ${settings.review_auto_close === '0' ? 'selected' : ''}>${t('global.off')}</option>
|
|
212
212
|
</select>
|
|
213
213
|
</div>
|
|
214
214
|
</div>
|
|
@@ -222,6 +222,46 @@ function renderRunLimitsCard() {
|
|
|
222
222
|
</div>`
|
|
223
223
|
}
|
|
224
224
|
|
|
225
|
+
// 团队指令段(B1/DSHBOTS-324):四段可编辑提示词的查看与编辑。
|
|
226
|
+
// defaultChanged 徽标提示「内置默认已升级」;保存即经后端预算校验(拆卡三段 ≤1200),
|
|
227
|
+
// 改动只对之后启动的会话生效(identity 段随会话冻结,进行中会话不唤醒)。
|
|
228
|
+
const PROMPT_SEGMENT_LABEL_KEYS = {
|
|
229
|
+
communication: 'global.promptSegCommunication',
|
|
230
|
+
subtask: 'global.promptSegSubtask',
|
|
231
|
+
splitting: 'global.promptSegSplitting',
|
|
232
|
+
selfcheck: 'global.promptSegSelfcheck',
|
|
233
|
+
}
|
|
234
|
+
const PROMPT_SEGMENT_HINT_KEYS = {
|
|
235
|
+
communication: 'global.promptSegCommunicationHint',
|
|
236
|
+
subtask: 'global.promptSegSubtaskHint',
|
|
237
|
+
splitting: 'global.promptSegSplittingHint',
|
|
238
|
+
selfcheck: 'global.promptSegSelfcheckHint',
|
|
239
|
+
}
|
|
240
|
+
function renderPromptSegmentsCard() {
|
|
241
|
+
const segments = state.data.promptSegments ?? []
|
|
242
|
+
if (!segments.length) return ''
|
|
243
|
+
return `
|
|
244
|
+
<div class="card form-card g-card">
|
|
245
|
+
<div class="card-head"><h3>${t('global.promptSegmentsTitle')}</h3><span class="meta">${t('global.promptSegmentsMeta')}</span></div>
|
|
246
|
+
${segments.map(segment => `
|
|
247
|
+
<div class="field" style="margin-top:12px">
|
|
248
|
+
<label for="prompt-seg-${attr(segment.key)}">${t(PROMPT_SEGMENT_LABEL_KEYS[segment.key] ?? '')}
|
|
249
|
+
${segment.override ? `<span class="unread-badge">${t('global.promptSegCustom')}</span>` : ''}
|
|
250
|
+
${segment.defaultChanged ? `<span class="unread-badge">${t('global.promptSegDefaultChanged')}</span>` : ''}
|
|
251
|
+
</label>
|
|
252
|
+
<textarea class="input" id="prompt-seg-${attr(segment.key)}" rows="4" style="min-height:72px;font:inherit">${esc(segment.effectiveText ?? '')}</textarea>
|
|
253
|
+
<div class="hint">${t(PROMPT_SEGMENT_HINT_KEYS[segment.key] ?? '')}</div>
|
|
254
|
+
<div class="btn-row" style="margin-top:8px">
|
|
255
|
+
<button class="btn small" type="button" data-action="save-prompt-segment" data-segment="${attr(segment.key)}">${t('global.save')}</button>
|
|
256
|
+
<button class="btn small" type="button" data-action="reset-prompt-segment" data-segment="${attr(segment.key)}"${segment.override ? '' : ' disabled'}>${t('global.promptSegReset')}</button>
|
|
257
|
+
</div>
|
|
258
|
+
</div>`).join('')}
|
|
259
|
+
<div class="hint">${t('global.promptSegmentsHint')}</div>
|
|
260
|
+
</div>`
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
// 设置变更历史(A4/DSHBOTS-330):audit_log 只读视图的呈现——回答「谁在什么时候改了什么」。
|
|
264
|
+
// 只回看不代恢复:历史行是增量 patch,恢复语义 = 按行内值手动重存(revision 闸兜并发)。
|
|
225
265
|
function renderOpsCard() {
|
|
226
266
|
const settings = state.data.settings ?? {}
|
|
227
267
|
const currency = settings.budget_currency || 'CNY'
|
|
@@ -271,7 +311,6 @@ function dshPathsCard() {
|
|
|
271
311
|
<div class="path-row"><span>${t('global.pathWorkspace')}</span>${pathCode(tildePath(paths.workspace))}${copyPath(paths.workspace)}</div>
|
|
272
312
|
<div class="path-row"><span>${t('global.pathSkills')}</span>${pathCode(paths.skillRoot)}${copyPath(paths.skillRoot)}</div>
|
|
273
313
|
<div class="path-row"><span>${t('global.pathData')}</span>${pathCode(paths.dataDir)}${copyPath(paths.dataDir)}</div>
|
|
274
|
-
<div class="hint">${t('global.dshPathsHint')}</div>
|
|
275
314
|
</div>`
|
|
276
315
|
}
|
|
277
316
|
|
|
@@ -284,7 +323,7 @@ function versionRow(labelKey, value) {
|
|
|
284
323
|
: ''
|
|
285
324
|
}
|
|
286
325
|
|
|
287
|
-
// DSH
|
|
326
|
+
// DSH 服务卡:版本检查。
|
|
288
327
|
function dshServiceCard() {
|
|
289
328
|
const data = state.data
|
|
290
329
|
// @ts-ignore 「DSH 服务」卡检查结果:loadState 只换 state.data,dshUpdate 存这里不被轮询盖掉。
|
|
@@ -294,7 +333,6 @@ function dshServiceCard() {
|
|
|
294
333
|
: available
|
|
295
334
|
? `<strong>${esc(latest)} <span class="pill amber">${t('可升级')}</span></strong>`
|
|
296
335
|
: `<strong>${esc(latest)} <span class="pill green">${t('global.latest')}</span></strong>`
|
|
297
|
-
const outbox = data.outbox ?? { pending: 0, failed: 0, delivered: 0 }
|
|
298
336
|
return `
|
|
299
337
|
<div class="card form-card g-card">
|
|
300
338
|
<div class="card-head">
|
|
@@ -305,7 +343,6 @@ function dshServiceCard() {
|
|
|
305
343
|
<div class="kv"><span>${t('global.dshLatestVersion')}</span>${latestCell(update?.latest, update?.updateAvailable)}</div>
|
|
306
344
|
${versionRow('global.pluginCurrentVersion', data.pluginVersion)}
|
|
307
345
|
<div class="kv"><span>${t('global.pluginLatestVersion')}</span>${latestCell(update?.pluginLatest, update?.pluginUpdateAvailable)}</div>
|
|
308
|
-
${Number(outbox.failed ?? 0) > 0 ? `<div class="kv" style="margin-top:12px"><span>${t('global.outboxQueue')}</span><strong>${t('global.outboxFailed', { count: outbox.failed })}</strong></div>` : ''}
|
|
309
346
|
</div>`
|
|
310
347
|
}
|
|
311
348
|
|
|
@@ -391,6 +428,7 @@ function renderGlobal() {
|
|
|
391
428
|
pageNav([
|
|
392
429
|
{ id: 'g-pref', label: t('global.groupPref') },
|
|
393
430
|
{ id: 'g-runtime', label: t('global.groupRuntime') },
|
|
431
|
+
{ id: 'g-prompts', label: t('global.groupPrompts') },
|
|
394
432
|
{ id: 'g-about', label: t('global.groupAbout') },
|
|
395
433
|
], t('global.navLabel')),
|
|
396
434
|
[
|
|
@@ -446,11 +484,15 @@ function renderGlobal() {
|
|
|
446
484
|
body: `${slot('half', renderRunLimitsCard())}${slot('half', renderOpsCard())}`,
|
|
447
485
|
}),
|
|
448
486
|
pageSection({
|
|
449
|
-
index: '03', id: 'g-
|
|
487
|
+
index: '03', id: 'g-prompts', title: t('global.groupPrompts'), desc: t('global.groupPromptsDesc'),
|
|
488
|
+
body: slot('full', renderPromptSegmentsCard()),
|
|
489
|
+
}),
|
|
490
|
+
pageSection({
|
|
491
|
+
index: '04', id: 'g-about', title: t('global.groupAbout'), desc: t('global.groupAboutDesc'),
|
|
450
492
|
body: `${slot('half', dshPathsCard())}${slot('half', dshServiceCard())}`,
|
|
451
493
|
}),
|
|
452
494
|
],
|
|
453
495
|
)
|
|
454
496
|
}
|
|
455
497
|
|
|
456
|
-
export { renderUsageGlobal, renderUsageDomain, renderUsageSolo, renderRunLimitsCard, renderOpsCard, renderSettings, currentScale, renderGlobal }
|
|
498
|
+
export { renderUsageGlobal, renderUsageDomain, renderUsageSolo, renderRunLimitsCard, renderOpsCard, renderPromptSegmentsCard, renderSettings, currentScale, renderGlobal }
|
package/ui/modules/state.js
CHANGED
|
@@ -26,6 +26,8 @@ export const state = {
|
|
|
26
26
|
// 折叠面板(<details data-panel>)展开态的 key 集合,toggle 时增删;render 全量重建后据此恢复 open 属性。
|
|
27
27
|
// 任务面板的分组(task-group:<status>)与子任务(task-children:<taskId>)也走这套 key(DSHBOTS-58)。
|
|
28
28
|
openPanels: new Set(),
|
|
29
|
+
// 连续系统通知折叠的展开态(B8/DSHBOTS-336):组键=首条消息 id,跨轮询稳定。
|
|
30
|
+
expandedCollapses: new Set(),
|
|
29
31
|
// 顶部「待处理审批」条(DSHBOTS-102):跨项目 pending 聚合;approvalPanelOpen 是明细面板展开态,
|
|
30
32
|
// approvalDeciding 是正在决策的 approval id 集合(决策中禁用按钮,防重复点击)。
|
|
31
33
|
approvalPanelOpen: false,
|
package/ui/styles/chat-cards.css
CHANGED
|
@@ -183,6 +183,34 @@
|
|
|
183
183
|
gap: 8px;
|
|
184
184
|
}
|
|
185
185
|
.approval-menu-empty { padding: 8px 10px; color: var(--ink-3); font-size: var(--fs-small); }
|
|
186
|
+
/* 连续系统通知折叠行(B8/DSHBOTS-336):Quiet by default——≥3 条连续系统通知折叠为一行,
|
|
187
|
+
展开态按组键存 state.expandedCollapses(跨轮询持久),bot/user 消息不折叠。 */
|
|
188
|
+
.msg-collapse-row {
|
|
189
|
+
display: flex;
|
|
190
|
+
align-items: center;
|
|
191
|
+
gap: 8px;
|
|
192
|
+
width: 100%;
|
|
193
|
+
padding: 6px 12px;
|
|
194
|
+
margin: 4px 0;
|
|
195
|
+
border: 1px dashed var(--line);
|
|
196
|
+
border-radius: 8px;
|
|
197
|
+
background: transparent;
|
|
198
|
+
color: var(--ink-3);
|
|
199
|
+
font: 500 var(--fs-small) var(--sans);
|
|
200
|
+
cursor: pointer;
|
|
201
|
+
text-align: left;
|
|
202
|
+
}
|
|
203
|
+
.msg-collapse-row:hover { border-color: var(--line-2); color: var(--ink); }
|
|
204
|
+
/* chevron 图标必须显式约束尺寸:icon() 产出的 svg 只有 viewBox,无 width/height 属性时
|
|
205
|
+
按 replaced element 默认尺寸(约 300×150)渲染,会把折叠行撑破群聊时间线。 */
|
|
206
|
+
.msg-collapse-row > svg { flex: 0 0 auto; width: 12px; height: 12px; }
|
|
207
|
+
.msg-collapse-last {
|
|
208
|
+
flex: 1 1 auto;
|
|
209
|
+
min-width: 0;
|
|
210
|
+
overflow: hidden;
|
|
211
|
+
text-overflow: ellipsis;
|
|
212
|
+
white-space: nowrap;
|
|
213
|
+
}
|
|
186
214
|
/* 来源定位行(DSHBOTS-240):顶部跨会话审批通知的卡片多一行「来源群聊(项目名/KEY)+ 任务 ID/任务名」,
|
|
187
215
|
让 owner 不跳转即可判断该批谁。群聊卡片不带这些字段,不渲染该行。 */
|
|
188
216
|
.approval-source {
|
package/ui/styles/frame.css
CHANGED
|
@@ -271,6 +271,28 @@
|
|
|
271
271
|
flex-direction: column;
|
|
272
272
|
gap: 4px;
|
|
273
273
|
}
|
|
274
|
+
/* 用户需办气泡(DSHBOTS-339):侧栏「总览bots」上方,问答/提权审批/进化审批三类
|
|
275
|
+
需用户干预事项的常驻信号;全 0 不渲染。点击复用顶部窄条展开/进化页导航。 */
|
|
276
|
+
.sidebar-bubbles {
|
|
277
|
+
display: flex;
|
|
278
|
+
flex-wrap: wrap;
|
|
279
|
+
gap: 6px;
|
|
280
|
+
padding: 0 4px 2px;
|
|
281
|
+
}
|
|
282
|
+
.sidebar-bubble {
|
|
283
|
+
display: inline-flex;
|
|
284
|
+
align-items: center;
|
|
285
|
+
gap: 6px;
|
|
286
|
+
padding: 3px 9px;
|
|
287
|
+
border: 1px solid var(--line);
|
|
288
|
+
border-radius: 999px;
|
|
289
|
+
background: var(--star-wash);
|
|
290
|
+
color: var(--ink);
|
|
291
|
+
font-size: var(--fs-small);
|
|
292
|
+
cursor: pointer;
|
|
293
|
+
}
|
|
294
|
+
.sidebar-bubble:hover { border-color: var(--line-2); }
|
|
295
|
+
.sidebar-bubble .unread-badge { margin-left: 0; }
|
|
274
296
|
.global-config {
|
|
275
297
|
width: 100%;
|
|
276
298
|
display: flex;
|
|
@@ -306,14 +328,16 @@
|
|
|
306
328
|
color: var(--accent-text);
|
|
307
329
|
opacity: 1;
|
|
308
330
|
}
|
|
309
|
-
/* 链接复用 global-config 按钮形态(DSH
|
|
331
|
+
/* 链接复用 global-config 按钮形态(DSH 原生界面切换入口、GitHub star 外链) */
|
|
310
332
|
a.global-config {
|
|
311
333
|
text-decoration: none;
|
|
312
334
|
}
|
|
313
|
-
a.global-config.dsh-official-link
|
|
335
|
+
a.global-config.dsh-official-link,
|
|
336
|
+
a.global-config.github-star-link {
|
|
314
337
|
color: var(--ink-3);
|
|
315
338
|
}
|
|
316
|
-
a.global-config.dsh-official-link:hover
|
|
339
|
+
a.global-config.dsh-official-link:hover,
|
|
340
|
+
a.global-config.github-star-link:hover {
|
|
317
341
|
color: var(--ink);
|
|
318
342
|
}
|
|
319
343
|
|