@xmanrui/dsh-im 0.7.2 → 0.8.0
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.en.md +152 -0
- package/README.md +25 -131
- package/lib/index.js +103 -102
- package/package.json +2 -1
- package/src/channels/dingtalk/dingtalk-bridge.mjs +1 -1
- package/src/channels/discord/discord-api.mjs +1 -1
- package/src/channels/feishu/bridge.mjs +1 -1
- package/src/channels/qq/qq-bridge.mjs +1 -1
- package/src/channels/shared/harness-client.mjs +35 -1
- package/src/channels/shared/text-harness-bridge.mjs +1 -1
- package/src/channels/shared/workspace-command.mjs +70 -6
- package/src/channels/wecom/wecom-bridge.mjs +1 -1
- package/src/channels/weixin/weixin-api.mjs +1 -1
- package/src/channels/weixin/weixin-bridge.mjs +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xmanrui/dsh-im",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"description": "通过扫码、App Manifest或机器人凭据把IM机器人接入DeepSeek Harness(支持飞书、微信、钉钉、企业微信、QQ、Slack、Telegram、Discord和WhatsApp)。",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -32,6 +32,7 @@
|
|
|
32
32
|
"src",
|
|
33
33
|
"LICENSE",
|
|
34
34
|
"README.md",
|
|
35
|
+
"README.en.md",
|
|
35
36
|
"THIRD_PARTY_NOTICES.md"
|
|
36
37
|
],
|
|
37
38
|
"dsh": {
|
|
@@ -24,7 +24,7 @@ const HELP_TEXT = [
|
|
|
24
24
|
'/workspace 工作区绝对路径 切换工作区',
|
|
25
25
|
'/workspacelist 列出工作区绝对路径',
|
|
26
26
|
'/sessionlist [工作区序号或绝对路径] 列出会话 ID 和标题',
|
|
27
|
-
'/session Session ID 将当前聊天绑定到指定会话',
|
|
27
|
+
'/session Session ID 或当前工作区序号 将当前聊天绑定到指定会话',
|
|
28
28
|
'/status 检查连接状态',
|
|
29
29
|
'/help 显示本帮助',
|
|
30
30
|
].join('\n');
|
|
@@ -108,7 +108,7 @@ export class DiscordApi {
|
|
|
108
108
|
headers: {
|
|
109
109
|
authorization: `Bot ${this.#token}`,
|
|
110
110
|
'content-type': 'application/json',
|
|
111
|
-
'user-agent': 'DeepSeek-Harness-dsh-im (https://github.com/xmanrui/dsh-im, 0.
|
|
111
|
+
'user-agent': 'DeepSeek-Harness-dsh-im (https://github.com/xmanrui/dsh-im, 0.8.0)',
|
|
112
112
|
},
|
|
113
113
|
...(body === undefined ? {} : { body: JSON.stringify(body) }),
|
|
114
114
|
signal: requestSignal(signal, timeoutMs),
|
|
@@ -25,7 +25,7 @@ const HELP_TEXT = [
|
|
|
25
25
|
'/workspace 工作区绝对路径 切换工作区',
|
|
26
26
|
'/workspacelist 列出工作区绝对路径',
|
|
27
27
|
'/sessionlist [工作区序号或绝对路径] 列出会话 ID 和标题',
|
|
28
|
-
'/session Session ID 将当前聊天绑定到指定会话',
|
|
28
|
+
'/session Session ID 或当前工作区序号 将当前聊天绑定到指定会话',
|
|
29
29
|
'/status 检查连接状态',
|
|
30
30
|
'/help 显示本帮助',
|
|
31
31
|
].join('\n');
|
|
@@ -17,7 +17,7 @@ const HELP_TEXT = [
|
|
|
17
17
|
'/workspace 工作区绝对路径 切换工作区',
|
|
18
18
|
'/workspacelist 列出工作区绝对路径',
|
|
19
19
|
'/sessionlist [工作区序号或绝对路径] 列出会话 ID 和标题',
|
|
20
|
-
'/session Session ID 将当前聊天绑定到指定会话',
|
|
20
|
+
'/session Session ID 或当前工作区序号 将当前聊天绑定到指定会话',
|
|
21
21
|
'/status 检查连接状态',
|
|
22
22
|
'/help 显示本帮助',
|
|
23
23
|
].join('\n');
|
|
@@ -40,6 +40,37 @@ function workspaceFromList(workspacePath, workspaceList) {
|
|
|
40
40
|
return workspace;
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
+
function toEpochMs(value) {
|
|
44
|
+
if (typeof value === 'number' && Number.isFinite(value)) {
|
|
45
|
+
return value < 1e12 ? value * 1000 : value;
|
|
46
|
+
}
|
|
47
|
+
if (typeof value === 'string' && value) {
|
|
48
|
+
const parsed = Date.parse(value);
|
|
49
|
+
if (!Number.isNaN(parsed)) return parsed;
|
|
50
|
+
}
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
function sessionTimeMs(summary) {
|
|
55
|
+
if (!summary || typeof summary !== 'object') return null;
|
|
56
|
+
const candidates = [
|
|
57
|
+
summary?.header?.lastActivityAt,
|
|
58
|
+
summary?.header?.updatedAt,
|
|
59
|
+
summary?.header?.createdAt,
|
|
60
|
+
summary?.projections?.values?.lastActivityAt,
|
|
61
|
+
summary?.projections?.values?.updatedAt,
|
|
62
|
+
summary?.projections?.values?.createdAt,
|
|
63
|
+
summary?.lastActivityAt,
|
|
64
|
+
summary?.updatedAt,
|
|
65
|
+
summary?.createdAt,
|
|
66
|
+
];
|
|
67
|
+
for (const value of candidates) {
|
|
68
|
+
const ms = toEpochMs(value);
|
|
69
|
+
if (ms !== null) return ms;
|
|
70
|
+
}
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
73
|
+
|
|
43
74
|
function workspaceSessions(workspace, archivedSessionIds, sessionList) {
|
|
44
75
|
if (!Array.isArray(sessionList?.items)) {
|
|
45
76
|
throw new Error('Harness returned an invalid response for session.list');
|
|
@@ -54,7 +85,7 @@ function workspaceSessions(workspace, archivedSessionIds, sessionList) {
|
|
|
54
85
|
sessions: workspace.sessionIds.map((sessionId) => {
|
|
55
86
|
const summary = summaries.get(sessionId);
|
|
56
87
|
const title = summary?.projections?.values?.title;
|
|
57
|
-
|
|
88
|
+
const session = {
|
|
58
89
|
sessionId,
|
|
59
90
|
title: typeof title === 'string' ? title : null,
|
|
60
91
|
archived: archived.has(sessionId),
|
|
@@ -62,6 +93,9 @@ function workspaceSessions(workspace, archivedSessionIds, sessionList) {
|
|
|
62
93
|
origin: summary?.origin === 'subagent' ? 'subagent' : null,
|
|
63
94
|
summaryAvailable: summary !== undefined,
|
|
64
95
|
};
|
|
96
|
+
const time = sessionTimeMs(summary);
|
|
97
|
+
if (time !== null) session.time = time;
|
|
98
|
+
return session;
|
|
65
99
|
}),
|
|
66
100
|
};
|
|
67
101
|
}
|
|
@@ -221,7 +221,7 @@ export class TextHarnessBridge {
|
|
|
221
221
|
'/workspace 工作区绝对路径 切换工作区',
|
|
222
222
|
'/workspacelist 列出工作区绝对路径',
|
|
223
223
|
'/sessionlist [工作区序号或绝对路径] 列出会话 ID 和标题',
|
|
224
|
-
'/session Session ID 将当前聊天绑定到指定会话',
|
|
224
|
+
'/session Session ID 或当前工作区序号 将当前聊天绑定到指定会话',
|
|
225
225
|
'/status 检查连接状态',
|
|
226
226
|
'/help 显示本帮助',
|
|
227
227
|
].join('\n'));
|
|
@@ -13,7 +13,7 @@ const MAX_COMMAND_MESSAGE_LENGTH = 1_800;
|
|
|
13
13
|
const MAX_SESSION_ID_LENGTH = 256;
|
|
14
14
|
const UNSAFE_DISPLAY_TEXT = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u;
|
|
15
15
|
const UNSAFE_DISPLAY_TEXT_GLOBAL = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu;
|
|
16
|
-
const SESSION_BIND_USAGE = '用法:/session Session ID';
|
|
16
|
+
const SESSION_BIND_USAGE = '用法:/session Session ID 或当前工作区序号(/session N)';
|
|
17
17
|
const SESSION_LIST_USAGE = [
|
|
18
18
|
'用法:',
|
|
19
19
|
'/sessionlist 列出当前工作区会话',
|
|
@@ -175,14 +175,35 @@ async function resolveSessionListWorkspace(selector, harness) {
|
|
|
175
175
|
return selected;
|
|
176
176
|
}
|
|
177
177
|
|
|
178
|
-
function
|
|
178
|
+
function formatSessionRelativeTime(value) {
|
|
179
|
+
const ms = typeof value === 'number' && Number.isFinite(value) ? value : null;
|
|
180
|
+
if (ms === null) return '';
|
|
181
|
+
const date = new Date(ms);
|
|
182
|
+
if (Number.isNaN(date.getTime())) return '';
|
|
183
|
+
const pad = (n) => String(n).padStart(2, '0');
|
|
184
|
+
const hm = `${pad(date.getHours())}:${pad(date.getMinutes())}`;
|
|
185
|
+
const startOfDay = (d) => new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
|
|
186
|
+
const now = new Date();
|
|
187
|
+
const dayDiff = Math.round((startOfDay(now) - startOfDay(date)) / 86_400_000);
|
|
188
|
+
if (dayDiff === 0) return `今天 ${hm}`;
|
|
189
|
+
if (dayDiff === 1) return `昨天 ${hm}`;
|
|
190
|
+
if (dayDiff === 2) return `前天 ${hm}`;
|
|
191
|
+
if (date.getFullYear() === now.getFullYear()) {
|
|
192
|
+
return `${date.getMonth() + 1}月${date.getDate()}日 ${hm}`;
|
|
193
|
+
}
|
|
194
|
+
return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
function sessionListMessage(workspace, sessions, { currentWorkspace = false } = {}) {
|
|
179
198
|
const rows = sessions.map((session) => {
|
|
180
199
|
const sessionId = safeDisplayText(session?.sessionId);
|
|
181
200
|
if (!sessionId) throw new TypeError('Harness returned an invalid session id');
|
|
182
201
|
const title = session?.summaryAvailable === false
|
|
183
202
|
? '标题暂不可用'
|
|
184
203
|
: safeDisplayText(session?.title) || '暂无标题';
|
|
185
|
-
|
|
204
|
+
const timeText = formatSessionRelativeTime(session?.time);
|
|
205
|
+
const annotation = `${timeText ? ` · ${timeText}` : ''}${session?.archived === true ? '(已归档)' : ''}`;
|
|
206
|
+
return `${title}${annotation}\n ID: ${sessionId}`;
|
|
186
207
|
});
|
|
187
208
|
if (rows.length === 0) return `工作区:${workspace}\n该工作区暂无会话。`;
|
|
188
209
|
return [
|
|
@@ -191,10 +212,19 @@ function sessionListMessage(workspace, sessions) {
|
|
|
191
212
|
'',
|
|
192
213
|
...rows.map((row, index) => `${index + 1}. ${row}`),
|
|
193
214
|
'',
|
|
194
|
-
|
|
215
|
+
currentWorkspace
|
|
216
|
+
? '绑定用法:/session Session ID 或当前工作区序号(/session N)'
|
|
217
|
+
: '绑定用法:/session Session ID\n提示:/session N 只按机器人当前工作区的序号绑定。',
|
|
195
218
|
].join('\n');
|
|
196
219
|
}
|
|
197
220
|
|
|
221
|
+
async function currentSessionListWorkspace(harness) {
|
|
222
|
+
if (typeof harness?.currentWorkspace !== 'function') return null;
|
|
223
|
+
const [current] = await existingWorkspacePaths([harness.currentWorkspace()]);
|
|
224
|
+
harness.assertWorkspaceScope?.();
|
|
225
|
+
return current ?? null;
|
|
226
|
+
}
|
|
227
|
+
|
|
198
228
|
async function runSessionListCommand(match, harness) {
|
|
199
229
|
if (typeof harness?.listWorkspaceSessions !== 'function') {
|
|
200
230
|
return commandResult('当前机器人暂不支持列出工作区会话。');
|
|
@@ -209,7 +239,10 @@ async function runSessionListCommand(match, harness) {
|
|
|
209
239
|
}
|
|
210
240
|
harness.assertWorkspaceScope?.();
|
|
211
241
|
const workspace = normalizedWorkspacePath(listed.workspace) ?? resolved.workspace;
|
|
212
|
-
const
|
|
242
|
+
const currentWorkspace = await currentSessionListWorkspace(harness);
|
|
243
|
+
const message = sessionListMessage(workspace, listed.sessions, {
|
|
244
|
+
currentWorkspace: workspace === currentWorkspace,
|
|
245
|
+
});
|
|
213
246
|
return commandResult(message, splitWorkspaceCommandMessage(message));
|
|
214
247
|
} catch (error) {
|
|
215
248
|
if (error?.code === 'workspace-bot-not-found') {
|
|
@@ -247,7 +280,38 @@ function sessionBindErrorMessage(error) {
|
|
|
247
280
|
|
|
248
281
|
async function runSessionBindCommand(command, harness, conversationKey) {
|
|
249
282
|
const match = SESSION_BIND_COMMAND.exec(command);
|
|
250
|
-
|
|
283
|
+
let sessionId = match?.[1];
|
|
284
|
+
if (typeof sessionId === 'string' && /^\d+$/u.test(sessionId)) {
|
|
285
|
+
// 序号模式:把 /session N 解析成当前工作区会话列表中的第 N 个会话
|
|
286
|
+
if (typeof harness?.listWorkspaceSessions !== 'function'
|
|
287
|
+
|| typeof harness?.currentWorkspace !== 'function') {
|
|
288
|
+
return commandResult('当前机器人暂不支持按序号绑定,请使用 /session Session ID。');
|
|
289
|
+
}
|
|
290
|
+
try {
|
|
291
|
+
const selected = await selectedWorkspacePath(harness.currentWorkspace());
|
|
292
|
+
if (selected.error) return commandResult(selected.error);
|
|
293
|
+
const listed = await harness.listWorkspaceSessions(selected.workspace);
|
|
294
|
+
if (!listed || !Array.isArray(listed.sessions)) {
|
|
295
|
+
throw new TypeError('Harness returned an invalid workspace session list');
|
|
296
|
+
}
|
|
297
|
+
harness.assertWorkspaceScope?.();
|
|
298
|
+
const position = Number(sessionId);
|
|
299
|
+
if (!Number.isSafeInteger(position) || position < 1
|
|
300
|
+
|| position > listed.sessions.length) {
|
|
301
|
+
return commandResult('会话序号不存在,请先执行 /sessionlist 查看序号。');
|
|
302
|
+
}
|
|
303
|
+
const selectedSessionId = listed.sessions[position - 1]?.sessionId;
|
|
304
|
+
if (!validSessionId(selectedSessionId)) {
|
|
305
|
+
throw new TypeError('Harness returned an invalid session id');
|
|
306
|
+
}
|
|
307
|
+
sessionId = selectedSessionId;
|
|
308
|
+
} catch (error) {
|
|
309
|
+
if (error?.code === 'workspace-bot-not-found') {
|
|
310
|
+
return commandResult(sessionBindErrorMessage(error));
|
|
311
|
+
}
|
|
312
|
+
return commandResult('暂时无法获取会话列表,请稍后重试。');
|
|
313
|
+
}
|
|
314
|
+
}
|
|
251
315
|
if (!validSessionId(sessionId)) return commandResult(SESSION_BIND_USAGE);
|
|
252
316
|
if (typeof harness?.bindWorkspaceSession !== 'function') {
|
|
253
317
|
return commandResult('当前机器人暂不支持绑定已有会话。');
|
|
@@ -16,7 +16,7 @@ const HELP_TEXT = [
|
|
|
16
16
|
'/workspace 工作区绝对路径 切换工作区',
|
|
17
17
|
'/workspacelist 列出工作区绝对路径',
|
|
18
18
|
'/sessionlist [工作区序号或绝对路径] 列出会话 ID 和标题',
|
|
19
|
-
'/session Session ID 将当前聊天绑定到指定会话',
|
|
19
|
+
'/session Session ID 或当前工作区序号 将当前聊天绑定到指定会话',
|
|
20
20
|
'/status 检查连接状态',
|
|
21
21
|
'/help 显示本帮助',
|
|
22
22
|
].join('\n');
|
|
@@ -22,7 +22,7 @@ const HELP_TEXT = [
|
|
|
22
22
|
'/workspace 工作区绝对路径 切换工作区',
|
|
23
23
|
'/workspacelist 列出工作区绝对路径',
|
|
24
24
|
'/sessionlist [工作区序号或绝对路径] 列出会话 ID 和标题',
|
|
25
|
-
'/session Session ID 将当前聊天绑定到指定会话',
|
|
25
|
+
'/session Session ID 或当前工作区序号 将当前聊天绑定到指定会话',
|
|
26
26
|
'/status 检查连接状态',
|
|
27
27
|
'/help 显示本帮助',
|
|
28
28
|
].join('\n');
|