@downcity/agent 1.1.148 → 1.1.150
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/bin/executor/core-engine/CoreEngineRunner.d.ts.map +1 -1
- package/bin/executor/core-engine/CoreEngineRunner.js +5 -2
- package/bin/executor/core-engine/CoreEngineRunner.js.map +1 -1
- package/bin/executor/core-engine/CoreEngineUiStreamCollector.d.ts +8 -0
- package/bin/executor/core-engine/CoreEngineUiStreamCollector.d.ts.map +1 -1
- package/bin/executor/core-engine/CoreEngineUiStreamCollector.js +21 -7
- package/bin/executor/core-engine/CoreEngineUiStreamCollector.js.map +1 -1
- package/bin/session/runtime/SessionPromptRuntime.js +5 -5
- package/bin/session/runtime/SessionPromptRuntime.js.map +1 -1
- package/package.json +3 -3
- package/scripts/session-prompt-runtime.test.mjs +6 -3
- package/src/executor/core-engine/CoreEngineRunner.ts +11 -5
- package/src/executor/core-engine/CoreEngineUiStreamCollector.ts +27 -6
- package/src/session/runtime/SessionPromptRuntime.ts +5 -5
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreEngineRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAA+B,KAAK,aAAa,EAAE,MAAM,IAAI,CAAC;AA0BrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AA6CxC,UAAU,uBAAuB;IAC/B;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,gBAAgB,EAAE,sBAAsB,CAAC;IAEzC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,uBAAuB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;CACtD;AAED,UAAU,kBAAkB;IAC1B;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAC;CAChC;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAqD;gBAEjF,OAAO,EAAE,uBAAuB;IAO5C;;OAEG;IACG,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"CoreEngineRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAA+B,KAAK,aAAa,EAAE,MAAM,IAAI,CAAC;AA0BrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AA6CxC,UAAU,uBAAuB;IAC/B;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,gBAAgB,EAAE,sBAAsB,CAAC;IAEzC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,uBAAuB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;CACtD;AAED,UAAU,kBAAkB;IAC1B;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAC;CAChC;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAqD;gBAEjF,OAAO,EAAE,uBAAuB;IAO5C;;OAEG;IACG,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA2ThE"}
|
|
@@ -79,6 +79,7 @@ export class CoreEngineRunner {
|
|
|
79
79
|
: [];
|
|
80
80
|
const tools = input.execute_input.tools;
|
|
81
81
|
let last_observed_stream_error = undefined;
|
|
82
|
+
let final_assistant_ui_message = null;
|
|
82
83
|
try {
|
|
83
84
|
const message_state = await CoreEngineMessageState.create({
|
|
84
85
|
messages: input.execute_input.messages,
|
|
@@ -111,7 +112,6 @@ export class CoreEngineRunner {
|
|
|
111
112
|
appendMergedUserMessages: append_merged_user_messages,
|
|
112
113
|
runContext: input.run_context,
|
|
113
114
|
});
|
|
114
|
-
let final_assistant_ui_message = null;
|
|
115
115
|
let text_only_continuation_count = 0;
|
|
116
116
|
let incomplete_response_recovery_count = 0;
|
|
117
117
|
while (step_count < MAX_TOOL_LOOP_STEPS) {
|
|
@@ -138,6 +138,7 @@ export class CoreEngineRunner {
|
|
|
138
138
|
logger: this.logger,
|
|
139
139
|
buildFallbackAssistantMessage: (text) => this.context_composer.buildFallbackAssistantMessage(text, input.run_context),
|
|
140
140
|
onUiMessageChunkCallback: input.run_context.onUiMessageChunkCallback,
|
|
141
|
+
abortSignal: input.run_context.abortSignal,
|
|
141
142
|
});
|
|
142
143
|
const executed_steps = await result.steps;
|
|
143
144
|
const last_step = executed_steps[executed_steps.length - 1];
|
|
@@ -293,10 +294,12 @@ export class CoreEngineRunner {
|
|
|
293
294
|
await this.logger.log("info", "[agent] stopped", {
|
|
294
295
|
sessionId: session_id,
|
|
295
296
|
});
|
|
297
|
+
const stopped_message = mergePendingAssistantFileParts(final_assistant_ui_message ||
|
|
298
|
+
this.context_composer.buildFallbackAssistantMessage(error_text, input.run_context), input.run_context.pendingAssistantFileParts);
|
|
296
299
|
return {
|
|
297
300
|
success: false,
|
|
298
301
|
error: error_text,
|
|
299
|
-
assistantMessage:
|
|
302
|
+
assistantMessage: stopped_message,
|
|
300
303
|
deferredPersistedUserMessages: [
|
|
301
304
|
...input.run_context.deferredPersistedUserMessages,
|
|
302
305
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreEngineRunner.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CoreEngineRunner.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,5 +34,13 @@ export declare function collectFinalAssistantMessageFromUiStream(params: {
|
|
|
34
34
|
* UI stream chunk 回调。
|
|
35
35
|
*/
|
|
36
36
|
onUiMessageChunkCallback?: SessionUiMessageChunkCallback;
|
|
37
|
+
/**
|
|
38
|
+
* 当前 turn 的取消信号。
|
|
39
|
+
*
|
|
40
|
+
* 关键点(中文)
|
|
41
|
+
* - stop 触发后,UI stream 可能在 onFinish 前中断。
|
|
42
|
+
* - 此时仍应尽量用已经收到的 text delta 构造可持久化 assistant 消息。
|
|
43
|
+
*/
|
|
44
|
+
abortSignal?: AbortSignal;
|
|
37
45
|
}): Promise<SessionMessageV1>;
|
|
38
46
|
//# sourceMappingURL=CoreEngineUiStreamCollector.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreEngineUiStreamCollector.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineUiStreamCollector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAOpF;;GAEG;AACH,wBAAsB,wCAAwC,CAAC,MAAM,EAAE;IACrE;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IACtC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,6BAA6B,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,CAAC;IAClE;;OAEG;IACH,wBAAwB,CAAC,EAAE,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"CoreEngineUiStreamCollector.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineUiStreamCollector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAOpF;;GAEG;AACH,wBAAsB,wCAAwC,CAAC,MAAM,EAAE;IACrE;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IACtC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,6BAA6B,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,CAAC;IAClE;;OAEG;IACH,wBAAwB,CAAC,EAAE,6BAA6B,CAAC;IACzD;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA+E5B"}
|
|
@@ -14,6 +14,7 @@ import { summarizeUiMessageForDebug, toInlinePreview, } from "../core-engine/Cor
|
|
|
14
14
|
export async function collectFinalAssistantMessageFromUiStream(params) {
|
|
15
15
|
let streamedAssistantMessage = null;
|
|
16
16
|
let uiFinishSummary = null;
|
|
17
|
+
let streamed_text = "";
|
|
17
18
|
const uiStream = params.result.toUIMessageStream({
|
|
18
19
|
// 关键点(中文):SDK stream 需要 reasoning 旁路事件时可直接消费;最终落盘仍由 responseMessage 收敛。
|
|
19
20
|
originalMessages: [],
|
|
@@ -41,14 +42,24 @@ export async function collectFinalAssistantMessageFromUiStream(params) {
|
|
|
41
42
|
};
|
|
42
43
|
},
|
|
43
44
|
});
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
try {
|
|
46
|
+
for await (const chunk of uiStream) {
|
|
47
|
+
if (chunk.type === "text-delta") {
|
|
48
|
+
streamed_text += String(chunk.delta || "");
|
|
49
|
+
}
|
|
50
|
+
if (typeof params.onUiMessageChunkCallback !== "function")
|
|
51
|
+
continue;
|
|
52
|
+
try {
|
|
53
|
+
await params.onUiMessageChunkCallback(chunk);
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
// ignore UI stream callback failures
|
|
57
|
+
}
|
|
49
58
|
}
|
|
50
|
-
|
|
51
|
-
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
if (!params.abortSignal?.aborted) {
|
|
62
|
+
throw error;
|
|
52
63
|
}
|
|
53
64
|
}
|
|
54
65
|
await params.logger.log("info", "[agent] ui.finish", {
|
|
@@ -66,6 +77,9 @@ export async function collectFinalAssistantMessageFromUiStream(params) {
|
|
|
66
77
|
catch {
|
|
67
78
|
assistantText = "";
|
|
68
79
|
}
|
|
80
|
+
if (!assistantText) {
|
|
81
|
+
assistantText = streamed_text.trim();
|
|
82
|
+
}
|
|
69
83
|
await params.logger.log("warn", "[agent] final.message.fallback", {
|
|
70
84
|
sessionId: params.sessionId,
|
|
71
85
|
assistantTextLength: assistantText.length,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreEngineUiStreamCollector.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineUiStreamCollector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,0BAA0B,EAC1B,eAAe,GAChB,MAAM,4CAA4C,CAAC;AAEpD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAAC,
|
|
1
|
+
{"version":3,"file":"CoreEngineUiStreamCollector.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineUiStreamCollector.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,15 +111,15 @@ export class SessionPromptRuntime {
|
|
|
111
111
|
},
|
|
112
112
|
abortSignal: activeTurn.abortController.signal,
|
|
113
113
|
});
|
|
114
|
-
|
|
115
|
-
throw new Error(TURN_STOPPED_MESSAGE);
|
|
116
|
-
}
|
|
114
|
+
const stopped = activeTurn.abortController.signal.aborted;
|
|
117
115
|
const finalResult = {
|
|
118
116
|
turnId,
|
|
119
117
|
text: result.text,
|
|
120
|
-
success: result.success,
|
|
118
|
+
success: stopped ? false : result.success,
|
|
121
119
|
assistantMessage: result.assistantMessage,
|
|
122
|
-
...(
|
|
120
|
+
...(stopped
|
|
121
|
+
? { error: TURN_STOPPED_MESSAGE }
|
|
122
|
+
: result.error ? { error: result.error } : {}),
|
|
123
123
|
};
|
|
124
124
|
activeTurn.result = finalResult;
|
|
125
125
|
this.publish({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionPromptRuntime.js","sourceRoot":"","sources":["../../../src/session/runtime/SessionPromptRuntime.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAWhC,MAAM,oBAAoB,GAAG,cAAc,CAAC;AAC5C,MAAM,+BAA+B,GACnC,8CAA8C,CAAC;AAgGjD;;GAEG;AACH,MAAM,OAAO,oBAAoB;IACd,SAAS,CAAS;IAClB,OAAO,CAAyC;IAChD,2BAA2B,CAA6D;IACxF,WAAW,CAA6C;IACxD,QAAQ,CAA0C;IAClD,KAAK,GAAmB,EAAE,CAAC;IACpC,iBAAiB,GAAyB,IAAI,CAAC;IAC/C,UAAU,GAA2B,IAAI,CAAC;IAElD,YAAY,OAAoC;QAC9C,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAC;QACvE,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAA8B;QACnC,MAAM,cAAc,GAAG,cAAc,EAA0B,CAAC;QAChE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,KAAK,EAAE;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;aACxC;YACD,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO,cAAc,CAAC,OAAO,CAAC;IAChC,CAAC;IAED;;;;;;OAMG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,iBAAiB,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACH,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC;QACpC,MAAM,wBAAwB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC5D,IAAI,uBAAuB,GAAG,KAAK,CAAC;QAEpC,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBAChD,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACrE,CAAC;YACD,uBAAuB,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5C,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CACrB,WAAW;YACT,uBAAuB;YACvB,wBAAwB,GAAG,CAAC,CAC/B,CAAC;QACF,OAAO;YACL,OAAO;YACP,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,sBAAsB,EAAE,wBAAwB;YAChD,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;SACrC,CAAC;IACJ,CAAC;IAEO,gBAAgB;QACtB,IAAI,IAAI,CAAC,iBAAiB;YAAE,OAAO;QACnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACnC,IAAI,CAAC,OAAO;gBAAE,MAAM;YAEpB,MAAM,MAAM,GAAG,QAAQ,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACnE,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC;gBACX,IAAI,EAAE,YAAY;gBAClB,MAAM;aACP,CAAC,CAAC;YACH,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;YAE7D,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;oBACpC,MAAM;oBACN,WAAW,EAAE,OAAO,CAAC,KAAK;oBAC1B,WAAW,EAAE,KAAK,IAAI,EAAE;wBACtB,OAAO,MAAM,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;oBAC7D,CAAC;oBACD,WAAW,EAAE,UAAU,CAAC,eAAe,CAAC,MAAM;iBAC/C,CAAC,CAAC;gBACH,
|
|
1
|
+
{"version":3,"file":"SessionPromptRuntime.js","sourceRoot":"","sources":["../../../src/session/runtime/SessionPromptRuntime.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAWhC,MAAM,oBAAoB,GAAG,cAAc,CAAC;AAC5C,MAAM,+BAA+B,GACnC,8CAA8C,CAAC;AAgGjD;;GAEG;AACH,MAAM,OAAO,oBAAoB;IACd,SAAS,CAAS;IAClB,OAAO,CAAyC;IAChD,2BAA2B,CAA6D;IACxF,WAAW,CAA6C;IACxD,QAAQ,CAA0C;IAClD,KAAK,GAAmB,EAAE,CAAC;IACpC,iBAAiB,GAAyB,IAAI,CAAC;IAC/C,UAAU,GAA2B,IAAI,CAAC;IAElD,YAAY,OAAoC;QAC9C,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAC;QACvE,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAA8B;QACnC,MAAM,cAAc,GAAG,cAAc,EAA0B,CAAC;QAChE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,KAAK,EAAE;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;aACxC;YACD,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO,cAAc,CAAC,OAAO,CAAC;IAChC,CAAC;IAED;;;;;;OAMG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,iBAAiB,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACH,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC;QACpC,MAAM,wBAAwB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC5D,IAAI,uBAAuB,GAAG,KAAK,CAAC;QAEpC,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBAChD,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACrE,CAAC;YACD,uBAAuB,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5C,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CACrB,WAAW;YACT,uBAAuB;YACvB,wBAAwB,GAAG,CAAC,CAC/B,CAAC;QACF,OAAO;YACL,OAAO;YACP,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,sBAAsB,EAAE,wBAAwB;YAChD,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;SACrC,CAAC;IACJ,CAAC;IAEO,gBAAgB;QACtB,IAAI,IAAI,CAAC,iBAAiB;YAAE,OAAO;QACnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACnC,IAAI,CAAC,OAAO;gBAAE,MAAM;YAEpB,MAAM,MAAM,GAAG,QAAQ,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACnE,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC;gBACX,IAAI,EAAE,YAAY;gBAClB,MAAM;aACP,CAAC,CAAC;YACH,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;YAE7D,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;oBACpC,MAAM;oBACN,WAAW,EAAE,OAAO,CAAC,KAAK;oBAC1B,WAAW,EAAE,KAAK,IAAI,EAAE;wBACtB,OAAO,MAAM,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;oBAC7D,CAAC;oBACD,WAAW,EAAE,UAAU,CAAC,eAAe,CAAC,MAAM;iBAC/C,CAAC,CAAC;gBACH,MAAM,OAAO,GAAG,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC;gBAC1D,MAAM,WAAW,GAA2B;oBAC1C,MAAM;oBACN,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO;oBACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,GAAG,CAAC,OAAO;wBACT,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE;wBACjC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACjD,CAAC;gBACF,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC;gBAChC,IAAI,CAAC,OAAO,CAAC;oBACX,IAAI,EAAE,aAAa;oBACnB,MAAM;oBACN,IAAI,EAAE,WAAW,CAAC,IAAI;oBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;oBAC5B,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC3D,CAAC,CAAC;gBACH,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO;oBACvD,CAAC,CAAC,oBAAoB;oBACtB,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC3D,MAAM,WAAW,GAA2B;oBAC1C,MAAM;oBACN,IAAI,EAAE,EAAE;oBACR,OAAO,EAAE,KAAK;oBACd,gBAAgB,EAAE,uCAAuC,CAAC;wBACxD,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,OAAO;qBACR,CAAC;oBACF,KAAK,EAAE,OAAO;iBACf,CAAC;gBACF,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC;gBAChC,IAAI,OAAO,KAAK,oBAAoB,EAAE,CAAC;oBACrC,IAAI,CAAC,OAAO,CAAC;wBACX,IAAI,EAAE,OAAO;wBACb,OAAO;qBACR,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC;oBACX,IAAI,EAAE,aAAa;oBACnB,MAAM;oBACN,IAAI,EAAE,EAAE;oBACR,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,OAAO;iBACf,CAAC,CAAC;gBACH,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACnD,CAAC;oBAAS,CAAC;gBACT,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;oBACnC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,mBAAmB;QACzB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC;YAAE,OAAO,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1D,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,QAAQ,IAAI,CAAC,SAAS,cAAc,IAAI,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,MAAM,aAAa,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACpD,MAAM,WAAW,GAA2B;gBAC1C,MAAM;gBACN,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,KAAK;gBACd,gBAAgB,EAAE,uCAAuC,CAAC;oBACxD,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,OAAO,EAAE,+BAA+B;iBACzC,CAAC;gBACF,KAAK,EAAE,+BAA+B;aACvC,CAAC;YACF,aAAa,CAAC,MAAM,GAAG,WAAW,CAAC;YACnC,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC;gBACX,IAAI,EAAE,YAAY;gBAClB,MAAM;aACP,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC;gBACX,IAAI,EAAE,aAAa;gBACnB,MAAM;gBACN,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,+BAA+B;aACvC,CAAC,CAAC;YACH,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,4BAA4B,CACxC,UAA2B;QAE3B,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,MAAM,GAA2B,EAAE,CAAC;QAE1C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC1D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC;YAAC,MAAM,CAAC;gBACT,4CAA4C;gBAC5C,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACvC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;gBACjC,MAAM;YACR,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,SAAS,uCAAuC,CAAC,KAGhD;IACC,OAAO;QACL,EAAE,EAAE,KAAK,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;QACrD,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE;YACR,CAAC,EAAE,CAAC;YACJ,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;YACd,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE;gBACL,IAAI,EAAE,8BAA8B;aACrC;SACF;QACD,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;KAC/C,CAAC;AACJ,CAAC;AAED,SAAS,cAAc;IACrB,IAAI,OAA4B,CAAC;IACjC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,YAAY,EAAE,EAAE;QAC9C,OAAO,GAAG,YAAY,CAAC;IACzB,CAAC,CAAC,CAAC;IACH,OAAO;QACL,OAAO;QACP,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAc;IAC3C,OAAO;QACL,MAAM;QACN,MAAM,EAAE,IAAI;QACZ,gBAAgB,EAAE,cAAc,EAA0B;QAC1D,eAAe,EAAE,IAAI,eAAe,EAAE;KACvC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,UAA2B;IAE3B,OAAO;QACL,EAAE,EAAE,UAAU,CAAC,MAAM;QACrB,IAAI,MAAM;YACR,OAAO,UAAU,CAAC,MAAM,CAAC;QAC3B,CAAC;QACD,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC,OAAO;KAC9C,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@downcity/agent",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.150",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Downcity Agent 运行时 — 单 Agent 执行壳与本机 RPC 能力",
|
|
6
6
|
"main": "./bin/index.js",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@ai-sdk/openai-compatible": "^2.0.48",
|
|
20
|
-
"@downcity/shell": "^0.1.
|
|
21
|
-
"@downcity/type": "0.1.
|
|
20
|
+
"@downcity/shell": "^0.1.29",
|
|
21
|
+
"@downcity/type": "0.1.63",
|
|
22
22
|
"@larksuiteoapi/node-sdk": "^1.66.0",
|
|
23
23
|
"ai": "^6.0.193",
|
|
24
24
|
"commander": "^15.0.0",
|
|
@@ -207,9 +207,10 @@ test("SessionPromptRuntime stops current turn and cancels unmerged queued prompt
|
|
|
207
207
|
});
|
|
208
208
|
await executionFinished.promise;
|
|
209
209
|
return {
|
|
210
|
-
text: "
|
|
211
|
-
success:
|
|
212
|
-
assistantMessage: createAssistantMessage("
|
|
210
|
+
text: "partial answer",
|
|
211
|
+
success: false,
|
|
212
|
+
assistantMessage: createAssistantMessage("partial answer", 1),
|
|
213
|
+
error: "Turn stopped",
|
|
213
214
|
};
|
|
214
215
|
},
|
|
215
216
|
stopTurn: () => {
|
|
@@ -234,6 +235,8 @@ test("SessionPromptRuntime stops current turn and cancels unmerged queued prompt
|
|
|
234
235
|
assert.equal(stopResult.cancelledQueuedPrompts, 1);
|
|
235
236
|
assert.equal(firstResult.success, false);
|
|
236
237
|
assert.equal(firstResult.error, "Turn stopped");
|
|
238
|
+
assert.equal(firstResult.text, "partial answer");
|
|
239
|
+
assert.equal(firstResult.assistantMessage.parts[0]?.text, "partial answer");
|
|
237
240
|
assert.equal(secondResult.success, false);
|
|
238
241
|
assert.equal(
|
|
239
242
|
secondResult.error,
|
|
@@ -151,6 +151,7 @@ export class CoreEngineRunner {
|
|
|
151
151
|
: [];
|
|
152
152
|
const tools = input.execute_input.tools;
|
|
153
153
|
let last_observed_stream_error: unknown = undefined;
|
|
154
|
+
let final_assistant_ui_message: SessionMessageV1 | null = null;
|
|
154
155
|
|
|
155
156
|
try {
|
|
156
157
|
const message_state = await CoreEngineMessageState.create({
|
|
@@ -190,7 +191,6 @@ export class CoreEngineRunner {
|
|
|
190
191
|
runContext: input.run_context,
|
|
191
192
|
});
|
|
192
193
|
|
|
193
|
-
let final_assistant_ui_message: SessionMessageV1 | null = null;
|
|
194
194
|
let text_only_continuation_count = 0;
|
|
195
195
|
let incomplete_response_recovery_count = 0;
|
|
196
196
|
|
|
@@ -224,6 +224,7 @@ export class CoreEngineRunner {
|
|
|
224
224
|
input.run_context,
|
|
225
225
|
),
|
|
226
226
|
onUiMessageChunkCallback: input.run_context.onUiMessageChunkCallback,
|
|
227
|
+
abortSignal: input.run_context.abortSignal,
|
|
227
228
|
});
|
|
228
229
|
|
|
229
230
|
const executed_steps = await result.steps;
|
|
@@ -413,13 +414,18 @@ export class CoreEngineRunner {
|
|
|
413
414
|
await this.logger.log("info", "[agent] stopped", {
|
|
414
415
|
sessionId: session_id,
|
|
415
416
|
});
|
|
417
|
+
const stopped_message = mergePendingAssistantFileParts(
|
|
418
|
+
final_assistant_ui_message ||
|
|
419
|
+
this.context_composer.buildFallbackAssistantMessage(
|
|
420
|
+
error_text,
|
|
421
|
+
input.run_context,
|
|
422
|
+
),
|
|
423
|
+
input.run_context.pendingAssistantFileParts,
|
|
424
|
+
);
|
|
416
425
|
return {
|
|
417
426
|
success: false,
|
|
418
427
|
error: error_text,
|
|
419
|
-
assistantMessage:
|
|
420
|
-
error_text,
|
|
421
|
-
input.run_context,
|
|
422
|
-
),
|
|
428
|
+
assistantMessage: stopped_message,
|
|
423
429
|
deferredPersistedUserMessages: [
|
|
424
430
|
...input.run_context.deferredPersistedUserMessages,
|
|
425
431
|
],
|
|
@@ -42,9 +42,18 @@ export async function collectFinalAssistantMessageFromUiStream(params: {
|
|
|
42
42
|
* UI stream chunk 回调。
|
|
43
43
|
*/
|
|
44
44
|
onUiMessageChunkCallback?: SessionUiMessageChunkCallback;
|
|
45
|
+
/**
|
|
46
|
+
* 当前 turn 的取消信号。
|
|
47
|
+
*
|
|
48
|
+
* 关键点(中文)
|
|
49
|
+
* - stop 触发后,UI stream 可能在 onFinish 前中断。
|
|
50
|
+
* - 此时仍应尽量用已经收到的 text delta 构造可持久化 assistant 消息。
|
|
51
|
+
*/
|
|
52
|
+
abortSignal?: AbortSignal;
|
|
45
53
|
}): Promise<SessionMessageV1> {
|
|
46
54
|
let streamedAssistantMessage: SessionMessageV1 | null = null;
|
|
47
55
|
let uiFinishSummary: JsonObject | null = null;
|
|
56
|
+
let streamed_text = "";
|
|
48
57
|
|
|
49
58
|
const uiStream = params.result.toUIMessageStream<SessionMessageV1>({
|
|
50
59
|
// 关键点(中文):SDK stream 需要 reasoning 旁路事件时可直接消费;最终落盘仍由 responseMessage 收敛。
|
|
@@ -74,12 +83,21 @@ export async function collectFinalAssistantMessageFromUiStream(params: {
|
|
|
74
83
|
},
|
|
75
84
|
});
|
|
76
85
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
86
|
+
try {
|
|
87
|
+
for await (const chunk of uiStream) {
|
|
88
|
+
if (chunk.type === "text-delta") {
|
|
89
|
+
streamed_text += String(chunk.delta || "");
|
|
90
|
+
}
|
|
91
|
+
if (typeof params.onUiMessageChunkCallback !== "function") continue;
|
|
92
|
+
try {
|
|
93
|
+
await params.onUiMessageChunkCallback(chunk);
|
|
94
|
+
} catch {
|
|
95
|
+
// ignore UI stream callback failures
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
} catch (error) {
|
|
99
|
+
if (!params.abortSignal?.aborted) {
|
|
100
|
+
throw error;
|
|
83
101
|
}
|
|
84
102
|
}
|
|
85
103
|
|
|
@@ -98,6 +116,9 @@ export async function collectFinalAssistantMessageFromUiStream(params: {
|
|
|
98
116
|
} catch {
|
|
99
117
|
assistantText = "";
|
|
100
118
|
}
|
|
119
|
+
if (!assistantText) {
|
|
120
|
+
assistantText = streamed_text.trim();
|
|
121
|
+
}
|
|
101
122
|
|
|
102
123
|
await params.logger.log("warn", "[agent] final.message.fallback", {
|
|
103
124
|
sessionId: params.sessionId,
|
|
@@ -228,15 +228,15 @@ export class SessionPromptRuntime {
|
|
|
228
228
|
},
|
|
229
229
|
abortSignal: activeTurn.abortController.signal,
|
|
230
230
|
});
|
|
231
|
-
|
|
232
|
-
throw new Error(TURN_STOPPED_MESSAGE);
|
|
233
|
-
}
|
|
231
|
+
const stopped = activeTurn.abortController.signal.aborted;
|
|
234
232
|
const finalResult: AgentSessionTurnResult = {
|
|
235
233
|
turnId,
|
|
236
234
|
text: result.text,
|
|
237
|
-
success: result.success,
|
|
235
|
+
success: stopped ? false : result.success,
|
|
238
236
|
assistantMessage: result.assistantMessage,
|
|
239
|
-
...(
|
|
237
|
+
...(stopped
|
|
238
|
+
? { error: TURN_STOPPED_MESSAGE }
|
|
239
|
+
: result.error ? { error: result.error } : {}),
|
|
240
240
|
};
|
|
241
241
|
activeTurn.result = finalResult;
|
|
242
242
|
this.publish({
|