diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7a6707f7..1f41de77 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
           npm i
           npm run build
       - name: Publish package for testing branch
-        run: npx pkg-pr-new publish || echo "Have you set up pkg-pr-new for this repo?"
+        run: npx pkg-pr-new publish || echo "pkg-pr-new failed"
       - name: Test
         run: |
           npm run test
diff --git a/eslint.config.js b/eslint.config.js
index e4fde5a2..9ddaf779 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -3,6 +3,7 @@ import pluginJs from "@eslint/js";
 import tseslint from "typescript-eslint";
 import reactHooks from "eslint-plugin-react-hooks";
 import reactRefresh from "eslint-plugin-react-refresh";
+import convexPlugin from "@convex-dev/eslint-plugin";
 
 export default [
   {
@@ -51,7 +52,12 @@ export default [
     languageOptions: {
       globals: globals.worker,
     },
+    plugins: {
+      "@convex-dev": convexPlugin,
+    },
     rules: {
+      ...convexPlugin.configs.recommended[0].rules,
+
       "@typescript-eslint/no-floating-promises": "error",
       "@typescript-eslint/no-explicit-any": "off",
       "no-unused-vars": "off",
diff --git a/example/convex/approval.test.ts b/example/convex/approval.test.ts
index b48e8795..e7994e57 100644
--- a/example/convex/approval.test.ts
+++ b/example/convex/approval.test.ts
@@ -2,7 +2,11 @@
 import { describe, expect, test } from "vitest";
 import { Agent, createTool, stepCountIs, mockModel } from "@convex-dev/agent";
 import { anyApi, actionGeneric, mutationGeneric } from "convex/server";
-import type { ApiFromModules, ActionBuilder, MutationBuilder } from "convex/server";
+import type {
+  ApiFromModules,
+  ActionBuilder,
+  MutationBuilder,
+} from "convex/server";
 import { v } from "convex/values";
 import { components } from "./_generated/api.js";
 import { initConvexTest } from "./setup.test.js";
@@ -153,9 +157,7 @@ export const testApproveE2E = action({
     const approvalMsg = result1.savedMessages?.find(
       (m) =>
         Array.isArray(m.message?.content) &&
-        m.message!.content.some(
-          (p: any) => p.type === "tool-approval-request",
-        ),
+        m.message!.content.some((p: any) => p.type === "tool-approval-request"),
     );
     if (!approvalMsg)
       throw new Error("No approval request found in saved messages");
@@ -209,9 +211,7 @@ export const testDenyE2E = action({
     const approvalMsg = result1.savedMessages?.find(
       (m) =>
         Array.isArray(m.message?.content) &&
-        m.message!.content.some(
-          (p: any) => p.type === "tool-approval-request",
-        ),
+        m.message!.content.some((p: any) => p.type === "tool-approval-request"),
     );
     if (!approvalMsg) throw new Error("No approval request found");
     const approvalPart = (approvalMsg.message!.content as any[]).find(
@@ -323,7 +323,11 @@ export const submitApprovalForTestApprovalAgent = mutation({
     reason: v.optional(v.string()),
   },
   handler: async (ctx, { threadId, approvalId, reason }) => {
-    return testApprovalAgent.approveToolCall(ctx, { threadId, approvalId, reason });
+    return testApprovalAgent.approveToolCall(ctx, {
+      threadId,
+      approvalId,
+      reason,
+    });
   },
 });
 
@@ -403,9 +407,7 @@ describe("Example Approval E2E (exercises usageHandler + insertRawUsage)", () =>
     const t = initConvexTest();
     const result = await t.action(testApi.testDenyE2E, {});
 
-    expect(result.secondText).toBe(
-      "Understood, I won't delete that file.",
-    );
+    expect(result.secondText).toBe("Understood, I won't delete that file.");
     expect(result.totalThreadMessages).toBeGreaterThanOrEqual(4);
 
     const rawUsageDocs = await t.run(async (ctx) => {
diff --git a/example/convex/chat/approval.ts b/example/convex/chat/approval.ts
index 0fb279ec..edf55b92 100644
--- a/example/convex/chat/approval.ts
+++ b/example/convex/chat/approval.ts
@@ -8,11 +8,7 @@
 // 5. AI SDK automatically handles the approval: executes tool (if approved)
 //    or creates execution-denied result (if denied), then continues generation
 import { paginationOptsValidator } from "convex/server";
-import {
-  listUIMessages,
-  syncStreams,
-  vStreamArgs,
-} from "@convex-dev/agent";
+import { listUIMessages, syncStreams, vStreamArgs } from "@convex-dev/agent";
 import { components, internal } from "../_generated/api";
 import { internalAction, mutation, query } from "../_generated/server";
 import { v } from "convex/values";
@@ -74,7 +70,11 @@ export const submitApproval = mutation({
   handler: async (ctx, { threadId, approvalId, approved, reason }) => {
     await authorizeThreadAccess(ctx, threadId);
     const { messageId } = approved
-      ? await approvalAgent.approveToolCall(ctx, { threadId, approvalId, reason })
+      ? await approvalAgent.approveToolCall(ctx, {
+          threadId,
+          approvalId,
+          reason,
+        })
       : await approvalAgent.denyToolCall(ctx, { threadId, approvalId, reason });
     return { messageId };
   },
diff --git a/example/convex/usage_tracking/invoicing.ts b/example/convex/usage_tracking/invoicing.ts
index a1cfdf14..366a1ec0 100644
--- a/example/convex/usage_tracking/invoicing.ts
+++ b/example/convex/usage_tracking/invoicing.ts
@@ -145,6 +145,7 @@ async function createInvoice(
     .withIndex("billingPeriod_userId", (q) =>
       q.eq("billingPeriod", billingPeriod).eq("userId", invoice.userId),
     )
+    // eslint-disable-next-line @convex-dev/no-filter-in-query -- We do not expect many failed invoices
     .filter((q) => q.neq(q.field("status"), "failed"))
     .first();
   if (existingInvoice) {
diff --git a/example/ui/chat/ChatApproval.tsx b/example/ui/chat/ChatApproval.tsx
index 12a6656a..25bfdc11 100644
--- a/example/ui/chat/ChatApproval.tsx
+++ b/example/ui/chat/ChatApproval.tsx
@@ -34,7 +34,11 @@ export default function ChatApproval() {
 }
 
 function Chat({ threadId, reset }: { threadId: string; reset: () => void }) {
-  const { results: messages, status, loadMore } = useUIMessages(
+  const {
+    results: messages,
+    status,
+    loadMore,
+  } = useUIMessages(
     api.chat.approval.listThreadMessages,
     { threadId },
     { initialNumItems: 10, stream: true },
@@ -47,7 +51,9 @@ function Chat({ threadId, reset }: { threadId: string; reset: () => void }) {
   );
 
   const submitApproval = useMutation(api.chat.approval.submitApproval);
-  const triggerContinuation = useMutation(api.chat.approval.triggerContinuation);
+  const triggerContinuation = useMutation(
+    api.chat.approval.triggerContinuation,
+  );
 
   // Track the last approval messageId so we can use it for continuation.
   const lastApprovalMessageIdRef = useRef<string | null>(null);
@@ -56,7 +62,9 @@ function Chat({ threadId, reset }: { threadId: string; reset: () => void }) {
 
   const hasPendingApprovals = messages.some((m) =>
     m.parts.some(
-      (p) => p.type.startsWith("tool-") && (p as ToolUIPart).state === "approval-requested",
+      (p) =>
+        p.type.startsWith("tool-") &&
+        (p as ToolUIPart).state === "approval-requested",
     ),
   );
 
@@ -90,7 +98,9 @@ function Chat({ threadId, reset }: { threadId: string; reset: () => void }) {
     lastApprovalMessageIdRef.current = messageId;
   }
 
-  const [prompt, setPrompt] = useState("Delete the file important.txt and transfer $500 to account savings-123");
+  const [prompt, setPrompt] = useState(
+    "Delete the file important.txt and transfer $500 to account savings-123",
+  );
   const messagesEndRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -142,7 +152,11 @@ function Chat({ threadId, reset }: { threadId: string; reset: () => void }) {
             value={prompt}
             onChange={(e) => setPrompt(e.target.value)}
             className="flex-1 px-4 py-2 rounded-lg border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-400 bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed"
-            placeholder={hasPendingApprovals ? "Respond to pending approvals first..." : "Ask the agent to do something..."}
+            placeholder={
+              hasPendingApprovals
+                ? "Respond to pending approvals first..."
+                : "Ask the agent to do something..."
+            }
             disabled={hasPendingApprovals}
           />
           <button
@@ -159,7 +173,9 @@ function Chat({ threadId, reset }: { threadId: string; reset: () => void }) {
                 reset();
                 lastApprovalMessageIdRef.current = null;
                 continuationTriggeredRef.current = false;
-                setPrompt("Delete the file important.txt and transfer $500 to account savings-123");
+                setPrompt(
+                  "Delete the file important.txt and transfer $500 to account savings-123",
+                );
               }}
               type="button"
             >
@@ -189,8 +205,8 @@ function Message({
   const isUser = message.role === "user";
 
   // Find tool parts that need approval
-  const toolParts = message.parts.filter(
-    (p): p is ToolUIPart => p.type.startsWith("tool-"),
+  const toolParts = message.parts.filter((p): p is ToolUIPart =>
+    p.type.startsWith("tool-"),
   );
 
   return (
@@ -330,7 +346,8 @@ function ToolCallDisplay({
         </div>
       )}
 
-      {(tool.state === "input-available" || tool.state === "input-streaming") && (
+      {(tool.state === "input-available" ||
+        tool.state === "input-streaming") && (
         <div className="text-gray-500 text-xs">Processing...</div>
       )}
     </div>
diff --git a/example/ui/main.tsx b/example/ui/main.tsx
index 636d9429..3e0e6386 100644
--- a/example/ui/main.tsx
+++ b/example/ui/main.tsx
@@ -13,7 +13,6 @@ import { StrictMode } from "react";
 import StreamArray from "./objects/StreamArray";
 import ChatApproval from "./chat/ChatApproval";
 
-
 const convex = new ConvexReactClient(import.meta.env.VITE_CONVEX_URL as string);
 
 createRoot(document.getElementById("root")!).render(
@@ -49,7 +48,6 @@ export function App() {
             <Route path="/weather-fashion" element={<WeatherFashion />} />
             <Route path="/stream-array" element={<StreamArray />} />
             <Route path="/chat-approval" element={<ChatApproval />} />
-
           </Routes>
         </main>
         <Toaster />
diff --git a/package-lock.json b/package-lock.json
index 49a3ce1c..1d4ddfa8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
         "@ai-sdk/openai": "3.0.10",
         "@ai-sdk/provider": "3.0.3",
         "@ai-sdk/provider-utils": "4.0.6",
+        "@convex-dev/eslint-plugin": "^2.0.0",
         "@convex-dev/rag": "0.7.2",
         "@convex-dev/rate-limiter": "0.3.2",
         "@convex-dev/workflow": "0.3.6",
@@ -38,9 +39,9 @@
         "chokidar-cli": "3.0.0",
         "class-variance-authority": "0.7.1",
         "clsx": "2.1.1",
-        "convex": "1.35.1",
+        "convex": "1.36.1",
         "convex-helpers": "0.1.114",
-        "convex-test": "0.0.44",
+        "convex-test": "0.0.50",
         "dayjs": "1.11.20",
         "dotenv": "16.6.1",
         "eslint": "9.39.4",
@@ -616,6 +617,213 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/@convex-dev/eslint-plugin": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@convex-dev/eslint-plugin/-/eslint-plugin-2.0.0.tgz",
+      "integrity": "sha512-GxYe0b5RoAb7c7JzcAX3t+UrdT6edQDtSgJ2F9UPECLyQGU0TeTkyGsDXNm3HK+MnWYi8isRlqaqoYTUD0Ko+Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@typescript-eslint/types": "~8.58.0",
+        "@typescript-eslint/utils": "~8.58.0"
+      },
+      "peerDependencies": {
+        "convex": "^1.34.1"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/@typescript-eslint/project-service": {
+      "version": "8.58.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.58.2.tgz",
+      "integrity": "sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.58.2",
+        "@typescript-eslint/types": "^8.58.2",
+        "debug": "^4.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.58.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.58.2.tgz",
+      "integrity": "sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.58.2",
+        "@typescript-eslint/visitor-keys": "8.58.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.58.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.2.tgz",
+      "integrity": "sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "8.58.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.58.2.tgz",
+      "integrity": "sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.58.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.2.tgz",
+      "integrity": "sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.58.2",
+        "@typescript-eslint/tsconfig-utils": "8.58.2",
+        "@typescript-eslint/types": "8.58.2",
+        "@typescript-eslint/visitor-keys": "8.58.2",
+        "debug": "^4.4.3",
+        "minimatch": "^10.2.2",
+        "semver": "^7.7.3",
+        "tinyglobby": "^0.2.15",
+        "ts-api-utils": "^2.5.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "8.58.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.58.2.tgz",
+      "integrity": "sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.58.2",
+        "@typescript-eslint/types": "8.58.2",
+        "@typescript-eslint/typescript-estree": "8.58.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.58.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.2.tgz",
+      "integrity": "sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.58.2",
+        "eslint-visitor-keys": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/brace-expansion": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@convex-dev/eslint-plugin/node_modules/minimatch": {
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.5"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@convex-dev/rag": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/@convex-dev/rag/-/rag-0.7.2.tgz",
@@ -3434,9 +3642,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4122,9 +4330,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4659,9 +4867,9 @@
       "license": "MIT"
     },
     "node_modules/convex": {
-      "version": "1.35.1",
-      "resolved": "https://registry.npmjs.org/convex/-/convex-1.35.1.tgz",
-      "integrity": "sha512-g23KrTjBiXqRHzWIN0PVFagKjrmFxWUaOSiBsAWPTpXX2rXl0L1F4PR0YpAcMJEzMgfZR9AGymJvLTM+KA6lsQ==",
+      "version": "1.36.1",
+      "resolved": "https://registry.npmjs.org/convex/-/convex-1.36.1.tgz",
+      "integrity": "sha512-NVnwNqU+h8jyPuS0Itvj4MPH9c2yF+tA/RNoSDpCqiLhmYD4+kZxm0dDkVM0QDzz66wem9NqheBb9YQGsHwzBQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -4679,7 +4887,7 @@
       "peerDependencies": {
         "@auth0/auth0-react": "^2.0.1",
         "@clerk/clerk-react": "^4.12.8 || ^5.0.0",
-        "@clerk/react": "^6.0.0",
+        "@clerk/react": "^6.4.3",
         "react": "^18.0.0 || ^19.0.0-0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
@@ -4733,9 +4941,9 @@
       }
     },
     "node_modules/convex-test": {
-      "version": "0.0.44",
-      "resolved": "https://registry.npmjs.org/convex-test/-/convex-test-0.0.44.tgz",
-      "integrity": "sha512-2tv5XRx1n9z4kKwIiUU1UZgC0UDgUGpqAL2D2Hq45cHJ6HBTemfP2wKPMOcfag6ATFfmyqK3Xau0fKiJCtrdxQ==",
+      "version": "0.0.50",
+      "resolved": "https://registry.npmjs.org/convex-test/-/convex-test-0.0.50.tgz",
+      "integrity": "sha512-rMNfrgcKJGToYDqNns2n1AO9KUP1NyC/AF9ldYEuWwTfRbgC9RQiHjlZsZQ/sOjLIVPUyKKIjoI/fNJUzy1urw==",
       "dev": true,
       "license": "Apache-2.0",
       "peerDependencies": {
@@ -6474,9 +6682,9 @@
       }
     },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8820,9 +9028,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10519,9 +10727,9 @@
       }
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11190,9 +11398,9 @@
       }
     },
     "node_modules/vite/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11276,9 +11484,9 @@
       }
     },
     "node_modules/vitest/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/package.json b/package.json
index a40417de..517ff082 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "@ai-sdk/openai": "3.0.10",
     "@ai-sdk/provider": "3.0.3",
     "@ai-sdk/provider-utils": "4.0.6",
+    "@convex-dev/eslint-plugin": "^2.0.0",
     "@convex-dev/rag": "0.7.2",
     "@convex-dev/rate-limiter": "0.3.2",
     "@convex-dev/workflow": "0.3.6",
@@ -110,9 +111,9 @@
     "chokidar-cli": "3.0.0",
     "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
-    "convex": "1.35.1",
+    "convex": "1.36.1",
     "convex-helpers": "0.1.114",
-    "convex-test": "0.0.44",
+    "convex-test": "0.0.50",
     "dayjs": "1.11.20",
     "dotenv": "16.6.1",
     "eslint": "9.39.4",
diff --git a/playground/src/components/ui/badge.tsx b/playground/src/components/ui/badge.tsx
index d3d5d604..76596916 100644
--- a/playground/src/components/ui/badge.tsx
+++ b/playground/src/components/ui/badge.tsx
@@ -24,7 +24,8 @@ const badgeVariants = cva(
 );
 
 export interface BadgeProps
-  extends React.HTMLAttributes<HTMLDivElement>,
+  extends
+    React.HTMLAttributes<HTMLDivElement>,
     VariantProps<typeof badgeVariants> {}
 
 function Badge({ className, variant, ...props }: BadgeProps) {
diff --git a/playground/src/components/ui/button.tsx b/playground/src/components/ui/button.tsx
index d6c7bcbc..bcb13be9 100644
--- a/playground/src/components/ui/button.tsx
+++ b/playground/src/components/ui/button.tsx
@@ -34,7 +34,8 @@ const buttonVariants = cva(
 );
 
 export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+  extends
+    React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
   asChild?: boolean;
 }
diff --git a/playground/src/components/ui/sheet.tsx b/playground/src/components/ui/sheet.tsx
index 02a0dec3..d2a5931f 100644
--- a/playground/src/components/ui/sheet.tsx
+++ b/playground/src/components/ui/sheet.tsx
@@ -48,7 +48,8 @@ const sheetVariants = cva(
 );
 
 interface SheetContentProps
-  extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
+  extends
+    React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
     VariantProps<typeof sheetVariants> {}
 
 const SheetContent = React.forwardRef<
diff --git a/src/UIMessages.ts b/src/UIMessages.ts
index 25a1537a..6fc6bc67 100644
--- a/src/UIMessages.ts
+++ b/src/UIMessages.ts
@@ -744,8 +744,7 @@ function createAssistantUIMessage<
   // Process execution-denied results to update tool call states
   for (const denied of executionDeniedResults) {
     const toolCallPart = allParts.find(
-      (part) =>
-        "toolCallId" in part && part.toolCallId === denied.toolCallId,
+      (part) => "toolCallId" in part && part.toolCallId === denied.toolCallId,
     ) as ToolUIPart | undefined;
 
     if (toolCallPart) {
diff --git a/src/client/approval.test.ts b/src/client/approval.test.ts
index 8f0d8ca5..07d00ec6 100644
--- a/src/client/approval.test.ts
+++ b/src/client/approval.test.ts
@@ -65,7 +65,8 @@ const renameFileTool = createTool({
     newName: z.string(),
   }),
   needsApproval: () => true,
-  execute: async (_ctx, input) => `Renamed: ${input.oldName} → ${input.newName}`,
+  execute: async (_ctx, input) =>
+    `Renamed: ${input.oldName} → ${input.newName}`,
 });
 
 // --- Agents (separate mock model instances to avoid shared callIndex) ---
@@ -291,7 +292,12 @@ const multiToolAgent = new Agent(components.agent, {
         },
       ],
       // Step 2: after both tools execute, model responds
-      [{ type: "text", text: "Done! Deleted old.txt and renamed a.txt to b.txt." }],
+      [
+        {
+          type: "text",
+          text: "Done! Deleted old.txt and renamed a.txt to b.txt.",
+        },
+      ],
     ],
   }),
   stopWhen: stepCountIs(5),
@@ -377,14 +383,22 @@ export const submitApprovalForMultiToolAgent = mutation({
 });
 
 export const submitApprovalForApprovalAgent = mutation({
-  args: { threadId: v.string(), approvalId: v.string(), reason: v.optional(v.string()) },
+  args: {
+    threadId: v.string(),
+    approvalId: v.string(),
+    reason: v.optional(v.string()),
+  },
   handler: async (ctx, { threadId, approvalId, reason }) => {
     return approvalAgent.approveToolCall(ctx, { threadId, approvalId, reason });
   },
 });
 
 export const submitDenialForDenialAgent = mutation({
-  args: { threadId: v.string(), approvalId: v.string(), reason: v.optional(v.string()) },
+  args: {
+    threadId: v.string(),
+    approvalId: v.string(),
+    reason: v.optional(v.string()),
+  },
   handler: async (ctx, { threadId, approvalId, reason }) => {
     return denialAgent.denyToolCall(ctx, { threadId, approvalId, reason });
   },
@@ -485,10 +499,15 @@ describe("Tool Approval Workflow", () => {
   test("approve remains valid with an intervening thread message", async () => {
     usageCalls.length = 0;
     const t = initConvexTest(schema);
-    const result = await t.action(testApi.testApproveFlowWithInterveningMessage, {});
+    const result = await t.action(
+      testApi.testApproveFlowWithInterveningMessage,
+      {},
+    );
 
     expect(result.secondText).toBe("Done! I deleted test.txt.");
     expect(result.approvalResponseOrder).toBe(result.approvalRequestOrder);
-    expect(result.interveningOrder).toBeGreaterThan(result.approvalResponseOrder);
+    expect(result.interveningOrder).toBeGreaterThan(
+      result.approvalResponseOrder,
+    );
   });
 });
diff --git a/src/client/createTool.ts b/src/client/createTool.ts
index f21cf5c9..88ae38c2 100644
--- a/src/client/createTool.ts
+++ b/src/client/createTool.ts
@@ -130,7 +130,7 @@ export type ToolInputProperties<INPUT> = {
  * @param tool The tool. See https://sdk.vercel.ai/docs/ai-sdk-core/tools-and-tool-calling
  * Currently contains deprecated parameters `args` and `handler` to maintain backwards compatibility
  * but these will be removed in the future. Use `inputSchema` and `execute` instead, respectively.
- * 
+ *
  * @returns A tool to be used with the AI SDK.
  */
 export function createTool<INPUT, OUTPUT, Ctx extends ToolCtx = ToolCtx>(
diff --git a/src/client/index.ts b/src/client/index.ts
index 874b5648..1d196fdd 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -476,8 +476,7 @@ export class Agent<
      * The arguments to the generateText function, similar to the ai sdk's
      * {@link generateText} function, along with Agent prompt options.
      */
-    generateTextArgs: AgentPrompt &
-      TextArgs<AgentTools, TOOLS, OUTPUT>,
+    generateTextArgs: AgentPrompt & TextArgs<AgentTools, TOOLS, OUTPUT>,
     options?: Options,
   ): Promise<
     GenerateTextResult<TOOLS extends undefined ? AgentTools : TOOLS, OUTPUT> &
@@ -535,8 +534,7 @@ export class Agent<
      * The arguments to the streamText function, similar to the ai sdk's
      * {@link streamText} function, along with Agent prompt options.
      */
-    streamTextArgs: AgentPrompt &
-      StreamingTextArgs<AgentTools, TOOLS, OUTPUT>,
+    streamTextArgs: AgentPrompt & StreamingTextArgs<AgentTools, TOOLS, OUTPUT>,
     /**
      * The {@link ContextOptions} and {@link StorageOptions}
      * options to use for fetching contextual messages and saving input/output messages.
@@ -555,10 +553,7 @@ export class Agent<
       saveStreamDeltas?: boolean | StreamingOptions;
     },
   ): Promise<
-    StreamTextResult<
-      TOOLS extends undefined ? AgentTools : TOOLS,
-      OUTPUT
-    > &
+    StreamTextResult<TOOLS extends undefined ? AgentTools : TOOLS, OUTPUT> &
       GenerationOutputMetadata
   > {
     type Tools = TOOLS extends undefined ? AgentTools : TOOLS;
@@ -1630,7 +1625,10 @@ export class Agent<
         } as GenerateObjectArgs<FlexibleSchema<T>>;
         const ctx = (
           options?.customCtx
-            ? { ...ctx_, ...options.customCtx(ctx_, targetArgs, llmArgs as any) }
+            ? {
+                ...ctx_,
+                ...options.customCtx(ctx_, targetArgs, llmArgs as any),
+              }
             : ctx_
         ) as GenericActionCtx<GenericDataModel> & CustomCtx;
         const value = await this.generateObject(ctx, targetArgs, llmArgs, {
diff --git a/src/client/saveInputMessages.ts b/src/client/saveInputMessages.ts
index 8c659516..9ad142e7 100644
--- a/src/client/saveInputMessages.ts
+++ b/src/client/saveInputMessages.ts
@@ -31,7 +31,10 @@ export async function saveInputMessages(
     storageOptions?: {
       saveMessages?: "all" | "promptAndOutput";
     };
-  } & Pick<Config, "usageHandler" | "textEmbeddingModel" | "embeddingModel" | "callSettings">,
+  } & Pick<
+    Config,
+    "usageHandler" | "textEmbeddingModel" | "embeddingModel" | "callSettings"
+  >,
 ): Promise<{
   promptMessageId: string | undefined;
   pendingMessage: MessageDoc;
diff --git a/src/client/streaming.integration.test.ts b/src/client/streaming.integration.test.ts
index 45fbc6fd..dcda4225 100644
--- a/src/client/streaming.integration.test.ts
+++ b/src/client/streaming.integration.test.ts
@@ -152,9 +152,7 @@ describe("HTTP Streaming Initiation", () => {
 
       // Verify we can reconstruct the text from deltas
       const { parts } = getParts(deltas);
-      const textParts = parts.filter(
-        (p: any) => p.type === "text-delta",
-      );
+      const textParts = parts.filter((p: any) => p.type === "text-delta");
       expect(textParts.length).toBeGreaterThan(0);
     });
   });
@@ -265,10 +263,9 @@ describe("Stream Exclusion Logic", () => {
       await streamer2.addParts([{ type: "start" }]);
 
       // Default list: only streaming
-      const defaultStreams = await ctx.runQuery(
-        components.agent.streams.list,
-        { threadId },
-      );
+      const defaultStreams = await ctx.runQuery(components.agent.streams.list, {
+        threadId,
+      });
       expect(defaultStreams).toHaveLength(1);
       expect(defaultStreams[0].status).toBe("streaming");
       expect(defaultStreams[0].order).toBe(1);
@@ -325,10 +322,10 @@ describe("Stream Exclusion Logic", () => {
       expect(finishedStreams[0].status).toBe("finished");
 
       // Query for only aborted
-      const abortedStreams = await ctx.runQuery(
-        components.agent.streams.list,
-        { threadId, statuses: ["aborted"] },
-      );
+      const abortedStreams = await ctx.runQuery(components.agent.streams.list, {
+        threadId,
+        statuses: ["aborted"],
+      });
       expect(abortedStreams).toHaveLength(1);
       expect(abortedStreams[0].status).toBe("aborted");
 
@@ -487,10 +484,10 @@ describe("Delta Stream Consumption", () => {
       expect(laterParts.length).toBeLessThanOrEqual(allParts.length);
 
       // Fetching from the end cursor should yield nothing
-      const noDeltas = await ctx.runQuery(
-        components.agent.streams.listDeltas,
-        { threadId, cursors: [{ cursor: endCursor, streamId }] },
-      );
+      const noDeltas = await ctx.runQuery(components.agent.streams.listDeltas, {
+        threadId,
+        cursors: [{ cursor: endCursor, streamId }],
+      });
       expect(noDeltas).toHaveLength(0);
     });
   });
@@ -526,16 +523,13 @@ describe("Delta Stream Consumption", () => {
       const id2 = streamer2.streamId!;
 
       // Fetch deltas for both streams simultaneously
-      const deltas = await ctx.runQuery(
-        components.agent.streams.listDeltas,
-        {
-          threadId,
-          cursors: [
-            { cursor: 0, streamId: id1 },
-            { cursor: 0, streamId: id2 },
-          ],
-        },
-      );
+      const deltas = await ctx.runQuery(components.agent.streams.listDeltas, {
+        threadId,
+        cursors: [
+          { cursor: 0, streamId: id1 },
+          { cursor: 0, streamId: id2 },
+        ],
+      });
 
       // Should have deltas for both streams
       const s1Deltas = deltas.filter((d) => d.streamId === id1);
@@ -568,10 +562,10 @@ describe("Delta Stream Consumption", () => {
         threadId,
         statuses: ["finished"],
       });
-      const deltas = await ctx.runQuery(
-        components.agent.streams.listDeltas,
-        { threadId, cursors: [{ cursor: 0, streamId }] },
-      );
+      const deltas = await ctx.runQuery(components.agent.streams.listDeltas, {
+        threadId,
+        cursors: [{ cursor: 0, streamId }],
+      });
 
       // Derive UI messages
       const uiMessages = await deriveUIMessagesFromDeltas(
@@ -615,10 +609,10 @@ describe("Delta Stream Consumption", () => {
       await streamer.consumeStream(result.toUIMessageStream());
       const streamId = streamer.streamId!;
 
-      const deltas = await ctx.runQuery(
-        components.agent.streams.listDeltas,
-        { threadId, cursors: [{ cursor: 0, streamId }] },
-      );
+      const deltas = await ctx.runQuery(components.agent.streams.listDeltas, {
+        threadId,
+        cursors: [{ cursor: 0, streamId }],
+      });
       const { parts } = getParts(deltas);
 
       // Compressed: all text-deltas for one text section should be merged
@@ -691,7 +685,9 @@ describe("Delta Stream Consumption", () => {
         streamId,
         start: 0,
         end: 1,
-        parts: [{ type: "text-delta", id: "txt-0", text: "Let me call a tool. " }],
+        parts: [
+          { type: "text-delta", id: "txt-0", text: "Let me call a tool. " },
+        ],
       },
       {
         streamId,
@@ -743,9 +739,7 @@ describe("Delta Stream Consumption", () => {
     expect(msg.text).toContain("Let me call a tool.");
     expect(msg.text).toContain("Here are the results.");
 
-    const toolParts = msg.parts.filter((p: any) =>
-      p.type.startsWith("tool-"),
-    );
+    const toolParts = msg.parts.filter((p: any) => p.type.startsWith("tool-"));
     expect(toolParts.length).toBeGreaterThan(0);
   });
 });
@@ -1001,10 +995,10 @@ describe("Stream Lifecycle Integration", () => {
       expect(finished).toHaveLength(1);
 
       // 4. Derive UI messages from stored deltas
-      const deltas = await ctx.runQuery(
-        components.agent.streams.listDeltas,
-        { threadId, cursors: [{ cursor: 0, streamId }] },
-      );
+      const deltas = await ctx.runQuery(components.agent.streams.listDeltas, {
+        threadId,
+        cursors: [{ cursor: 0, streamId }],
+      });
       const uiMessages = await deriveUIMessagesFromDeltas(
         threadId,
         finished,
@@ -1056,10 +1050,10 @@ describe("Stream Lifecycle Integration", () => {
       expect(aborted[0].status).toBe("aborted");
 
       // Even aborted streams have their deltas stored
-      const deltas = await ctx.runQuery(
-        components.agent.streams.listDeltas,
-        { threadId, cursors: [{ cursor: 0, streamId }] },
-      );
+      const deltas = await ctx.runQuery(components.agent.streams.listDeltas, {
+        threadId,
+        cursors: [{ cursor: 0, streamId }],
+      });
       expect(deltas.length).toBeGreaterThan(0);
     });
   });
diff --git a/src/client/types.ts b/src/client/types.ts
index ea07439a..f8f72fad 100644
--- a/src/client/types.ts
+++ b/src/client/types.ts
@@ -356,10 +356,7 @@ export type TextArgs<
   OUTPUT extends Output<any, any, any> = never,
 > = Omit<
   Parameters<
-    typeof generateText<
-      TOOLS extends undefined ? AgentTools : TOOLS,
-      OUTPUT
-    >
+    typeof generateText<TOOLS extends undefined ? AgentTools : TOOLS, OUTPUT>
   >[0],
   "model" | "prompt" | "messages"
 > & {
@@ -376,10 +373,7 @@ export type StreamingTextArgs<
   OUTPUT extends Output<any, any, any> = never,
 > = Omit<
   Parameters<
-    typeof streamText<
-      TOOLS extends undefined ? AgentTools : TOOLS,
-      OUTPUT
-    >
+    typeof streamText<TOOLS extends undefined ? AgentTools : TOOLS, OUTPUT>
   >[0],
   "model" | "prompt" | "messages"
 > & {
@@ -496,11 +490,7 @@ export interface Thread<DefaultTools extends ToolSet> {
     OUTPUT extends Output<any, any, any> = never,
   >(
     generateTextArgs: AgentPrompt &
-      TextArgs<
-        TOOLS extends undefined ? DefaultTools : TOOLS,
-        TOOLS,
-        OUTPUT
-      >,
+      TextArgs<TOOLS extends undefined ? DefaultTools : TOOLS, TOOLS, OUTPUT>,
     options?: Options,
   ): Promise<
     GenerateTextResult<TOOLS extends undefined ? DefaultTools : TOOLS, OUTPUT> &
@@ -541,10 +531,7 @@ export interface Thread<DefaultTools extends ToolSet> {
       saveStreamDeltas?: boolean | StreamingOptions;
     },
   ): Promise<
-    StreamTextResult<
-      TOOLS extends undefined ? DefaultTools : TOOLS,
-      OUTPUT
-    > &
+    StreamTextResult<TOOLS extends undefined ? DefaultTools : TOOLS, OUTPUT> &
       ThreadOutputMetadata
   >;
   /**
diff --git a/src/component/apiKeys.ts b/src/component/apiKeys.ts
index ac05eabc..836fca43 100644
--- a/src/component/apiKeys.ts
+++ b/src/component/apiKeys.ts
@@ -13,7 +13,7 @@ export const issue = mutation({
         .first();
       if (existingApiKey) {
         console.warn(`API key ${args.name} already exists, deleting...`);
-        await ctx.db.delete(existingApiKey._id);
+        await ctx.db.delete("apiKeys", existingApiKey._id);
       }
     }
     const apiKey = await ctx.db.insert("apiKeys", args);
@@ -27,7 +27,7 @@ export const validate = query({
     apiKey: v.id("apiKeys"),
   },
   handler: async (ctx, args) => {
-    const apiKey = await ctx.db.get(args.apiKey);
+    const apiKey = await ctx.db.get("apiKeys", args.apiKey);
     if (!apiKey) {
       throw new Error("Invalid API key");
     }
@@ -43,14 +43,14 @@ export const destroy = mutation({
   }),
   handler: async (ctx, args) => {
     if (args.apiKey) {
-      const apiKey = await ctx.db.get(args.apiKey);
+      const apiKey = await ctx.db.get("apiKeys", args.apiKey);
       if (!apiKey) {
         return "missing";
       }
       if (apiKey.name !== args.name) {
         return "name mismatch";
       }
-      await ctx.db.delete(args.apiKey);
+      await ctx.db.delete("apiKeys", args.apiKey);
     } else if (args.name) {
       const apiKey = await ctx.db
         .query("apiKeys")
@@ -59,7 +59,7 @@ export const destroy = mutation({
       if (!apiKey) {
         return "missing";
       }
-      await ctx.db.delete(apiKey._id);
+      await ctx.db.delete("apiKeys", apiKey._id);
     } else {
       return "must provide either apiKey or name";
     }
diff --git a/src/component/files.test.ts b/src/component/files.test.ts
index 582b1e9d..b77401bd 100644
--- a/src/component/files.test.ts
+++ b/src/component/files.test.ts
@@ -96,7 +96,7 @@ describe("files", () => {
       });
       // Manually set refcount to 0
       await t.run(async (ctx) => {
-        await ctx.db.patch(fileId, { refcount: 0 });
+        await ctx.db.patch("files", fileId, { refcount: 0 });
       });
       files.push(fileId);
     }
diff --git a/src/component/files.ts b/src/component/files.ts
index 89506f4c..1b66caf5 100644
--- a/src/component/files.ts
+++ b/src/component/files.ts
@@ -29,15 +29,16 @@ export async function addFileHandler(
 ) {
   // Support both mediaType (preferred) and mimeType (deprecated)
   const mediaType = args.mediaType ?? args.mimeType;
-  
+
   const existingFile = await ctx.db
     .query("files")
     .withIndex("hash", (q) => q.eq("hash", args.hash))
+    // eslint-disable-next-line @convex-dev/no-filter-in-query -- We do not expect many files with the same hash and different filenames
     .filter((q) => q.eq(q.field("filename"), args.filename))
     .first();
   if (existingFile) {
     // increment the refcount
-    await ctx.db.patch(existingFile._id, {
+    await ctx.db.patch("files", existingFile._id, {
       refcount: existingFile.refcount + 1,
       lastTouchedAt: Date.now(),
     });
@@ -68,7 +69,7 @@ export const get = query({
   },
   returns: v.union(v.null(), v.doc("files")),
   handler: async (ctx, args) => {
-    return ctx.db.get(args.fileId);
+    return ctx.db.get("files", args.fileId);
   },
 });
 
@@ -87,12 +88,13 @@ export const useExistingFile = mutation({
     const file = await ctx.db
       .query("files")
       .withIndex("hash", (q) => q.eq("hash", args.hash))
+      // eslint-disable-next-line @convex-dev/no-filter-in-query -- We do not expect many files with the same hash and different filenames
       .filter((q) => q.eq(q.field("filename"), args.filename))
       .first();
     if (!file) {
       return null;
     }
-    await ctx.db.patch(file._id, {
+    await ctx.db.patch("files", file._id, {
       lastTouchedAt: Date.now(),
     });
     return { fileId: file._id, storageId: file.storageId };
@@ -115,9 +117,9 @@ export async function changeRefcount(
   const nextSet = new Set(next);
   for (const fileId of prevSet) {
     if (!nextSet.has(fileId)) {
-      const file = await ctx.db.get(fileId);
+      const file = await ctx.db.get("files", fileId);
       if (file) {
-        await ctx.db.patch(fileId, {
+        await ctx.db.patch("files", fileId, {
           refcount: file.refcount - 1,
         });
       } else {
@@ -127,9 +129,9 @@ export async function changeRefcount(
   }
   for (const fileId of nextSet) {
     if (!prevSet.has(fileId)) {
-      const file = await ctx.db.get(fileId);
+      const file = await ctx.db.get("files", fileId);
       if (file) {
-        await ctx.db.patch(fileId, {
+        await ctx.db.patch("files", fileId, {
           refcount: file.refcount + 1,
         });
       } else {
@@ -151,11 +153,11 @@ export async function copyFileHandler(
   ctx: MutationCtx,
   args: { fileId: Id<"files"> },
 ) {
-  const file = await ctx.db.get(args.fileId);
+  const file = await ctx.db.get("files", args.fileId);
   if (!file) {
     throw new Error("File not found");
   }
-  await ctx.db.patch(args.fileId, {
+  await ctx.db.patch("files", args.fileId, {
     refcount: file.refcount + 1,
     lastTouchedAt: Date.now(),
   });
@@ -195,7 +197,7 @@ export const deleteFiles = mutation({
   handler: async (ctx, args) => {
     const deletedFileIds = await Promise.all(
       args.fileIds.map(async (fileId) => {
-        const file = await ctx.db.get(fileId);
+        const file = await ctx.db.get("files", fileId);
         if (!file) {
           console.error(`File ${fileId} not found when deleting, skipping...`);
           return null;
@@ -208,7 +210,7 @@ export const deleteFiles = mutation({
             return null;
           }
         }
-        await ctx.db.delete(fileId);
+        await ctx.db.delete("files", fileId);
         return fileId;
       }),
     );
diff --git a/src/component/messages.ts b/src/component/messages.ts
index 1f38ec87..dacf57d5 100644
--- a/src/component/messages.ts
+++ b/src/component/messages.ts
@@ -34,6 +34,7 @@ import {
 import { schema, v } from "./schema.js";
 import { insertVector, searchVectors } from "./vector/index.js";
 import {
+  getVectorIdInfo,
   validateVectorDimension,
   type VectorTableId,
   vVectorId,
@@ -50,9 +51,10 @@ export async function deleteMessage(
   ctx: MutationCtx,
   messageDoc: Doc<"messages">,
 ) {
-  await ctx.db.delete(messageDoc._id);
+  await ctx.db.delete("messages", messageDoc._id);
   if (messageDoc.embeddingId) {
-    await ctx.db.delete(messageDoc.embeddingId);
+    const { tableName } = getVectorIdInfo(ctx, messageDoc.embeddingId);
+    await ctx.db.delete(tableName, messageDoc.embeddingId);
   }
   if (messageDoc.fileIds) {
     await changeRefcount(ctx, messageDoc.fileIds, []);
@@ -65,7 +67,7 @@ export const deleteByIds = mutation({
   handler: async (ctx, args) => {
     const deletedMessageIds = await Promise.all(
       args.messageIds.map(async (id) => {
-        const message = await ctx.db.get(id);
+        const message = await ctx.db.get("messages", id);
         if (message) {
           await deleteMessage(ctx, message);
           return id;
@@ -157,7 +159,7 @@ async function addMessagesHandler(
   let userId = args.userId;
   const threadId = args.threadId;
   if (!userId && args.threadId) {
-    const thread = await ctx.db.get(args.threadId);
+    const thread = await ctx.db.get("threads", args.threadId);
     assert(thread, `Thread ${args.threadId} not found`);
     userId = thread.userId;
   }
@@ -172,7 +174,8 @@ async function addMessagesHandler(
     hideFromUserIdSearch,
     ...rest
   } = args;
-  const promptMessage = promptMessageId && (await ctx.db.get(promptMessageId));
+  const promptMessage =
+    promptMessageId && (await ctx.db.get("messages", promptMessageId));
   if (failPendingSteps) {
     assert(args.threadId, "threadId is required to fail pending steps");
     const pendingMessages = await ctx.db
@@ -188,9 +191,10 @@ async function addMessagesHandler(
         .filter((m) => !pendingMessageId || m._id !== pendingMessageId)
         .map(async (m) => {
           if (m.embeddingId) {
-            await ctx.db.delete(m.embeddingId);
+            const { tableName } = getVectorIdInfo(ctx, m.embeddingId);
+            await ctx.db.delete(tableName, m.embeddingId);
           }
-          await ctx.db.patch(m._id, {
+          await ctx.db.patch("messages", m._id, {
             status: "failed",
             error: "Restarting",
             embeddingId: undefined,
@@ -257,7 +261,7 @@ async function addMessagesHandler(
     // If there is a pending message, we replace that one with the first message
     // and subsequent ones will follow the regular order/subOrder advancement.
     if (i === 0 && pendingMessageId) {
-      const pendingMessage = await ctx.db.get(pendingMessageId);
+      const pendingMessage = await ctx.db.get("messages", pendingMessageId);
       assert(pendingMessage, `Pending msg ${pendingMessageId} not found`);
       if (pendingMessage.status === "failed") {
         fail = true;
@@ -274,12 +278,12 @@ async function addMessagesHandler(
           message.fileIds,
         );
       }
-      await ctx.db.replace(pendingMessage._id, {
+      await ctx.db.replace("messages", pendingMessage._id, {
         ...messageDoc,
         order: pendingMessage.order,
         stepOrder: pendingMessage.stepOrder,
       });
-      toReturn.push((await ctx.db.get(pendingMessage._id))!);
+      toReturn.push((await ctx.db.get("messages", pendingMessage._id))!);
       continue;
     }
     if (message.message.role === "user") {
@@ -306,7 +310,7 @@ async function addMessagesHandler(
       await changeRefcount(ctx, [], message.fileIds);
     }
     // TODO: delete the associated stream data for the order/stepOrder
-    toReturn.push((await ctx.db.get(messageId))!);
+    toReturn.push((await ctx.db.get("messages", messageId))!);
   }
   // Atomically finish the stream if requested, preventing UI flickering
   // from separate mutations for message save and stream finish (issue #181).
@@ -375,7 +379,7 @@ export const finalizeMessage = mutation({
   },
   returns: v.null(),
   handler: async (ctx, { messageId, result }) => {
-    const message = await ctx.db.get(messageId);
+    const message = await ctx.db.get("messages", messageId);
     assert(message, `Message ${messageId} not found`);
     if (message.status !== "pending") {
       console.debug(
@@ -406,15 +410,16 @@ export const finalizeMessage = mutation({
     }
     if (result.status === "failed") {
       if (message.embeddingId) {
-        await ctx.db.delete(message.embeddingId);
+        const { tableName } = getVectorIdInfo(ctx, message.embeddingId);
+        await ctx.db.delete(tableName, message.embeddingId);
       }
-      await ctx.db.patch(messageId, {
+      await ctx.db.patch("messages", messageId, {
         status: "failed",
         error: result.error,
         embeddingId: undefined,
       });
     } else {
-      await ctx.db.patch(messageId, { status: "success" });
+      await ctx.db.patch("messages", messageId, { status: "success" });
     }
   },
 });
@@ -439,7 +444,7 @@ export const updateMessage = mutation({
   },
   returns: vMessageDoc,
   handler: async (ctx, args) => {
-    const message = await ctx.db.get(args.messageId);
+    const message = await ctx.db.get("messages", args.messageId);
     assert(message, `Message ${args.messageId} not found`);
 
     if (args.patch.fileIds) {
@@ -456,13 +461,14 @@ export const updateMessage = mutation({
 
     if (args.patch.status === "failed") {
       if (message.embeddingId) {
-        await ctx.db.delete(message.embeddingId);
+        const { tableName } = getVectorIdInfo(ctx, message.embeddingId);
+        await ctx.db.delete(tableName, message.embeddingId);
       }
       patch.embeddingId = undefined;
     }
 
-    await ctx.db.patch(args.messageId, patch);
-    return publicMessage((await ctx.db.get(args.messageId))!);
+    await ctx.db.patch("messages", args.messageId, patch);
+    return publicMessage((await ctx.db.get("messages", args.messageId))!);
   },
 });
 
@@ -540,7 +546,8 @@ export const cloneMessageBatch = internalMutation({
           }
           let embeddingId: VectorTableId | undefined = undefined;
           if (m.embeddingId) {
-            const vector = await ctx.db.get(m.embeddingId);
+            const { tableName } = getVectorIdInfo(ctx, m.embeddingId);
+            const vector = await ctx.db.get(tableName, m.embeddingId);
             assert(vector, `Vector ${m.embeddingId} not found`);
             const dimension = vector.vector.length;
             validateVectorDimension(dimension);
@@ -636,7 +643,7 @@ async function listMessagesByThreadIdHandler(
   const statuses = args.statuses ?? vMessageStatus.members.map((m) => m.value);
   const last =
     args.upToAndIncludingMessageId &&
-    (await ctx.db.get(args.upToAndIncludingMessageId));
+    (await ctx.db.get("messages", args.upToAndIncludingMessageId));
   assert(
     !last || last.threadId === args.threadId,
     "upToAndIncludingMessageId must be a message in the thread",
@@ -679,9 +686,9 @@ async function listMessagesByThreadIdHandler(
 export const getMessagesByIds = query({
   args: { messageIds: v.array(v.id("messages")) },
   handler: async (ctx, args) => {
-    return (await Promise.all(args.messageIds.map((id) => ctx.db.get(id)))).map(
-      (m) => (m ? publicMessage(m) : null),
-    );
+    return (
+      await Promise.all(args.messageIds.map((id) => ctx.db.get("messages", id)))
+    ).map((m) => (m ? publicMessage(m) : null));
   },
   returns: v.array(v.union(v.null(), vMessageDoc)),
 });
@@ -793,7 +800,8 @@ export const _fetchSearchMessages = internalQuery({
   returns: v.array(vMessageDoc),
   handler: async (ctx, args): Promise<MessageDoc[]> => {
     const beforeMessage =
-      args.beforeMessageId && (await ctx.db.get(args.beforeMessageId));
+      args.beforeMessageId &&
+      (await ctx.db.get("messages", args.beforeMessageId));
     const { searchAllMessagesForUserId, threadId } = args;
     assert(
       searchAllMessagesForUserId || threadId,
@@ -809,6 +817,7 @@ export const _fetchSearchMessages = internalQuery({
                 ? q.eq("embeddingId", embeddingId)
                 : q.eq("embeddingId", embeddingId).eq("threadId", threadId!),
             )
+            // eslint-disable-next-line @convex-dev/no-filter-in-query -- We do not expect many messages with the same embeddingId for different users / threads
             .filter((q) =>
               q.and(
                 q.eq(q.field("status"), "success"),
@@ -911,7 +920,8 @@ export const textSearch = query({
       "Specify userId or threadId",
     );
     const targetMessage =
-      args.targetMessageId && (await ctx.db.get(args.targetMessageId));
+      args.targetMessageId &&
+      (await ctx.db.get("messages", args.targetMessageId));
     const order = targetMessage?.order;
     const text = args.text || targetMessage?.text;
     if (!text) {
@@ -926,6 +936,7 @@ export const textSearch = query({
           : q.search("text", text).eq("threadId", args.threadId!),
       )
       // Just in case tool messages slip through
+      // eslint-disable-next-line @convex-dev/no-filter-in-query -- we can't do this in the search index, but text search ideally isn't for really old orders
       .filter((q) => {
         const qq = q.eq(q.field("tool"), false);
         if (order) {
@@ -964,12 +975,13 @@ export const getMessageSearchFields = query({
     embedding?: number[] | undefined;
     embeddingModel?: string | undefined;
   }> => {
-    const message = await ctx.db.get(args.messageId);
+    const message = await ctx.db.get("messages", args.messageId);
     const text = message?.text;
     let embedding = undefined;
     let embeddingModel = undefined;
     if (message?.embeddingId) {
-      const target = await ctx.db.get(message.embeddingId);
+      const { tableName } = getVectorIdInfo(ctx, message.embeddingId);
+      const target = await ctx.db.get(tableName, message.embeddingId);
       embedding = target?.vector;
       embeddingModel = target?.model;
     }
diff --git a/src/component/streams.ts b/src/component/streams.ts
index 4c3499fe..2fc67e89 100644
--- a/src/component/streams.ts
+++ b/src/component/streams.ts
@@ -38,7 +38,7 @@ export const addDelta = mutation({
   args: deltaValidator,
   returns: v.boolean(),
   handler: async (ctx, args) => {
-    const stream = await ctx.db.get(args.streamId);
+    const stream = await ctx.db.get("streamingMessages", args.streamId);
     if (!stream) {
       console.warn("Stream not found", args.streamId);
       return false;
@@ -101,7 +101,9 @@ export const create = mutation({
       internal.streams.timeoutStream,
       { streamId },
     );
-    await ctx.db.patch(streamId, { state: { ...state, timeoutFnId } });
+    await ctx.db.patch("streamingMessages", streamId, {
+      state: { ...state, timeoutFnId },
+    });
     return streamId;
   },
 });
@@ -197,7 +199,7 @@ async function abortById(
     finalDelta?: WithoutSystemFields<Doc<"streamDeltas">>;
   },
 ) {
-  const stream = await ctx.db.get(args.streamId);
+  const stream = await ctx.db.get("streamingMessages", args.streamId);
   if (!stream) {
     throw new Error(`Stream not found: ${args.streamId}`);
   }
@@ -208,7 +210,7 @@ async function abortById(
     return false;
   }
   await cleanupTimeoutFn(ctx, stream);
-  await ctx.db.patch(args.streamId, {
+  await ctx.db.patch("streamingMessages", args.streamId, {
     state: { kind: "aborted", reason: args.reason },
   });
   return true;
@@ -219,7 +221,10 @@ async function cleanupTimeoutFn(
   stream: Doc<"streamingMessages">,
 ) {
   if (stream.state.kind === "streaming" && stream.state.timeoutFnId) {
-    const timeoutFn = await ctx.db.system.get(stream.state.timeoutFnId);
+    const timeoutFn = await ctx.db.system.get(
+      "_scheduled_functions",
+      stream.state.timeoutFnId,
+    );
     if (timeoutFn?.state.kind === "pending") {
       await ctx.scheduler.cancel(stream.state.timeoutFnId);
     }
@@ -246,7 +251,7 @@ export async function finishHandler(
   if (args.finalDelta) {
     await ctx.db.insert("streamDeltas", args.finalDelta);
   }
-  const stream = await ctx.db.get(args.streamId);
+  const stream = await ctx.db.get("streamingMessages", args.streamId);
   if (!stream) {
     throw new Error(`Stream not found: ${args.streamId}`);
   }
@@ -262,7 +267,7 @@ export async function finishHandler(
     api.streams.deleteStreamAsync,
     { streamId: args.streamId },
   );
-  await ctx.db.patch(args.streamId, {
+  await ctx.db.patch("streamingMessages", args.streamId, {
     state: { kind: "finished", endedAt: Date.now(), cleanupFnId },
   });
 }
@@ -279,7 +284,7 @@ async function heartbeatStream(
   ctx: MutationCtx,
   args: { streamId: Id<"streamingMessages"> },
 ): Promise<void> {
-  const stream = await ctx.db.get(args.streamId);
+  const stream = await ctx.db.get("streamingMessages", args.streamId);
   if (!stream) {
     console.warn("Stream not found", args.streamId);
     return;
@@ -294,7 +299,10 @@ async function heartbeatStream(
   if (!stream.state.timeoutFnId) {
     throw new Error("Stream has no timeout function");
   }
-  const timeoutFn = await ctx.db.system.get(stream.state.timeoutFnId);
+  const timeoutFn = await ctx.db.system.get(
+    "_scheduled_functions",
+    stream.state.timeoutFnId,
+  );
   if (!timeoutFn) {
     throw new Error("Timeout function not found");
   }
@@ -307,7 +315,7 @@ async function heartbeatStream(
     internal.streams.timeoutStream,
     { streamId: args.streamId },
   );
-  await ctx.db.patch(args.streamId, {
+  await ctx.db.patch("streamingMessages", args.streamId, {
     state: { kind: "streaming", lastHeartbeat: Date.now(), timeoutFnId },
   });
 }
@@ -316,12 +324,12 @@ export const timeoutStream = internalMutation({
   args: { streamId: v.id("streamingMessages") },
   returns: v.null(),
   handler: async (ctx, args) => {
-    const stream = await ctx.db.get(args.streamId);
+    const stream = await ctx.db.get("streamingMessages", args.streamId);
     if (!stream || stream.state.kind !== "streaming") {
       console.warn("Stream not found", args.streamId);
       return;
     }
-    await ctx.db.patch(args.streamId, {
+    await ctx.db.patch("streamingMessages", args.streamId, {
       state: { kind: "aborted", reason: "timeout" },
     });
   },
@@ -338,15 +346,17 @@ async function deletePageForStreamId(
       numItems: MAX_DELTAS_PER_REQUEST,
       cursor: args.cursor ?? null,
     });
-  await Promise.all(deltas.page.map((d) => ctx.db.delete(d._id)));
+  await Promise.all(
+    deltas.page.map((d) => ctx.db.delete("streamDeltas", d._id)),
+  );
   if (deltas.isDone) {
-    const stream = await ctx.db.get(args.streamId);
+    const stream = await ctx.db.get("streamingMessages", args.streamId);
     if (stream) {
       await cleanupTimeoutFn(ctx, stream);
       if (stream.state.kind === "finished" && stream.state.cleanupFnId) {
         await ctx.scheduler.cancel(stream.state.cleanupFnId);
       }
-      await ctx.db.delete(args.streamId);
+      await ctx.db.delete("streamingMessages", args.streamId);
     }
   }
   return deltas;
@@ -434,7 +444,7 @@ export const deleteAllStreamsForThreadIdAsync = mutation({
         },
       );
     } else {
-      await ctx.db.delete(args.threadId);
+      await ctx.db.delete("threads", args.threadId);
     }
     return result;
   },
diff --git a/src/component/threads.ts b/src/component/threads.ts
index e63d90d8..4e25a9f7 100644
--- a/src/component/threads.ts
+++ b/src/component/threads.ts
@@ -32,7 +32,7 @@ function publicThread(thread: Doc<"threads">): ThreadDoc {
 export const getThread = query({
   args: { threadId: v.id("threads") },
   handler: async (ctx, args) => {
-    return publicThreadOrNull(await ctx.db.get(args.threadId));
+    return publicThreadOrNull(await ctx.db.get("threads", args.threadId));
   },
   returns: v.union(vThreadDoc, v.null()),
 });
@@ -66,7 +66,7 @@ export const createThread = mutation({
       ...args,
       status: "active",
     });
-    return publicThread((await ctx.db.get(threadId))!);
+    return publicThread((await ctx.db.get("threads", threadId))!);
   },
   returns: vThreadDoc,
 });
@@ -84,10 +84,10 @@ export const updateThread = mutation({
     patch: v.object(partial(pick(vThread.fields, threadFieldsSupportingPatch))),
   },
   handler: async (ctx, args) => {
-    const thread = await ctx.db.get(args.threadId);
+    const thread = await ctx.db.get("threads", args.threadId);
     assert(thread, `Thread ${args.threadId} not found`);
-    await ctx.db.patch(args.threadId, args.patch);
-    return publicThread((await ctx.db.get(args.threadId))!);
+    await ctx.db.patch("threads", args.threadId, args.patch);
+    return publicThread((await ctx.db.get("threads", args.threadId))!);
   },
   returns: vThreadDoc,
 });
@@ -231,9 +231,9 @@ async function deletePageForThreadIdHandler(
     });
   await Promise.all(messages.page.map((m) => deleteMessage(ctx, m)));
   if (messages.isDone) {
-    const thread = await ctx.db.get(args.threadId);
+    const thread = await ctx.db.get("threads", args.threadId);
     if (thread) {
-      await ctx.db.delete(args.threadId);
+      await ctx.db.delete("threads", args.threadId);
     }
   }
   return {
diff --git a/src/component/users.ts b/src/component/users.ts
index b13dc50a..a53081db 100644
--- a/src/component/users.ts
+++ b/src/component/users.ts
@@ -227,7 +227,7 @@ async function deletePageForUserId(
 
   if (streamResult.isDone) {
     // Streams are done, delete the thread and reset for next thread
-    await ctx.db.delete(threadInProgress);
+    await ctx.db.delete("threads", threadInProgress);
     threadInProgress = null;
     messagesCursor = null;
     streamsInProgress = false;
@@ -256,7 +256,7 @@ export const getThreadUserId = internalQuery({
   },
   returns: v.union(v.string(), v.null()),
   handler: async (ctx, args) => {
-    const thread = await ctx.db.get(args.threadId);
+    const thread = await ctx.db.get("threads", args.threadId);
     return thread?.userId ?? null;
   },
 });
diff --git a/src/component/vector/index.ts b/src/component/vector/index.ts
index 854e903f..5704f463 100644
--- a/src/component/vector/index.ts
+++ b/src/component/vector/index.ts
@@ -11,6 +11,7 @@ import {
 import schema from "../schema.js";
 import {
   type EmbeddingsWithoutDenormalizedFields,
+  getVectorIdInfo,
   getVectorTableName,
   type VectorDimension,
   vEmbeddingsWithoutDenormalizedFields,
@@ -84,7 +85,7 @@ export const deleteBatchForThread = mutation({
       numItems: args.limit,
       maximumRowsRead: 300,
     });
-    await Promise.all(vectors.page.map((v) => ctx.db.delete(v._id)));
+    await Promise.all(vectors.page.map((v) => ctx.db.delete(tableName, v._id)));
     return {
       isDone: vectors.isDone,
       continueCursor: vectors.continueCursor,
@@ -108,7 +109,7 @@ export const insertBatch = mutation({
       args.vectors.map(async ({ messageId, ...v }) => {
         const embeddingId = await insertVector(ctx, args.vectorDimension, v);
         if (messageId) {
-          await ctx.db.patch(messageId, { embeddingId });
+          await ctx.db.patch("messages", messageId, { embeddingId });
         }
         return embeddingId;
       }),
@@ -180,12 +181,13 @@ export const updateBatch = mutation({
   returns: v.null(),
   handler: async (ctx, args) => {
     await Promise.all(
-      args.vectors.map((embedding) =>
-        ctx.db.patch(embedding.id, {
+      args.vectors.map((embedding) => {
+        const { tableName } = getVectorIdInfo(ctx, embedding.id);
+        return ctx.db.patch(tableName, embedding.id, {
           model: embedding.model,
           vector: embedding.vector,
-        }),
-      ),
+        });
+      }),
     );
   },
 });
@@ -196,6 +198,11 @@ export const deleteBatch = mutation({
   },
   returns: v.null(),
   handler: async (ctx, args) => {
-    await Promise.all(args.ids.map((id) => ctx.db.delete(id)));
+    await Promise.all(
+      args.ids.map((id) => {
+        const { tableName } = getVectorIdInfo(ctx, id);
+        return ctx.db.delete(tableName, id);
+      }),
+    );
   },
 });
diff --git a/src/mapping.test.ts b/src/mapping.test.ts
index ec6a7d22..dc0b5952 100644
--- a/src/mapping.test.ts
+++ b/src/mapping.test.ts
@@ -267,13 +267,21 @@ describe("mapping", () => {
           role: "assistant" as const,
           content: [
             { type: "tool-call", toolCallId: "tc1", toolName: "a", input: {} },
-            { type: "tool-approval-request", approvalId: "ap1", toolCallId: "tc1" },
+            {
+              type: "tool-approval-request",
+              approvalId: "ap1",
+              toolCallId: "tc1",
+            },
           ],
         },
         {
           role: "tool" as const,
           content: [
-            { type: "tool-approval-response", approvalId: "ap1", approved: true },
+            {
+              type: "tool-approval-response",
+              approvalId: "ap1",
+              approved: true,
+            },
           ],
         },
       ] as any;
@@ -289,7 +297,11 @@ describe("mapping", () => {
           role: "assistant" as const,
           content: [
             { type: "tool-call", toolCallId: "tc1", toolName: "a", input: {} },
-            { type: "tool-approval-request", approvalId: "ap1", toolCallId: "tc1" },
+            {
+              type: "tool-approval-request",
+              approvalId: "ap1",
+              toolCallId: "tc1",
+            },
           ],
         },
         { role: "user" as const, content: "new message" },
@@ -304,7 +316,9 @@ describe("mapping", () => {
       expect(denialContent[0].type).toBe("tool-approval-response");
       expect(denialContent[0].approvalId).toBe("ap1");
       expect(denialContent[0].approved).toBe(false);
-      expect(denialContent[0].reason).toBe("auto-denied: new generation started");
+      expect(denialContent[0].reason).toBe(
+        "auto-denied: new generation started",
+      );
       // The new user message should follow
       expect(result[3].role).toBe("user");
       expect(result[3].content).toBe("new message");
@@ -317,8 +331,16 @@ describe("mapping", () => {
           content: [
             { type: "tool-call", toolCallId: "tc1", toolName: "a", input: {} },
             { type: "tool-call", toolCallId: "tc2", toolName: "b", input: {} },
-            { type: "tool-approval-request", approvalId: "ap1", toolCallId: "tc1" },
-            { type: "tool-approval-request", approvalId: "ap2", toolCallId: "tc2" },
+            {
+              type: "tool-approval-request",
+              approvalId: "ap1",
+              toolCallId: "tc1",
+            },
+            {
+              type: "tool-approval-request",
+              approvalId: "ap2",
+              toolCallId: "tc2",
+            },
           ],
         },
       ] as any;
@@ -341,14 +363,26 @@ describe("mapping", () => {
           content: [
             { type: "tool-call", toolCallId: "tc1", toolName: "a", input: {} },
             { type: "tool-call", toolCallId: "tc2", toolName: "b", input: {} },
-            { type: "tool-approval-request", approvalId: "ap1", toolCallId: "tc1" },
-            { type: "tool-approval-request", approvalId: "ap2", toolCallId: "tc2" },
+            {
+              type: "tool-approval-request",
+              approvalId: "ap1",
+              toolCallId: "tc1",
+            },
+            {
+              type: "tool-approval-request",
+              approvalId: "ap2",
+              toolCallId: "tc2",
+            },
           ],
         },
         {
           role: "tool" as const,
           content: [
-            { type: "tool-approval-response", approvalId: "ap1", approved: true },
+            {
+              type: "tool-approval-response",
+              approvalId: "ap1",
+              approved: true,
+            },
           ],
         },
         { role: "user" as const, content: "next question" },
@@ -381,8 +415,16 @@ describe("mapping", () => {
           content: [
             { type: "tool-call", toolCallId: "tc1", toolName: "a", input: {} },
             { type: "tool-call", toolCallId: "tc2", toolName: "b", input: {} },
-            { type: "tool-approval-request", approvalId: "ap1", toolCallId: "tc1" },
-            { type: "tool-approval-request", approvalId: "ap2", toolCallId: "tc2" },
+            {
+              type: "tool-approval-request",
+              approvalId: "ap1",
+              toolCallId: "tc1",
+            },
+            {
+              type: "tool-approval-request",
+              approvalId: "ap2",
+              toolCallId: "tc2",
+            },
           ],
         },
       ] as any;
@@ -390,12 +432,8 @@ describe("mapping", () => {
       autoDenyUnresolvedApprovals(messages);
 
       expect(warnSpy).toHaveBeenCalledTimes(2);
-      expect(warnSpy).toHaveBeenCalledWith(
-        expect.stringContaining("ap1"),
-      );
-      expect(warnSpy).toHaveBeenCalledWith(
-        expect.stringContaining("ap2"),
-      );
+      expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining("ap1"));
+      expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining("ap2"));
       warnSpy.mockRestore();
     });
   });
diff --git a/src/mapping.ts b/src/mapping.ts
index 2efdec0d..7832a93e 100644
--- a/src/mapping.ts
+++ b/src/mapping.ts
@@ -331,7 +331,13 @@ export async function serializeNewMessagesInStep<TOOLS extends ToolSet>(
   } else {
     messagesToSerialize = [{ role: "assistant" as const, content: [] }];
   }
-  return serializeStepMessages(ctx, component, step, model, messagesToSerialize);
+  return serializeStepMessages(
+    ctx,
+    component,
+    step,
+    model,
+    messagesToSerialize,
+  );
 }
 
 async function serializeStepMessages<TOOLS extends ToolSet>(