@lemoncat7/dsh-partner 2.4.1 → 2.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.
- package/docs/channel-reply-progress.md +9 -4
- package/docs/releases/2.4.2.md +9 -0
- package/lib/agent-runtime.d.ts.map +1 -1
- package/lib/agent-runtime.js +12 -2
- package/lib/agent-runtime.js.map +1 -1
- package/lib/channels/direct/progress-transport.d.ts +2 -0
- package/lib/channels/direct/progress-transport.d.ts.map +1 -1
- package/lib/channels/direct/progress-transport.js +5 -2
- package/lib/channels/direct/progress-transport.js.map +1 -1
- package/lib/channels/direct/transport.js +1 -1
- package/lib/channels/manager.d.ts +2 -0
- package/lib/channels/manager.d.ts.map +1 -1
- package/lib/channels/manager.js +31 -4
- package/lib/channels/manager.js.map +1 -1
- package/lib/channels/notification-delivery.d.ts +2 -0
- package/lib/channels/notification-delivery.d.ts.map +1 -1
- package/lib/channels/notification-delivery.js +19 -2
- package/lib/channels/notification-delivery.js.map +1 -1
- package/lib/channels/notification-timeout.d.ts +7 -0
- package/lib/channels/notification-timeout.d.ts.map +1 -0
- package/lib/channels/notification-timeout.js +27 -0
- package/lib/channels/notification-timeout.js.map +1 -0
- package/lib/channels/reply-blocks.d.ts +25 -0
- package/lib/channels/reply-blocks.d.ts.map +1 -0
- package/lib/channels/reply-blocks.js +86 -0
- package/lib/channels/reply-blocks.js.map +1 -0
- package/lib/channels/reply-progress-controller.d.ts +11 -2
- package/lib/channels/reply-progress-controller.d.ts.map +1 -1
- package/lib/channels/reply-progress-controller.js +78 -2
- package/lib/channels/reply-progress-controller.js.map +1 -1
- package/lib/execution/reply-progress.d.ts +15 -2
- package/lib/execution/reply-progress.d.ts.map +1 -1
- package/lib/execution/reply-progress.js +12 -0
- package/lib/execution/reply-progress.js.map +1 -1
- package/package.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-progress-controller.d.ts","sourceRoot":"","sources":["../../src/channels/reply-progress-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"reply-progress-controller.d.ts","sourceRoot":"","sources":["../../src/channels/reply-progress-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAA;AAC5E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAA;AAKrE,0FAA0F;AAC1F,qBAAa,uBAAuB;IAiBtB,OAAO,CAAC,SAAS;IAAmB,OAAO,CAAC,OAAO;IAAa,OAAO,CAAC,MAAM;IAAa,OAAO,CAAC,QAAQ;IAAM,OAAO,CAAC,KAAK;IAhB1I,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,QAAQ,CAAG;IACnB,OAAO,CAAC,EAAE,CAAiB;IAC3B,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,QAAQ,CAAE;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,kBAAkB,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAE;IAClB,OAAO,CAAC,KAAK,CAAyC;IACtD,OAAO,CAAC,UAAU,CAAwC;IAC1D,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;gBAC3B,SAAS,EAAC,iBAAiB,EAAS,OAAO,EAAC,MAAI,OAAO,EAAS,MAAM,EAAC,WAAW,EAAS,QAAQ,SAAK,EAAS,KAAK,SAAK;IAG/I,KAAK,IAAG,IAAI;IAQZ,MAAM,GAAE,OAAM,UAAU,GAAC,aAAa,KAAE,IAAI,CAK3C;IACD;mFAC+E;IAC/E,kBAAkB,IAAG,OAAO,CAAC,IAAI,CAAC;IAGlC;6EACyE;IACzE,YAAY,IAAG,CAAC,QAAQ,EAAC,OAAO,KAAG,OAAO,CAAC,IAAI,CAAC;IAqBhD,OAAO,CAAC,IAAI;YAeE,IAAI;IAKZ,MAAM,CAAC,IAAI,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAuBjC,IAAI,IAAG,OAAO,CAAC,IAAI,CAAC;YAOZ,WAAW;CAI1B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ReplyBlocks } from './reply-blocks.js';
|
|
1
2
|
const labels = { queued: '已收到，正在等待处理…', working: '正在处理…', tools: '正在执行工具…', composing: '正在整理回复…' };
|
|
2
3
|
/** One controller per inbound message. Background feedback is best-effort and bounded. */
|
|
3
4
|
export class ReplyProgressController {
|
|
@@ -13,6 +14,9 @@ export class ReplyProgressController {
|
|
|
13
14
|
disabled = false;
|
|
14
15
|
typingDisabled = false;
|
|
15
16
|
creating = false;
|
|
17
|
+
rotating = 0;
|
|
18
|
+
blocks;
|
|
19
|
+
deferredActivities = [];
|
|
16
20
|
lastEdit = 0;
|
|
17
21
|
timer;
|
|
18
22
|
startTimer;
|
|
@@ -25,6 +29,8 @@ export class ReplyProgressController {
|
|
|
25
29
|
this.signal = signal;
|
|
26
30
|
this.interval = interval;
|
|
27
31
|
this.delay = delay;
|
|
32
|
+
if (transport.activityBlocks)
|
|
33
|
+
this.blocks = new ReplyBlocks(transport, allowed, signal);
|
|
28
34
|
}
|
|
29
35
|
start() {
|
|
30
36
|
if (this.signal.aborted)
|
|
@@ -36,9 +42,62 @@ export class ReplyProgressController {
|
|
|
36
42
|
this.timer.unref?.();
|
|
37
43
|
this.startTimer.unref?.();
|
|
38
44
|
}
|
|
39
|
-
update = (stage) => {
|
|
45
|
+
update = (stage) => {
|
|
46
|
+
if (this.closed)
|
|
47
|
+
return;
|
|
48
|
+
if (typeof stage === 'string') {
|
|
49
|
+
this.stage = stage;
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
if (this.rotating) {
|
|
53
|
+
if (this.deferredActivities.length < 64)
|
|
54
|
+
this.deferredActivities.push(stage);
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
this.blocks?.update(stage);
|
|
58
|
+
};
|
|
59
|
+
/** An accepted steering input starts a new chronological display segment,
|
|
60
|
+
* not a new model execution. Serialize with in-flight placeholder creation. */
|
|
61
|
+
continueAfterInput() {
|
|
62
|
+
return this.prepareInput()(true);
|
|
63
|
+
}
|
|
64
|
+
/** Fence final delivery before awaiting Agent.steer: accepting an input can
|
|
65
|
+
* synchronously release the active reply, before the manager resumes. */
|
|
66
|
+
prepareInput() {
|
|
67
|
+
if (this.closed || this.signal.aborted || !this.allowed())
|
|
68
|
+
return () => Promise.resolve();
|
|
69
|
+
let decide;
|
|
70
|
+
const decision = new Promise(resolve => { decide = resolve; });
|
|
71
|
+
this.rotating++;
|
|
72
|
+
this.background = this.background.then(async () => {
|
|
73
|
+
if (!await decision)
|
|
74
|
+
return;
|
|
75
|
+
if (this.blocks) {
|
|
76
|
+
await this.blocks.boundary('已收到后续消息，后续过程将在下方继续。');
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
const previous = this.id;
|
|
80
|
+
this.id = undefined;
|
|
81
|
+
this.lastText = '';
|
|
82
|
+
this.lastEdit = 0;
|
|
83
|
+
this.disabled = false;
|
|
84
|
+
if (previous && !this.signal.aborted && this.allowed()) {
|
|
85
|
+
const signal = AbortSignal.any([this.signal, AbortSignal.timeout(3000)]);
|
|
86
|
+
await this.transport.edit(previous, '已收到后续消息，处理进度与回复将在下方继续。', signal).catch(() => { });
|
|
87
|
+
}
|
|
88
|
+
}).finally(() => {
|
|
89
|
+
this.rotating--;
|
|
90
|
+
if (!this.rotating) {
|
|
91
|
+
for (const activity of this.deferredActivities)
|
|
92
|
+
this.blocks?.update(activity);
|
|
93
|
+
this.deferredActivities = [];
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
const settled = this.background;
|
|
97
|
+
return accepted => { decide(accepted); return settled; };
|
|
98
|
+
}
|
|
40
99
|
tick(show) {
|
|
41
|
-
if (this.closed || this.creating || !this.allowed() || this.signal.aborted)
|
|
100
|
+
if (this.closed || this.creating || this.rotating || !this.allowed() || this.signal.aborted)
|
|
42
101
|
return;
|
|
43
102
|
this.creating = true;
|
|
44
103
|
this.background = (async () => {
|
|
@@ -47,6 +106,10 @@ export class ReplyProgressController {
|
|
|
47
106
|
await this.transport.typing(true, signal).catch(() => { this.typingDisabled = true; });
|
|
48
107
|
if (!show || this.closed || this.disabled || !this.allowed())
|
|
49
108
|
return;
|
|
109
|
+
if (this.blocks) {
|
|
110
|
+
await this.blocks.flush();
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
50
113
|
const text = labels[this.stage];
|
|
51
114
|
try {
|
|
52
115
|
if (!this.id) {
|
|
@@ -79,6 +142,17 @@ export class ReplyProgressController {
|
|
|
79
142
|
if (!this.allowed())
|
|
80
143
|
throw Error('渠道或联系人授权已撤销');
|
|
81
144
|
const signal = AbortSignal.any([this.signal, AbortSignal.timeout(35000)]);
|
|
145
|
+
if (this.blocks) {
|
|
146
|
+
await this.blocks.finish(text);
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
if (this.transport.finalDelivery === 'separate') {
|
|
150
|
+
// A progress-card edit must never swallow or replace the actual reply.
|
|
151
|
+
await this.transport.send(text || '本次处理已结束，未生成文字回复。', signal);
|
|
152
|
+
if (this.id && this.allowed() && !this.signal.aborted)
|
|
153
|
+
await this.transport.edit(this.id, '本次处理已完成，回复已单独发送。', AbortSignal.any([this.signal, AbortSignal.timeout(3000)])).catch(() => { });
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
82
156
|
if (this.id) {
|
|
83
157
|
try {
|
|
84
158
|
await this.transport.edit(this.id, text || '本次处理已结束，未生成文字回复。', signal);
|
|
@@ -103,6 +177,8 @@ export class ReplyProgressController {
|
|
|
103
177
|
if (this.closed)
|
|
104
178
|
return;
|
|
105
179
|
await this.stop();
|
|
180
|
+
if (this.blocks)
|
|
181
|
+
await this.blocks.boundary('本次处理已中断或未完成，请在 DSH 查看执行结果。');
|
|
106
182
|
if (this.id && this.allowed())
|
|
107
183
|
await this.transport.edit(this.id, '本次处理已中断或未完成，请在 DSH 查看执行结果。', AbortSignal.timeout(3000)).catch(() => { });
|
|
108
184
|
await this.clearTyping();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-progress-controller.js","sourceRoot":"","sources":["../../src/channels/reply-progress-controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reply-progress-controller.js","sourceRoot":"","sources":["../../src/channels/reply-progress-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,20 @@
|
|
|
1
1
|
import type { SessionEvent } from '@deepseek-ai/dsh-session';
|
|
2
2
|
export type ReplyStage = 'queued' | 'working' | 'tools' | 'composing';
|
|
3
|
-
export type
|
|
3
|
+
export type ReplyActivity = {
|
|
4
|
+
kind: 'text';
|
|
5
|
+
text: string;
|
|
6
|
+
} | {
|
|
7
|
+
kind: 'tool-start';
|
|
8
|
+
id: string;
|
|
9
|
+
name: string;
|
|
10
|
+
} | {
|
|
11
|
+
kind: 'tool-end';
|
|
12
|
+
id: string;
|
|
13
|
+
failed: boolean;
|
|
14
|
+
};
|
|
15
|
+
export type ReplyProgress = (stage: ReplyStage | ReplyActivity) => void;
|
|
4
16
|
/** Deliberately expose only fixed labels, never tool names, arguments or reasoning. */
|
|
5
17
|
export declare function replyStage(event: SessionEvent): ReplyStage | undefined;
|
|
6
|
-
export declare function
|
|
18
|
+
export declare function replyActivity(event: SessionEvent): ReplyActivity | undefined;
|
|
19
|
+
export declare function reportProgress(notify: ReplyProgress | undefined, stage: ReplyStage | ReplyActivity): void;
|
|
7
20
|
//# sourceMappingURL=reply-progress.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-progress.d.ts","sourceRoot":"","sources":["../../src/execution/reply-progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAA;AAE1D,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,WAAW,CAAA;AACrE,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAC,UAAU,KAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"reply-progress.d.ts","sourceRoot":"","sources":["../../src/execution/reply-progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAA;AAE1D,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,WAAW,CAAA;AACrE,MAAM,MAAM,aAAa,GAAG;IAAC,IAAI,EAAC,MAAM,CAAC;IAAA,IAAI,EAAC,MAAM,CAAA;CAAC,GAAG;IAAC,IAAI,EAAC,YAAY,CAAC;IAAA,EAAE,EAAC,MAAM,CAAC;IAAA,IAAI,EAAC,MAAM,CAAA;CAAC,GAAG;IAAC,IAAI,EAAC,UAAU,CAAC;IAAA,EAAE,EAAC,MAAM,CAAC;IAAA,MAAM,EAAC,OAAO,CAAA;CAAC,CAAA;AAC9I,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAC,UAAU,GAAG,aAAa,KAAG,IAAI,CAAA;AAEpE,uFAAuF;AACvF,wBAAgB,UAAU,CAAC,KAAK,EAAC,YAAY,GAAE,UAAU,GAAC,SAAS,CAIlE;AACD,wBAAgB,aAAa,CAAC,KAAK,EAAC,YAAY,GAAE,aAAa,GAAC,SAAS,CAQxE;AACD,wBAAgB,cAAc,CAAC,MAAM,EAAC,aAAa,GAAC,SAAS,EAAC,KAAK,EAAC,UAAU,GAAC,aAAa,GAAE,IAAI,CAEjG"}
|
|
@@ -6,6 +6,18 @@ export function replyStage(event) {
|
|
|
6
6
|
return 'composing';
|
|
7
7
|
return undefined;
|
|
8
8
|
}
|
|
9
|
+
export function replyActivity(event) {
|
|
10
|
+
if (event.type === 'tool/call')
|
|
11
|
+
return { kind: 'tool-start', id: event.data.callId, name: /^[\w.:-]{1,100}$/.test(event.data.name) ? event.data.name : '工具' };
|
|
12
|
+
if (event.type === 'tool/result')
|
|
13
|
+
return { kind: 'tool-end', id: event.data.message.content[0].toolCallId, failed: !!event.data.error || !!event.data.message.content[0].isError };
|
|
14
|
+
if (event.type === 'assistant/message' && !event.data.interrupted && event.data.message.content.some(block => block.type === 'tool-call')) {
|
|
15
|
+
const text = event.data.message.content.filter(block => block.type === 'text').map(block => block.text).join('\n').trim();
|
|
16
|
+
if (text)
|
|
17
|
+
return { kind: 'text', text };
|
|
18
|
+
}
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
9
21
|
export function reportProgress(notify, stage) {
|
|
10
22
|
try {
|
|
11
23
|
notify?.(stage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-progress.js","sourceRoot":"","sources":["../../src/execution/reply-progress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reply-progress.js","sourceRoot":"","sources":["../../src/execution/reply-progress.ts"],"names":[],"mappings":"AAMA,uFAAuF;AACvF,MAAM,UAAU,UAAU,CAAC,KAAkB;IAC3C,IAAG,KAAK,CAAC,IAAI,KAAG,WAAW;QAAC,OAAO,OAAO,CAAA;IAC1C,IAAG,KAAK,CAAC,IAAI,KAAG,gBAAgB;QAAC,OAAO,WAAW,CAAA;IACnD,OAAO,SAAS,CAAA;AAClB,CAAC;AACD,MAAM,UAAU,aAAa,CAAC,KAAkB;IAC9C,IAAG,KAAK,CAAC,IAAI,KAAG,WAAW;QAAC,OAAO,EAAC,IAAI,EAAC,YAAY,EAAC,EAAE,EAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAC,IAAI,EAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA,CAAC,CAAA,KAAK,CAAC,IAAI,CAAC,IAAI,CAAA,CAAC,CAAA,IAAI,EAAC,CAAA;IAC9I,IAAG,KAAK,CAAC,IAAI,KAAG,aAAa;QAAC,OAAO,EAAC,IAAI,EAAC,UAAU,EAAC,EAAE,EAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,EAAC,MAAM,EAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAC,CAAA;IACrK,IAAG,KAAK,CAAC,IAAI,KAAG,mBAAmB,IAAE,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,IAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAA,EAAE,CAAA,KAAK,CAAC,IAAI,KAAG,WAAW,CAAC,EAAC,CAAC;QAC9H,MAAM,IAAI,GAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAA,EAAE,CAAA,KAAK,CAAC,IAAI,KAAG,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAA,EAAE,CAAA,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QACjH,IAAG,IAAI;YAAC,OAAO,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,EAAC,CAAA;IACnC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AACD,MAAM,UAAU,cAAc,CAAC,MAA8B,EAAC,KAA8B;IAC1F,IAAG,CAAC;QAAA,MAAM,EAAE,CAAC,KAAK,CAAC,CAAA;IAAA,CAAC;IAAA,MAAK,CAAC,CAAC,qDAAqD,CAAC,CAAC;AACpF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lemoncat7/dsh-partner",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.2",
|
|
4
4
|
"description": "Long-lived AI companions with WeChat, Matrix and Mattermost channels for DeepSeek Harness",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"deepseek-harness",
|
|
@@ -38,6 +38,7 @@
|
|
|
38
38
|
"docs/releases/2.3.0.md",
|
|
39
39
|
"docs/releases/2.4.0.md",
|
|
40
40
|
"docs/releases/2.4.1.md",
|
|
41
|
+
"docs/releases/2.4.2.md",
|
|
41
42
|
"docs/mcp.md",
|
|
42
43
|
"docs/channel-questions-and-avatar.md",
|
|
43
44
|
"docs/memory-quality.md",
|