@convex-dev/agent 0.1.3 → 0.1.4

package/dist/esm/react/types.d.ts

@@ -0,0 +1,26 @@
+import type { BetterOmit, Expand } from "convex-helpers";
+import type { FunctionArgs, FunctionReference, PaginationOptions, PaginationResult } from "convex/server";
+import type { MessageDoc } from "../client";
+import type { SyncStreamsReturnValue } from "../client/types";
+import type { StreamArgs } from "../validators";
+export type ThreadQuery<Args = unknown, M extends MessageDoc = MessageDoc> = FunctionReference<"query", "public", {
+    threadId: string;
+    paginationOpts: PaginationOptions;
+    /**
+     * If { stream: true } is passed, it will also query for stream deltas.
+     * In order for this to work, the query must take as an argument streamArgs.
+     */
+    streamArgs?: StreamArgs;
+} & Args, PaginationResult<M> & {
+    streams?: SyncStreamsReturnValue;
+}>;
+export type ThreadStreamQuery<Args = Record<string, unknown>, M extends MessageDoc = MessageDoc> = FunctionReference<"query", "public", {
+    threadId: string;
+    paginationOpts: PaginationOptions;
+    streamArgs?: StreamArgs;
+} & Args, PaginationResult<M> & {
+    streams: SyncStreamsReturnValue;
+}>;
+export type ThreadMessagesArgs<Query extends ThreadQuery<unknown, MessageDoc>> = Query extends ThreadQuery<unknown, MessageDoc> ? Expand<BetterOmit<FunctionArgs<Query>, "paginationOpts" | "streamArgs">> : never;
+export type ThreadMessagesResult<Query extends ThreadQuery<unknown, MessageDoc>> = Query extends ThreadQuery<unknown, infer M> ? M : never;
+//# sourceMappingURL=types.d.ts.map

package/dist/esm/react/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/react/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,MAAM,WAAW,CACrB,IAAI,GAAG,OAAO,EACd,CAAC,SAAS,UAAU,GAAG,UAAU,IAC/B,iBAAiB,CACnB,OAAO,EACP,QAAQ,EACR;IACE,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,iBAAiB,CAAC;IAElC;;;OAGG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,GAAG,IAAI,EACR,gBAAgB,CAAC,CAAC,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,sBAAsB,CAAA;CAAE,CAC3D,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAC3B,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,CAAC,SAAS,UAAU,GAAG,UAAU,IAC/B,iBAAiB,CACnB,OAAO,EACP,QAAQ,EACR;IACE,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,iBAAiB,CAAC;IAClC,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,GAAG,IAAI,EACR,gBAAgB,CAAC,CAAC,CAAC,GAAG;IAAE,OAAO,EAAE,sBAAsB,CAAA;CAAE,CAC1D,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,IAC3E,KAAK,SAAS,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,GAC1C,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,gBAAgB,GAAG,YAAY,CAAC,CAAC,GACxE,KAAK,CAAC;AAEZ,MAAM,MAAM,oBAAoB,CAC9B,KAAK,SAAS,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,IAC5C,KAAK,SAAS,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}

package/dist/esm/react/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/esm/react/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/react/types.ts"],"names":[],"mappings":""}

package/dist/esm/react/useSmoothText.d.ts

@@ -0,0 +1,20 @@
+/**
+ * A hook that smoothly displays text as it is streamed.
+ *
+ * @param text The text to display. Pass in the full text each time.
+ * @param charsPerSec The number of characters to display per second.
+ * @returns A tuple of the visible text and the state of the smooth text,
+ * including the current cursor position and whether it's still streaming.
+ * This allows you to decide if it's too far behind and you want to adjust
+ * the charsPerSec or just prefer the full text.
+ */
+export declare function useSmoothText(text: string, { charsPerSec, }?: {
+    /**
+     * The number of characters to display per second.
+     */
+    charsPerSec?: number;
+}): [string, {
+    cursor: number;
+    isStreaming: boolean;
+}];
+//# sourceMappingURL=useSmoothText.d.ts.map

package/dist/esm/react/useSmoothText.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSmoothText.d.ts","sourceRoot":"","sources":["../../../src/react/useSmoothText.ts"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,EACE,WAAiB,GAClB,GAAE;IACD;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACjB,GACL,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,CAkDpD"}

package/dist/esm/react/useSmoothText.js

@@ -0,0 +1,50 @@
+import { useEffect, useRef, useState } from "react";
+const FPS = 20;
+const MS_PER_FRAME = 1000 / FPS;
+const MAX_TIME_JUMP_MS = 250;
+/**
+ * A hook that smoothly displays text as it is streamed.
+ *
+ * @param text The text to display. Pass in the full text each time.
+ * @param charsPerSec The number of characters to display per second.
+ * @returns A tuple of the visible text and the state of the smooth text,
+ * including the current cursor position and whether it's still streaming.
+ * This allows you to decide if it's too far behind and you want to adjust
+ * the charsPerSec or just prefer the full text.
+ */
+export function useSmoothText(text, { charsPerSec = 256, } = {}) {
+    const [visibleText, setVisibleText] = useState(text);
+    const smoothState = useRef({
+        tick: Date.now() + (text.length * 1000) / charsPerSec,
+        cursor: text.length,
+        start: Date.now(),
+        initialLength: text.length,
+        charsPerMs: charsPerSec / 1000,
+    });
+    const isStreaming = smoothState.current.cursor < text.length;
+    useEffect(() => {
+        if (!isStreaming) {
+            return;
+        }
+        const latestCharsPerMs = (text.length - smoothState.current.initialLength) /
+            (Date.now() - smoothState.current.start);
+        // Smooth out the charsPerSec by averaging it with the previous value.
+        smoothState.current.charsPerMs = Math.min((2 * latestCharsPerMs + smoothState.current.charsPerMs) / 3, smoothState.current.charsPerMs * 2);
+        function update() {
+            if (smoothState.current.cursor >= text.length) {
+                return;
+            }
+            const now = Date.now();
+            const timeSinceLastUpdate = Math.min(MAX_TIME_JUMP_MS, now - smoothState.current.tick);
+            const chars = Math.floor(timeSinceLastUpdate * smoothState.current.charsPerMs);
+            smoothState.current.cursor = Math.min(smoothState.current.cursor + chars, text.length);
+            smoothState.current.tick = now;
+            setVisibleText(text.slice(0, smoothState.current.cursor));
+        }
+        update();
+        const interval = setInterval(update, MS_PER_FRAME);
+        return () => clearInterval(interval);
+    }, [text, isStreaming, charsPerSec]);
+    return [visibleText, { cursor: smoothState.current.cursor, isStreaming }];
+}
+//# sourceMappingURL=useSmoothText.js.map

package/dist/esm/react/useSmoothText.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSmoothText.js","sourceRoot":"","sources":["../../../src/react/useSmoothText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEpD,MAAM,GAAG,GAAG,EAAE,CAAC;AACf,MAAM,YAAY,GAAG,IAAI,GAAG,GAAG,CAAC;AAChC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAY,EACZ,EACE,WAAW,GAAG,GAAG,MAMf,EAAE;IAEN,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,MAAM,CAAC;QACzB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,WAAW;QACrD,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;QACjB,aAAa,EAAE,IAAI,CAAC,MAAM;QAC1B,UAAU,EAAE,WAAW,GAAG,IAAI;KAC/B,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAE7D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,MAAM,gBAAgB,GACpB,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;YACjD,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3C,sEAAsE;QACtE,WAAW,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CACvC,CAAC,CAAC,GAAG,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAC3D,WAAW,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,CACnC,CAAC;QAEF,SAAS,MAAM;YACb,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC9C,OAAO;YACT,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAClC,gBAAgB,EAChB,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAC/B,CAAC;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CACtB,mBAAmB,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CACrD,CAAC;YACF,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CACnC,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,EAClC,IAAI,CAAC,MAAM,CACZ,CAAC;YACF,WAAW,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC;YAC/B,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,MAAM,EAAE,CAAC;QACT,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACnD,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IAErC,OAAO,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;AAC5E,CAAC"}

package/package.json

@@ -7,7 +7,7 @@
     "email": "support@convex.dev",
     "url": "https://github.com/get-convex/agent/issues"
   },
-  "version": "0.1.3",
+  "version": "0.1.4",
   "license": "Apache-2.0",
   "keywords": [
     "convex",
@@ -105,6 +105,9 @@
     "chokidar-cli": "^3.0.0",
     "convex-test": "^0.0.37",
     "eslint": "^9.24.0",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-react": "^7.34.0",
+    "eslint-plugin-react-hooks": "^5.2.0",
     "globals": "^15.15.0",
     "prettier": "3.2.5",
     "typescript": "^5.8.3",

package/src/client/index.ts

@@ -464,7 +464,15 @@ export class Agent<AgentTools extends ToolSet> {
       const searchMessages = await ctx.runAction(
         this.component.messages.searchMessages,
         {
-          userId: opts?.searchOtherThreads ? args.userId : undefined,
+          searchAllMessagesForUserId: opts?.searchOtherThreads
+            ? args.userId ??
+              (args.threadId &&
+                (
+                  await ctx.runQuery(this.component.threads.getThread, {
+                    threadId: args.threadId,
+                  })
+                )?.userId)
+            : undefined,
           threadId: args.threadId,
           beforeMessageId: args.upToAndIncludingMessageId,
           ...(await this._searchOptionsWithDefaults(opts, messagesToSearch)),
@@ -752,7 +760,7 @@ export class Agent<AgentTools extends ToolSet> {
   >(
     ctx: RunActionCtx,
     {
-      userId,
+      userId: argsUserId,
       threadId,
       usageHandler,
       tools: threadTools,
@@ -773,11 +781,12 @@ export class Agent<AgentTools extends ToolSet> {
     GenerateTextResult<TOOLS extends undefined ? AgentTools : TOOLS, OUTPUT> &
       GenerationOutputMetadata
   > {
-    const { args: aiArgs, messageId } = await this._saveMessagesAndFetchContext(
-      ctx,
-      args,
-      { userId, threadId, ...options }
-    );
+    const context = await this._saveMessagesAndFetchContext(ctx, args, {
+      userId: argsUserId,
+      threadId,
+      ...options,
+    });
+    const { args: aiArgs, messageId, userId } = context;
     const toolCtx = { ...ctx, userId, threadId, messageId, agent: this };
     const tools = wrapTools(
       toolCtx,
@@ -848,7 +857,7 @@ export class Agent<AgentTools extends ToolSet> {
   >(
     ctx: RunActionCtx,
     {
-      userId,
+      userId: argsUserId,
       threadId,
       usageHandler,
       /**
@@ -891,11 +900,11 @@ export class Agent<AgentTools extends ToolSet> {
       GenerationOutputMetadata
   > {
     const context = await this._saveMessagesAndFetchContext(ctx, args, {
-      userId,
+      userId: argsUserId,
       threadId,
       ...options,
     });
-    const { args: aiArgs, messageId, order, stepOrder } = context;
+    const { args: aiArgs, messageId, order, stepOrder, userId } = context;
     const toolCtx = { ...ctx, userId, threadId, messageId, agent: this };
     const tools = wrapTools(
       toolCtx,
@@ -993,7 +1002,7 @@ export class Agent<AgentTools extends ToolSet> {
     ctx: RunActionCtx | RunMutationCtx,
     args: T,
     {
-      userId,
+      userId: argsUserId,
       threadId,
       contextOptions,
       storageOptions,
@@ -1003,6 +1012,7 @@ export class Agent<AgentTools extends ToolSet> {
     } & Options
   ): Promise<{
     args: T & { model: LanguageModelV1 };
+    userId: string | undefined;
     messageId: string | undefined;
     order: number | undefined;
     stepOrder: number | undefined;
@@ -1013,6 +1023,11 @@ export class Agent<AgentTools extends ToolSet> {
     const messages = args.promptMessageId
       ? []
       : promptOrMessagesToCoreMessages(args);
+    const userId =
+      argsUserId ??
+      (threadId &&
+        (await ctx.runQuery(this.component.threads.getThread, { threadId }))
+          ?.userId);
     assert(
       !args.promptMessageId || !(args.prompt || args.messages),
       "you can't specify a prompt or message if you specify a promptMessageId"
@@ -1063,6 +1078,7 @@ export class Agent<AgentTools extends ToolSet> {
           ...messages,
         ],
       } as T & { model: LanguageModelV1 },
+      userId,
       messageId,
       order,
       stepOrder,
@@ -1079,7 +1095,7 @@ export class Agent<AgentTools extends ToolSet> {
   async generateObject<T>(
     ctx: RunActionCtx,
     {
-      userId,
+      userId: argsUserId,
       threadId,
       usageHandler,
     }: { userId?: string; threadId?: string; usageHandler?: UsageHandler },
@@ -1093,11 +1109,12 @@ export class Agent<AgentTools extends ToolSet> {
      */
     options?: Options
   ): Promise<GenerateObjectResult<T> & GenerationOutputMetadata> {
-    const { args: aiArgs, messageId } = await this._saveMessagesAndFetchContext(
-      ctx,
-      args,
-      { userId, threadId, ...options }
-    );
+    const context = await this._saveMessagesAndFetchContext(ctx, args, {
+      userId: argsUserId,
+      threadId,
+      ...options,
+    });
+    const { args: aiArgs, messageId, userId } = context;
     const trackUsage = usageHandler ?? this.options.usageHandler;
     const saveOutputMessages =
       options?.storageOptions?.saveOutputMessages ??
@@ -1150,7 +1167,7 @@ export class Agent<AgentTools extends ToolSet> {
   async streamObject<T>(
     ctx: RunActionCtx,
     {
-      userId,
+      userId: argsUserId,
       threadId,
       usageHandler,
     }: { userId?: string; threadId?: string; usageHandler?: UsageHandler },
@@ -1167,11 +1184,12 @@ export class Agent<AgentTools extends ToolSet> {
     StreamObjectResult<DeepPartial<T>, T, never> & GenerationOutputMetadata
   > {
     // TODO: unify all this shared code between all the generate* and stream* functions
-    const { args: aiArgs, messageId } = await this._saveMessagesAndFetchContext(
-      ctx,
-      args,
-      { userId, threadId, ...options }
-    );
+    const context = await this._saveMessagesAndFetchContext(ctx, args, {
+      userId: argsUserId,
+      threadId,
+      ...options,
+    });
+    const { args: aiArgs, messageId, userId } = context;
     const trackUsage = usageHandler ?? this.options.usageHandler;
     const saveOutputMessages =
       options?.storageOptions?.saveOutputMessages ??

package/src/client/streaming.ts

@@ -9,7 +9,7 @@ export type StreamingOptions = {
    * Note: this is not a guarantee that every delta will be exactly one line.
    * E.g. if "line" is specified, it won't save any deltas until it encounters
    * a newline character.
-   * Defaults to "word".
+   * Defaults to a regex that chunks by punctuation followed by whitespace.
    */
   chunking?: "word" | "line" | RegExp | ChunkDetector;
   /**
@@ -19,7 +19,8 @@ export type StreamingOptions = {
   throttleMs?: number;
 };
 export const DEFAULT_STREAMING_OPTIONS = {
-  chunking: "word",
+  // This chunks by sentences / clauses. Punctuation followed by whitespace.
+  chunking: /[\p{P}\s]/u,
   throttleMs: 250,
 } satisfies StreamingOptions;
 

package/src/component/_generated/api.d.ts

@@ -1375,9 +1375,9 @@ export type Mounts = {
         beforeMessageId?: string;
         limit: number;
         messageRange?: { after: number; before: number };
+        searchAllMessagesForUserId?: string;
         text?: string;
         threadId?: string;
-        userId?: string;
         vector?: Array<number>;
         vectorModel?: string;
         vectorScoreThreshold?: number;
@@ -1529,9 +1529,9 @@ export type Mounts = {
       {
         beforeMessageId?: string;
         limit: number;
+        searchAllMessagesForUserId?: string;
         text: string;
         threadId?: string;
-        userId?: string;
       },
       Array<{
         _creationTime: number;

package/src/component/messages.ts

@@ -454,19 +454,22 @@ export const getThreadMessages = query({
 
 export const searchMessages = action({
   args: {
-    userId: v.optional(v.string()),
     threadId: v.optional(v.id("threads")),
+    searchAllMessagesForUserId: v.optional(v.string()),
     beforeMessageId: v.optional(v.id("messages")),
     ...vSearchOptions.fields,
   },
   returns: v.array(vMessageDoc),
   handler: async (ctx, args): Promise<MessageDoc[]> => {
-    assert(args.userId || args.threadId, "Specify userId or threadId");
+    assert(
+      args.searchAllMessagesForUserId || args.threadId,
+      "Specify userId or threadId"
+    );
     const limit = args.limit;
     let textSearchMessages: MessageDoc[] | undefined;
     if (args.text) {
       textSearchMessages = await ctx.runQuery(api.messages.textSearch, {
-        userId: args.userId,
+        searchAllMessagesForUserId: args.searchAllMessagesForUserId,
         threadId: args.threadId,
         text: args.text,
         limit,
@@ -483,7 +486,7 @@ export const searchMessages = action({
           dimension,
           model: args.vectorModel ?? "unknown",
           table: "messages",
-          userId: args.userId,
+          searchAllMessagesForUserId: args.searchAllMessagesForUserId,
           threadId: args.threadId,
           limit,
         })
@@ -503,7 +506,7 @@ export const searchMessages = action({
       const messages: MessageDoc[] = await ctx.runQuery(
         internal.messages._fetchSearchMessages,
         {
-          userId: args.userId,
+          searchAllMessagesForUserId: args.searchAllMessagesForUserId,
           threadId: args.threadId,
           vectorIds,
           textSearchMessages: textSearchMessages?.filter(
@@ -522,9 +525,9 @@ export const searchMessages = action({
 
 export const _fetchSearchMessages = internalQuery({
   args: {
-    userId: v.optional(v.string()),
     threadId: v.optional(v.id("threads")),
     vectorIds: v.array(vVectorId),
+    searchAllMessagesForUserId: v.optional(v.string()),
     textSearchMessages: v.optional(v.array(vMessageDoc)),
     messageRange: v.object({ before: v.number(), after: v.number() }),
     beforeMessageId: v.optional(v.id("messages")),
@@ -534,8 +537,11 @@ export const _fetchSearchMessages = internalQuery({
   handler: async (ctx, args): Promise<MessageDoc[]> => {
     const beforeMessage =
       args.beforeMessageId && (await ctx.db.get(args.beforeMessageId));
-    const { userId, threadId } = args;
-    assert(userId || threadId, "Specify userId or threadId to search");
+    const { searchAllMessagesForUserId, threadId } = args;
+    assert(
+      searchAllMessagesForUserId || threadId,
+      "Specify searchAllMessagesForUserId or threadId to search"
+    );
     let messages: MessageDoc[] = (
       await Promise.all(
         args.vectorIds.map((embeddingId) =>
@@ -543,9 +549,9 @@ export const _fetchSearchMessages = internalQuery({
             .query("messages")
             .withIndex("embeddingId", (q) => q.eq("embeddingId", embeddingId))
             .filter((q) =>
-              userId
-                ? q.eq(q.field("userId"), userId)
-                : q.eq(q.field("threadId"), threadId)
+              searchAllMessagesForUserId
+                ? q.eq(q.field("userId"), searchAllMessagesForUserId)
+                : q.eq(q.field("threadId"), threadId!)
             )
             // Don't include pending. Failed messages hopefully are deleted but may as well be safe.
             .filter((q) => q.eq(q.field("status"), "success"))
@@ -632,21 +638,26 @@ export const _fetchSearchMessages = internalQuery({
 export const textSearch = query({
   args: {
     threadId: v.optional(v.id("threads")),
-    userId: v.optional(v.string()),
+    searchAllMessagesForUserId: v.optional(v.string()),
     text: v.string(),
     limit: v.number(),
     beforeMessageId: v.optional(v.id("messages")),
   },
   handler: async (ctx, args) => {
-    assert(args.userId || args.threadId, "Specify userId or threadId");
+    assert(
+      args.searchAllMessagesForUserId || args.threadId,
+      "Specify userId or threadId"
+    );
     const beforeMessage =
       args.beforeMessageId && (await ctx.db.get(args.beforeMessageId));
     const order = beforeMessage?.order;
     const messages = await ctx.db
       .query("messages")
       .withSearchIndex("text_search", (q) =>
-        args.userId
-          ? q.search("text", args.text).eq("userId", args.userId)
+        args.searchAllMessagesForUserId
+          ? q
+              .search("text", args.text)
+              .eq("userId", args.searchAllMessagesForUserId)
           : q.search("text", args.text).eq("threadId", args.threadId!)
       )
       // Just in case tool messages slip through

package/src/component/streams.ts

@@ -51,10 +51,9 @@ export const listDeltas = query({
         );
       totalDeltas += streamDeltas.length;
       deltas.push(
-        ...streamDeltas.map((d) => ({
-          streamId: d.streamId.toString(),
-          ...pick(d, ["start", "end", "parts"]),
-        }))
+        ...streamDeltas.map((d) =>
+          pick(d, ["streamId", "start", "end", "parts"])
+        )
       );
       if (totalDeltas >= MAX_DELTAS_PER_REQUEST) {
         break;

package/src/component/users.ts

@@ -5,6 +5,7 @@ import { internal } from "./_generated/api.js";
 import {
   action,
   internalMutation,
+  internalQuery,
   mutation,
   MutationCtx,
   query,
@@ -168,3 +169,14 @@ async function deletePageForUserId(
     isDone: false,
   };
 }
+
+export const getThreadUserId = internalQuery({
+  args: {
+    threadId: v.id("threads"),
+  },
+  returns: v.union(v.string(), v.null()),
+  handler: async (ctx, args) => {
+    const thread = await ctx.db.get(args.threadId);
+    return thread?.userId ?? null;
+  },
+});

package/src/component/vector/index.ts

@@ -12,6 +12,7 @@ import {
 import schema from "../schema";
 import { mergedStream } from "convex-helpers/server/stream";
 import { stream } from "convex-helpers/server/stream";
+import { Id } from "../_generated/dataModel";
 
 export const paginate = query({
   args: {
@@ -124,7 +125,8 @@ export function searchVectors(
     model: string;
     table: string;
     userId?: string;
-    threadId?: string;
+    threadId?: Id<"threads">;
+    searchAllMessagesForUserId?: string;
     limit?: number;
   }
 ) {
@@ -133,8 +135,12 @@ export function searchVectors(
     vector,
     // TODO: to support more tables, add more "OR" clauses for each.
     filter: (q) =>
-      args.userId
-        ? q.eq("model_table_userId", [args.model, args.table, args.userId])
+      args.searchAllMessagesForUserId
+        ? q.eq("model_table_userId", [
+            args.model,
+            args.table,
+            args.searchAllMessagesForUserId,
+          ])
         : q.eq("model_table_threadId", [
             args.model,
             args.table,