convex-durable-agents 0.2.5 → 0.2.6
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 +1 -0
- package/dist/client/handler.d.ts +2 -0
- package/dist/client/handler.d.ts.map +1 -1
- package/dist/client/handler.js +1 -0
- package/dist/client/handler.js.map +1 -1
- package/dist/client/streamer.d.ts +3 -1
- package/dist/client/streamer.d.ts.map +1 -1
- package/dist/client/streamer.js +9 -3
- package/dist/client/streamer.js.map +1 -1
- package/dist/react/test/happy-dom-setup.d.ts +2 -0
- package/dist/react/test/happy-dom-setup.d.ts.map +1 -0
- package/dist/react/test/happy-dom-setup.js +28 -0
- package/dist/react/test/happy-dom-setup.js.map +1 -0
- package/package.json +24 -21
- package/src/client/handler.ts +3 -0
- package/src/client/streamer.test.ts +187 -0
- package/src/client/streamer.ts +10 -3
- package/src/client/tools.test.ts +48 -0
- package/src/component/messages.test.ts +40 -0
- package/src/component/streams.test.ts +118 -0
- package/src/component/threads.test.ts +48 -0
- package/src/react/__fixtures__/01-early-streaming-start.json +35 -0
- package/src/react/__fixtures__/02-reasoning-complete-tool-call.json +85 -0
- package/src/react/__fixtures__/03-new-round-seq2.json +89 -0
- package/src/react/__fixtures__/04-tool-call-error-seq3.json +145 -0
- package/src/react/__fixtures__/05-later-round-seq5.json +117 -0
- package/src/react/__fixtures__/06-text-streaming-seq6.json +162 -0
- package/src/react/__fixtures__/07-text-streaming-more-seq6.json +212 -0
- package/src/react/__fixtures__/08-fully-committed-seq6.json +188 -0
- package/src/react/__snapshots__/apply-streaming-updates.test.ts.snap +1357 -0
- package/src/react/__snapshots__/use-thread-messages.test.tsx.snap +1429 -0
- package/src/react/agent-chat.test.tsx +155 -0
- package/src/react/apply-streaming-updates.test.ts +28 -0
- package/src/react/test/happy-dom-setup.ts +31 -0
- package/src/react/use-thread-messages.test.tsx +702 -0
- package/src/utils/msg.test.ts +34 -0
- package/src/utils/retry.test.ts +214 -0
package/README.md
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
# Durable Agents Component for Convex
|
|
2
2
|
|
|
3
|
+
[](https://www.convex.dev/components/durable-agents)
|
|
3
4
|
[](https://badge.fury.io/js/convex-durable-agents)
|
|
4
5
|
|
|
5
6
|
A Convex component for building durable AI agents with an async tool loop. The goal of this component is to provide a
|
package/dist/client/handler.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ import { type UsageInfo } from "./usage.js";
|
|
|
7
7
|
export type StreamingOptions = {
|
|
8
8
|
throttleMs?: number;
|
|
9
9
|
returnImmediately?: boolean;
|
|
10
|
+
/** Include tool-input-delta chunks in the stream, enabling incremental tool call input on the client. Default: false */
|
|
11
|
+
includeToolInputDeltas?: boolean;
|
|
10
12
|
};
|
|
11
13
|
export type { RetryContext, RetryDecision, RetryErrorClassification, RetryErrorKind, RetryErrorSignal, RetryOptions, } from "../utils/retry.js";
|
|
12
14
|
export type MessageReceivedCallbackArgs = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/client/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,YAAY,EACjB,UAAU,EAGV,KAAK,SAAS,EACf,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,KAAK,iBAAiB,EAAgD,MAAM,eAAe,CAAC;AAErG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAIzE,OAAO,EAQL,KAAK,cAAc,EACnB,KAAK,YAAY,EAClB,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAA0C,MAAM,YAAY,CAAC;AACtG,OAAO,EAAqD,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAM/F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/client/handler.ts"],"names":[],"mappings":"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"}
|
package/dist/client/handler.js
CHANGED
|
@@ -71,6 +71,7 @@ export function streamHandlerAction(component, argsOrFactory) {
|
|
|
71
71
|
threadId: args.threadId,
|
|
72
72
|
streamId: args.streamId,
|
|
73
73
|
lockId,
|
|
74
|
+
includeToolInputDeltas: streamingOptions.includeToolInputDeltas ?? false,
|
|
74
75
|
});
|
|
75
76
|
logger.debug("Acquiring stream lock...");
|
|
76
77
|
const stream = await streamer.acquireLock().catch((e) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/client/handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/client/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare class Streamer {
|
|
|
12
12
|
lockId: string;
|
|
13
13
|
threadId: Id<"threads">;
|
|
14
14
|
streamId: Id<"streams">;
|
|
15
|
+
includeToolInputDeltas: boolean;
|
|
15
16
|
};
|
|
16
17
|
constructor(component: ComponentApi, ctx: ActionCtx, config: {
|
|
17
18
|
throttleMs: number;
|
|
@@ -19,6 +20,7 @@ export declare class Streamer {
|
|
|
19
20
|
lockId: string;
|
|
20
21
|
threadId: Id<"threads">;
|
|
21
22
|
streamId: Id<"streams">;
|
|
23
|
+
includeToolInputDeltas: boolean;
|
|
22
24
|
});
|
|
23
25
|
acquireLock(): Promise<Doc<"streams">>;
|
|
24
26
|
enableDeltaStreaming(): void;
|
|
@@ -30,7 +32,7 @@ export declare class Streamer {
|
|
|
30
32
|
finish(): Promise<void>;
|
|
31
33
|
fail(reason: string): Promise<void>;
|
|
32
34
|
}
|
|
33
|
-
export declare function compactQueue(queue: Array<UIMessageChunk
|
|
35
|
+
export declare function compactQueue(queue: Array<UIMessageChunk>, includeToolInputDeltas?: boolean): Array<UIMessageChunk>;
|
|
34
36
|
export declare function dropUnnecessaryInfo(chunk: UIMessageChunk): UIMessageChunk;
|
|
35
37
|
export declare function joinAdjacentDeltas(queue: Array<UIMessageChunk>): Array<UIMessageChunk>;
|
|
36
38
|
//# sourceMappingURL=streamer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamer.d.ts","sourceRoot":"","sources":["../../src/client/streamer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,mCAAmC,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,QAAQ;;aAYD,SAAS,EAAE,YAAY;aACvB,GAAG,EAAE,SAAS;aACd,MAAM,EAAE;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;QACxB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"streamer.d.ts","sourceRoot":"","sources":["../../src/client/streamer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,mCAAmC,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,QAAQ;;aAYD,SAAS,EAAE,YAAY;aACvB,GAAG,EAAE,SAAS;aACd,MAAM,EAAE;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;QACxB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;QACxB,sBAAsB,EAAE,OAAO,CAAC;KACjC;gBATe,SAAS,EAAE,YAAY,EACvB,GAAG,EAAE,SAAS,EACd,MAAM,EAAE;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;QACxB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;QACxB,sBAAsB,EAAE,OAAO,CAAC;KACjC;IAKG,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAW5C,oBAAoB,IAAI,IAAI;IAKtB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvF,cAAc,IAAI,IAAI;IAehB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB9B,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgDtB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBvB,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB1C;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,EAAE,sBAAsB,UAAQ,GAAG,KAAK,CAAC,cAAc,CAAC,CAGhH;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAOzE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,CActF"}
|
package/dist/client/streamer.js
CHANGED
|
@@ -112,7 +112,7 @@ export class Streamer {
|
|
|
112
112
|
try {
|
|
113
113
|
const queue = this.#queue;
|
|
114
114
|
this.#queue = [];
|
|
115
|
-
const compacted = compactQueue(queue);
|
|
115
|
+
const compacted = compactQueue(queue, this.config.includeToolInputDeltas);
|
|
116
116
|
if (compacted.length === 0) {
|
|
117
117
|
this.#logger.debug(`Skipping delta write: seq=${this.#seq}, rawParts=${queue.length}, compactedParts=0`);
|
|
118
118
|
return;
|
|
@@ -150,6 +150,11 @@ export class Streamer {
|
|
|
150
150
|
}
|
|
151
151
|
async fail(reason) {
|
|
152
152
|
try {
|
|
153
|
+
if (this.#flushTimeout != null) {
|
|
154
|
+
clearTimeout(this.#flushTimeout);
|
|
155
|
+
this.#flushTimeout = undefined;
|
|
156
|
+
}
|
|
157
|
+
this.#queue = [];
|
|
153
158
|
this.#logger.debug(`Aborting stream: ${reason}`);
|
|
154
159
|
await this.ctx.runMutation(this.component.streams.abort, {
|
|
155
160
|
streamId: this.config.streamId,
|
|
@@ -162,8 +167,9 @@ export class Streamer {
|
|
|
162
167
|
}
|
|
163
168
|
}
|
|
164
169
|
}
|
|
165
|
-
export function compactQueue(queue) {
|
|
166
|
-
|
|
170
|
+
export function compactQueue(queue, includeToolInputDeltas = false) {
|
|
171
|
+
const filtered = includeToolInputDeltas ? queue : queue.filter((part) => part.type !== "tool-input-delta");
|
|
172
|
+
return joinAdjacentDeltas(filtered.map(dropUnnecessaryInfo));
|
|
167
173
|
}
|
|
168
174
|
export function dropUnnecessaryInfo(chunk) {
|
|
169
175
|
let copy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamer.js","sourceRoot":"","sources":["../../src/client/streamer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,MAAM,OAAO,QAAQ;IAYD;IACA;IACA;IAblB,qBAAqB,GAAG,KAAK,CAAC;IAC9B,MAAM,CAAqB;IAC3B,SAAS,CAA4B;IACrC,MAAM,GAA0B,EAAE,CAAC;IACnC,aAAa,CAA6B;IAC1C,kBAAkB,CAA6B;IAC/C,kBAAkB,CAA4B;IAC9C,IAAI,GAAG,CAAC,CAAC;IACT,OAAO,CAAS;IAEhB,YACkB,SAAuB,EACvB,GAAc,EACd,
|
|
1
|
+
{"version":3,"file":"streamer.js","sourceRoot":"","sources":["../../src/client/streamer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"happy-dom-setup.d.ts","sourceRoot":"","sources":["../../../src/react/test/happy-dom-setup.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Window } from "happy-dom";
|
|
2
|
+
const win = new Window({ url: "http://localhost" });
|
|
3
|
+
// Register DOM globals that @testing-library/react needs
|
|
4
|
+
const globals = [
|
|
5
|
+
"document",
|
|
6
|
+
"window",
|
|
7
|
+
"navigator",
|
|
8
|
+
"HTMLElement",
|
|
9
|
+
"HTMLInputElement",
|
|
10
|
+
"HTMLTextAreaElement",
|
|
11
|
+
"HTMLSelectElement",
|
|
12
|
+
"Element",
|
|
13
|
+
"Node",
|
|
14
|
+
"Text",
|
|
15
|
+
"DocumentFragment",
|
|
16
|
+
"MutationObserver",
|
|
17
|
+
"Event",
|
|
18
|
+
"CustomEvent",
|
|
19
|
+
"getComputedStyle",
|
|
20
|
+
];
|
|
21
|
+
for (const key of globals) {
|
|
22
|
+
if (win[key] !== undefined) {
|
|
23
|
+
globalThis[key] = win[key];
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
// Bind document.createElement etc. properly
|
|
27
|
+
globalThis.document = win.document;
|
|
28
|
+
//# sourceMappingURL=happy-dom-setup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"happy-dom-setup.js","sourceRoot":"","sources":["../../../src/react/test/happy-dom-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,CAAC;AAEpD,yDAAyD;AACzD,MAAM,OAAO,GAAG;IACd,UAAU;IACV,QAAQ;IACR,WAAW;IACX,aAAa;IACb,kBAAkB;IAClB,qBAAqB;IACrB,mBAAmB;IACnB,SAAS;IACT,MAAM;IACN,MAAM;IACN,kBAAkB;IAClB,kBAAkB;IAClB,OAAO;IACP,aAAa;IACb,kBAAkB;CACV,CAAC;AAEX,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;IAC1B,IAAK,GAAW,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;QACnC,UAAkB,CAAC,GAAG,CAAC,GAAI,GAAW,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,4CAA4C;AAC5C,UAAU,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAe,CAAC"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"bugs": {
|
|
7
7
|
"url": "https://github.com/ziegfried/convex-durable-agents/issues"
|
|
8
8
|
},
|
|
9
|
-
"version": "0.2.
|
|
9
|
+
"version": "0.2.6",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"keywords": [
|
|
12
12
|
"convex",
|
|
@@ -83,38 +83,41 @@
|
|
|
83
83
|
}
|
|
84
84
|
},
|
|
85
85
|
"devDependencies": {
|
|
86
|
-
"@biomejs/biome": "^2.
|
|
87
|
-
"@convex-dev/eslint-plugin": "^
|
|
88
|
-
"@convex-dev/workpool": "^0.
|
|
86
|
+
"@biomejs/biome": "^2.4.14",
|
|
87
|
+
"@convex-dev/eslint-plugin": "^2.0.0",
|
|
88
|
+
"@convex-dev/workpool": "^0.4.6",
|
|
89
89
|
"@edge-runtime/vm": "^5.0.0",
|
|
90
|
-
"@eslint/eslintrc": "^3.3.
|
|
90
|
+
"@eslint/eslintrc": "^3.3.5",
|
|
91
91
|
"@eslint/js": "9.39.2",
|
|
92
|
-
"@
|
|
93
|
-
"@types/
|
|
94
|
-
"@types/
|
|
92
|
+
"@testing-library/react": "^16.3.2",
|
|
93
|
+
"@types/bun": "^1.3.13",
|
|
94
|
+
"@types/node": "^24.12.2",
|
|
95
|
+
"@types/react": "^19.2.14",
|
|
95
96
|
"@types/react-dom": "^19.2.3",
|
|
96
|
-
"@vitejs/plugin-react": "^
|
|
97
|
-
"ai": "^6.0.
|
|
97
|
+
"@vitejs/plugin-react": "^6.0.1",
|
|
98
|
+
"ai": "^6.0.174",
|
|
98
99
|
"chokidar-cli": "3.0.0",
|
|
99
|
-
"convex": "1.
|
|
100
|
-
"convex-test": "0.0.
|
|
100
|
+
"convex": "1.37.0",
|
|
101
|
+
"convex-test": "0.0.51",
|
|
101
102
|
"cpy-cli": "^7.0.0",
|
|
102
103
|
"eslint": "9.39.2",
|
|
103
104
|
"eslint-plugin-react": "^7.37.5",
|
|
104
|
-
"eslint-plugin-react-hooks": "^7.
|
|
105
|
-
"eslint-plugin-react-refresh": "^0.5.
|
|
106
|
-
"globals": "^17.
|
|
105
|
+
"eslint-plugin-react-hooks": "^7.1.1",
|
|
106
|
+
"eslint-plugin-react-refresh": "^0.5.2",
|
|
107
|
+
"globals": "^17.6.0",
|
|
108
|
+
"happy-dom": "^20.9.0",
|
|
107
109
|
"npm-run-all2": "8.0.4",
|
|
108
110
|
"path-exists-cli": "2.0.0",
|
|
109
111
|
"pkg-pr-new": "^0.0.63",
|
|
110
|
-
"react": "^19.2.
|
|
111
|
-
"react-dom": "^19.2.
|
|
112
|
+
"react": "^19.2.5",
|
|
113
|
+
"react-dom": "^19.2.5",
|
|
112
114
|
"typescript": "5.9.3",
|
|
113
|
-
"typescript-eslint": "8.
|
|
114
|
-
"vite": "
|
|
115
|
+
"typescript-eslint": "8.56.1",
|
|
116
|
+
"vite": "8.0.10",
|
|
115
117
|
"vitest": "4.0.18",
|
|
116
|
-
"zod": "^4.
|
|
118
|
+
"zod": "^4.4.2"
|
|
117
119
|
},
|
|
118
120
|
"types": "./dist/client/index.d.ts",
|
|
119
|
-
"module": "./dist/client/index.js"
|
|
121
|
+
"module": "./dist/client/index.js",
|
|
122
|
+
"packageManager": "bun@1.3.9"
|
|
120
123
|
}
|
package/src/client/handler.ts
CHANGED
|
@@ -39,6 +39,8 @@ import { getStreamTextProviderMetadata, getStreamTextUsage, type UsageInfo } fro
|
|
|
39
39
|
export type StreamingOptions = {
|
|
40
40
|
throttleMs?: number;
|
|
41
41
|
returnImmediately?: boolean;
|
|
42
|
+
/** Include tool-input-delta chunks in the stream, enabling incremental tool call input on the client. Default: false */
|
|
43
|
+
includeToolInputDeltas?: boolean;
|
|
42
44
|
};
|
|
43
45
|
|
|
44
46
|
const DEFAULT_STREAMING_OPTIONS: StreamingOptions = {
|
|
@@ -218,6 +220,7 @@ export function streamHandlerAction(
|
|
|
218
220
|
threadId: args.threadId as Id<"threads">,
|
|
219
221
|
streamId: args.streamId as Id<"streams">,
|
|
220
222
|
lockId,
|
|
223
|
+
includeToolInputDeltas: streamingOptions.includeToolInputDeltas ?? false,
|
|
221
224
|
});
|
|
222
225
|
logger.debug("Acquiring stream lock...");
|
|
223
226
|
const stream = await streamer.acquireLock().catch((e) => {
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import type { UIMessageChunk } from "ai";
|
|
3
|
+
import { joinAdjacentDeltas, Streamer } from "./streamer.js";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Minimal mocks for testing the Streamer in isolation.
|
|
7
|
+
* We only need the mutation calls the Streamer makes.
|
|
8
|
+
*/
|
|
9
|
+
function createMockCtx() {
|
|
10
|
+
return {
|
|
11
|
+
runQuery: vi.fn().mockResolvedValue(null),
|
|
12
|
+
runMutation: vi.fn().mockResolvedValue(null),
|
|
13
|
+
runAction: vi.fn().mockResolvedValue(null),
|
|
14
|
+
storage: {} as any,
|
|
15
|
+
auth: {} as any,
|
|
16
|
+
scheduler: { runAfter: vi.fn() } as any,
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function createMockComponent() {
|
|
21
|
+
return {
|
|
22
|
+
streams: {
|
|
23
|
+
take: "streams:take" as any,
|
|
24
|
+
addDelta: "streams:addDelta" as any,
|
|
25
|
+
finish: "streams:finish" as any,
|
|
26
|
+
abort: "streams:abort" as any,
|
|
27
|
+
heartbeat: "streams:heartbeat" as any,
|
|
28
|
+
},
|
|
29
|
+
} as any;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function createStreamer(ctx = createMockCtx(), component = createMockComponent()) {
|
|
33
|
+
const streamer = new Streamer(component, ctx, {
|
|
34
|
+
throttleMs: 50,
|
|
35
|
+
heartbeatMs: 60_000,
|
|
36
|
+
lockId: "test-lock",
|
|
37
|
+
threadId: "test-thread" as any,
|
|
38
|
+
streamId: "test-stream" as any,
|
|
39
|
+
includeToolInputDeltas: false,
|
|
40
|
+
});
|
|
41
|
+
return { streamer, ctx, component };
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
describe("Streamer", () => {
|
|
45
|
+
describe("fail() cancels pending flush timeout", () => {
|
|
46
|
+
it("should not write deltas after fail() is called", async () => {
|
|
47
|
+
const { streamer, ctx } = createStreamer();
|
|
48
|
+
streamer.enableDeltaStreaming();
|
|
49
|
+
await streamer.setMessageId("msg-1", false);
|
|
50
|
+
|
|
51
|
+
// Queue some parts via process() — this schedules a throttled flush
|
|
52
|
+
await streamer.process({ type: "text-delta" as any, id: "t1", delta: "hello " });
|
|
53
|
+
await streamer.process({ type: "text-delta" as any, id: "t1", delta: "world" });
|
|
54
|
+
|
|
55
|
+
// Now call fail() — this should cancel the pending flush
|
|
56
|
+
await streamer.fail("Provider connection lost");
|
|
57
|
+
|
|
58
|
+
// Verify abort was called
|
|
59
|
+
expect(ctx.runMutation).toHaveBeenCalledWith("streams:abort", {
|
|
60
|
+
streamId: "test-stream",
|
|
61
|
+
reason: "Provider connection lost",
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
// Wait longer than the throttle interval to give the (cancelled) timeout
|
|
65
|
+
// a chance to fire if it wasn't properly cancelled
|
|
66
|
+
await new Promise((resolve) => setTimeout(resolve, 150));
|
|
67
|
+
|
|
68
|
+
// addDelta should NEVER have been called — the flush was cancelled
|
|
69
|
+
const addDeltaCalls = ctx.runMutation.mock.calls.filter(
|
|
70
|
+
(call) => call[0] === "streams:addDelta",
|
|
71
|
+
);
|
|
72
|
+
expect(addDeltaCalls).toHaveLength(0);
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it("should still flush deltas on finish() (happy path)", async () => {
|
|
76
|
+
const { streamer, ctx } = createStreamer();
|
|
77
|
+
streamer.enableDeltaStreaming();
|
|
78
|
+
await streamer.setMessageId("msg-1", false);
|
|
79
|
+
|
|
80
|
+
await streamer.process({ type: "text-delta" as any, id: "t1", delta: "hello" });
|
|
81
|
+
|
|
82
|
+
await streamer.finish();
|
|
83
|
+
|
|
84
|
+
// finish() should flush remaining deltas then mark stream finished
|
|
85
|
+
const addDeltaCalls = ctx.runMutation.mock.calls.filter(
|
|
86
|
+
(call) => call[0] === "streams:addDelta",
|
|
87
|
+
);
|
|
88
|
+
expect(addDeltaCalls).toHaveLength(1);
|
|
89
|
+
|
|
90
|
+
expect(ctx.runMutation).toHaveBeenCalledWith("streams:finish", {
|
|
91
|
+
streamId: "test-stream",
|
|
92
|
+
});
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
describe("joinAdjacentDeltas", () => {
|
|
98
|
+
it("returns empty array for empty input", () => {
|
|
99
|
+
expect(joinAdjacentDeltas([])).toEqual([]);
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
it("joins adjacent text-delta chunks with the same id", () => {
|
|
103
|
+
const chunks: Array<UIMessageChunk> = [
|
|
104
|
+
{ type: "text-delta", id: "a", delta: "Hello" },
|
|
105
|
+
{ type: "text-delta", id: "a", delta: " world" },
|
|
106
|
+
{ type: "text-delta", id: "a", delta: "!" },
|
|
107
|
+
];
|
|
108
|
+
expect(joinAdjacentDeltas(chunks)).toEqual([{ type: "text-delta", id: "a", delta: "Hello world!" }]);
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
it("joins adjacent reasoning-delta chunks with the same id", () => {
|
|
112
|
+
const chunks: Array<UIMessageChunk> = [
|
|
113
|
+
{ type: "reasoning-delta", id: "r1", delta: "Let me " },
|
|
114
|
+
{ type: "reasoning-delta", id: "r1", delta: "think" },
|
|
115
|
+
];
|
|
116
|
+
expect(joinAdjacentDeltas(chunks)).toEqual([{ type: "reasoning-delta", id: "r1", delta: "Let me think" }]);
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
it("does not join text-delta chunks with different ids", () => {
|
|
120
|
+
const chunks: Array<UIMessageChunk> = [
|
|
121
|
+
{ type: "text-delta", id: "a", delta: "Hello" },
|
|
122
|
+
{ type: "text-delta", id: "b", delta: " world" },
|
|
123
|
+
];
|
|
124
|
+
expect(joinAdjacentDeltas(chunks)).toEqual([
|
|
125
|
+
{ type: "text-delta", id: "a", delta: "Hello" },
|
|
126
|
+
{ type: "text-delta", id: "b", delta: " world" },
|
|
127
|
+
]);
|
|
128
|
+
});
|
|
129
|
+
|
|
130
|
+
it("does not join text-delta and reasoning-delta even with same id", () => {
|
|
131
|
+
const chunks: Array<UIMessageChunk> = [
|
|
132
|
+
{ type: "text-delta", id: "a", delta: "Hello" },
|
|
133
|
+
{ type: "reasoning-delta", id: "a", delta: "think" },
|
|
134
|
+
];
|
|
135
|
+
expect(joinAdjacentDeltas(chunks)).toEqual([
|
|
136
|
+
{ type: "text-delta", id: "a", delta: "Hello" },
|
|
137
|
+
{ type: "reasoning-delta", id: "a", delta: "think" },
|
|
138
|
+
]);
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
it("does not join non-adjacent same-type chunks", () => {
|
|
142
|
+
const chunks: Array<UIMessageChunk> = [
|
|
143
|
+
{ type: "text-delta", id: "a", delta: "Hello" },
|
|
144
|
+
{ type: "text-start", id: "b" },
|
|
145
|
+
{ type: "text-delta", id: "a", delta: " world" },
|
|
146
|
+
];
|
|
147
|
+
expect(joinAdjacentDeltas(chunks)).toEqual([
|
|
148
|
+
{ type: "text-delta", id: "a", delta: "Hello" },
|
|
149
|
+
{ type: "text-start", id: "b" },
|
|
150
|
+
{ type: "text-delta", id: "a", delta: " world" },
|
|
151
|
+
]);
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
it("passes through non-delta chunk types unchanged", () => {
|
|
155
|
+
const chunks: Array<UIMessageChunk> = [
|
|
156
|
+
{ type: "text-start", id: "a" },
|
|
157
|
+
{ type: "text-end", id: "a" },
|
|
158
|
+
{ type: "start" },
|
|
159
|
+
{ type: "finish" },
|
|
160
|
+
];
|
|
161
|
+
expect(joinAdjacentDeltas(chunks)).toEqual(chunks);
|
|
162
|
+
});
|
|
163
|
+
|
|
164
|
+
it("handles mixed delta and non-delta chunks", () => {
|
|
165
|
+
const chunks: Array<UIMessageChunk> = [
|
|
166
|
+
{ type: "text-start", id: "a" },
|
|
167
|
+
{ type: "text-delta", id: "a", delta: "Hello" },
|
|
168
|
+
{ type: "text-delta", id: "a", delta: " world" },
|
|
169
|
+
{ type: "text-end", id: "a" },
|
|
170
|
+
{ type: "reasoning-start", id: "r1" },
|
|
171
|
+
{ type: "reasoning-delta", id: "r1", delta: "Step " },
|
|
172
|
+
{ type: "reasoning-delta", id: "r1", delta: "1" },
|
|
173
|
+
];
|
|
174
|
+
expect(joinAdjacentDeltas(chunks)).toEqual([
|
|
175
|
+
{ type: "text-start", id: "a" },
|
|
176
|
+
{ type: "text-delta", id: "a", delta: "Hello world" },
|
|
177
|
+
{ type: "text-end", id: "a" },
|
|
178
|
+
{ type: "reasoning-start", id: "r1" },
|
|
179
|
+
{ type: "reasoning-delta", id: "r1", delta: "Step 1" },
|
|
180
|
+
]);
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
it("handles a single chunk", () => {
|
|
184
|
+
const chunks: Array<UIMessageChunk> = [{ type: "text-delta", id: "a", delta: "Hello" }];
|
|
185
|
+
expect(joinAdjacentDeltas(chunks)).toEqual([{ type: "text-delta", id: "a", delta: "Hello" }]);
|
|
186
|
+
});
|
|
187
|
+
});
|
package/src/client/streamer.ts
CHANGED
|
@@ -24,6 +24,7 @@ export class Streamer {
|
|
|
24
24
|
lockId: string;
|
|
25
25
|
threadId: Id<"threads">;
|
|
26
26
|
streamId: Id<"streams">;
|
|
27
|
+
includeToolInputDeltas: boolean;
|
|
27
28
|
},
|
|
28
29
|
) {
|
|
29
30
|
this.#logger = new Logger(`streamer:${config.streamId}`);
|
|
@@ -129,7 +130,7 @@ export class Streamer {
|
|
|
129
130
|
try {
|
|
130
131
|
const queue = this.#queue;
|
|
131
132
|
this.#queue = [];
|
|
132
|
-
const compacted = compactQueue(queue);
|
|
133
|
+
const compacted = compactQueue(queue, this.config.includeToolInputDeltas);
|
|
133
134
|
if (compacted.length === 0) {
|
|
134
135
|
this.#logger.debug(`Skipping delta write: seq=${this.#seq}, rawParts=${queue.length}, compactedParts=0`);
|
|
135
136
|
return;
|
|
@@ -169,6 +170,11 @@ export class Streamer {
|
|
|
169
170
|
|
|
170
171
|
async fail(reason: string): Promise<void> {
|
|
171
172
|
try {
|
|
173
|
+
if (this.#flushTimeout != null) {
|
|
174
|
+
clearTimeout(this.#flushTimeout);
|
|
175
|
+
this.#flushTimeout = undefined;
|
|
176
|
+
}
|
|
177
|
+
this.#queue = [];
|
|
172
178
|
this.#logger.debug(`Aborting stream: ${reason}`);
|
|
173
179
|
await this.ctx.runMutation(this.component.streams.abort, {
|
|
174
180
|
streamId: this.config.streamId,
|
|
@@ -181,8 +187,9 @@ export class Streamer {
|
|
|
181
187
|
}
|
|
182
188
|
}
|
|
183
189
|
|
|
184
|
-
export function compactQueue(queue: Array<UIMessageChunk
|
|
185
|
-
|
|
190
|
+
export function compactQueue(queue: Array<UIMessageChunk>, includeToolInputDeltas = false): Array<UIMessageChunk> {
|
|
191
|
+
const filtered = includeToolInputDeltas ? queue : queue.filter((part) => part.type !== "tool-input-delta");
|
|
192
|
+
return joinAdjacentDeltas(filtered.map(dropUnnecessaryInfo));
|
|
186
193
|
}
|
|
187
194
|
|
|
188
195
|
export function dropUnnecessaryInfo(chunk: UIMessageChunk): UIMessageChunk {
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import type { FunctionReference } from "convex/server";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
import { createActionTool } from "./tools";
|
|
5
|
+
|
|
6
|
+
const fakeHandler = "internal:fake.handler" as unknown as FunctionReference<"action", "internal" | "public">;
|
|
7
|
+
|
|
8
|
+
describe("createActionTool", () => {
|
|
9
|
+
it("normalizes retry=true into enabled retry policy", () => {
|
|
10
|
+
const tool = createActionTool({
|
|
11
|
+
description: "test",
|
|
12
|
+
args: z.object({ value: z.string() }),
|
|
13
|
+
handler: fakeHandler,
|
|
14
|
+
retry: true,
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
expect(tool.retry).toEqual({ enabled: true });
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it("preserves custom retry policy", () => {
|
|
21
|
+
const tool = createActionTool({
|
|
22
|
+
description: "test",
|
|
23
|
+
args: z.object({ value: z.string() }),
|
|
24
|
+
handler: fakeHandler,
|
|
25
|
+
retry: {
|
|
26
|
+
enabled: true,
|
|
27
|
+
maxAttempts: 5,
|
|
28
|
+
backoff: { strategy: "fixed", delayMs: 250, jitter: false },
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
expect(tool.retry).toEqual({
|
|
33
|
+
enabled: true,
|
|
34
|
+
maxAttempts: 5,
|
|
35
|
+
backoff: { strategy: "fixed", delayMs: 250, jitter: false },
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it("omits retry policy when not provided", () => {
|
|
40
|
+
const tool = createActionTool({
|
|
41
|
+
description: "test",
|
|
42
|
+
args: z.object({ value: z.string() }),
|
|
43
|
+
handler: fakeHandler,
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
expect(tool.retry).toBeUndefined();
|
|
47
|
+
});
|
|
48
|
+
});
|