dsh-team-bots 0.2.347 → 0.2.393
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -2
- package/docs/README.zh.md +12 -2
- package/docs/assets/global-config.png +0 -0
- package/docs/assets/global-config.zh.png +0 -0
- package/docs/assets/tasks.png +0 -0
- package/docs/assets/tasks.zh.png +0 -0
- package/docs/assets/usage.png +0 -0
- package/docs/assets/usage.zh.png +0 -0
- package/index.js +2 -0
- package/package.json +2 -1
- package/src/config.js +55 -10
- package/src/db-migrations.js +144 -9
- package/src/paths.js +12 -0
- package/src/services/approvals.js +12 -2
- package/src/services/core.js +2 -1
- package/src/services/notify.js +71 -1
- package/src/services/proposals.js +36 -1
- package/src/services/questions.js +16 -3
- package/src/services/run-finish.js +18 -3
- package/src/services/runs.js +369 -34
- package/src/services/runtime/prompt.js +135 -88
- package/src/services/runtime/session.js +260 -72
- package/src/services/scheduler.js +135 -97
- package/src/services/task-dispatch.js +112 -5
- package/src/services/task-review.js +19 -1
- package/src/services/task-runs.js +53 -15
- package/src/services/tasks.js +81 -0
- package/src/services/wechat.js +23 -21
- package/src/subagent-ledger.js +165 -0
- package/src/tools.js +5 -5
- package/src/wechat/commands.js +3 -1
- package/ui/app.js +4 -14
- package/ui/i18n/en/chat.js +11 -11
- package/ui/i18n/en/common.js +0 -12
- package/ui/i18n/en/nav.js +0 -4
- package/ui/i18n/en/settings.js +14 -9
- package/ui/i18n/en/tasks.js +0 -1
- package/ui/i18n/en/usage.js +4 -7
- package/ui/i18n/zh/chat.js +11 -11
- package/ui/i18n/zh/common.js +0 -12
- package/ui/i18n/zh/nav.js +0 -4
- package/ui/i18n/zh/settings.js +13 -9
- package/ui/i18n/zh/tasks.js +0 -1
- package/ui/i18n/zh/usage.js +4 -7
- package/ui/modules/cards.js +19 -5
- package/ui/modules/composer.js +16 -3
- package/ui/modules/i18n.js +10 -0
- package/ui/modules/modal-forms.js +15 -8
- package/ui/modules/settings.js +9 -0
- package/ui/modules/util.js +0 -2
- package/ui/styles/frame.css +0 -28
- package/ui/styles/wide.css +0 -3
package/ui/i18n/en/usage.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
// ui/i18n/en/usage.ts —— English copy dictionary: usage domain (DSHBOTS-233)
|
|
2
2
|
export default {
|
|
3
3
|
// Usage page (DSHBOTS-204): source-assertion tests lock some Chinese copy literals, so those entries key on the source text itself; display goes through t() so language switching follows.
|
|
4
|
-
"今日": "Today",
|
|
5
|
-
"7 日": "7 days",
|
|
6
|
-
"30 日": "30 days",
|
|
7
|
-
"至今": "All time",
|
|
8
4
|
"汇总窗口": "Summary window",
|
|
9
5
|
"总 tokens(${scope})": "Total tokens (${scope})",
|
|
10
6
|
"调用次数(${scope})": "Calls (${scope})",
|
|
@@ -23,9 +19,6 @@ export default {
|
|
|
23
19
|
"本群分模型": "Group by model",
|
|
24
20
|
"本群各 Bot": "Group bots",
|
|
25
21
|
"该 Bot 分模型": "Bot by model",
|
|
26
|
-
"全局用量总览": "Global usage overview",
|
|
27
|
-
"本群用量总览": "Group usage overview",
|
|
28
|
-
"该 Bot 用量总览": "Bot usage overview",
|
|
29
22
|
"未配置价格的调用不计入成本合计;价格按每百万 token 配置。": "Calls without a configured price are excluded from the cost total; prices are per million tokens.",
|
|
30
23
|
"日历图只画最近 14 天,更早的调用计入上方汇总。": "The calendar chart covers the last 14 days; earlier calls are included in the summary above.",
|
|
31
24
|
"下方分组明细暂不可用,上方汇总仍按本群统计。": "Per-group details are unavailable; the summary above still covers this group.",
|
|
@@ -59,6 +52,10 @@ export default {
|
|
|
59
52
|
"usage.dayTitleToday": "Today",
|
|
60
53
|
"usage.dayTitle7d": "Last 7 days",
|
|
61
54
|
"usage.dayTitle30d": "Last 30 days",
|
|
55
|
+
"usage.window.today": "Today",
|
|
56
|
+
"usage.window.7d": "7 days",
|
|
57
|
+
"usage.window.30d": "30 days",
|
|
58
|
+
"usage.window.all": "All time",
|
|
62
59
|
"usage.windowTextFallback": "Last ${days} days",
|
|
63
60
|
"usage.windowTextToday": "Today (from 00:00 in the product timezone)",
|
|
64
61
|
"usage.windowText7d": "Last 7 days (rolling window)",
|
package/ui/i18n/zh/chat.js
CHANGED
|
@@ -10,7 +10,10 @@ export default {
|
|
|
10
10
|
"chat.emptyBody": "直接发言会交给总监 Bot;用 <strong>@Bot</strong> 点名成员,或输入 <strong>/task @Bot 任务标题</strong> 直接创建任务。",
|
|
11
11
|
"chat.typingQueued": "排队等待回复…",
|
|
12
12
|
"chat.typingRunning": "正在思考与回复…",
|
|
13
|
-
|
|
13
|
+
// 聊天里的图片加载失败占位(app.ts 的 md-img-missing chip)
|
|
14
|
+
"chat.imageFallback": "图片",
|
|
15
|
+
"chat.imageMissingSuffix": "(图片未能加载)",
|
|
16
|
+
"chat.imageMissingHint": "工作区里找不到该图片,或类型/大小不在白名单内",
|
|
14
17
|
// 历史消息分页
|
|
15
18
|
"chat.loadingOlder": "加载中…",
|
|
16
19
|
"chat.loadOlder": "加载前 ${count} 条",
|
|
@@ -68,6 +71,13 @@ export default {
|
|
|
68
71
|
"solo.noRuns": "还没有调度运行。",
|
|
69
72
|
"solo.workspace": "专属工作区",
|
|
70
73
|
// DSHBOTS-220: ui/modules 文案(原文即键)
|
|
74
|
+
"等待审批": "等待审批",
|
|
75
|
+
"已允许一次": "已允许一次",
|
|
76
|
+
"已拒绝": "已拒绝",
|
|
77
|
+
"已超时": "已超时",
|
|
78
|
+
"已取消": "已取消",
|
|
79
|
+
"等待回答": "等待回答",
|
|
80
|
+
"已回答": "已回答",
|
|
71
81
|
"${head}:${summary}": "${head}:${summary}",
|
|
72
82
|
"${source}|${head}:${summary}": "${source}|${head}:${summary}",
|
|
73
83
|
"${minutes} 分 ${seconds} 秒后自动拒绝": "${minutes} 分 ${seconds} 秒后自动拒绝",
|
|
@@ -99,14 +109,6 @@ export default {
|
|
|
99
109
|
"图片预览": "图片预览",
|
|
100
110
|
"图片预览不可用": "图片预览不可用",
|
|
101
111
|
"失败": "失败",
|
|
102
|
-
"已允许一次": "已允许一次",
|
|
103
|
-
"已取消": "已取消",
|
|
104
|
-
"已回复": "已回复",
|
|
105
|
-
"已回答": "已回答",
|
|
106
|
-
"已拒绝": "已拒绝",
|
|
107
|
-
"已超时": "已超时",
|
|
108
|
-
"已送达": "已送达",
|
|
109
|
-
"待回复": "待回复",
|
|
110
112
|
"待回答提问": "待回答提问",
|
|
111
113
|
"待处理审批": "待处理审批",
|
|
112
114
|
"排队等待回复…": "排队等待回复…",
|
|
@@ -120,8 +122,6 @@ export default {
|
|
|
120
122
|
"清空本群全部聊天记录?清除后不可恢复(任务与记忆保留)。": "清空本群全部聊天记录?清除后不可恢复(任务与记忆保留)。",
|
|
121
123
|
"清空聊天": "清空聊天",
|
|
122
124
|
"的全部对话记录?清除后不可恢复(记忆保留)。": "的全部对话记录?清除后不可恢复(记忆保留)。",
|
|
123
|
-
"等待回答": "等待回答",
|
|
124
|
-
"等待审批": "等待审批",
|
|
125
125
|
"补充说明(可选)": "补充说明(可选)",
|
|
126
126
|
"计划评审": "计划评审",
|
|
127
127
|
"请求使用": "请求使用",
|
package/ui/i18n/zh/common.js
CHANGED
|
@@ -74,17 +74,7 @@ export default {
|
|
|
74
74
|
"filePolicy.read-only": "只读",
|
|
75
75
|
"filePolicy.workspace-write": "工作区内修改",
|
|
76
76
|
"filePolicy.danger-full-access": "完全访问",
|
|
77
|
-
"approvalStatus.pending": "等待审批",
|
|
78
|
-
"approvalStatus.allowed": "已允许一次",
|
|
79
|
-
"approvalStatus.rejected": "已拒绝",
|
|
80
|
-
"approvalStatus.timeout": "已超时",
|
|
81
|
-
"approvalStatus.cancelled": "已取消",
|
|
82
|
-
"questionStatus.pending": "等待回答",
|
|
83
|
-
"questionStatus.answered": "已回答",
|
|
84
|
-
"questionStatus.expired": "已取消",
|
|
85
|
-
"questionStatus.timeout": "已超时",
|
|
86
77
|
// DSHBOTS-220: ui/modules 文案(原文即键)
|
|
87
|
-
"<span class=\\\"pill amber\\\">${pending} 条待审</span>": "<span class=\\\"pill amber\\\">${pending} 条待审</span>",
|
|
88
78
|
"Bot 已归档": "Bot 已归档",
|
|
89
79
|
"」关闭": "」关闭",
|
|
90
80
|
"」恢复": "」恢复",
|
|
@@ -153,10 +143,8 @@ export default {
|
|
|
153
143
|
"该成员": "该成员",
|
|
154
144
|
"请先选择负责人": "请先选择负责人",
|
|
155
145
|
"请求失败,请稍后重试。": "请求失败,请稍后重试。",
|
|
156
|
-
"运行失败": "运行失败",
|
|
157
146
|
"运行已取消": "运行已取消",
|
|
158
147
|
"运行沉淀": "运行沉淀",
|
|
159
|
-
"限流等待": "限流等待",
|
|
160
148
|
"限流等待,约 ${waitMin} 分钟后自动重试": "限流等待,约 ${waitMin} 分钟后自动重试",
|
|
161
149
|
"项目已再开,恢复为进行中": "项目已再开,恢复为进行中",
|
|
162
150
|
"项目已归档": "项目已归档",
|
package/ui/i18n/zh/nav.js
CHANGED
|
@@ -74,10 +74,6 @@ export default {
|
|
|
74
74
|
"sidebar.globalConfig": "全局配置",
|
|
75
75
|
"sidebar.switchToDsh": "切换到 DSH 原生 Web 界面",
|
|
76
76
|
"sidebar.dshNative": "DSH 原生界面",
|
|
77
|
-
"sidebar.tasksActive": "${count} 个任务中",
|
|
78
|
-
"sidebar.idle": "团队空闲",
|
|
79
|
-
"sidebar.botsCount": "${count} Bots",
|
|
80
|
-
"sidebar.pendingReviews": "${count} 待审",
|
|
81
77
|
// 顶栏统计与操作
|
|
82
78
|
"topbar.taskOne": "任务",
|
|
83
79
|
"topbar.taskMany": "任务",
|
package/ui/i18n/zh/settings.js
CHANGED
|
@@ -35,6 +35,8 @@ export default {
|
|
|
35
35
|
"global.stallOff": "看门狗关闭",
|
|
36
36
|
"global.stallMinutes": "${minutes} 分钟看门狗",
|
|
37
37
|
"global.runTimeoutLabel": "超时中止(分钟)",
|
|
38
|
+
"global.approvalTimeoutLabel": "审批等待超时(分钟)",
|
|
39
|
+
"global.questionTimeoutLabel": "提问转接超时(分钟)",
|
|
38
40
|
"global.stallWatchdogLabel": "无进展看门狗(分钟)",
|
|
39
41
|
"global.runLimitsHint1": "超时中止 = 单次运行的最长时长(1–360 分钟);无进展看门狗 = 运行多久没有任何输出即判定卡住(0–360 分钟,0 为关闭)。",
|
|
40
42
|
"global.reviewIdleLabel": "验收滞留阈值(分钟)",
|
|
@@ -81,6 +83,9 @@ export default {
|
|
|
81
83
|
"secrets.sectionListDesc": "团队与项目两级密钥,值加密存储。",
|
|
82
84
|
"secrets.sectionAdd": "新增密钥",
|
|
83
85
|
"secrets.sectionAddDesc": "保存后不再回显,同作用域同名会覆盖旧值。",
|
|
86
|
+
// 思考过程(运行轨迹):后端落库的是中文原文,前端剥出主体后按当前语言重组。
|
|
87
|
+
"完成": "完成",
|
|
88
|
+
"中止": "中止",
|
|
84
89
|
"不可用": "不可用",
|
|
85
90
|
"桌面通知": "桌面通知",
|
|
86
91
|
"当前环境不支持桌面通知(需 HTTPS 或 localhost)。": "当前环境不支持桌面通知(需 HTTPS 或 localhost)。",
|
|
@@ -94,6 +99,14 @@ export default {
|
|
|
94
99
|
"新值只对之后启动的运行生效,进行中的运行不追溯。": "新值只对之后启动的运行生效,进行中的运行不追溯。",
|
|
95
100
|
"可升级": "可升级",
|
|
96
101
|
// DSHBOTS-220: ui/modules 文案(原文即键)
|
|
102
|
+
"思考": "思考",
|
|
103
|
+
"回复": "回复",
|
|
104
|
+
"调用工具 ${name}": "调用工具 ${name}",
|
|
105
|
+
"工具 ${name} 返回": "工具 ${name} 返回",
|
|
106
|
+
"运行结束(${label})": "运行结束(${label})",
|
|
107
|
+
"运行结束": "运行结束",
|
|
108
|
+
"第 ${n} 轮开始": "第 ${n} 轮开始",
|
|
109
|
+
"(失败)": "(失败)",
|
|
97
110
|
"Bot 配置": "Bot 配置",
|
|
98
111
|
"、": "、",
|
|
99
112
|
"。": "。",
|
|
@@ -166,7 +179,6 @@ export default {
|
|
|
166
179
|
"可用": "可用",
|
|
167
180
|
"同时移除项目生产目录": "同时移除项目生产目录",
|
|
168
181
|
"名称": "名称",
|
|
169
|
-
"回复": "回复",
|
|
170
182
|
"回滚": "回滚",
|
|
171
183
|
"团队": "团队",
|
|
172
184
|
"团队级无需选择": "团队级无需选择",
|
|
@@ -195,8 +207,6 @@ export default {
|
|
|
195
207
|
"尚未提供模型": "尚未提供模型",
|
|
196
208
|
"工作区路径": "工作区路径",
|
|
197
209
|
"工具": "工具",
|
|
198
|
-
"工具 ${title} 返回": "工具 ${title} 返回",
|
|
199
|
-
"工具返回": "工具返回",
|
|
200
210
|
"已停用": "已停用",
|
|
201
211
|
"已归档": "已归档",
|
|
202
212
|
"已归档项目停止新运行,工作区文件保留。项目再开会恢复为进行中;移除追踪会清理本项目的管理数据。": "已归档项目停止新运行,工作区文件保留。项目再开会恢复为进行中;移除追踪会清理本项目的管理数据。",
|
|
@@ -205,7 +215,6 @@ export default {
|
|
|
205
215
|
"归档项目": "归档项目",
|
|
206
216
|
"当前生效": "当前生效",
|
|
207
217
|
"待审": "待审",
|
|
208
|
-
"思考": "思考",
|
|
209
218
|
"思考过程": "思考过程",
|
|
210
219
|
"总监": "总监",
|
|
211
220
|
"总监优先": "总监优先",
|
|
@@ -277,7 +286,6 @@ export default {
|
|
|
277
286
|
"移除追踪 · 后果确认": "移除追踪 · 后果确认",
|
|
278
287
|
"移除追踪 · 确认执行": "移除追踪 · 确认执行",
|
|
279
288
|
"移除追踪后不能恢复,该 Bot 也不能再被修改或重新启用。": "移除追踪后不能恢复,该 Bot 也不能再被修改或重新启用。",
|
|
280
|
-
"第": "第",
|
|
281
289
|
"管理员": "管理员",
|
|
282
290
|
"管理数据": "管理数据",
|
|
283
291
|
"紧急": "紧急",
|
|
@@ -302,17 +310,13 @@ export default {
|
|
|
302
310
|
"请先进入一个项目": "请先进入一个项目",
|
|
303
311
|
"请求": "请求",
|
|
304
312
|
"读取思考过程失败": "读取思考过程失败",
|
|
305
|
-
"调用工具": "调用工具",
|
|
306
|
-
"调用工具 ${title}": "调用工具 ${title}",
|
|
307
313
|
"负责人": "负责人",
|
|
308
314
|
"超出预算时项目会提示预算已用尽。成本预算与模型价格使用同一币种计价。": "超出预算时项目会提示预算已用尽。成本预算与模型价格使用同一币种计价。",
|
|
309
|
-
"轮": "轮",
|
|
310
315
|
"输入 Bot 名称「": "输入 Bot 名称「",
|
|
311
316
|
"输入项目名「": "输入项目名「",
|
|
312
317
|
"运行中": "运行中",
|
|
313
318
|
"运行总数": "运行总数",
|
|
314
319
|
"运行次数": "运行次数",
|
|
315
|
-
"运行结束": "运行结束",
|
|
316
320
|
"运行记录": "运行记录",
|
|
317
321
|
"运行记录、单聊消息、版本历史与专属工作区目录": "运行记录、单聊消息、版本历史与专属工作区目录",
|
|
318
322
|
"还没有密钥。": "还没有密钥。",
|
package/ui/i18n/zh/tasks.js
CHANGED
package/ui/i18n/zh/usage.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
// ui/i18n/zh/usage.ts —— 中文文案字典:usage 域(DSHBOTS-233)
|
|
2
2
|
export default {
|
|
3
3
|
// 用量页(DSHBOTS-204):源码断言测试锁定部分中文文案字面量,这些条目以「原文即键」入典, 展示统一走 t(),切换语言后文案跟随,源码字面量保持不变。
|
|
4
|
-
"今日": "今日",
|
|
5
|
-
"7 日": "7 日",
|
|
6
|
-
"30 日": "30 日",
|
|
7
|
-
"至今": "至今",
|
|
8
4
|
"汇总窗口": "汇总窗口",
|
|
9
5
|
"总 tokens(${scope})": "总 tokens(${scope})",
|
|
10
6
|
"调用次数(${scope})": "调用次数(${scope})",
|
|
@@ -23,9 +19,6 @@ export default {
|
|
|
23
19
|
"本群分模型": "本群分模型",
|
|
24
20
|
"本群各 Bot": "本群各 Bot",
|
|
25
21
|
"该 Bot 分模型": "该 Bot 分模型",
|
|
26
|
-
"全局用量总览": "全局用量总览",
|
|
27
|
-
"本群用量总览": "本群用量总览",
|
|
28
|
-
"该 Bot 用量总览": "该 Bot 用量总览",
|
|
29
22
|
"未配置价格的调用不计入成本合计;价格按每百万 token 配置。": "未配置价格的调用不计入成本合计;价格按每百万 token 配置。",
|
|
30
23
|
"日历图只画最近 14 天,更早的调用计入上方汇总。": "日历图只画最近 14 天,更早的调用计入上方汇总。",
|
|
31
24
|
"下方分组明细暂不可用,上方汇总仍按本群统计。": "下方分组明细暂不可用,上方汇总仍按本群统计。",
|
|
@@ -59,6 +52,10 @@ export default {
|
|
|
59
52
|
"usage.dayTitleToday": "今日",
|
|
60
53
|
"usage.dayTitle7d": "近 7 天",
|
|
61
54
|
"usage.dayTitle30d": "近 30 天",
|
|
55
|
+
"usage.window.today": "今日",
|
|
56
|
+
"usage.window.7d": "7 天",
|
|
57
|
+
"usage.window.30d": "30 天",
|
|
58
|
+
"usage.window.all": "至今",
|
|
62
59
|
"usage.windowTextFallback": "近 ${days} 天",
|
|
63
60
|
"usage.windowTextToday": "今日(产品时区当日 0 点起)",
|
|
64
61
|
"usage.windowText7d": "近 7 天(滚动窗口)",
|
package/ui/modules/cards.js
CHANGED
|
@@ -39,7 +39,14 @@ function approvalExpiresMs(expiresAt) {
|
|
|
39
39
|
// 五态:pending(唯一强调态)/ allowed / rejected / timeout / cancelled。
|
|
40
40
|
// pending 之外四态统一走「已决」排版:无倒计时无按钮、正文降 --ink-2、卡片回中性底;
|
|
41
41
|
// 红色只出现在 rejected 的左侧条与 pill 小点,其余中性。
|
|
42
|
-
|
|
42
|
+
// 状态文案走 getter 现取:模块顶层求值早于 setLanguage,顶层固化会让英文界面留中文。
|
|
43
|
+
const APPROVAL_STATUS = {
|
|
44
|
+
get pending() { return t('等待审批') },
|
|
45
|
+
get allowed() { return t('已允许一次') },
|
|
46
|
+
get rejected() { return t('已拒绝') },
|
|
47
|
+
get timeout() { return t('已超时') },
|
|
48
|
+
get cancelled() { return t('已取消') },
|
|
49
|
+
}
|
|
43
50
|
// 各态图标:盾牌(待批)/ 对勾(已放行)/ 叉(已拒绝)/ 时钟(超时)/ 禁止(取消)。
|
|
44
51
|
// ui/modules/icons.js 不在本卡写范围,shield 与 ban 两枚路径在此内联;check/close/clock 走既有图标表。
|
|
45
52
|
const APPROVAL_ICON_PATHS = {
|
|
@@ -119,7 +126,7 @@ function approvalCardMarkup(approval, deciding = false, showSource = false) {
|
|
|
119
126
|
<span class="approval-icon is-${attr(status)}">${approvalIcon(APPROVAL_STATE_ICON[status] ?? 'clock')}</span>
|
|
120
127
|
<div class="approval-head-main">
|
|
121
128
|
<div class="message-meta approval-meta"><strong>${esc(approval.botName)}</strong><span class="approval-ask">${t("请求提权")}</span><span>${esc(formatTime(approval.created_at))}</span></div>
|
|
122
|
-
<div class="approval-tools"><span class="approval-chip mono">${esc(approval.tool_name)}</span>${target ? `<span class="approval-chip mono approval-chip-path" title="${attr(target.title)}">${esc(target.text)}</span>` : ''}</div>
|
|
129
|
+
<div class="approval-tools"><span class="approval-chip mono">${esc(approval.tool_name)}</span>${approval.projectKey ? `<span class="approval-chip mono" title="${attr(approval.projectName ?? '')}">[${attr(approval.projectKey)}] ${esc(approval.projectName ?? '')}</span>` : `<span class="approval-chip mono">${t("单聊")}</span>`}${target ? `<span class="approval-chip mono approval-chip-path" title="${attr(target.title)}">${esc(target.text)}</span>` : ''}</div>
|
|
123
130
|
</div>
|
|
124
131
|
</div>
|
|
125
132
|
${showSource ? approvalSourceLine(approval) : ''}
|
|
@@ -151,7 +158,12 @@ function renderApprovalCard(message) {
|
|
|
151
158
|
// ===== question-card:start 提问卡片(DSHBOTS-116 UI)=====
|
|
152
159
|
// 四态:pending(唯一强调态,可作答)/ answered / expired / timeout。
|
|
153
160
|
// 与审批卡片同骨架:pending 有倒计时 + 进度条 + 作答区,已决态只留状态 pill 与答案摘要。
|
|
154
|
-
const QUESTION_STATUS = {
|
|
161
|
+
const QUESTION_STATUS = {
|
|
162
|
+
get pending() { return t('等待回答') },
|
|
163
|
+
get answered() { return t('已回答') },
|
|
164
|
+
get expired() { return t('已取消') },
|
|
165
|
+
get timeout() { return t('已超时') },
|
|
166
|
+
}
|
|
155
167
|
const QUESTION_STATE_ICON = { pending: 'message', answered: 'check', expired: 'close', timeout: 'clock' }
|
|
156
168
|
const QUESTION_URGENT_MS = 15_000
|
|
157
169
|
const questionBadgeText = (count) => (Number(count) > 99 ? '99+' : String(Number(count) || 0))
|
|
@@ -518,7 +530,9 @@ function renderMessage(message) {
|
|
|
518
530
|
|
|
519
531
|
// ===== Bot 私信(项目群聊视图的折叠面板,数据来自 state.directMessages)=====
|
|
520
532
|
|
|
521
|
-
|
|
533
|
+
// 私信状态码集合:只判定「是否已知状态」,标签文案统一走 t('dm.' + status) 现取,
|
|
534
|
+
// 不在模块顶层固化(顶层求值早于 setLanguage,固化会让英文界面留中文)。
|
|
535
|
+
const DM_STATUS_KEYS = new Set(['pending', 'delivered', 'replied', 'failed'])
|
|
522
536
|
const DM_STATUS_TONE = { pending: '', delivered: 'violet', replied: 'green', failed: 'red' }
|
|
523
537
|
|
|
524
538
|
function renderDirectMessagesCard() {
|
|
@@ -531,7 +545,7 @@ function renderDirectMessagesCard() {
|
|
|
531
545
|
<div class="subpanel-row">
|
|
532
546
|
<div class="subpanel-row-head">
|
|
533
547
|
<strong>${esc(dm.fromName)} → ${esc(dm.toName)}</strong>
|
|
534
|
-
<span class="pill ${DM_STATUS_TONE[dm.status] ?? ''}">${esc(dm.status
|
|
548
|
+
<span class="pill ${DM_STATUS_TONE[dm.status] ?? ''}">${esc(DM_STATUS_KEYS.has(dm.status) ? t('dm.' + dm.status) : dm.status)}</span>
|
|
535
549
|
<span class="faint">${esc(formatTime(dm.createdAt))}</span>
|
|
536
550
|
${dm.repliedAt ? `<span class="faint">${t('dm.repliedAt', { time: formatTime(dm.repliedAt) })}</span>` : ''}
|
|
537
551
|
<span class="subpanel-tag">#${esc(dm.id)}</span>
|
package/ui/modules/composer.js
CHANGED
|
@@ -8,10 +8,23 @@ import { app, renderShell, renderKeepingChatScroll, render } from '../app.js'
|
|
|
8
8
|
import { flushAppRender } from './modal-layer.js'
|
|
9
9
|
|
|
10
10
|
// ac-core:start —— 输入框 / 与 @ 自动补全的纯逻辑(tests/ac.test.js 抽取此块断言)
|
|
11
|
+
// title/desc 走 getter 现取:模块顶层求值早于 setLanguage,顶层固化会让英文界面留中文。
|
|
11
12
|
const AC_COMMANDS = [
|
|
12
|
-
{
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
{
|
|
14
|
+
kind: 'command', label: '/task', insert: '/task @', then: 'mention',
|
|
15
|
+
get title() { return t("派任务") },
|
|
16
|
+
get desc() { return t("创建任务并排队执行:/task @成员 标题") },
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
kind: 'command', label: '/remember', insert: '/remember ',
|
|
20
|
+
get title() { return t("写项目记忆") },
|
|
21
|
+
get desc() { return t("写入项目级记忆:/remember 内容") },
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
kind: 'command', label: '/clear', insert: '/clear',
|
|
25
|
+
get title() { return t("清空聊天") },
|
|
26
|
+
get desc() { return t("清空本群全部聊天记录(任务与记忆保留)") },
|
|
27
|
+
},
|
|
15
28
|
]
|
|
16
29
|
const acWordChar = (ch) => ch !== undefined && !/[\s@/]/.test(ch)
|
|
17
30
|
|
package/ui/modules/i18n.js
CHANGED
|
@@ -47,3 +47,13 @@ export function t(key, params = null) {
|
|
|
47
47
|
params[name] === undefined || params[name] === null ? match : String(params[name])
|
|
48
48
|
))
|
|
49
49
|
}
|
|
50
|
+
|
|
51
|
+
// 静默取值:字典里没有该键时原样返回,不告警。
|
|
52
|
+
// 给后端下发的自由文本用(轨迹里的工具名、运行结束原因等)——它们大多不是词典键,
|
|
53
|
+
// 原样显示即可,不该刷 console.warn;落在词典里的(如后端兜底写的中文词)照常翻译。
|
|
54
|
+
export function tMaybe(key, fallback = key) {
|
|
55
|
+
const dict = DICTS[current] ?? zh
|
|
56
|
+
if (dict[key] !== undefined) return dict[key]
|
|
57
|
+
if (zh[key] !== undefined) return zh[key]
|
|
58
|
+
return fallback
|
|
59
|
+
}
|
|
@@ -3,7 +3,7 @@ import { icon } from './icons.js'
|
|
|
3
3
|
import { activeBots, activeProject, attr, avatar, botById, duration, esc, filePolicyOptions, formatCost, formatNumber, formatTime, inSoloContext, pageProject, runDot, sandboxPill, timeAgo, toast } from './util.js'
|
|
4
4
|
import { api } from './api.js'
|
|
5
5
|
import { mdChatScope, richText } from './markdown.js'
|
|
6
|
-
import { t } from './i18n.js'
|
|
6
|
+
import { t, tMaybe } from './i18n.js'
|
|
7
7
|
import { currentSkillVersion, skillVersions, taskUsageBlock } from './tasks.js'
|
|
8
8
|
import { ensureComposerImageInput, ensureImageViewer } from './composer.js'
|
|
9
9
|
import { app, refresh, panelAttrs, render, updateRunClocks } from '../app.js'
|
|
@@ -345,15 +345,22 @@ function runArtifacts(state, run) {
|
|
|
345
345
|
}
|
|
346
346
|
|
|
347
347
|
// ===== 思考过程:Bot 运行轨迹(run_trajectory)=====
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
348
|
+
// 轨迹标题是后端落库时拼好的中文原文(src/services/runtime/trajectory.ts):剥出主体后按当前语言
|
|
349
|
+
// 重组,英文界面不留中文。全角括号用 \u 转义(ui/modules 不得出现 CJK 字面量,cjk-zero 守门)。
|
|
351
350
|
function trajectoryLabel(entry) {
|
|
352
351
|
const kind = String(entry?.kind ?? '')
|
|
353
352
|
const title = String(entry?.title ?? '').trim()
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
353
|
+
const tail = /[\uFF08(]([^\uFF08()\uFF09]*)[\uFF09)]$/.exec(title)
|
|
354
|
+
const head = (tail ? title.slice(0, tail.index) : title).trim()
|
|
355
|
+
const parts = head.split(/\s+/)
|
|
356
|
+
const name = tMaybe(parts[1] ?? '')
|
|
357
|
+
if (kind === 'turn') return t('第 ${n} 轮开始', { n: entry?.turn ?? parts[1] ?? '?' })
|
|
358
|
+
if (kind === 'end') return tail ? t('运行结束(${label})', { label: tMaybe(tail[1]) }) : t('运行结束')
|
|
359
|
+
if (kind === 'thinking') return t('思考')
|
|
360
|
+
if (kind === 'text') return t('回复')
|
|
361
|
+
if (kind === 'tool_call') return t('调用工具 ${name}', { name })
|
|
362
|
+
if (kind === 'tool_result') return t('工具 ${name} 返回', { name }) + (tail ? t('(失败)') : '')
|
|
363
|
+
return title
|
|
357
364
|
}
|
|
358
365
|
|
|
359
366
|
function trajectoryEntry(entry, index = 0, runId = '') {
|
|
@@ -362,7 +369,7 @@ function trajectoryEntry(entry, index = 0, runId = '') {
|
|
|
362
369
|
const detail = String(entry?.detail ?? '')
|
|
363
370
|
const label = trajectoryLabel(entry)
|
|
364
371
|
if (kind === 'turn') {
|
|
365
|
-
return `<div class="traj-turn"><span>${esc(
|
|
372
|
+
return `<div class="traj-turn"><span>${esc(label)}</span></div>`
|
|
366
373
|
}
|
|
367
374
|
if (kind === 'note') {
|
|
368
375
|
return `<div class="traj-note">${esc([title, detail].filter(Boolean).join(' · '))}</div>`
|
package/ui/modules/settings.js
CHANGED
|
@@ -187,6 +187,11 @@ function renderRunLimitsCard() {
|
|
|
187
187
|
const stallText = limits.stallTimeoutMinutes === 0
|
|
188
188
|
? t('global.stallOff')
|
|
189
189
|
: t('global.stallMinutes', { minutes: limits.stallTimeoutMinutes ?? 30 })
|
|
190
|
+
// 审批/提问等待(DSHBOTS-309):默认 10 分钟,settings 可调 [1,60];未保存回填默认。
|
|
191
|
+
const savedApproval = settings.approval_timeout_minutes ?? ''
|
|
192
|
+
const savedQuestion = settings.question_timeout_minutes ?? ''
|
|
193
|
+
const approvalValue = savedApproval !== '' ? savedApproval : '10'
|
|
194
|
+
const questionValue = savedQuestion !== '' ? savedQuestion : '10'
|
|
190
195
|
return `
|
|
191
196
|
<div class="card form-card g-card">
|
|
192
197
|
<div class="card-head"><h3>${t('global.cardRunLimits')}</h3><span class="meta">${t('global.runLimitsCurrent', { timeout: limits.runTimeoutMinutes ?? 120, stall: stallText })}</span></div>
|
|
@@ -194,6 +199,10 @@ function renderRunLimitsCard() {
|
|
|
194
199
|
<div class="field"><label id="settings-run-timeout-label" for="settings-run-timeout">${t('global.runTimeoutLabel')}</label><input class="input mono" style="text-align:right" type="number" min="1" max="360" id="settings-run-timeout" name="run_timeout_minutes" value="${attr(runValue)}"></div>
|
|
195
200
|
<div class="field"><label id="settings-stall-watchdog-label" for="settings-stall-watchdog">${t('global.stallWatchdogLabel')}</label><input class="input mono" style="text-align:right" type="number" min="0" max="360" id="settings-stall-watchdog" name="stall_watchdog_minutes" value="${attr(stallValue)}"></div>
|
|
196
201
|
</div>
|
|
202
|
+
<div class="field-row">
|
|
203
|
+
<div class="field"><label id="settings-approval-timeout-label" for="settings-approval-timeout">${t('global.approvalTimeoutLabel')}</label><input class="input mono" style="text-align:right" type="number" min="1" max="60" id="settings-approval-timeout" name="approval_timeout_minutes" value="${attr(approvalValue)}"></div>
|
|
204
|
+
<div class="field"><label id="settings-question-timeout-label" for="settings-question-timeout">${t('global.questionTimeoutLabel')}</label><input class="input mono" style="text-align:right" type="number" min="1" max="60" id="settings-question-timeout" name="question_timeout_minutes" value="${attr(questionValue)}"></div>
|
|
205
|
+
</div>
|
|
197
206
|
<div class="field-row">
|
|
198
207
|
<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>
|
|
199
208
|
<div class="field"><label id="settings-review-auto-close-label" for="settings-review-auto-close">${t('global.reviewAutoCloseLabel')}</label>
|
package/ui/modules/util.js
CHANGED
|
@@ -176,8 +176,6 @@ export function memberRunDot(member) {
|
|
|
176
176
|
export function runDotHtml(dot) {
|
|
177
177
|
return `<span class="run-dot ${dot.cls}" data-status="${dot.status}" title="${esc(dot.text)}" aria-label="${esc(dot.text)}"></span>`
|
|
178
178
|
}
|
|
179
|
-
// 卡片底部的状态短标签(完整说明仍在 run-dot 的 title 里)。
|
|
180
|
-
export const MEMBER_STATUS_TEXT = { idle: t("空闲"), running: t("运行中"), queued: t("排队中"), plan_wait: t("限流等待"), failed: t("运行失败") }
|
|
181
179
|
export function memorySource(source) {
|
|
182
180
|
const value = String(source ?? '')
|
|
183
181
|
if (!value) return t("手动写入")
|
package/ui/styles/frame.css
CHANGED
|
@@ -316,32 +316,4 @@ a.global-config.dsh-official-link {
|
|
|
316
316
|
a.global-config.dsh-official-link:hover {
|
|
317
317
|
color: var(--ink);
|
|
318
318
|
}
|
|
319
|
-
.sidebar-meta {
|
|
320
|
-
display: flex;
|
|
321
|
-
align-items: center;
|
|
322
|
-
gap: 6px;
|
|
323
|
-
padding: 4px 8px 0;
|
|
324
|
-
color: var(--ink-3);
|
|
325
|
-
font-size: var(--fs-caption);
|
|
326
|
-
white-space: nowrap;
|
|
327
|
-
overflow: hidden;
|
|
328
|
-
min-width: 0;
|
|
329
|
-
}
|
|
330
|
-
.sidebar-meta span {
|
|
331
|
-
overflow: hidden;
|
|
332
|
-
text-overflow: ellipsis;
|
|
333
|
-
}
|
|
334
|
-
.sidebar-meta .dot {
|
|
335
|
-
width: 5px;
|
|
336
|
-
height: 5px;
|
|
337
|
-
border-radius: 50%;
|
|
338
|
-
background: var(--green);
|
|
339
|
-
flex: 0 0 auto;
|
|
340
|
-
}
|
|
341
|
-
.sidebar-meta .dot.amber {
|
|
342
|
-
background: var(--star);
|
|
343
|
-
}
|
|
344
|
-
.sidebar-meta-sep {
|
|
345
|
-
opacity: 0.55;
|
|
346
|
-
}
|
|
347
319
|
|