dsh-wecom-bot 0.2.0 → 0.4.2

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 (50) hide show
  1. package/README.md +159 -54
  2. package/dist/client.js +1462 -613
  3. package/dist/host/bridge/commands.js +315 -48
  4. package/dist/host/bridge/commands.js.map +1 -1
  5. package/dist/host/bridge/directory.js +33 -10
  6. package/dist/host/bridge/directory.js.map +1 -1
  7. package/dist/host/bridge/format.js +23 -0
  8. package/dist/host/bridge/format.js.map +1 -1
  9. package/dist/host/bridge/index.js +219 -104
  10. package/dist/host/bridge/index.js.map +1 -1
  11. package/dist/host/bridge/interactions.js +2 -2
  12. package/dist/host/bridge/interactions.js.map +1 -1
  13. package/dist/host/bridge/notices.js +229 -46
  14. package/dist/host/bridge/notices.js.map +1 -1
  15. package/dist/host/bridge/outbox.js.map +1 -1
  16. package/dist/host/bridge/policy.js +16 -16
  17. package/dist/host/bridge/policy.js.map +1 -1
  18. package/dist/host/bridge/selection.js +1 -0
  19. package/dist/host/bridge/selection.js.map +1 -1
  20. package/dist/host/catalog.js +70 -7
  21. package/dist/host/catalog.js.map +1 -1
  22. package/dist/host/config.js +31 -12
  23. package/dist/host/config.js.map +1 -1
  24. package/dist/host/groups-view.js +308 -0
  25. package/dist/host/groups-view.js.map +1 -0
  26. package/dist/host/index.js +21 -11
  27. package/dist/host/index.js.map +1 -1
  28. package/dist/host/models.js +106 -0
  29. package/dist/host/models.js.map +1 -0
  30. package/dist/host/observation.js +53 -60
  31. package/dist/host/observation.js.map +1 -1
  32. package/dist/host/presets.js +49 -0
  33. package/dist/host/presets.js.map +1 -0
  34. package/dist/host/routes.js +76 -4
  35. package/dist/host/routes.js.map +1 -1
  36. package/dist/host/routing-store.js +349 -0
  37. package/dist/host/routing-store.js.map +1 -0
  38. package/dist/host/routing.js +71 -0
  39. package/dist/host/routing.js.map +1 -0
  40. package/dist/host/runtime.js +177 -7
  41. package/dist/host/runtime.js.map +1 -1
  42. package/dist/host/session-ops.js +100 -0
  43. package/dist/host/session-ops.js.map +1 -0
  44. package/dist/host/sessions.js +140 -0
  45. package/dist/host/sessions.js.map +1 -0
  46. package/dist/host/workspaces.js +154 -0
  47. package/dist/host/workspaces.js.map +1 -0
  48. package/dist/shared/protocol.js +23 -0
  49. package/dist/shared/protocol.js.map +1 -1
  50. package/package.json +3 -2
@@ -1,6 +1,6 @@
1
- import { displayTitle, oneLine, shortId } from './format.js';
1
+ import { formatContext, shortId } from './format.js';
2
2
  import { parseAnswer } from './interactions.js';
3
- import { HELP_TEXT, sessionListText } from './notices.js';
3
+ import { adminOnlyText, adminPrivateOnlyText, code, compactedText, deleteWarningText, deletedText, field, HELP_TEXT, inline, newSessionText, noWorkspaceText, nothingToCompactText, sessionLabel, sessionListText, sessionRef, title, workspaceListText, } from './notices.js';
4
4
  export function parseCommand(text) {
5
5
  const trimmed = text.trim();
6
6
  const match = /^\/([A-Za-z]+)(?:\s+([\s\S]*))?$/.exec(trimmed);
@@ -16,105 +16,369 @@ export function textAfterTokens(text, count) {
16
16
  rest = rest.replace(/^\S+\s*/, '');
17
17
  return rest.trim();
18
18
  }
19
+ const BINDING_LABEL = { user: '个人', group: '群聊' };
20
+ /**
21
+ * Commands only an administrator may ever run. They act on the Bot rather than
22
+ * on this chat's conversation, so a group chat refuses them even for an
23
+ * administrator: the Session there is shared, and it must not be created,
24
+ * switched or re-pointed — or its tool calls approved — from the group.
25
+ */
26
+ const ADMIN_ONLY_COMMANDS = new Set([
27
+ 'new', 'workspaces', 'ws', 'sessions', 'list', 'ls', 'use', 'reset', 'approve', 'deny',
28
+ ]);
29
+ /**
30
+ * `**🏷 一句话结论**` plus an optional explanation line — the shape every
31
+ * refusal and confirmation in this file uses, so a reply never looks like an
32
+ * undifferentiated wall of text.
33
+ */
34
+ function notice(emoji, summary, detail) {
35
+ return [title(emoji, summary), ...(detail ? ['', detail] : [])].join('\n');
36
+ }
37
+ /** `- **标签**:值` — one detail line of a multi-line reply. */
38
+ function bullet(label, value) {
39
+ return `- ${field(label, value)}`;
40
+ }
41
+ /** The Workspace a command should default to for one administrator. */
42
+ function preferredWorkspace(services, user) {
43
+ return services.adminWorkspaces.adminWorkspace(user);
44
+ }
45
+ /** Title of one Workspace path, falling back to the path itself. */
46
+ async function workspaceTitle(services, path) {
47
+ if (!path) {
48
+ try {
49
+ return (await services.workspaces.describe('')).title;
50
+ }
51
+ catch {
52
+ return '插件默认 Workspace';
53
+ }
54
+ }
55
+ const listed = services.workspaces.list().find(workspace => workspace.path === path);
56
+ return listed?.title ?? path;
57
+ }
19
58
  export async function runCommand(services, scope, command) {
20
59
  const { message, reply } = scope;
21
60
  const { directory, selection, interactions, policy } = services;
22
61
  const ticket = services.ticket();
23
62
  const current = () => !services.stale(ticket);
63
+ const isAdmin = policy.isAdmin(message.user);
64
+ // An administrator command in a group chat is refused whoever sends it: the
65
+ // shared conversation is not the place to manage the Bot. The reply names the
66
+ // real reason — rank for a member, the shared chat for an administrator.
67
+ if (message.chatType === 'group' && ADMIN_ONLY_COMMANDS.has(command.name)) {
68
+ await reply(isAdmin ? adminPrivateOnlyText() : adminOnlyText());
69
+ return;
70
+ }
71
+ // Commands that touch this conversation's Session (compact, delete) are open
72
+ // to everybody in a private chat; in a group chat that Session is shared, so
73
+ // they need an administrator.
74
+ const allowed = () => isAdmin || message.chatType === 'single';
75
+ const deny = async () => { await reply(adminOnlyText()); };
24
76
  switch (command.name) {
25
77
  case 'help':
26
78
  case 'h':
27
79
  await reply(HELP_TEXT);
28
80
  return;
29
- case 'whoami':
81
+ case 'whoami': {
82
+ const target = await services.current(message);
83
+ if (!current())
84
+ return;
85
+ const lines = [
86
+ title('🪪', '你的身份'),
87
+ '',
88
+ bullet('userid', code(inline(message.user, 120))),
89
+ message.chatType === 'group'
90
+ ? bullet('当前群聊', code(inline(message.chat, 120)))
91
+ : bullet('当前会话', '单聊(chatid 即你的 userid)'),
92
+ bullet('管理员', isAdmin ? '是' : '否'),
93
+ ];
94
+ if (target.group)
95
+ lines.push(bullet('分组', inline(target.group.name, 60)));
96
+ if (target.binding) {
97
+ lines.push(bullet('绑定', `${BINDING_LABEL[target.binding.kind]} ${code(inline(target.binding.id, 120))}`));
98
+ }
99
+ lines.push('', isAdmin
100
+ ? `你是本插件的管理员:可以切换会话、选择默认 Workspace,并按 Workspace 接收通知。`
101
+ : `你不是本插件的管理员:消息只会进入你自己的专属会话,发送 ${code('/delete')} 可以清空它的记忆。`, '', '分组、Workspace 与模型都可以在 DSH 的插件主页里查看和调整。');
102
+ await reply(lines.join('\n'));
103
+ return;
104
+ }
105
+ case 'status': {
106
+ const target = await services.current(message);
107
+ const info = target.sessionId ? await directory.describe(target.sessionId) : undefined;
108
+ if (!current())
109
+ return;
110
+ const questions = [...interactions.questions.values()].filter(q => q.sessionId === target.sessionId).length;
111
+ const approvals = [...interactions.approvals.values()].filter(a => a.privateChats.has(message.chat)).length;
112
+ const running = info?.running === true;
113
+ const lines = [
114
+ title('🧭', '当前状态'),
115
+ '',
116
+ target.sessionId
117
+ ? bullet('会话', sessionRef(info?.title, target.sessionId))
118
+ : bullet('会话', '尚未创建(发送任意消息即会自动创建)'),
119
+ ...(info?.workspace ? [bullet('Workspace', inline(info.workspace, 120))] : []),
120
+ ...(target.sessionId ? [bullet('preset', info?.preset ? code(inline(info.preset, 60)) : 'DSH 默认')] : []),
121
+ ...(info?.model ? [bullet('模型', code(`${info.model.provider}/${info.model.model}`))] : []),
122
+ ...(info?.model?.reasoningEffort ? [bullet('effort', code(inline(info.model.reasoningEffort, 40)))] : []),
123
+ ...(info?.context ? [bullet('上下文', formatContext(info.context.used, info.context.window))] : []),
124
+ ...(info?.turns !== undefined || info?.steps !== undefined
125
+ ? [bullet('进度', `第 ${info?.turns ?? 0} 轮 · 累计 ${info?.steps ?? 0} 步`)]
126
+ : []),
127
+ ...(target.sessionId
128
+ ? [bullet('运行状态', questions ? '等待回答提问' : running ? '运行中' : '空闲')]
129
+ : []),
130
+ ];
131
+ if (target.group)
132
+ lines.push(bullet('分组', inline(target.group.name, 60)));
133
+ if (target.binding) {
134
+ const note = target.note ? `(${inline(target.note, 40)})` : '';
135
+ lines.push(bullet('绑定', `${BINDING_LABEL[target.binding.kind]} ${code(inline(target.binding.id, 120))}${note}`));
136
+ }
137
+ lines.push(bullet('待处理', `${questions} 个提问 · ${approvals} 个审批`));
138
+ if (target.switched) {
139
+ lines.push('', `> 管理员切换中:你现在操作的不是自己的专属会话。发送 ${code('/reset')} 可以回到自己的会话。`);
140
+ }
141
+ await reply(lines.join('\n'));
142
+ return;
143
+ }
144
+ case 'new': {
145
+ if (!isAdmin) {
146
+ await deny();
147
+ return;
148
+ }
149
+ const path = preferredWorkspace(services, message.user);
150
+ try {
151
+ const created = await services.ops.create({ workspace: path });
152
+ if (!current())
153
+ return;
154
+ selection.set(message.chat, message.user, created.sessionId);
155
+ const label = await workspaceTitle(services, path);
156
+ if (!current())
157
+ return;
158
+ services.journal.write({
159
+ event: 'wecom.session.new', roundId: scope.round.id, chatId: message.chat,
160
+ userId: message.user, sessionId: created.sessionId, workspace: path,
161
+ });
162
+ await reply(newSessionText(label, created.sessionId));
163
+ }
164
+ catch (error) {
165
+ if (current())
166
+ await reply(notice('⚠️', '新建会话失败', inline(error instanceof Error ? error.message : String(error), 300)));
167
+ }
168
+ return;
169
+ }
170
+ case 'workspaces':
171
+ case 'ws': {
172
+ if (!isAdmin) {
173
+ await deny();
174
+ return;
175
+ }
176
+ const selected = preferredWorkspace(services, message.user);
177
+ const list = services.workspaces.list();
178
+ const token = command.args[0];
179
+ if (!token) {
180
+ await reply(workspaceListText(list, selected).text);
181
+ return;
182
+ }
183
+ if (!list.length) {
184
+ await reply(noWorkspaceText());
185
+ return;
186
+ }
187
+ if (token === '0' || token.toLowerCase() === 'all') {
188
+ await services.adminWorkspaces.setAdminWorkspace(message.user, '');
189
+ if (!current())
190
+ return;
191
+ await reply(notice('🗂', '已取消 Workspace 限定', `之后的 ${code('/sessions')} 会列出所有 Workspace 的会话,${code('/new')} 使用插件默认 Workspace。`));
192
+ return;
193
+ }
194
+ const index = /^\d{1,3}$/.test(token) ? Number(token) : undefined;
195
+ const picked = index !== undefined ? list[index - 1] : list.find(workspace => workspace.path === token);
196
+ if (!picked) {
197
+ await reply(notice('⚠️', '没有这个 Workspace', `发送 ${code('/workspaces')} 查看序号。`));
198
+ return;
199
+ }
200
+ await services.adminWorkspaces.setAdminWorkspace(message.user, picked.path);
201
+ if (!current())
202
+ return;
203
+ services.journal.write({ event: 'wecom.workspace.select', roundId: scope.round.id, chatId: message.chat, userId: message.user, workspace: picked.path });
30
204
  await reply([
31
- `你的 userid:${message.user}`,
32
- message.chatType === 'group' ? `当前群聊 chatid:${message.chat}` : `当前为单聊(会话 ID 即你的 userid)`,
33
- '可在 DSH 插件主页把这些 ID 加入白名单。',
205
+ title('🗂', `默认 Workspace 已设为 ${inline(picked.title, 60)}`),
206
+ '',
207
+ bullet('路径', inline(picked.path, 200)),
208
+ '',
209
+ `${code('/sessions')} 只列出这个 Workspace 的会话,${code('/new')} 也在这里创建。发送 ${code('/workspaces 0')} 取消限定。`,
34
210
  ].join('\n'));
35
211
  return;
212
+ }
36
213
  case 'sessions':
37
214
  case 'list':
38
215
  case 'ls': {
216
+ if (!isAdmin) {
217
+ await deny();
218
+ return;
219
+ }
220
+ const scopePath = preferredWorkspace(services, message.user);
39
221
  try {
40
- const groups = await directory.groups();
222
+ const groups = await directory.groups(scopePath ? { workspacePath: scopePath } : undefined);
41
223
  if (!current())
42
224
  return;
43
- const { text, listing } = sessionListText(groups, services.target(message));
225
+ const target = await services.current(message);
226
+ const label = scopePath ? await workspaceTitle(services, scopePath) : undefined;
227
+ if (!current())
228
+ return;
229
+ const { text, listing } = sessionListText(groups, target.sessionId, 30, label);
44
230
  selection.setListing(message.chat, message.user, listing);
45
231
  await reply(text);
46
232
  }
47
233
  catch {
48
234
  if (current())
49
- await reply('读取 DSH 会话列表失败,请稍后重试或到 DSH 页面查看。');
235
+ await reply(notice('⚠️', '读取 DSH 会话列表失败', '请稍后重试,或到 DSH 页面查看。'));
50
236
  }
51
237
  return;
52
238
  }
53
239
  case 'use': {
240
+ if (!isAdmin) {
241
+ await deny();
242
+ return;
243
+ }
54
244
  const token = command.args[0];
55
245
  if (!token) {
56
- await reply('用法:/use <序号|会话ID前缀>。先发送 /sessions 查看序号。');
246
+ await reply(notice('ℹ️', '用法', `${code('/use 序号')} 或 ${code('/use 会话ID前缀')};先发送 ${code('/sessions')} 查看序号。`));
57
247
  return;
58
248
  }
59
249
  const result = await directory.resolve(token, selection.listing(message.chat, message.user));
60
250
  if (!current())
61
251
  return;
62
252
  if (!result.ok) {
63
- const text = result.reason === 'ambiguous' ? '匹配到多个会话,请提供更长的会话 ID 前缀。'
64
- : result.reason === 'unavailable' ? '暂时无法读取 DSH 会话列表,请稍后重试。'
65
- : result.reason === 'forbidden' ? '该会话不在插件允许的 Session 范围内。'
66
- : result.hidden === 'archived' ? '该会话已归档,不能从企业微信操作。'
67
- : result.hidden ? '该会话当前不可操作。'
68
- : '找不到该会话。发送 /sessions 查看可操作的会话。';
253
+ const text = result.reason === 'ambiguous' ? notice('⚠️', '匹配到多个会话', '请提供更长的会话 ID 前缀。')
254
+ : result.reason === 'unavailable' ? notice('⚠️', '暂时无法读取 DSH 会话列表', '请稍后重试。')
255
+ : result.reason === 'forbidden' ? notice('🔒', '该会话不在你的 Workspace 范围内', '请让管理员调整管理员 Workspace 设置。')
256
+ : result.hidden === 'archived' ? notice('⚠️', '该会话已归档', '归档的会话不能从企业微信操作。')
257
+ : result.hidden ? notice('⚠️', '该会话当前不可操作')
258
+ : notice('⚠️', '找不到该会话', `发送 ${code('/sessions')} 查看可切换的会话。`);
69
259
  await reply(text);
70
260
  return;
71
261
  }
72
262
  selection.set(message.chat, message.user, result.session.sessionId);
73
263
  services.journal.write({ event: 'wecom.selection', roundId: scope.round.id, chatId: message.chat, userId: message.user, sessionId: result.session.sessionId });
74
- await reply(`已选择《${oneLine(displayTitle(result.session.title))}》(${oneLine(result.session.workspace)} · ${shortId(result.session.sessionId)})。\n现在直接发送消息即可继续该会话。`);
264
+ await reply([
265
+ title('🔄', `已切换到${sessionLabel(result.session.title)}`),
266
+ '',
267
+ bullet('Workspace', inline(result.session.workspace, 120)),
268
+ bullet('会话 ID', code(shortId(result.session.sessionId))),
269
+ '',
270
+ `现在直接发送消息即可继续该会话;发送 ${code('/reset')} 可以回到自己的专属会话。`,
271
+ ].join('\n'));
75
272
  return;
76
273
  }
77
- case 'status': {
78
- const target = services.target(message);
79
- const info = target ? await directory.describe(target) : undefined;
274
+ case 'reset': {
275
+ if (!isAdmin) {
276
+ await deny();
277
+ return;
278
+ }
279
+ selection.clear(message.chat, message.user);
80
280
  if (!current())
81
281
  return;
82
- const questions = [...interactions.questions.values()].filter(q => policy.sessionListed(q.sessionId)).length;
83
- const approvals = [...interactions.approvals.values()].filter(a => a.privateChats.has(message.chat)).length;
84
- await reply([
85
- target ? `当前会话:《${oneLine(displayTitle(info?.title))}》${info?.workspace ? `(${oneLine(info.workspace)})` : ''} ${shortId(target)}` : '当前会话:未选择(发送 /sessions 后用 /use 选择)',
86
- `待回答提问:${questions} 个;可在此审批的请求:${approvals} 个`,
87
- ].join('\n'));
282
+ const target = await services.current(message);
283
+ if (!target.sessionId) {
284
+ await reply(notice('↩️', '已放弃切换', '你还没有专属会话,发送任意消息即可创建。'));
285
+ return;
286
+ }
287
+ const info = await directory.describe(target.sessionId);
288
+ if (!current())
289
+ return;
290
+ await reply(`${title('↩️', '已放弃切换')} · 回到你自己的专属会话${sessionLabel(info.title)}`);
88
291
  return;
89
292
  }
90
- case 'cancel': {
91
- const target = services.target(message);
92
- if (!target) {
93
- await reply('请先用 /use 选择会话。');
293
+ case 'compact': {
294
+ const target = await services.current(message);
295
+ if (!target.sessionId) {
296
+ await reply(notice('ℹ️', '你还没有专属会话', '发送任意消息即可创建。'));
297
+ return;
298
+ }
299
+ if (!allowed()) {
300
+ await deny();
301
+ return;
302
+ }
303
+ try {
304
+ const outcome = await services.ops.compact(target.sessionId);
305
+ if (!current())
306
+ return;
307
+ await reply(outcome ? compactedText(outcome.items, outcome.tokens) : nothingToCompactText());
308
+ }
309
+ catch (error) {
310
+ if (current())
311
+ await reply(notice('⚠️', '上下文压缩失败', inline(error instanceof Error ? error.message : String(error), 300)));
312
+ }
313
+ return;
314
+ }
315
+ case 'delete': {
316
+ const target = await services.current(message);
317
+ if (!target.sessionId) {
318
+ await reply(notice('ℹ️', '你还没有专属会话', '发送任意消息即可创建。'));
319
+ return;
320
+ }
321
+ if (!allowed()) {
322
+ await deny();
94
323
  return;
95
324
  }
96
- if (!(await directory.permitted(target))) {
325
+ const confirmed = (command.args[0] ?? '').toLowerCase() === 'confirm';
326
+ if (!confirmed) {
327
+ const info = await directory.describe(target.sessionId);
328
+ if (!current())
329
+ return;
330
+ await reply(deleteWarningText(info.title, target.sessionId));
331
+ return;
332
+ }
333
+ try {
334
+ const info = await directory.describe(target.sessionId);
335
+ await services.archiveSession(message, target.sessionId);
336
+ if (!current())
337
+ return;
338
+ services.journal.write({
339
+ event: 'wecom.session.delete', roundId: scope.round.id, chatId: message.chat,
340
+ userId: message.user, sessionId: target.sessionId,
341
+ });
342
+ await reply(`${deletedText()}\n\n> 已归档${sessionLabel(info.title)}`);
343
+ }
344
+ catch (error) {
97
345
  if (current())
98
- await reply('该会话当前不可操作。');
346
+ await reply(notice('⚠️', '归档会话失败', inline(error instanceof Error ? error.message : String(error), 300)));
347
+ }
348
+ return;
349
+ }
350
+ case 'cancel': {
351
+ const target = await services.current(message);
352
+ if (!target.sessionId) {
353
+ await reply(notice('ℹ️', '你还没有专属会话', '发送任意消息即可创建。'));
99
354
  return;
100
355
  }
356
+ if (!(await directory.permitted(target.sessionId))) {
357
+ // A bound Session may live outside the administrator scope; cancelling
358
+ // it is still the owner's business, so only a switched-to Session is refused here.
359
+ if (target.switched) {
360
+ if (current())
361
+ await reply(notice('⚠️', '该会话当前不可操作'));
362
+ return;
363
+ }
364
+ }
101
365
  if (!current())
102
366
  return;
103
367
  try {
104
- services.sessionController.cancel({ sessionId: target });
105
- services.journal.write({ event: 'dsh.cancel', roundId: scope.round.id, sessionId: target, chatId: message.chat, userId: message.user });
106
- await reply(`已请求停止 ${shortId(target)} 的当前回合。`);
368
+ services.sessionController.cancel({ sessionId: target.sessionId });
369
+ services.journal.write({ event: 'dsh.cancel', roundId: scope.round.id, sessionId: target.sessionId, chatId: message.chat, userId: message.user });
370
+ await reply(`${title('🛑', '已请求停止当前回合')} · ${code(shortId(target.sessionId))}`);
107
371
  }
108
372
  catch (error) {
109
- services.journal.write({ event: 'dsh.cancel', level: 'warn', roundId: scope.round.id, sessionId: target, error });
110
- await reply('该会话当前没有可停止的回合。');
373
+ services.journal.write({ event: 'dsh.cancel', level: 'warn', roundId: scope.round.id, sessionId: target.sessionId, error });
374
+ await reply(notice('🛑', '没有可停止的回合', '该会话当前没有正在运行的回合。'));
111
375
  }
112
376
  return;
113
377
  }
114
378
  case 'answer': {
115
379
  const state = command.args[0] ? interactions.findQuestion(command.args[0]) : undefined;
116
- if (!state || !policy.sessionListed(state.sessionId)) {
117
- await reply('没有对应的待回答提问,或验证码无效/已过期。');
380
+ if (!state) {
381
+ await reply(notice('⚠️', '没有对应的待回答提问', '验证码可能无效或已经过期。'));
118
382
  return;
119
383
  }
120
384
  let question = state.questions.length === 1 ? state.questions[0] : undefined;
@@ -126,12 +390,12 @@ export async function runCommand(services, scope, command) {
126
390
  answer = textAfterTokens(command.rest, 2);
127
391
  }
128
392
  if (!question) {
129
- await reply(`请指明题目 ID:${state.questions.map(q => q.id).join('、')}`);
393
+ await reply(notice('⚠️', '请指明题目 ID', state.questions.map(q => code(inline(q.id, 60))).join('、')));
130
394
  return;
131
395
  }
132
396
  const parsed = parseAnswer(question, answer);
133
397
  if (!parsed.ok) {
134
- await reply(parsed.error);
398
+ await reply(notice('⚠️', parsed.error, `格式:${code('/answer 验证码 选项序号或文字')}`));
135
399
  return;
136
400
  }
137
401
  state.answers.set(question.id, parsed.item);
@@ -139,26 +403,29 @@ export async function runCommand(services, scope, command) {
139
403
  services.journal.write({ event: 'dsh.question.answer', roundId: scope.round.id, sessionId: state.sessionId, questionId: question.id, answer: parsed.item, remaining: remaining.length });
140
404
  if (!remaining.length)
141
405
  state.finish({ answers: state.questions.map(q => state.answers.get(q.id)) });
142
- await reply(remaining.length ? `已记录,还需回答:${remaining.map(q => q.id).join('、')}` : '答案已提交给 DSH。');
406
+ await reply(remaining.length
407
+ ? `${title('📝', '已记录')} · 还需回答:${remaining.map(q => inline(q.id, 60)).join('、')}`
408
+ : title('✅', '答案已提交给 DSH'));
143
409
  return;
144
410
  }
145
411
  case 'approve':
146
412
  case 'deny': {
147
413
  const state = command.args[0] ? interactions.findApproval(command.args[0]) : undefined;
148
- // Tool execution may only be authorized by an allowlisted person in a single chat.
149
- if (!state || command.args.length !== 1 || message.chatType !== 'single' || message.chat !== message.user
150
- || !state.privateChats.has(message.chat)) {
151
- await reply('没有可在此单聊审批的请求,或验证码无效/已过期。');
414
+ // Reaching here already means a single chat (a group is refused above);
415
+ // the approval must still be visible to this chat and the sender an
416
+ // administrator.
417
+ if (!state || command.args.length !== 1 || !state.privateChats.has(message.chat) || !isAdmin) {
418
+ await reply(notice('⚠️', '没有可在此单聊审批的请求', '只有管理员可以在单聊里用验证码审批;验证码也可能已经过期。'));
152
419
  return;
153
420
  }
154
421
  const outcome = command.name === 'approve' ? 'allowed-once' : 'rejected';
155
422
  services.journal.write({ event: 'dsh.approval.answer', roundId: scope.round.id, sessionId: state.sessionId, toolName: state.toolName, callId: state.callId, outcome });
156
423
  state.finish(outcome);
157
- await reply(outcome === 'allowed-once' ? '已允许本次工具调用。' : '已拒绝本次工具调用。');
424
+ await reply(title(outcome === 'allowed-once' ? '✅' : '🚫', outcome === 'allowed-once' ? '已允许本次工具调用' : '已拒绝本次工具调用'));
158
425
  return;
159
426
  }
160
427
  default:
161
- await reply('未知命令,发送 /help 查看可用命令。');
428
+ await reply(`${title('❓', '未知命令')} · 发送 ${code('/help')} 查看可用命令。`);
162
429
  }
163
430
  }
164
431
  //# sourceMappingURL=commands.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/host/bridge/commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/host/bridge/commands.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,12 @@
1
- export function createSessionDirectory(catalogs, policy) {
1
+ export function createSessionDirectory(catalogs, options) {
2
2
  function operable(catalog) {
3
3
  return catalog.entries
4
- .filter(entry => policy.sessionListed(entry.sessionId))
4
+ .filter(entry => options.allow(entry))
5
5
  .map(entry => ({
6
- sessionId: entry.sessionId, title: entry.title, workspace: entry.group.title, groupKey: entry.group.key,
6
+ sessionId: entry.sessionId, title: entry.title, workspace: entry.group.title,
7
+ workspacePath: entry.group.path ?? '', groupKey: entry.group.key,
7
8
  running: entry.running, pinned: entry.pinned,
9
+ ...(entry.model ? { model: entry.model } : {}),
8
10
  }));
9
11
  }
10
12
  async function lookup(sessionId) {
@@ -15,9 +17,12 @@ export function createSessionDirectory(catalogs, policy) {
15
17
  : catalog;
16
18
  }
17
19
  return {
18
- async groups() {
20
+ async groups(filter) {
19
21
  const result = new Map();
22
+ const scope = filter?.workspacePath;
20
23
  for (const session of operable(await catalogs.load({ force: true }))) {
24
+ if (scope && session.workspacePath !== scope)
25
+ continue;
21
26
  const group = result.get(session.groupKey) ?? { title: session.workspace, sessions: [] };
22
27
  group.sessions.push(session);
23
28
  result.set(session.groupKey, group);
@@ -49,26 +54,44 @@ export function createSessionDirectory(catalogs, policy) {
49
54
  return { ok: true, session: candidates[0] };
50
55
  if (candidates.length > 1)
51
56
  return { ok: false, reason: 'ambiguous' };
52
- if (!policy.sessionListed(value) && catalog.get(value))
57
+ const entry = catalog.get(value);
58
+ if (entry && !options.allow(entry))
53
59
  return { ok: false, reason: 'forbidden' };
54
60
  const hidden = catalog.hiddenReason(value);
55
61
  return { ok: false, reason: 'not-found', ...(hidden && hidden !== 'missing' ? { hidden } : {}) };
56
62
  },
57
63
  async permitted(sessionId) {
58
- if (!policy.sessionListed(sessionId))
59
- return false;
60
64
  try {
61
- return Boolean((await lookup(sessionId)).get(sessionId));
65
+ const catalog = await lookup(sessionId);
66
+ const entry = catalog.get(sessionId);
67
+ if (entry)
68
+ return options.allow(entry);
69
+ // A Session created a moment ago is `blank` until its first turn: the
70
+ // catalog hides it from the sidebar, but the administrator who just
71
+ // created it (or the member it belongs to) must be able to use it.
72
+ return catalog.hiddenReason(sessionId) === 'blank';
62
73
  }
63
74
  catch {
64
- return policy.sessionIds.has(sessionId);
75
+ return false;
65
76
  }
66
77
  },
67
78
  async describe(sessionId) {
68
79
  try {
69
80
  const catalog = await catalogs.load();
70
81
  const entry = catalog.get(sessionId);
71
- return entry ? { title: entry.title, workspace: entry.group.title } : { title: catalog.titleOf(sessionId) };
82
+ if (!entry)
83
+ return { title: catalog.titleOf(sessionId) };
84
+ return {
85
+ title: entry.title,
86
+ workspace: entry.group.title,
87
+ workspacePath: entry.group.path ?? '',
88
+ running: entry.running,
89
+ ...(entry.model ? { model: entry.model } : {}),
90
+ ...(entry.preset ? { preset: entry.preset } : {}),
91
+ ...(entry.context ? { context: entry.context } : {}),
92
+ ...(entry.turns !== undefined ? { turns: entry.turns } : {}),
93
+ ...(entry.steps !== undefined ? { steps: entry.steps } : {}),
94
+ };
72
95
  }
73
96
  catch {
74
97
  return { title: null };