@convex-dev/agent 0.2.11-alpha.0 → 0.2.11-alpha.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 (19) hide show
  1. package/dist/client/definePlaygroundAPI.d.ts +42 -42
  2. package/dist/client/index.d.ts +38 -38
  3. package/dist/client/messages.d.ts +10 -10
  4. package/dist/client/search.d.ts +10 -10
  5. package/dist/client/search.d.ts.map +1 -1
  6. package/dist/client/search.js +29 -8
  7. package/dist/client/search.js.map +1 -1
  8. package/dist/client/streaming.d.ts +89 -89
  9. package/dist/component/messages.d.ts +113 -113
  10. package/dist/component/streams.d.ts +7 -7
  11. package/dist/component/threads.d.ts +7 -7
  12. package/dist/component/users.d.ts +3 -3
  13. package/dist/deltas.d.ts.map +1 -1
  14. package/dist/deltas.js +3 -1
  15. package/dist/deltas.js.map +1 -1
  16. package/package.json +1 -1
  17. package/src/client/search.test.ts +25 -4
  18. package/src/client/search.ts +34 -9
  19. package/src/deltas.ts +5 -1
package/dist/component/streams.d.ts CHANGED
@@ -3,8 +3,8 @@ import type { Doc, Id } from "./_generated/dataModel.js";
3
3
  import { type MutationCtx } from "./_generated/server.js";
4
4
  import type { WithoutSystemFields } from "convex/server";
5
5
  export declare const addDelta: import("convex/server").RegisteredMutation<"public", {
6
- start: number;
7
6
  streamId: import("convex/values").GenericId<"streamingMessages">;
7
+ start: number;
8
8
  end: number;
9
9
  parts: any[];
10
10
  }, Promise<boolean>>;
@@ -15,8 +15,8 @@ export declare const listDeltas: import("convex/server").RegisteredQuery<"public
15
15
  cursor: number;
16
16
  }[];
17
17
  }, Promise<{
18
- start: number;
19
18
  streamId: string;
19
+ start: number;
20
20
  end: number;
21
21
  parts: any[];
22
22
  }[]>>;
@@ -27,13 +27,13 @@ export declare const create: import("convex/server").RegisteredMutation<"public"
27
27
  provider?: string | undefined;
28
28
  providerOptions?: Record<string, Record<string, any>> | undefined;
29
29
  format?: "UIMessageChunk" | "TextStreamPart" | undefined;
30
- threadId: import("convex/values").GenericId<"threads">;
31
30
  order: number;
31
+ threadId: import("convex/values").GenericId<"threads">;
32
32
  stepOrder: number;
33
33
  }, Promise<import("convex/values").GenericId<"streamingMessages">>>;
34
34
  export declare const list: import("convex/server").RegisteredQuery<"public", {
35
35
  startOrder?: number | undefined;
36
- statuses?: ("aborted" | "streaming" | "finished")[] | undefined;
36
+ statuses?: ("streaming" | "finished" | "aborted")[] | undefined;
37
37
  threadId: import("convex/values").GenericId<"threads">;
38
38
  }, Promise<{
39
39
  userId?: string | undefined;
@@ -42,14 +42,14 @@ export declare const list: import("convex/server").RegisteredQuery<"public", {
42
42
  provider?: string | undefined;
43
43
  providerOptions?: Record<string, Record<string, any>> | undefined;
44
44
  format?: "UIMessageChunk" | "TextStreamPart" | undefined;
45
+ status: "streaming" | "finished" | "aborted";
45
46
  order: number;
46
47
  stepOrder: number;
47
- status: "aborted" | "streaming" | "finished";
48
48
  streamId: string;
49
49
  }[]>>;
50
50
  export declare const abortByOrder: import("convex/server").RegisteredMutation<"public", {
51
- threadId: import("convex/values").GenericId<"threads">;
52
51
  order: number;
52
+ threadId: import("convex/values").GenericId<"threads">;
53
53
  reason: string;
54
54
  }, Promise<boolean>>;
55
55
  export declare const abort: import("convex/server").RegisteredMutation<"public", {
@@ -98,8 +98,8 @@ export declare const deleteStreamsPageForThreadIdMutation: import("convex/server
98
98
  deltaCursor: string | undefined;
99
99
  }>>;
100
100
  export declare const deleteAllStreamsForThreadIdAsync: import("convex/server").RegisteredMutation<"public", {
101
- deltaCursor?: string | undefined;
102
101
  streamOrder?: number | undefined;
102
+ deltaCursor?: string | undefined;
103
103
  threadId: import("convex/values").GenericId<"threads">;
104
104
  }, Promise<{
105
105
  isDone: boolean;
package/dist/component/threads.d.ts CHANGED
@@ -47,12 +47,12 @@ export declare const createThread: import("convex/server").RegisteredMutation<"p
47
47
  _creationTime: number;
48
48
  status: "active" | "archived";
49
49
  }>>;
50
- export declare const threadFieldsSupportingPatch: ("userId" | "status" | "title" | "summary")[];
50
+ export declare const threadFieldsSupportingPatch: ("status" | "userId" | "title" | "summary")[];
51
51
  export declare const updateThread: import("convex/server").RegisteredMutation<"public", {
52
52
  threadId: import("convex/values").GenericId<"threads">;
53
53
  patch: {
54
- userId?: string | undefined;
55
54
  status?: "active" | "archived" | undefined;
55
+ userId?: string | undefined;
56
56
  title?: string | undefined;
57
57
  summary?: string | undefined;
58
58
  };
@@ -88,14 +88,14 @@ export declare const deleteAllForThreadIdSync: import("convex/server").Registere
88
88
  export declare const _deletePageForThreadId: import("convex/server").RegisteredMutation<"internal", {
89
89
  limit?: number | undefined;
90
90
  cursor?: string | undefined;
91
- deltaCursor?: string | undefined;
92
91
  messagesDone?: boolean | undefined;
93
- streamOrder?: number | undefined;
94
92
  streamsDone?: boolean | undefined;
93
+ streamOrder?: number | undefined;
94
+ deltaCursor?: string | undefined;
95
95
  threadId: import("convex/values").GenericId<"threads">;
96
96
  }, Promise<{
97
- cursor: string;
98
97
  isDone: boolean;
98
+ cursor: string;
99
99
  }>>;
100
100
  /**
101
101
  * Use this to delete a thread and everything it contains.
@@ -104,10 +104,10 @@ export declare const _deletePageForThreadId: import("convex/server").RegisteredM
104
104
  export declare const deleteAllForThreadIdAsync: import("convex/server").RegisteredMutation<"public", {
105
105
  limit?: number | undefined;
106
106
  cursor?: string | undefined;
107
- deltaCursor?: string | undefined;
108
107
  messagesDone?: boolean | undefined;
109
- streamOrder?: number | undefined;
110
108
  streamsDone?: boolean | undefined;
109
+ streamOrder?: number | undefined;
110
+ deltaCursor?: string | undefined;
111
111
  threadId: import("convex/values").GenericId<"threads">;
112
112
  }, Promise<{
113
113
  isDone: boolean;
package/dist/component/users.d.ts CHANGED
@@ -21,8 +21,8 @@ export declare const deleteAllForUserIdAsync: import("convex/server").Registered
21
21
  userId: string;
22
22
  }, Promise<boolean>>;
23
23
  export declare const _deleteAllForUserIdAsync: import("convex/server").RegisteredMutation<"internal", {
24
- deltaCursor?: string | undefined;
25
24
  streamOrder?: number | undefined;
25
+ deltaCursor?: string | undefined;
26
26
  streamsInProgress?: boolean | undefined;
27
27
  userId: string;
28
28
  messagesCursor: string | null;
@@ -30,16 +30,16 @@ export declare const _deleteAllForUserIdAsync: import("convex/server").Registere
30
30
  threadInProgress: import("convex/values").GenericId<"threads"> | null;
31
31
  }, Promise<boolean>>;
32
32
  export declare const _deletePageForUserId: import("convex/server").RegisteredMutation<"internal", {
33
- deltaCursor?: string | undefined;
34
33
  streamOrder?: number | undefined;
34
+ deltaCursor?: string | undefined;
35
35
  streamsInProgress?: boolean | undefined;
36
36
  userId: string;
37
37
  messagesCursor: string | null;
38
38
  threadsCursor: string | null;
39
39
  threadInProgress: import("convex/values").GenericId<"threads"> | null;
40
40
  }, Promise<{
41
- deltaCursor?: string | undefined;
42
41
  streamOrder?: number | undefined;
42
+ deltaCursor?: string | undefined;
43
43
  streamsInProgress?: boolean | undefined;
44
44
  isDone: boolean;
45
45
  messagesCursor: string | null;
package/dist/deltas.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"deltas.d.ts","sourceRoot":"","sources":["../src/deltas.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,cAAc,EACpB,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,aAAa,EACnB,MAAM,iBAAiB,CAAC;AAGzB,wBAAgB,cAAc,CAAC,QAAQ,GAAG,OAAO,EAC/C,aAAa,EAAE,aAAa,GAAG;IAAE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAE,EACtD,QAAQ,EAAE,MAAM,GACf,SAAS,CAAC,QAAQ,CAAC,CAcrB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAC9B,aAAa,GAAG,WAAW,CAW7B;AAED,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,cAAc,EAAE,sBAiCxB;AAED,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,aAAa,EAAE,EAC/B,SAAS,EAAE,WAAW,EAAE,GACvB,OAAO,CAAC,SAAS,EAAE,CAAC,CAyBtB;AAED;;GAEG;AAEH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,aAAa,EAAE,EAC/B,eAAe,EAAE,KAAK,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC,EACF,SAAS,EAAE,WAAW,EAAE,GACvB;IACD,SAAS,EAAE;IACX,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/D,OAAO;CACR,CAgCA;AAED,wBAAgB,QAAQ,CAAC,CAAC,SAAS,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAC7D,MAAM,EAAE,WAAW,EAAE,EACrB,UAAU,CAAC,EAAE,MAAM,GAClB;IAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CA0BhC;AAED;;;GAGG;AAGH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EACJ;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,CAAA;CAAE,GACxD,SAAS,EACb,MAAM,EAAE,WAAW,EAAE,GACpB,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,CAAA;CAAE,EAAE,OAAO,CAAC,CAiSrE;AAyBD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAsCpE"}
1
+ {"version":3,"file":"deltas.d.ts","sourceRoot":"","sources":["../src/deltas.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,cAAc,EACpB,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,aAAa,EACnB,MAAM,iBAAiB,CAAC;AAGzB,wBAAgB,cAAc,CAAC,QAAQ,GAAG,OAAO,EAC/C,aAAa,EAAE,aAAa,GAAG;IAAE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAE,EACtD,QAAQ,EAAE,MAAM,GACf,SAAS,CAAC,QAAQ,CAAC,CAcrB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAC9B,aAAa,GAAG,WAAW,CAW7B;AAED,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,cAAc,EAAE,sBAiCxB;AAED,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,aAAa,EAAE,EAC/B,SAAS,EAAE,WAAW,EAAE,GACvB,OAAO,CAAC,SAAS,EAAE,CAAC,CAyBtB;AAED;;GAEG;AAEH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,aAAa,EAAE,EAC/B,eAAe,EAAE,KAAK,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC,EACF,SAAS,EAAE,WAAW,EAAE,GACvB;IACD,SAAS,EAAE;IACX,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/D,OAAO;CACR,CAgCA;AAED,wBAAgB,QAAQ,CAAC,CAAC,SAAS,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAC7D,MAAM,EAAE,WAAW,EAAE,EACrB,UAAU,CAAC,EAAE,MAAM,GAClB;IAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CA0BhC;AAED;;;GAGG;AAGH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EACJ;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,CAAA;CAAE,GACxD,SAAS,EACb,MAAM,EAAE,WAAW,EAAE,GACpB,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,CAAA;CAAE,EAAE,OAAO,CAAC,CAiSrE;AAyBD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CA0CpE"}
package/dist/deltas.js CHANGED
@@ -415,7 +415,9 @@ export function combineUIMessages(messages) {
415
415
  return [message];
416
416
  }
417
417
  const previous = acc.at(-1);
418
- if (previous.role !== message.role) {
418
+ if (message.order !== previous.order ||
419
+ previous.role !== message.role ||
420
+ message.role !== "assistant") {
419
421
  acc.push(message);
420
422
  return acc;
421
423
  }
package/dist/deltas.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"deltas.js","sourceRoot":"","sources":["../src/deltas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deltas.js","sourceRoot":"","sources":["../src/deltas.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "email": "support@convex.dev",
8
8
  "url": "https://github.com/get-convex/agent/issues"
9
9
  },
10
- "version": "0.2.11-alpha.0",
10
+ "version": "0.2.11-alpha.2",
11
11
  "license": "Apache-2.0",
12
12
  "keywords": [
13
13
  "convex",
package/src/client/search.test.ts CHANGED
@@ -190,10 +190,25 @@ describe("search.ts", () => {
190
190
  it("should filter out orphaned tool messages", () => {
191
191
  const messages: MessageDoc[] = [
192
192
  {
193
- _id: "1",
193
+ _id: "0",
194
194
  message: { role: "user", content: "Hello" },
195
195
  order: 1,
196
196
  } as MessageDoc,
197
+ {
198
+ _id: "1",
199
+ message: {
200
+ role: "assistant",
201
+ content: [
202
+ {
203
+ type: "tool-call",
204
+ toolCallId: "call_orphaned",
205
+ toolName: "test",
206
+ args: {},
207
+ },
208
+ ],
209
+ },
210
+ order: 1,
211
+ } as MessageDoc,
197
212
  {
198
213
  _id: "2",
199
214
  message: {
@@ -201,18 +216,24 @@ describe("search.ts", () => {
201
216
  content: [
202
217
  {
203
218
  type: "tool-result",
204
- toolCallId: "call_orphaned",
219
+ toolCallId: "result_orphaned",
205
220
  result: "orphaned",
206
221
  },
207
222
  ],
208
223
  },
209
224
  order: 2,
210
225
  } as MessageDoc,
226
+ {
227
+ _id: "3",
228
+ message: { role: "assistant", content: "I'll help you with that" },
229
+ order: 1,
230
+ } as MessageDoc,
211
231
  ];
212
232
 
213
233
  const result = filterOutOrphanedToolMessages(messages);
214
- expect(result).toHaveLength(1);
215
- expect(result[0]._id).toBe("1");
234
+ expect(result).toHaveLength(2);
235
+ expect(result[0]._id).toBe("0");
236
+ expect(result[1]._id).toBe("3");
216
237
  });
217
238
  });
218
239
 
package/src/client/search.ts CHANGED
@@ -230,23 +230,48 @@ export async function fetchRecentAndSearchMessages(
230
230
  */
231
231
  export function filterOutOrphanedToolMessages(docs: MessageDoc[]) {
232
232
  const toolCallIds = new Set<string>();
233
+ const toolResultIds = new Set<string>();
233
234
  const result: MessageDoc[] = [];
234
235
  for (const doc of docs) {
235
- if (
236
- doc.message?.role === "assistant" &&
237
- Array.isArray(doc.message.content)
238
- ) {
236
+ if (doc.message && Array.isArray(doc.message.content)) {
239
237
  for (const content of doc.message.content) {
240
238
  if (content.type === "tool-call") {
241
239
  toolCallIds.add(content.toolCallId);
240
+ } else if (content.type === "tool-result") {
241
+ toolResultIds.add(content.toolCallId);
242
242
  }
243
243
  }
244
- result.push(doc);
244
+ }
245
+ }
246
+ for (const doc of docs) {
247
+ if (
248
+ doc.message?.role === "assistant" &&
249
+ Array.isArray(doc.message.content)
250
+ ) {
251
+ const content = doc.message.content.filter(
252
+ (p) => p.type !== "tool-call" || toolResultIds.has(p.toolCallId),
253
+ );
254
+ if (content.length) {
255
+ result.push({
256
+ ...doc,
257
+ message: {
258
+ ...doc.message,
259
+ content,
260
+ },
261
+ });
262
+ }
245
263
  } else if (doc.message?.role === "tool") {
246
- if (doc.message.content.every((c) => toolCallIds.has(c.toolCallId))) {
247
- result.push(doc);
248
- } else {
249
- console.debug("Filtering out orphaned tool message", doc);
264
+ const content = doc.message.content.filter((c) =>
265
+ toolCallIds.has(c.toolCallId),
266
+ );
267
+ if (content.length) {
268
+ result.push({
269
+ ...doc,
270
+ message: {
271
+ ...doc.message,
272
+ content,
273
+ },
274
+ });
250
275
  }
251
276
  } else {
252
277
  result.push(doc);
package/src/deltas.ts CHANGED
@@ -536,7 +536,11 @@ export function combineUIMessages(messages: UIMessage[]): UIMessage[] {
536
536
  return [message];
537
537
  }
538
538
  const previous = acc.at(-1)!;
539
- if (previous.role !== message.role) {
539
+ if (
540
+ message.order !== previous.order ||
541
+ previous.role !== message.role ||
542
+ message.role !== "assistant"
543
+ ) {
540
544
  acc.push(message);
541
545
  return acc;
542
546
  }