diff --git a/apps/landing/package.json b/apps/landing/package.json
index 70b0e7f..fb91937 100644
--- a/apps/landing/package.json
+++ b/apps/landing/package.json
@@ -17,7 +17,7 @@
     "framer-motion": "^12.34.3",
     "geist": "^1.7.0",
     "lucide-react": "^0.469.0",
-    "next": "^15.5.10",
+    "next": "^15.5.15",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "tailwind-merge": "^2.1.0"
diff --git a/apps/web/e2e/global-teardown.ts b/apps/web/e2e/global-teardown.ts
index 2cb6bf9..84bf2f7 100644
--- a/apps/web/e2e/global-teardown.ts
+++ b/apps/web/e2e/global-teardown.ts
@@ -46,7 +46,7 @@ async function globalTeardown() {
         args: {
           secret: adminSecret,
           name: "testing/helpers:cleanupE2ETestData",
-          mutationArgs: {},
+          mutationArgsJson: JSON.stringify({}),
         },
         format: "json",
       }),
diff --git a/apps/web/e2e/helpers/test-data.ts b/apps/web/e2e/helpers/test-data.ts
index 78835e9..cf9df43 100644
--- a/apps/web/e2e/helpers/test-data.ts
+++ b/apps/web/e2e/helpers/test-data.ts
@@ -37,7 +37,11 @@ async function callInternalMutation<T>(path: string, args: Record<string, unknow
     },
     body: JSON.stringify({
       path: "testAdmin:runTestMutation",
-      args: { secret: getAdminSecret(), name: path, mutationArgs: args },
+      args: {
+        secret: getAdminSecret(),
+        name: path,
+        mutationArgsJson: JSON.stringify(args),
+      },
       format: "json",
     }),
   });
diff --git a/apps/web/e2e/helpers/widget-helpers.ts b/apps/web/e2e/helpers/widget-helpers.ts
index 5e615e0..9d58cbe 100644
--- a/apps/web/e2e/helpers/widget-helpers.ts
+++ b/apps/web/e2e/helpers/widget-helpers.ts
@@ -315,6 +315,8 @@ export async function waitForSurveyVisible(page: Page, timeout = 10000): Promise
 export async function submitNPSRating(page: Page, rating: number): Promise<void> {
   const frame = getWidgetContainer(page);
 
+  await dismissTour(page);
+
   // Click the rating button (0-10)
   await frame
     .locator(
diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index 5021f99..ca1d5b6 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -46,18 +46,6 @@ const nextConfig = {
     // Reduce memory usage during webpack compilation
     webpackMemoryOptimizations: true,
   },
-  webpack: (config, { dev }) => {
-    if (dev) {
-      // Use filesystem cache to reduce in-memory pressure during dev
-      config.cache = {
-        type: "filesystem",
-        buildDependencies: {
-          config: [__filename],
-        },
-      };
-    }
-    return config;
-  },
   async headers() {
     return [
       {
diff --git a/apps/web/package.json b/apps/web/package.json
index b49f80c..0a2614d 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -22,7 +22,7 @@
     "fflate": "^0.8.2",
     "lucide-react": "^0.469.0",
     "markdown-it": "^14.1.1",
-    "next": "^15.5.10",
+    "next": "^15.5.15",
     "react": "^19.2.3",
     "react-dom": "^19.2.3"
   },
diff --git a/apps/web/src/app/inbox/InboxAiReviewPanel.test.tsx b/apps/web/src/app/inbox/InboxAiReviewPanel.test.tsx
new file mode 100644
index 0000000..b50d431
--- /dev/null
+++ b/apps/web/src/app/inbox/InboxAiReviewPanel.test.tsx
@@ -0,0 +1,46 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import type { Id } from "@opencom/convex/dataModel";
+import { InboxAiReviewPanel } from "./InboxAiReviewPanel";
+import type { InboxAiResponse } from "./inboxRenderTypes";
+
+function messageId(value: string): Id<"messages"> {
+  return value as Id<"messages">;
+}
+
+function responseId(value: string): Id<"aiResponses"> {
+  return value as Id<"aiResponses">;
+}
+
+describe("InboxAiReviewPanel", () => {
+  it("renders persisted model and provider metadata for AI responses", () => {
+    const response: InboxAiResponse = {
+      _id: responseId("response_1"),
+      createdAt: Date.now(),
+      query: "How do I reset my password?",
+      response: "Go to Settings > Security > Reset Password.",
+      confidence: 0.82,
+      model: "openai/gpt-5-nano",
+      provider: "openai",
+      handedOff: false,
+      messageId: messageId("message_1"),
+      sources: [],
+      deliveredResponseContext: null,
+      generatedResponseContext: null,
+    };
+
+    render(
+      <InboxAiReviewPanel
+        aiResponses={[response]}
+        orderedAiResponses={[response]}
+        selectedConversation={null}
+        onOpenArticle={vi.fn()}
+        onJumpToMessage={vi.fn()}
+        getHandoffReasonLabel={(reason) => reason ?? "No reason"}
+      />
+    );
+
+    expect(screen.getByText("Model openai/gpt-5-nano")).toBeInTheDocument();
+    expect(screen.getByText("Provider openai")).toBeInTheDocument();
+  });
+});
diff --git a/apps/web/src/app/inbox/InboxAiReviewPanel.tsx b/apps/web/src/app/inbox/InboxAiReviewPanel.tsx
index 14cfcda..91b5b74 100644
--- a/apps/web/src/app/inbox/InboxAiReviewPanel.tsx
+++ b/apps/web/src/app/inbox/InboxAiReviewPanel.tsx
@@ -136,6 +136,12 @@ export function InboxAiReviewPanel({
                   <span className="rounded bg-muted px-2 py-0.5">
                     {confidenceLabel} {Math.round(confidenceValue * 100)}%
                   </span>
+                  <span className="rounded bg-muted px-2 py-0.5" data-testid={`inbox-ai-review-model-${response._id}`}>
+                    Model {response.model}
+                  </span>
+                  <span className="rounded bg-muted px-2 py-0.5" data-testid={`inbox-ai-review-provider-${response._id}`}>
+                    Provider {response.provider}
+                  </span>
                   {response.feedback && (
                     <span className="rounded bg-muted px-2 py-0.5">
                       Feedback {response.feedback === "helpful" ? "helpful" : "not helpful"}
diff --git a/apps/web/src/app/inbox/inboxRenderTypes.ts b/apps/web/src/app/inbox/inboxRenderTypes.ts
index f3809de..1bee376 100644
--- a/apps/web/src/app/inbox/inboxRenderTypes.ts
+++ b/apps/web/src/app/inbox/inboxRenderTypes.ts
@@ -87,6 +87,8 @@ export interface InboxAiResponse {
   query: string;
   response: string;
   confidence: number;
+  model: string;
+  provider: string;
   handedOff: boolean;
   handoffReason?: string | null;
   messageId: Id<"messages">;
diff --git a/apps/web/src/app/settings/AIAgentSection.test.tsx b/apps/web/src/app/settings/AIAgentSection.test.tsx
new file mode 100644
index 0000000..1ed0fc8
--- /dev/null
+++ b/apps/web/src/app/settings/AIAgentSection.test.tsx
@@ -0,0 +1,87 @@
+import { act, render, screen, waitFor } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Id } from "@opencom/convex/dataModel";
+import { AIAgentSection } from "./AIAgentSection";
+import { useWebAction, useWebMutation, useWebQuery } from "@/lib/convex/hooks";
+
+vi.mock("@/lib/convex/hooks", () => ({
+  useWebAction: vi.fn(),
+  useWebMutation: vi.fn(),
+  useWebQuery: vi.fn(),
+  webActionRef: vi.fn((functionName: string) => functionName),
+  webMutationRef: vi.fn((functionName: string) => functionName),
+  webQueryRef: vi.fn((functionName: string) => functionName),
+}));
+
+describe("AIAgentSection model discovery fallbacks", () => {
+  const workspaceId = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" as unknown as Id<"workspaces">;
+  const aiSettingsFixture = {
+    enabled: true,
+    model: "openai/gpt-5-nano",
+    confidenceThreshold: 0.6,
+    knowledgeSources: ["articles"],
+    personality: "",
+    handoffMessage: "",
+    suggestionsEnabled: false,
+    embeddingModel: "text-embedding-3-small",
+    lastConfigError: null,
+  } as const;
+
+  let listAvailableModelsMock: ReturnType<typeof vi.fn>;
+  let rejectDiscovery: ((reason?: unknown) => void) | undefined;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.spyOn(console, "error").mockImplementation(() => {});
+
+    const mockedUseWebQuery = useWebQuery as unknown as ReturnType<typeof vi.fn>;
+    mockedUseWebQuery.mockImplementation((_: unknown, args: unknown) => {
+      if (args === "skip") {
+        return undefined;
+      }
+
+      return aiSettingsFixture;
+    });
+
+    listAvailableModelsMock = vi.fn(
+      () =>
+        new Promise((_, reject) => {
+          rejectDiscovery = reject;
+        })
+    );
+
+    const mockedUseWebAction = useWebAction as unknown as ReturnType<typeof vi.fn>;
+    mockedUseWebAction.mockReturnValue(listAvailableModelsMock);
+
+    const mockedUseWebMutation = useWebMutation as unknown as ReturnType<typeof vi.fn>;
+    mockedUseWebMutation.mockReturnValue(vi.fn().mockResolvedValue(undefined));
+  });
+
+  it("stops showing the loading placeholder when model discovery fails", async () => {
+    render(<AIAgentSection workspaceId={workspaceId} />);
+
+    await waitFor(() => {
+      expect(listAvailableModelsMock).toHaveBeenCalledWith({
+        workspaceId,
+        selectedModel: aiSettingsFixture.model,
+      });
+    });
+
+    expect(screen.getByRole("option", { name: /loading discovered models/i })).toBeInTheDocument();
+
+    await act(async () => {
+      rejectDiscovery?.(new Error("Discovery failed"));
+    });
+
+    await waitFor(() => {
+      expect(screen.getByRole("option", { name: /model discovery unavailable/i })).toBeInTheDocument();
+    });
+
+    expect(
+      screen.getByText(/model discovery is currently unavailable\. enter a model id manually/i)
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByRole("option", { name: /loading discovered models/i })
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/apps/web/src/app/settings/AIAgentSection.tsx b/apps/web/src/app/settings/AIAgentSection.tsx
index 738d87b..96078da 100644
--- a/apps/web/src/app/settings/AIAgentSection.tsx
+++ b/apps/web/src/app/settings/AIAgentSection.tsx
@@ -6,12 +6,17 @@ import { AlertTriangle, Bot } from "lucide-react";
 import type { Id } from "@opencom/convex/dataModel";
 import { useAIAgentSectionConvex } from "./hooks/useSettingsSectionsConvex";
 
+function normalizeModelValue(value: string): string {
+  return value.trim();
+}
+
 export function AIAgentSection({
   workspaceId,
 }: {
   workspaceId?: Id<"workspaces">;
 }): React.JSX.Element | null {
-  const { aiSettings, availableModels, updateSettings } = useAIAgentSectionConvex(workspaceId);
+  const { aiSettings, availableModels, availableModelsStatus, isSaving, saveSettings } =
+    useAIAgentSectionConvex(workspaceId);
 
   const [enabled, setEnabled] = useState(false);
   const [model, setModel] = useState("openai/gpt-5-nano");
@@ -21,7 +26,17 @@ export function AIAgentSection({
   const [handoffMessage, setHandoffMessage] = useState("");
   const [suggestionsEnabled, setSuggestionsEnabled] = useState(false);
   const [embeddingModel, setEmbeddingModel] = useState("text-embedding-3-small");
-  const [isSaving, setIsSaving] = useState(false);
+  const normalizedModel = normalizeModelValue(model);
+  const selectedDiscoveredModel =
+    availableModels?.some((availableModel) => availableModel.id === normalizedModel) ?? false
+      ? normalizedModel
+      : "";
+  const discoveredModelsPlaceholder =
+    availableModelsStatus === "loading"
+      ? "Loading discovered models..."
+      : availableModelsStatus === "error"
+        ? "Model discovery unavailable"
+        : "Choose a discovered model";
 
   useEffect(() => {
     if (aiSettings) {
@@ -38,23 +53,19 @@ export function AIAgentSection({
 
   const handleSave = async () => {
     if (!workspaceId) return;
-    setIsSaving(true);
-    try {
-      await updateSettings({
-        workspaceId,
-        enabled,
-        model,
-        confidenceThreshold,
-        knowledgeSources: knowledgeSources as ("articles" | "internalArticles" | "snippets")[],
-        personality: personality || undefined,
-        handoffMessage: handoffMessage || undefined,
-        suggestionsEnabled,
-        embeddingModel,
-      });
-    } catch (error) {
-      console.error("Failed to save AI settings:", error);
-    } finally {
-      setIsSaving(false);
+    const nextModel = await saveSettings({
+      workspaceId,
+      enabled,
+      model,
+      confidenceThreshold,
+      knowledgeSources: knowledgeSources as ("articles" | "internalArticles" | "snippets")[],
+      personality,
+      handoffMessage,
+      suggestionsEnabled,
+      embeddingModel,
+    });
+    if (nextModel) {
+      setModel(nextModel);
     }
   };
 
@@ -131,18 +142,31 @@ export function AIAgentSection({
             <div className="space-y-2">
               <label className="text-sm font-medium">AI Model</label>
               <select
-                value={model}
+                value={selectedDiscoveredModel}
                 onChange={(e) => setModel(e.target.value)}
                 className="w-full px-3 py-2 border rounded-md text-sm bg-background"
               >
+                <option value="">{discoveredModelsPlaceholder}</option>
                 {availableModels?.map((m: NonNullable<typeof availableModels>[number]) => (
                   <option key={m.id} value={m.id}>
                     {m.name} ({m.provider})
                   </option>
                 ))}
               </select>
+              <Input
+                value={model}
+                onChange={(e) => setModel(e.target.value)}
+                placeholder="openai/gpt-5-nano"
+              />
+              {availableModelsStatus === "error" && (
+                <p className="text-xs text-amber-700">
+                  Model discovery is currently unavailable. Enter a model ID manually or try again
+                  later.
+                </p>
+              )}
               <p className="text-xs text-muted-foreground">
-                Choose the AI model for generating responses.
+                Choose a discovered model or enter one manually. Raw model IDs are interpreted
+                against the currently configured AI gateway runtime.
               </p>
             </div>
 
@@ -252,9 +276,6 @@ export function AIAgentSection({
                     <option value="text-embedding-3-small">
                       text-embedding-3-small (Recommended)
                     </option>
-                    <option value="text-embedding-3-large">
-                      text-embedding-3-large (Higher quality)
-                    </option>
                     <option value="text-embedding-ada-002">text-embedding-ada-002 (Legacy)</option>
                   </select>
                   <p className="text-xs text-muted-foreground">
diff --git a/apps/web/src/app/settings/hooks/useSettingsSectionsConvex.ts b/apps/web/src/app/settings/hooks/useSettingsSectionsConvex.ts
index c1711aa..f30dc63 100644
--- a/apps/web/src/app/settings/hooks/useSettingsSectionsConvex.ts
+++ b/apps/web/src/app/settings/hooks/useSettingsSectionsConvex.ts
@@ -1,5 +1,6 @@
 "use client";
 
+import { useCallback, useEffect, useState } from "react";
 import type { Id } from "@opencom/convex/dataModel";
 import type { HomeCard, HomeConfig, HomeDefaultSpace, HomeTab } from "@opencom/types";
 import {
@@ -15,6 +16,57 @@ type WorkspaceArgs = {
   workspaceId: Id<"workspaces">;
 };
 
+type AIAgentKnowledgeSource = "articles" | "internalArticles" | "snippets";
+
+type AIAgentSettingsQueryResult = {
+  enabled: boolean;
+  model: string;
+  confidenceThreshold: number;
+  knowledgeSources: AIAgentKnowledgeSource[];
+  personality?: string;
+  handoffMessage?: string;
+  suggestionsEnabled?: boolean;
+  embeddingModel?: string;
+  lastConfigError?: {
+    message: string;
+    code: string;
+    provider?: string;
+    model?: string;
+  } | null;
+} | null;
+
+type AvailableAIAgentModel = {
+  id: string;
+  name: string;
+  provider: string;
+};
+
+type AvailableModelsStatus = "idle" | "loading" | "loaded" | "error";
+
+type UpdateAIAgentSettingsArgs = {
+  workspaceId: Id<"workspaces">;
+  enabled?: boolean;
+  model?: string;
+  confidenceThreshold?: number;
+  knowledgeSources?: AIAgentKnowledgeSource[];
+  personality?: string;
+  handoffMessage?: string;
+  suggestionsEnabled?: boolean;
+  embeddingModel?: string;
+};
+
+type SaveAIAgentSettingsArgs = {
+  workspaceId: Id<"workspaces">;
+  enabled: boolean;
+  model: string;
+  confidenceThreshold: number;
+  knowledgeSources: AIAgentKnowledgeSource[];
+  personality: string;
+  handoffMessage: string;
+  suggestionsEnabled: boolean;
+  embeddingModel: string;
+};
+
 type AuditAccessRecord = {
   status: "unauthenticated" | "forbidden" | "ok";
   canManageSecurity?: boolean;
@@ -64,43 +116,16 @@ type SuccessResponse = {
   success: boolean;
 };
 
-const AI_SETTINGS_QUERY_REF = webQueryRef<
-  WorkspaceArgs,
-  {
-    enabled: boolean;
-    model: string;
-    confidenceThreshold: number;
-    knowledgeSources: string[];
-    personality?: string;
-    handoffMessage?: string;
-    suggestionsEnabled?: boolean;
-    embeddingModel?: string;
-    lastConfigError?: {
-      message: string;
-      code: string;
-      provider?: string;
-      model?: string;
-    } | null;
-  } | null
->("aiAgent:getSettings");
-const AVAILABLE_MODELS_QUERY_REF = webQueryRef<
-  Record<string, never>,
-  Array<{ id: string; name: string; provider: string }>
+const AI_SETTINGS_QUERY_REF = webQueryRef<WorkspaceArgs, AIAgentSettingsQueryResult>(
+  "aiAgent:getSettings"
+);
+const AVAILABLE_MODELS_ACTION_REF = webActionRef<
+  { workspaceId: Id<"workspaces">; selectedModel?: string },
+  AvailableAIAgentModel[]
 >("aiAgent:listAvailableModels");
-const UPDATE_AI_SETTINGS_REF = webMutationRef<
-  {
-    workspaceId: Id<"workspaces">;
-    enabled?: boolean;
-    model?: string;
-    confidenceThreshold?: number;
-    knowledgeSources?: Array<"articles" | "internalArticles" | "snippets">;
-    personality?: string;
-    handoffMessage?: string;
-    suggestionsEnabled?: boolean;
-    embeddingModel?: string;
-  },
-  null
->("aiAgent:updateSettings");
+const UPDATE_AI_SETTINGS_REF = webMutationRef<UpdateAIAgentSettingsArgs, Id<"aiAgentSettings">>(
+  "aiAgent:updateSettings"
+);
 const AUTOMATION_SETTINGS_QUERY_REF = webQueryRef<
   WorkspaceArgs,
   {
@@ -278,10 +303,86 @@ const TRANSFER_OWNERSHIP_REF = webMutationRef<TransferOwnershipArgs, SuccessResp
 );
 
 export function useAIAgentSectionConvex(workspaceId?: Id<"workspaces">) {
+  const aiSettings = useWebQuery(AI_SETTINGS_QUERY_REF, workspaceId ? { workspaceId } : "skip");
+  const listAvailableModels = useWebAction(AVAILABLE_MODELS_ACTION_REF);
+  const updateAIAgentSettings = useWebMutation(UPDATE_AI_SETTINGS_REF);
+  const [availableModels, setAvailableModels] = useState<AvailableAIAgentModel[] | undefined>(
+    undefined
+  );
+  const [availableModelsStatus, setAvailableModelsStatus] =
+    useState<AvailableModelsStatus>("idle");
+  const [isSaving, setIsSaving] = useState(false);
+
+  const saveSettings = useCallback(
+    async (settings: SaveAIAgentSettingsArgs): Promise<string | null> => {
+      const normalizedModel = settings.model.trim();
+      setIsSaving(true);
+      try {
+        await updateAIAgentSettings({
+          workspaceId: settings.workspaceId,
+          enabled: settings.enabled,
+          model: normalizedModel,
+          confidenceThreshold: settings.confidenceThreshold,
+          knowledgeSources: settings.knowledgeSources,
+          personality: settings.personality || undefined,
+          handoffMessage: settings.handoffMessage || undefined,
+          suggestionsEnabled: settings.suggestionsEnabled,
+          embeddingModel: settings.embeddingModel,
+        });
+        return normalizedModel;
+      } catch (error) {
+        console.error("Failed to save AI settings:", error);
+        return null;
+      } finally {
+        setIsSaving(false);
+      }
+    },
+    [updateAIAgentSettings]
+  );
+
+  useEffect(() => {
+    let cancelled = false;
+
+    if (!workspaceId) {
+      setAvailableModels(undefined);
+      setAvailableModelsStatus("idle");
+      return () => {
+        cancelled = true;
+      };
+    }
+
+    setAvailableModels(undefined);
+    setAvailableModelsStatus("loading");
+
+    void listAvailableModels({
+      workspaceId,
+      selectedModel: aiSettings?.model,
+    })
+      .then((models) => {
+        if (!cancelled) {
+          setAvailableModels(models);
+          setAvailableModelsStatus("loaded");
+        }
+      })
+      .catch((error) => {
+        console.error("Failed to load available AI models:", error);
+        if (!cancelled) {
+          setAvailableModels([]);
+          setAvailableModelsStatus("error");
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [workspaceId, aiSettings?.model, listAvailableModels]);
+
   return {
-    aiSettings: useWebQuery(AI_SETTINGS_QUERY_REF, workspaceId ? { workspaceId } : "skip"),
-    availableModels: useWebQuery(AVAILABLE_MODELS_QUERY_REF, {}),
-    updateSettings: useWebMutation(UPDATE_AI_SETTINGS_REF),
+    aiSettings,
+    availableModels,
+    availableModelsStatus,
+    isSaving,
+    saveSettings,
   };
 }
 
diff --git a/apps/web/src/components/SuggestionsPanel.test.tsx b/apps/web/src/components/SuggestionsPanel.test.tsx
new file mode 100644
index 0000000..0b15d04
--- /dev/null
+++ b/apps/web/src/components/SuggestionsPanel.test.tsx
@@ -0,0 +1,95 @@
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Id } from "@opencom/convex/dataModel";
+import { SuggestionsPanel } from "./SuggestionsPanel";
+
+const mocks = vi.hoisted(() => ({
+  getSuggestions: vi.fn(),
+  trackUsage: vi.fn(),
+  trackDismissal: vi.fn(),
+}));
+
+vi.mock("@/components/hooks/useSuggestionsPanelConvex", () => ({
+  useSuggestionsPanelConvex: () => ({
+    settings: {
+      suggestionsEnabled: true,
+      embeddingModel: "text-embedding-3-small",
+    },
+    getSuggestions: mocks.getSuggestions,
+    trackUsage: mocks.trackUsage,
+    trackDismissal: mocks.trackDismissal,
+  }),
+}));
+
+function workspaceId(value: string): Id<"workspaces"> {
+  return value as Id<"workspaces">;
+}
+
+function conversationId(value: string): Id<"conversations"> {
+  return value as Id<"conversations">;
+}
+
+describe("SuggestionsPanel", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.getSuggestions.mockResolvedValue([
+      {
+        id: "article_1",
+        type: "article",
+        title: "Reset Password",
+        snippet: "Go to Settings > Security.",
+        content: "Full reset password content",
+        score: 0.91,
+        embeddingModel: "text-embedding-3-small",
+      },
+    ]);
+  });
+
+  it("shows the resolved embedding model and passes it into usage tracking", async () => {
+    render(
+      <SuggestionsPanel
+        conversationId={conversationId("conversation_1")}
+        workspaceId={workspaceId("workspace_1")}
+        onInsert={vi.fn()}
+      />
+    );
+
+    expect(await screen.findByText("Using embedding model: text-embedding-3-small")).toBeInTheDocument();
+    expect(screen.getByText("Embedding model text-embedding-3-small")).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("button", { name: /insert/i }));
+
+    await waitFor(() => {
+      expect(mocks.trackUsage).toHaveBeenCalledWith({
+        workspaceId: workspaceId("workspace_1"),
+        conversationId: conversationId("conversation_1"),
+        contentType: "article",
+        contentId: "article_1",
+        embeddingModel: "text-embedding-3-small",
+      });
+    });
+  });
+
+  it("passes the embedding model into dismissal tracking", async () => {
+    render(
+      <SuggestionsPanel
+        conversationId={conversationId("conversation_2")}
+        workspaceId={workspaceId("workspace_2")}
+        onInsert={vi.fn()}
+      />
+    );
+
+    await screen.findByText("Reset Password");
+    fireEvent.click(screen.getByRole("button", { name: /dismiss/i }));
+
+    await waitFor(() => {
+      expect(mocks.trackDismissal).toHaveBeenCalledWith({
+        workspaceId: workspaceId("workspace_2"),
+        conversationId: conversationId("conversation_2"),
+        contentType: "article",
+        contentId: "article_1",
+        embeddingModel: "text-embedding-3-small",
+      });
+    });
+  });
+});
diff --git a/apps/web/src/components/SuggestionsPanel.tsx b/apps/web/src/components/SuggestionsPanel.tsx
index b12c7f8..720e5e6 100644
--- a/apps/web/src/components/SuggestionsPanel.tsx
+++ b/apps/web/src/components/SuggestionsPanel.tsx
@@ -37,6 +37,8 @@ export function SuggestionsPanel({
   const [dismissedIds, setDismissedIds] = useState<Set<string>>(new Set());
   const { settings, getSuggestions, trackUsage, trackDismissal } =
     useSuggestionsPanelConvex(workspaceId);
+  const resolvedEmbeddingModel =
+    suggestions[0]?.embeddingModel ?? settings?.embeddingModel ?? "text-embedding-3-small";
 
   const fetchSuggestions = useCallback(async () => {
     if (!settings?.suggestionsEnabled) {
@@ -82,6 +84,7 @@ export function SuggestionsPanel({
         conversationId,
         contentType: suggestion.type,
         contentId: suggestion.id,
+        embeddingModel: suggestion.embeddingModel,
       });
     } catch (err) {
       console.error("Failed to track usage:", err);
@@ -97,6 +100,7 @@ export function SuggestionsPanel({
         conversationId,
         contentType: suggestion.type,
         contentId: suggestion.id,
+        embeddingModel: suggestion.embeddingModel,
       });
     } catch (err) {
       console.error("Failed to track dismissal:", err);
@@ -166,6 +170,10 @@ export function SuggestionsPanel({
         </Button>
       </div>
 
+      <p className="mb-3 text-xs text-muted-foreground" data-testid="inbox-suggestions-embedding-model">
+        Using embedding model: {resolvedEmbeddingModel}
+      </p>
+
       {isLoading && visibleSuggestions.length === 0 && (
         <div className="flex items-center justify-center py-4 text-muted-foreground">
           <Loader2 className="h-5 w-5 animate-spin mr-2" />
@@ -198,6 +206,11 @@ export function SuggestionsPanel({
                   <p className="text-xs text-muted-foreground mt-1 line-clamp-2">
                     {suggestion.snippet}
                   </p>
+                  {suggestion.embeddingModel && (
+                    <p className="mt-1 text-[11px] text-muted-foreground">
+                      Embedding model {suggestion.embeddingModel}
+                    </p>
+                  )}
                 </div>
               </div>
               <Button
@@ -205,6 +218,7 @@ export function SuggestionsPanel({
                 size="sm"
                 onClick={() => handleDismiss(suggestion)}
                 className="h-6 w-6 p-0 flex-shrink-0"
+                aria-label={`Dismiss suggestion ${suggestion.title}`}
                 title="Dismiss"
               >
                 <X className="h-3 w-3" />
diff --git a/apps/web/src/components/hooks/useSuggestionsPanelConvex.ts b/apps/web/src/components/hooks/useSuggestionsPanelConvex.ts
index 1a3e58e..ce9774b 100644
--- a/apps/web/src/components/hooks/useSuggestionsPanelConvex.ts
+++ b/apps/web/src/components/hooks/useSuggestionsPanelConvex.ts
@@ -17,6 +17,7 @@ export type SuggestionRecord = {
   snippet: string;
   content: string;
   score: number;
+  embeddingModel?: string;
 };
 
 type WorkspaceArgs = {
@@ -33,11 +34,12 @@ type TrackSuggestionArgs = {
   conversationId: Id<"conversations">;
   contentType: SuggestionRecord["type"];
   contentId: string;
+  embeddingModel?: string;
 };
 
 const AI_SETTINGS_QUERY_REF = webQueryRef<
   WorkspaceArgs,
-  { suggestionsEnabled?: boolean } | null
+  { suggestionsEnabled?: boolean; embeddingModel?: string } | null
 >("aiAgent:getSettings");
 const GET_SUGGESTIONS_ACTION_REF = webActionRef<SuggestionsArgs, SuggestionRecord[]>(
   "suggestions:getForConversation"
diff --git a/apps/widget/src/components/Home.tsx b/apps/widget/src/components/Home.tsx
index 72d909d..fd9897d 100644
--- a/apps/widget/src/components/Home.tsx
+++ b/apps/widget/src/components/Home.tsx
@@ -76,10 +76,11 @@ export function Home({
 }: HomeProps) {
   const [searchQuery, setSearchQuery] = useState("");
 
-  const homeConfig = useWidgetQuery(publicHomeConfigQueryRef, {
-    workspaceId,
-    isIdentified,
-  }) as NormalizedHomeConfig | undefined;
+  const homeConfig =
+    (useWidgetQuery(publicHomeConfigQueryRef, {
+      workspaceId,
+      isIdentified,
+    }) as NormalizedHomeConfig | undefined) ?? getDefaultHomeConfig();
 
   const featuredArticles = useWidgetQuery(
     visitorArticlesListQueryRef,
@@ -93,7 +94,7 @@ export function Home({
       : "skip"
   ) as Article[] | undefined;
 
-  if (!homeConfig?.enabled) {
+  if (!homeConfig.enabled) {
     return null;
   }
 
diff --git a/docs/api-reference.md b/docs/api-reference.md
index 9b7deb4..6be3bab 100644
--- a/docs/api-reference.md
+++ b/docs/api-reference.md
@@ -325,8 +325,59 @@ Source: `aiAgent.ts`
 
 | Function         | Type     | Auth   | Key Args                                                               | Description          |
 | ---------------- | -------- | ------ | ---------------------------------------------------------------------- | -------------------- |
-| `getSettings`    | query    | member | workspaceId                                                            | Get AI configuration |
-| `updateSettings` | mutation | agent  | workspaceId, enabled?, model?, confidenceThreshold?, knowledgeSources? | Update AI config     |
+| `getSettings`              | query    | member            | workspaceId                                                                                                   | Get AI configuration                                             |
+| `getPublicSettings`        | query    | public            | workspaceId                                                                                                   | Get widget-safe AI settings for runtime use                      |
+| `updateSettings`           | mutation | agent             | workspaceId, enabled?, model?, confidenceThreshold?, knowledgeSources?, suggestionsEnabled?, embeddingModel? | Update AI config                                                 |
+| `getConversationResponses` | query    | member or visitor | conversationId, visitorId?, sessionToken?                                                                     | Get stored AI response records for a conversation                |
+| `listAvailableModels`      | action   | agent             | workspaceId, selectedModel?                                                                                   | Discover generation-capable models for the configured AI gateway |
+
+ The AI agent currently uses two separate model settings:
+
+ - **[reply generation model]**
+   - Stored at `aiAgentSettings.model`
+   - Used by `aiAgentActions:generateResponse` for AI replies and handoff candidate responses
+
+ - **[suggestions / retrieval embedding model]**
+   - Stored at `aiAgentSettings.embeddingModel`
+   - Used by suggestions and embedding-powered retrieval paths such as `suggestions:getForConversation`
+
+ To validate that AI replies are using the selected reply model instead of a default:
+
+ - **[save a distinctive model]**
+   - Save a recognizable model value in AI Agent settings.
+
+ - **[trigger a new AI reply]**
+   - Send a visitor message that produces a fresh AI response.
+
+ - **[inspect stored response metadata]**
+   - The `aiResponses` table persists `model` and `provider` for each stored AI response.
+   - `aiAgent:getConversationResponses` returns those persisted fields.
+
+ - **[expected result]**
+   - The stored `model` should match the selected `aiAgentSettings.model` value that was active when the reply was generated.
+
+ To validate the model used for suggestions:
+ 
+ - **[confirm saved settings]**
+   - `aiAgent:getSettings` should return the selected `embeddingModel`.
+ 
+ - **[trace the runtime path]**
+   - `suggestions:getForConversation` reads `settings.embeddingModel` and passes it into the embedding search path.
+   - That value is normalized by `resolveContentEmbeddingModel(...)` before the embedding provider is called.
+ 
+ - **[inspect admin visibility and persisted feedback]**
+   - The admin suggestions panel now shows `Using embedding model: ...` for the active request.
+   - Usage and dismissal tracking now persist `embeddingModel` on `suggestionFeedback` records.
+ 
+ Current admin UI visibility:
+
+ - **[AI review panel]**
+   - The admin inbox AI review panel currently shows response text, confidence, feedback, sources, and handoff context.
+   - It now also displays the persisted `model` and `provider` fields returned by `aiAgent:getConversationResponses`.
+ 
+ - **[suggestions UI]**
+   - The admin suggestions UI now displays the resolved embedding model used for the current suggestion request.
+   - Individual suggestion usage and dismissal events can also be validated against persisted `suggestionFeedback.embeddingModel` metadata.
 
 ## Identity Verification
 
diff --git a/package.json b/package.json
index 665cabb..d860bb5 100644
--- a/package.json
+++ b/package.json
@@ -82,15 +82,24 @@
   "pnpm": {
     "overrides": {
       "@isaacs/brace-expansion": "5.0.1",
+      "@xmldom/xmldom@0.7.13": "0.8.12",
+      "@xmldom/xmldom@0.8.11": "0.8.12",
       "esbuild": "^0.27.0",
+      "fast-xml-parser": "4.5.5",
+      "flatted": "3.4.2",
       "minimatch": "10.2.3",
+      "node-forge": "1.4.0",
       "@expo/cli>minimatch": "10.2.3",
       "@expo/fingerprint>minimatch": "10.2.3",
       "@expo/metro-config>minimatch": "10.2.3",
       "glob@13.0.0>minimatch": "10.2.3",
       "glob@10.5.0>minimatch": "10.2.3",
+      "picomatch@2.3.1": "2.3.2",
+      "picomatch@3.0.1": "3.0.2",
+      "picomatch@4.0.3": "4.0.4",
       "rollup": "4.59.0",
       "tar": "7.5.11",
+      "vite@7.3.1": "7.3.2",
       "@react-native-community/cli": "17.0.1",
       "@react-native-community/cli-server-api": "17.0.1",
       "@react-native-community/cli-tools": "17.0.1",
diff --git a/packages/convex/convex/_generated/api.d.ts b/packages/convex/convex/_generated/api.d.ts
index 7c39510..07bd412 100644
--- a/packages/convex/convex/_generated/api.d.ts
+++ b/packages/convex/convex/_generated/api.d.ts
@@ -52,6 +52,7 @@ import type * as internalArticles from "../internalArticles.js";
 import type * as knowledge from "../knowledge.js";
 import type * as lib_aiGateway from "../lib/aiGateway.js";
 import type * as lib_authWrappers from "../lib/authWrappers.js";
+import type * as lib_embeddingModels from "../lib/embeddingModels.js";
 import type * as lib_notificationPreferences from "../lib/notificationPreferences.js";
 import type * as lib_seriesRuntimeAdapter from "../lib/seriesRuntimeAdapter.js";
 import type * as lib_unifiedArticles from "../lib/unifiedArticles.js";
@@ -238,6 +239,7 @@ declare const fullApi: ApiFromModules<{
   knowledge: typeof knowledge;
   "lib/aiGateway": typeof lib_aiGateway;
   "lib/authWrappers": typeof lib_authWrappers;
+  "lib/embeddingModels": typeof lib_embeddingModels;
   "lib/notificationPreferences": typeof lib_notificationPreferences;
   "lib/seriesRuntimeAdapter": typeof lib_seriesRuntimeAdapter;
   "lib/unifiedArticles": typeof lib_unifiedArticles;
diff --git a/packages/convex/convex/aiAgent.ts b/packages/convex/convex/aiAgent.ts
index 3b95393..bb114b5 100644
--- a/packages/convex/convex/aiAgent.ts
+++ b/packages/convex/convex/aiAgent.ts
@@ -12,6 +12,8 @@ import { Doc, Id } from "./_generated/dataModel";
 import { getAuthenticatedUserFromSession } from "./auth";
 import { getWorkspaceMembership, requirePermission } from "./permissions";
 import { authAction, authMutation, authQuery } from "./lib/authWrappers";
+import { DEFAULT_CONTENT_EMBEDDING_MODEL, resolveContentEmbeddingModel } from "./lib/embeddingModels";
+import { getAIGatewayApiKey, getAIBaseURL, getAIGatewayProviderLabel } from "./lib/aiGateway";
 import { getShallowRunAfter, routeEventRef } from "./notifications/functionRefs";
 import { resolveVisitorFromSession } from "./widgetSessions";
 
@@ -31,6 +33,41 @@ type RuntimeKnowledgeResult = {
   relevanceScore: number;
 };
 
+type AvailableAIModel = {
+  id: string;
+  name: string;
+  provider: string;
+};
+
+type OpenAIModelListResponse = {
+  data?: Array<{
+    id?: string;
+    created?: number;
+  }>;
+};
+
+type StoredAIResponse = Doc<"aiResponses">;
+type StoredAIResponseSource = StoredAIResponse["sources"][number];
+type StoredAIResponseWithMessage = StoredAIResponse & {
+  messageId: Id<"messages">;
+};
+
+type ConversationResponse = Omit<StoredAIResponse, "messageId"> & {
+  messageId: Id<"messages">;
+  deliveredResponseContext: {
+    response: string;
+    sources: StoredAIResponseSource[];
+    confidence: number | null;
+  };
+  generatedResponseContext:
+    | {
+        response: string;
+        sources: StoredAIResponseSource[];
+        confidence: number;
+      }
+    | null;
+};
+
 type GetRelevantKnowledgeForRuntimeActionArgs = {
   workspaceId: Id<"workspaces">;
   query: string;
@@ -77,10 +114,125 @@ const DEFAULT_AI_SETTINGS = {
   workingHours: null,
   model: "openai/gpt-5-nano",
   suggestionsEnabled: false,
-  embeddingModel: "text-embedding-3-small",
+  embeddingModel: DEFAULT_CONTENT_EMBEDDING_MODEL,
   lastConfigError: null,
 };
 
+const AVAILABLE_MODEL_DISCOVERY_TIMEOUT_MS = 5000;
+const NON_GENERATION_MODEL_PREFIXES = [
+  "text-embedding-",
+  "omni-moderation-",
+  "whisper-",
+  "tts-",
+  "gpt-image-",
+  "dall-e-",
+  "babbage-",
+  "davinci-",
+];
+
+function normalizeAvailableModelId(value: string | undefined): string | null {
+  const normalized = value?.trim();
+  if (!normalized) {
+    return null;
+  }
+
+  return normalized;
+}
+
+function createAvailableAIModel(value: string | undefined): AvailableAIModel | null {
+  const normalizedId = normalizeAvailableModelId(value);
+  if (!normalizedId) {
+    return null;
+  }
+
+  const defaultProvider = getAIGatewayProviderLabel(getAIBaseURL(getAIGatewayApiKey()));
+  const providerSeparatorIndex = normalizedId.indexOf("/");
+  if (providerSeparatorIndex === -1) {
+    return {
+      id: normalizedId,
+      name: normalizedId,
+      provider: defaultProvider,
+    };
+  }
+
+  const provider = normalizedId.slice(0, providerSeparatorIndex).trim();
+  const model = normalizedId.slice(providerSeparatorIndex + 1).trim();
+  return {
+    id: normalizedId,
+    name: model || normalizedId,
+    provider: provider || defaultProvider,
+  };
+}
+
+function isLikelyGenerationModel(modelId: string): boolean {
+  const normalized = modelId.trim().toLowerCase();
+  if (!normalized) {
+    return false;
+  }
+
+  const modelPathParts = normalized.split("/").map((part) => part.trim()).filter(Boolean);
+  const modelName = modelPathParts[modelPathParts.length - 1] ?? "";
+  if (!modelName) {
+    return false;
+  }
+
+  return !NON_GENERATION_MODEL_PREFIXES.some((prefix) => modelName.startsWith(prefix));
+}
+
+function dedupeAvailableAIModels(models: AvailableAIModel[]): AvailableAIModel[] {
+  const seen = new Set<string>();
+  return models.filter((model) => {
+    if (seen.has(model.id)) {
+      return false;
+    }
+
+    seen.add(model.id);
+    return true;
+  });
+}
+
+async function discoverAvailableAIModels(): Promise<AvailableAIModel[] | null> {
+  const apiKey = getAIGatewayApiKey();
+  if (!apiKey) {
+    return null;
+  }
+
+  const providerLabel = getAIGatewayProviderLabel(getAIBaseURL(apiKey));
+
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), AVAILABLE_MODEL_DISCOVERY_TIMEOUT_MS);
+  try {
+    const response = await fetch(`${getAIBaseURL(apiKey)}/models`, {
+      headers: {
+        Accept: "application/json",
+        Authorization: `Bearer ${apiKey}`,
+      },
+      signal: controller.signal,
+    });
+    if (!response.ok) {
+      return null;
+    }
+
+    const payload = (await response.json()) as OpenAIModelListResponse;
+    const models = Array.isArray(payload.data) ? payload.data : [];
+
+    return models
+      .filter(
+        (model): model is { id: string; created?: number } =>
+          typeof model.id === "string" && isLikelyGenerationModel(model.id)
+      )
+      .sort((left, right) => (right.created ?? 0) - (left.created ?? 0) || left.id.localeCompare(right.id))
+      .map((model) =>
+        createAvailableAIModel(model.id.includes("/") ? model.id : `${providerLabel}/${model.id}`)
+      )
+      .filter((model): model is AvailableAIModel => model !== null);
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
 function withAISettingDefaults(settings: Doc<"aiAgentSettings"> | null): {
   _id?: Id<"aiAgentSettings">;
   _creationTime?: number;
@@ -115,7 +267,9 @@ function withAISettingDefaults(settings: Doc<"aiAgentSettings"> | null): {
     handoffMessage: settings.handoffMessage ?? DEFAULT_AI_SETTINGS.handoffMessage,
     workingHours: settings.workingHours ?? null,
     suggestionsEnabled: settings.suggestionsEnabled ?? false,
-    embeddingModel: settings.embeddingModel ?? DEFAULT_AI_SETTINGS.embeddingModel,
+    embeddingModel: resolveContentEmbeddingModel(
+      settings.embeddingModel ?? DEFAULT_AI_SETTINGS.embeddingModel
+    ),
     lastConfigError: settings.lastConfigError ?? null,
   };
 }
@@ -129,6 +283,7 @@ async function getWorkspaceAISettings(
     .withIndex("by_workspace", (q) => q.eq("workspaceId", workspaceId))
     .first();
 }
+
 async function requireConversationAccess(
   ctx: QueryCtx | MutationCtx,
   args: {
@@ -241,7 +396,7 @@ export const updateSettings = authMutation({
     embeddingModel: v.optional(v.string()),
   },
   permission: "settings.workspace",
-  handler: async (ctx, args) => {
+  handler: async (ctx, args): Promise<Id<"aiAgentSettings">> => {
     const now = Date.now();
 
     const existing = await ctx.db
@@ -264,7 +419,8 @@ export const updateSettings = authMutation({
       if (args.model !== undefined) updates.model = args.model;
       if (args.suggestionsEnabled !== undefined)
         updates.suggestionsEnabled = args.suggestionsEnabled;
-      if (args.embeddingModel !== undefined) updates.embeddingModel = args.embeddingModel;
+      if (args.embeddingModel !== undefined)
+        updates.embeddingModel = resolveContentEmbeddingModel(args.embeddingModel);
 
       await ctx.db.patch(existing._id, updates);
       return existing._id;
@@ -281,7 +437,9 @@ export const updateSettings = authMutation({
       workingHours: args.workingHours ?? undefined,
       model: args.model ?? "openai/gpt-5-nano",
       suggestionsEnabled: args.suggestionsEnabled ?? false,
-      embeddingModel: args.embeddingModel ?? "text-embedding-3-small",
+      embeddingModel: resolveContentEmbeddingModel(
+        args.embeddingModel ?? DEFAULT_CONTENT_EMBEDDING_MODEL
+      ),
       createdAt: now,
       updatedAt: now,
     });
@@ -382,7 +540,7 @@ export const getRelevantKnowledgeForRuntime = internalQuery({
     knowledgeSources: v.optional(v.array(knowledgeSourceValidator)),
     limit: v.optional(v.number()),
   },
-  handler: async () => {
+  handler: async (): Promise<RuntimeKnowledgeResult[]> => {
     return [];
   },
 });
@@ -408,7 +566,7 @@ export const storeResponse = mutation({
     model: v.string(),
     provider: v.string(),
   },
-  handler: async (ctx, args) => {
+  handler: async (ctx, args): Promise<Id<"aiResponses">> => {
     await requireConversationAccess(ctx, {
       conversationId: args.conversationId,
       visitorId: args.visitorId,
@@ -454,7 +612,7 @@ export const submitFeedback = mutation({
     visitorId: v.optional(v.id("visitors")),
     sessionToken: v.optional(v.string()),
   },
-  handler: async (ctx, args) => {
+  handler: async (ctx, args): Promise<void> => {
     const response = await ctx.db.get(args.responseId);
     if (!response) {
       throw new Error("AI response not found");
@@ -477,7 +635,7 @@ export const getConversationResponses = query({
     visitorId: v.optional(v.id("visitors")),
     sessionToken: v.optional(v.string()),
   },
-  handler: async (ctx, args) => {
+  handler: async (ctx, args): Promise<ConversationResponse[]> => {
     await requireConversationAccess(ctx, {
       conversationId: args.conversationId,
       visitorId: args.visitorId,
@@ -489,22 +647,26 @@ export const getConversationResponses = query({
       .withIndex("by_conversation", (q) => q.eq("conversationId", args.conversationId))
       .collect();
 
-    return responses.map((response) => ({
-      ...response,
-      deliveredResponseContext: {
-        response: response.response,
-        sources: response.sources,
-        confidence: response.handedOff ? null : response.confidence,
-      },
-      generatedResponseContext:
-        response.generatedCandidateResponse === undefined
-          ? null
-          : {
-              response: response.generatedCandidateResponse,
-              sources: response.generatedCandidateSources ?? [],
-              confidence: response.generatedCandidateConfidence ?? response.confidence,
-            },
-    }));
+    return responses
+      .filter(
+        (response): response is StoredAIResponseWithMessage => response.messageId !== undefined
+      )
+      .map((response) => ({
+        ...response,
+        deliveredResponseContext: {
+          response: response.response,
+          sources: response.sources,
+          confidence: response.handedOff ? null : response.confidence,
+        },
+        generatedResponseContext:
+          response.generatedCandidateResponse === undefined
+            ? null
+            : {
+                response: response.generatedCandidateResponse,
+                sources: response.generatedCandidateSources ?? [],
+                confidence: response.generatedCandidateConfidence ?? response.confidence,
+              },
+      }));
   },
 });
 
@@ -711,20 +873,19 @@ export const getAnalytics = authQuery({
 });
 
 // List available AI models (from AI Gateway)
-export const listAvailableModels = query({
-  args: {},
-  handler: async () => {
-    // Return a static list of supported models
-    // In production, this could query the AI Gateway API
-    return [
-      { id: "openai/gpt-5-nano", name: "GPT-5.1 Mini", provider: "openai" },
-      // { id: "openai/gpt-5.1", name: "GPT-5.1", provider: "openai" },
-      // { id: "anthropic/claude-3-haiku-20240307", name: "Claude 3 Haiku", provider: "anthropic" },
-      // {
-      //   id: "anthropic/claude-3-5-sonnet-20241022",
-      //   name: "Claude 3.5 Sonnet",
-      //   provider: "anthropic",
-      // },
-    ];
+export const listAvailableModels = authAction({
+  args: {
+    workspaceId: v.id("workspaces"),
+    selectedModel: v.optional(v.string()),
+  },
+  permission: "settings.workspace",
+  handler: async (_ctx, args): Promise<AvailableAIModel[]> => {
+    const discoveredModels = await discoverAvailableAIModels();
+    const fallbackModels = [
+      createAvailableAIModel(args.selectedModel),
+      createAvailableAIModel(DEFAULT_AI_SETTINGS.model),
+    ].filter((model): model is AvailableAIModel => model !== null);
+
+    return dedupeAvailableAIModels([...(discoveredModels ?? []), ...fallbackModels]);
   },
 });
diff --git a/packages/convex/convex/aiAgentActions.ts b/packages/convex/convex/aiAgentActions.ts
index 2830050..10e977d 100644
--- a/packages/convex/convex/aiAgentActions.ts
+++ b/packages/convex/convex/aiAgentActions.ts
@@ -5,7 +5,7 @@ import { v } from "convex/values";
 import type { Id } from "./_generated/dataModel";
 import { action } from "./_generated/server";
 import { generateText } from "ai";
-import { createAIClient } from "./lib/aiGateway";
+import { createAIClient, getAIGatewayProviderLabel } from "./lib/aiGateway";
 
 type AIConfigurationDiagnostic = {
   code: string;
@@ -242,7 +242,13 @@ function getShallowRunAction(ctx: { runAction: unknown }) {
   ) => Promise<Return>;
 }
 
-const SUPPORTED_AI_PROVIDERS = new Set(["openai"]);
+function maybeGetShallowRunAction(ctx: { runAction?: unknown }) {
+  if (typeof ctx.runAction !== "function") {
+    return null;
+  }
+  return getShallowRunAction(ctx as { runAction: unknown });
+}
+
 const GENERATION_FAILURE_FALLBACK_RESPONSE =
   "I'm having trouble processing your request right now. Let me connect you with a human agent.";
 const EMPTY_RESPONSE_RETRY_LIMIT = 1;
@@ -263,17 +269,20 @@ const isGPT5ReasoningModel = (provider: string, model: string): boolean =>
 
 // Parse model string to get provider and model name
 export const parseModel = (modelString: string): { provider: string; model: string } => {
-  const parts = modelString.split("/");
+  const trimmedModel = modelString.trim();
+  const parts = trimmedModel.split("/");
   if (parts.length === 2) {
     return { provider: parts[0], model: parts[1] };
   }
-  return { provider: "openai", model: modelString };
+
+  return { provider: getAIGatewayProviderLabel(), model: trimmedModel };
 };
 
 export const getAIConfigurationDiagnostic = (
   modelString: string,
-  environment: { aiGatewayApiKey?: string } = {
+  environment: { aiGatewayApiKey?: string; aiGatewayProviderLabel?: string } = {
     aiGatewayApiKey: process.env.AI_GATEWAY_API_KEY,
+    aiGatewayProviderLabel: getAIGatewayProviderLabel(),
   }
 ): AIConfigurationDiagnostic | null => {
   const trimmedModel = modelString.trim();
@@ -284,21 +293,24 @@ export const getAIConfigurationDiagnostic = (
     };
   }
 
+  const providerLabel = environment.aiGatewayProviderLabel ?? getAIGatewayProviderLabel();
   const parts = trimmedModel.split("/");
-  if (parts.length !== 2 || !parts[0] || !parts[1]) {
+  if (parts.length > 2 || (parts.length === 2 && (!parts[0] || !parts[1]))) {
     return {
       code: "INVALID_MODEL_FORMAT",
-      message: "AI model format is invalid. Use provider/model (for example openai/gpt-5-nano).",
+      message:
+        "AI model format is invalid. Use provider/model or a raw model ID exposed by the configured AI gateway.",
       model: trimmedModel,
     };
   }
 
-  const provider = parts[0];
-  if (!SUPPORTED_AI_PROVIDERS.has(provider)) {
+  const provider = parts.length === 2 ? parts[0] : providerLabel;
+  const model = parts.length === 2 ? parts[1] : trimmedModel;
+  if (!provider || !model) {
     return {
-      code: "UNSUPPORTED_PROVIDER",
-      message: `Provider '${provider}' is not supported in this runtime.`,
-      provider,
+      code: "INVALID_MODEL_FORMAT",
+      message:
+        "AI model format is invalid. Use provider/model or a raw model ID exposed by the configured AI gateway.",
       model: trimmedModel,
     };
   }
@@ -473,7 +485,7 @@ export const generateResponse = action({
 
     const runQuery = getShallowRunQuery(ctx);
     const runMutation = getShallowRunMutation(ctx);
-    const runAction = getShallowRunAction(ctx);
+    const runAction = maybeGetShallowRunAction(ctx);
     const access = await runQuery(AUTHORIZE_CONVERSATION_ACCESS_REF, {
       conversationId: args.conversationId,
       visitorId: args.visitorId,
@@ -576,19 +588,21 @@ export const generateResponse = action({
 
     // Get relevant knowledge
     let knowledgeResults: RelevantKnowledgeResult[] = [];
-    try {
-      knowledgeResults = await runAction(GET_RELEVANT_KNOWLEDGE_FOR_RUNTIME_ACTION_REF, {
-        workspaceId: args.workspaceId,
-        query: args.query,
-        knowledgeSources: settings.knowledgeSources,
-        limit: 5,
-        embeddingModel: settings.embeddingModel,
-      });
-    } catch (retrievalError) {
-      console.error(
-        "Knowledge retrieval failed; continuing without knowledge context:",
-        retrievalError
-      );
+    if (runAction) {
+      try {
+        knowledgeResults = await runAction(GET_RELEVANT_KNOWLEDGE_FOR_RUNTIME_ACTION_REF, {
+          workspaceId: args.workspaceId,
+          query: args.query,
+          knowledgeSources: settings.knowledgeSources,
+          limit: 5,
+          embeddingModel: settings.embeddingModel,
+        });
+      } catch (retrievalError) {
+        console.error(
+          "Knowledge retrieval failed; continuing without knowledge context:",
+          retrievalError
+        );
+      }
     }
 
     // Build knowledge context for prompt
diff --git a/packages/convex/convex/aiAgentActionsKnowledge.ts b/packages/convex/convex/aiAgentActionsKnowledge.ts
index 67debcb..fdf6809 100644
--- a/packages/convex/convex/aiAgentActionsKnowledge.ts
+++ b/packages/convex/convex/aiAgentActionsKnowledge.ts
@@ -2,10 +2,10 @@ import { internalAction } from "./_generated/server";
 import { v } from "convex/values";
 import { embed } from "ai";
 import { createAIClient } from "./lib/aiGateway";
+import { DEFAULT_CONTENT_EMBEDDING_MODEL, resolveContentEmbeddingModel } from "./lib/embeddingModels";
 import { makeFunctionReference, type FunctionReference } from "convex/server";
 import type { Id } from "./_generated/dataModel";
 
-const DEFAULT_EMBEDDING_MODEL = "text-embedding-3-small";
 const RUNTIME_KNOWLEDGE_DEFAULT_LIMIT = 5;
 const RUNTIME_KNOWLEDGE_MAX_LIMIT = 20;
 
@@ -75,7 +75,9 @@ export const getRelevantKnowledgeForRuntimeAction = internalAction({
     const aiClient = createAIClient();
     const runQuery = getShallowRunQuery(ctx);
 
-    const embeddingModel = args.embeddingModel?.trim() || DEFAULT_EMBEDDING_MODEL;
+    const embeddingModel = resolveContentEmbeddingModel(
+      args.embeddingModel?.trim() || DEFAULT_CONTENT_EMBEDDING_MODEL
+    );
 
     // 1. Embed the query
     const { embedding } = await embed({
diff --git a/packages/convex/convex/embeddings.ts b/packages/convex/convex/embeddings.ts
index 82d6f7d..be1d123 100644
--- a/packages/convex/convex/embeddings.ts
+++ b/packages/convex/convex/embeddings.ts
@@ -5,13 +5,13 @@ import { Doc, Id } from "./_generated/dataModel";
 import { embedMany } from "ai";
 import { authAction } from "./lib/authWrappers";
 import { createAIClient } from "./lib/aiGateway";
+import { DEFAULT_CONTENT_EMBEDDING_MODEL, resolveContentEmbeddingModel } from "./lib/embeddingModels";
 import {
   isInternalArticle,
   isPublicArticle,
   listUnifiedArticlesWithLegacyFallback,
 } from "./lib/unifiedArticles";
 
-const DEFAULT_EMBEDDING_MODEL = "text-embedding-3-small";
 const EMBEDDING_GENERATE_CONCURRENCY = 4;
 const EMBEDDING_BACKFILL_BATCH_CONCURRENCY = 2;
 
@@ -315,7 +315,9 @@ export const generateInternal = internalAction({
       return { id: existing[0]._id, skipped: true };
     }
 
-    const modelName = args.model || DEFAULT_EMBEDDING_MODEL;
+    const modelName = resolveContentEmbeddingModel(
+      args.model?.trim() || DEFAULT_CONTENT_EMBEDDING_MODEL
+    );
     const aiClient = createAIClient();
     const chunkTexts = chunks.map((chunk) => `${args.title}\n\n${chunk}`);
     const { embeddings } = await embedMany({
diff --git a/packages/convex/convex/lib/aiGateway.ts b/packages/convex/convex/lib/aiGateway.ts
index 829254e..747029b 100644
--- a/packages/convex/convex/lib/aiGateway.ts
+++ b/packages/convex/convex/lib/aiGateway.ts
@@ -1,17 +1,74 @@
 import { createOpenAI } from "@ai-sdk/openai";
 
+const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
+const DEFAULT_VERCEL_AI_GATEWAY_BASE_URL = "https://ai-gateway.vercel.sh/v1";
+const GENERIC_PROVIDER_LABEL = "gateway";
+
+function sanitizeProviderLabel(value: string): string {
+  const sanitized = value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "");
+  return sanitized || GENERIC_PROVIDER_LABEL;
+}
+
+export function getAIGatewayApiKey(): string | undefined {
+  const apiKey = process.env.AI_GATEWAY_API_KEY?.trim();
+  return apiKey && apiKey.length > 0 ? apiKey : undefined;
+}
+
+export function getAIBaseURL(apiKey = getAIGatewayApiKey()): string {
+  const configuredBaseURL = process.env.AI_GATEWAY_BASE_URL?.trim();
+  if (configuredBaseURL && configuredBaseURL.length > 0) {
+    return configuredBaseURL.replace(/\/+$/, "");
+  }
+
+  return apiKey?.startsWith("vck_")
+    ? DEFAULT_VERCEL_AI_GATEWAY_BASE_URL
+    : DEFAULT_OPENAI_BASE_URL;
+}
+
+export function getAIGatewayProviderLabel(baseURL = getAIBaseURL()): string {
+  try {
+    const hostname = new URL(baseURL).hostname.toLowerCase();
+    if (hostname === "api.openai.com" || hostname.endsWith(".openai.com")) {
+      return "openai";
+    }
+    if (hostname === "ai-gateway.vercel.sh") {
+      return GENERIC_PROVIDER_LABEL;
+    }
+
+    const segments = hostname
+      .split(".")
+      .filter(Boolean)
+      .filter((segment) => !["api", "chat", "www", "gateway"].includes(segment));
+
+    if (segments.length >= 2 && segments[segments.length - 1] === "ai") {
+      const providerRoot = segments[segments.length - 2] ?? "";
+      if (providerRoot.length === 1) {
+        return sanitizeProviderLabel(`${providerRoot}ai`);
+      }
+    }
+
+    for (let index = segments.length - 1; index >= 0; index -= 1) {
+      const segment = segments[index];
+      if (!segment || ["com", "ai", "net", "dev", "app", "io", "sh", "co"].includes(segment)) {
+        continue;
+      }
+      return sanitizeProviderLabel(segment);
+    }
+  } catch {
+    return GENERIC_PROVIDER_LABEL;
+  }
+
+  return GENERIC_PROVIDER_LABEL;
+}
+
 export function createAIClient() {
-  const apiKey = process.env.AI_GATEWAY_API_KEY;
+  const apiKey = getAIGatewayApiKey();
   if (!apiKey) {
     throw new Error("AI_GATEWAY_API_KEY environment variable is not set");
   }
 
-  const baseURL =
-    process.env.AI_GATEWAY_BASE_URL ||
-    (apiKey.startsWith("vck_") ? "https://ai-gateway.vercel.sh/v1" : "https://api.openai.com/v1");
-
   return createOpenAI({
     apiKey,
-    baseURL,
+    baseURL: getAIBaseURL(apiKey),
   });
 }
diff --git a/packages/convex/convex/lib/embeddingModels.ts b/packages/convex/convex/lib/embeddingModels.ts
new file mode 100644
index 0000000..83ee9a9
--- /dev/null
+++ b/packages/convex/convex/lib/embeddingModels.ts
@@ -0,0 +1,45 @@
+export const CONTENT_EMBEDDING_INDEX_DIMENSIONS = 1536;
+export const DEFAULT_CONTENT_EMBEDDING_MODEL = "text-embedding-3-small";
+export const LARGE_CONTENT_EMBEDDING_MODEL = "text-embedding-3-large";
+export const LEGACY_CONTENT_EMBEDDING_MODEL = "text-embedding-ada-002";
+
+function normalizeModelName(model: string | undefined): string {
+  return model?.trim().toLowerCase() ?? "";
+}
+
+export function getDefaultContentEmbeddingModel(): string {
+  return DEFAULT_CONTENT_EMBEDDING_MODEL;
+}
+
+export function getContentEmbeddingIndexDimensions(): number {
+  return CONTENT_EMBEDDING_INDEX_DIMENSIONS;
+}
+
+export function isContentEmbeddingModelSupportedByCurrentIndex(model: string | undefined): boolean {
+  const normalized = normalizeModelName(model);
+  return (
+    normalized === "" ||
+    normalized === DEFAULT_CONTENT_EMBEDDING_MODEL ||
+    normalized === LEGACY_CONTENT_EMBEDDING_MODEL
+  );
+}
+
+export function resolveContentEmbeddingModel(model: string | undefined): string {
+  const normalized = normalizeModelName(model);
+  if (normalized === "" || normalized === DEFAULT_CONTENT_EMBEDDING_MODEL) {
+    return DEFAULT_CONTENT_EMBEDDING_MODEL;
+  }
+  if (normalized === LEGACY_CONTENT_EMBEDDING_MODEL) {
+    return LEGACY_CONTENT_EMBEDDING_MODEL;
+  }
+  return DEFAULT_CONTENT_EMBEDDING_MODEL;
+}
+
+export function getContentEmbeddingModelCompatibilityMessage(model: string | undefined): string | null {
+  const normalized = normalizeModelName(model);
+  if (normalized === LARGE_CONTENT_EMBEDDING_MODEL) {
+    return `The current content embedding index expects ${CONTENT_EMBEDDING_INDEX_DIMENSIONS}-dimension vectors, so ${LARGE_CONTENT_EMBEDDING_MODEL} is not compatible yet. Falling back to ${DEFAULT_CONTENT_EMBEDDING_MODEL}.`;
+  }
+
+  return null;
+}
diff --git a/packages/convex/convex/schema/inboxConversationTables.ts b/packages/convex/convex/schema/inboxConversationTables.ts
index 26a6074..9e13b5d 100644
--- a/packages/convex/convex/schema/inboxConversationTables.ts
+++ b/packages/convex/convex/schema/inboxConversationTables.ts
@@ -87,6 +87,7 @@ export const inboxConversationTables = {
     aiWorkflowState: v.optional(
       v.union(v.literal("none"), v.literal("ai_handled"), v.literal("handoff"))
     ),
+    aiTurnSequence: v.optional(v.number()),
     aiHandoffReason: v.optional(v.string()),
     aiLastConfidence: v.optional(v.number()),
     aiLastResponseAt: v.optional(v.number()),
diff --git a/packages/convex/convex/schema/operationsAiTables.ts b/packages/convex/convex/schema/operationsAiTables.ts
index eb2c20a..0795c7a 100644
--- a/packages/convex/convex/schema/operationsAiTables.ts
+++ b/packages/convex/convex/schema/operationsAiTables.ts
@@ -1,5 +1,6 @@
 import { defineTable } from "convex/server";
 import { v } from "convex/values";
+import { CONTENT_EMBEDDING_INDEX_DIMENSIONS } from "../lib/embeddingModels";
 
 export const operationsAiTables = {
   aiAgentSettings: defineTable({
@@ -49,7 +50,7 @@ export const operationsAiTables = {
     .index("by_workspace", ["workspaceId"])
     .vectorIndex("by_embedding", {
       vectorField: "embedding",
-      dimensions: 1536,
+      dimensions: CONTENT_EMBEDDING_INDEX_DIMENSIONS,
       filterFields: ["workspaceId", "contentType"],
     }),
 
@@ -59,6 +60,7 @@ export const operationsAiTables = {
     conversationId: v.id("conversations"),
     contentType: v.union(v.literal("article"), v.literal("internalArticle"), v.literal("snippet")),
     contentId: v.string(),
+    embeddingModel: v.optional(v.string()),
     action: v.union(v.literal("used"), v.literal("dismissed")),
     createdAt: v.number(),
   })
diff --git a/packages/convex/convex/schema/operationsReportingTables.ts b/packages/convex/convex/schema/operationsReportingTables.ts
index 5f028bc..6a31a71 100644
--- a/packages/convex/convex/schema/operationsReportingTables.ts
+++ b/packages/convex/convex/schema/operationsReportingTables.ts
@@ -5,7 +5,7 @@ import { jsonRecordValidator } from "../validators";
 export const operationsReportingTables = {
   aiResponses: defineTable({
     conversationId: v.id("conversations"),
-    messageId: v.id("messages"),
+    messageId: v.optional(v.id("messages")),
     query: v.string(),
     response: v.string(),
     generatedCandidateResponse: v.optional(v.string()),
@@ -28,6 +28,7 @@ export const operationsReportingTables = {
         articleId: v.optional(v.string()),
       })
     ),
+    attemptStatus: v.optional(v.string()),
     confidence: v.number(),
     feedback: v.optional(v.union(v.literal("helpful"), v.literal("not_helpful"))),
     handedOff: v.boolean(),
diff --git a/packages/convex/convex/suggestions.ts b/packages/convex/convex/suggestions.ts
index 60a5bb7..b36bb9f 100644
--- a/packages/convex/convex/suggestions.ts
+++ b/packages/convex/convex/suggestions.ts
@@ -5,10 +5,10 @@ import { Doc, Id } from "./_generated/dataModel";
 import { embed } from "ai";
 import { authAction, authMutation, authQuery } from "./lib/authWrappers";
 import { createAIClient } from "./lib/aiGateway";
+import { DEFAULT_CONTENT_EMBEDDING_MODEL, resolveContentEmbeddingModel } from "./lib/embeddingModels";
 import { getUnifiedArticleByIdOrLegacyInternalId, isInternalArticle } from "./lib/unifiedArticles";
 import type { Permission } from "./permissions";
 
-const DEFAULT_EMBEDDING_MODEL = "text-embedding-3-small";
 const FEEDBACK_STATS_DEFAULT_LIMIT = 5000;
 const FEEDBACK_STATS_MAX_LIMIT = 20000;
 const SUGGESTIONS_DEFAULT_LIMIT = 10;
@@ -41,6 +41,7 @@ type SuggestionResult = {
   title: string;
   snippet: string;
   score: number;
+  embeddingModel?: string;
 };
 
 type SuggestionResultWithContent = SuggestionResult & { content: string };
@@ -258,7 +259,9 @@ export const searchSimilar = authAction({
       1,
       Math.min(args.limit ?? SUGGESTIONS_DEFAULT_LIMIT, SUGGESTIONS_MAX_LIMIT)
     );
-    const modelName = args.model || DEFAULT_EMBEDDING_MODEL;
+    const modelName = resolveContentEmbeddingModel(
+      args.model?.trim() || DEFAULT_CONTENT_EMBEDDING_MODEL
+    );
     const aiClient = createAIClient();
     const runQuery = getShallowRunQuery(ctx);
 
@@ -350,6 +353,8 @@ export const getForConversation = authAction({
       return [];
     }
 
+    const embeddingModel = resolveContentEmbeddingModel(settings.embeddingModel);
+
     const messages = await runQuery(GET_RECENT_MESSAGES_REF, {
       conversationId: args.conversationId,
       limit: 5,
@@ -369,10 +374,13 @@ export const getForConversation = authAction({
       query: contextText,
       contentTypes: normalizedContentTypes,
       limit,
-      model: settings.embeddingModel,
+      model: embeddingModel,
     });
 
-    return results;
+    return results.map((result) => ({
+      ...result,
+      embeddingModel,
+    }));
   },
 });
 
@@ -403,7 +411,9 @@ export const searchSimilarInternal = internalAction({
       1,
       Math.min(args.limit ?? SUGGESTIONS_DEFAULT_LIMIT, SUGGESTIONS_MAX_LIMIT)
     );
-    const modelName = args.model || DEFAULT_EMBEDDING_MODEL;
+    const modelName = resolveContentEmbeddingModel(
+      args.model?.trim() || DEFAULT_CONTENT_EMBEDDING_MODEL
+    );
     const aiClient = createAIClient();
     const runQuery = getShallowRunQuery(ctx);
 
@@ -484,6 +494,7 @@ export const trackUsage = authMutation({
     conversationId: v.id("conversations"),
     contentType: v.union(v.literal("article"), v.literal("internalArticle"), v.literal("snippet")),
     contentId: v.string(),
+    embeddingModel: v.optional(v.string()),
   },
   permission: "conversations.read",
   handler: async (ctx, args) => {
@@ -501,6 +512,7 @@ export const trackUsage = authMutation({
       conversationId: args.conversationId,
       contentType: args.contentType,
       contentId: args.contentId,
+      embeddingModel: args.embeddingModel,
       action: "used",
       createdAt: Date.now(),
     });
@@ -513,6 +525,7 @@ export const trackDismissal = authMutation({
     conversationId: v.id("conversations"),
     contentType: v.union(v.literal("article"), v.literal("internalArticle"), v.literal("snippet")),
     contentId: v.string(),
+    embeddingModel: v.optional(v.string()),
   },
   permission: "conversations.read",
   handler: async (ctx, args) => {
@@ -530,6 +543,7 @@ export const trackDismissal = authMutation({
       conversationId: args.conversationId,
       contentType: args.contentType,
       contentId: args.contentId,
+      embeddingModel: args.embeddingModel,
       action: "dismissed",
       createdAt: Date.now(),
     });
@@ -715,7 +729,7 @@ export const searchForWidget = action({
 
     const aiClient = createAIClient();
     const { embedding } = await embed({
-      model: aiClient.embedding(DEFAULT_EMBEDDING_MODEL),
+      model: aiClient.embedding(DEFAULT_CONTENT_EMBEDDING_MODEL),
       value: normalizedQuery,
     });
 
diff --git a/packages/convex/convex/testAdmin.ts b/packages/convex/convex/testAdmin.ts
index abbeaef..e30a000 100644
--- a/packages/convex/convex/testAdmin.ts
+++ b/packages/convex/convex/testAdmin.ts
@@ -38,6 +38,25 @@ function getShallowRunMutation(ctx: { runMutation: unknown }) {
   ) => Promise<unknown>;
 }
 
+function parseMutationArgsJson(mutationArgsJson: string): Record<string, unknown> {
+  if (!mutationArgsJson.trim()) {
+    return {};
+  }
+
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(mutationArgsJson);
+  } catch {
+    throw new Error("mutationArgsJson must be valid JSON.");
+  }
+
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error("mutationArgsJson must decode to a JSON object.");
+  }
+
+  return parsed as Record<string, unknown>;
+}
+
 export function isAuthorizedAdminSecret(providedSecret: string, expectedSecret: string): boolean {
   const providedBytes = toSecretBytes(providedSecret);
   const expectedBytes = toSecretBytes(expectedSecret);
@@ -62,9 +81,9 @@ export const runTestMutation = action({
   args: {
     secret: v.string(),
     name: v.string(),
-    mutationArgs: v.any(),
+    mutationArgsJson: v.string(),
   },
-  handler: async (ctx, { secret, name, mutationArgs }) => {
+  handler: async (ctx, { secret, name, mutationArgsJson }) => {
     // Validate admin secret
     const expected = process.env.TEST_ADMIN_SECRET;
     if (!expected) {
@@ -92,6 +111,6 @@ export const runTestMutation = action({
     }
 
     const runMutation = getShallowRunMutation(ctx);
-    return await runMutation(getInternalRef(name), (mutationArgs ?? {}) as Record<string, unknown>);
+    return await runMutation(getInternalRef(name), parseMutationArgsJson(mutationArgsJson));
   },
 });
diff --git a/packages/convex/convex/testing/helpers.ts b/packages/convex/convex/testing/helpers.ts
index 060308e..12c7ae8 100644
--- a/packages/convex/convex/testing/helpers.ts
+++ b/packages/convex/convex/testing/helpers.ts
@@ -77,6 +77,8 @@ export const updateTestAllowedOrigins: ReturnType<typeof internalMutation> = wor
 export const updateTestSignupSettings: ReturnType<typeof internalMutation> = workspaceTestHelpers.updateTestSignupSettings;
 export const getTestAISettings: ReturnType<typeof internalMutation> = aiTestHelpers.getTestAISettings;
 export const updateTestAISettings: ReturnType<typeof internalMutation> = aiTestHelpers.updateTestAISettings;
+export const listTestSuggestionFeedback: ReturnType<typeof internalMutation> =
+  aiTestHelpers.listTestSuggestionFeedback;
 export const getTestVisitor: ReturnType<typeof internalMutation> = conversationTestHelpers.getTestVisitor;
 export const addTestWorkspaceMember: ReturnType<typeof internalMutation> = workspaceTestHelpers.addTestWorkspaceMember;
 export const listTestWorkspaceMembers: ReturnType<typeof internalMutation> = workspaceTestHelpers.listTestWorkspaceMembers;
diff --git a/packages/convex/convex/testing/helpers/ai.ts b/packages/convex/convex/testing/helpers/ai.ts
index 4c1b03a..1d62fe2 100644
--- a/packages/convex/convex/testing/helpers/ai.ts
+++ b/packages/convex/convex/testing/helpers/ai.ts
@@ -173,6 +173,19 @@ const updateTestAISettings = internalMutation({
   },
 });
 
+const listTestSuggestionFeedback = internalMutation({
+  args: {
+    workspaceId: v.id("workspaces"),
+  },
+  handler: async (ctx, args) => {
+    return await ctx.db
+      .query("suggestionFeedback")
+      .withIndex("by_workspace", (q) => q.eq("workspaceId", args.workspaceId))
+      .order("desc")
+      .collect();
+  },
+});
+
 /**
  * Gets a visitor by ID directly (bypasses auth).
  */
@@ -181,4 +194,5 @@ export const aiTestHelpers: Record<string, ReturnType<typeof internalMutation>>
   seedTestAIResponse,
   getTestAISettings,
   updateTestAISettings,
+  listTestSuggestionFeedback,
 } as const;
diff --git a/packages/convex/tests/aiAgent.test.ts b/packages/convex/tests/aiAgent.test.ts
index 1902f86..cbf375f 100644
--- a/packages/convex/tests/aiAgent.test.ts
+++ b/packages/convex/tests/aiAgent.test.ts
@@ -174,6 +174,8 @@ describe("aiAgent", () => {
       expect(responses.length).toBeGreaterThan(0);
       expect(responses[0].query).toBe("How do I reset my password?");
       expect(responses[0].confidence).toBe(0.85);
+      expect(responses[0].model).toBe("openai/gpt-5-nano");
+      expect(responses[0].provider).toBe("openai");
     });
   });
 
@@ -274,12 +276,24 @@ describe("aiAgent", () => {
 
   describe("listAvailableModels", () => {
     it("should return list of available models", async () => {
-      const models = await client.query(api.aiAgent.listAvailableModels, {});
+      const models = await client.action(api.aiAgent.listAvailableModels, {
+        workspaceId: testWorkspaceId,
+        selectedModel: "openai/gpt-5-nano",
+      });
 
       expect(models.length).toBeGreaterThan(0);
       expect(models[0]).toHaveProperty("id");
       expect(models[0]).toHaveProperty("name");
       expect(models[0]).toHaveProperty("provider");
     });
+
+    it("should preserve the selected model when discovery falls back", async () => {
+      const models = await client.action(api.aiAgent.listAvailableModels, {
+        workspaceId: testWorkspaceId,
+        selectedModel: "openai/gpt-5.1-mini",
+      });
+
+      expect(models.some((model) => model.id === "openai/gpt-5.1-mini")).toBe(true);
+    });
   });
 });
diff --git a/packages/convex/tests/aiAgentAuthorizationSemantics.test.ts b/packages/convex/tests/aiAgentAuthorizationSemantics.test.ts
index 3d64608..e5d1370 100644
--- a/packages/convex/tests/aiAgentAuthorizationSemantics.test.ts
+++ b/packages/convex/tests/aiAgentAuthorizationSemantics.test.ts
@@ -22,11 +22,14 @@ vi.mock("../convex/widgetSessions", () => ({
 import { getAuthenticatedUserFromSession } from "../convex/auth";
 import { requirePermission } from "../convex/permissions";
 import { resolveVisitorFromSession } from "../convex/widgetSessions";
-import { getConversationResponses } from "../convex/aiAgent";
+import { getConversationResponses as getConversationResponsesDefinition } from "../convex/aiAgent";
 
 const mockGetAuthenticatedUserFromSession = vi.mocked(getAuthenticatedUserFromSession);
 const mockRequirePermission = vi.mocked(requirePermission);
 const mockResolveVisitorFromSession = vi.mocked(resolveVisitorFromSession);
+const getConversationResponses = getConversationResponsesDefinition as unknown as {
+  _handler: (ctx: unknown, args: Record<string, unknown>) => Promise<Array<Record<string, unknown>>>;
+};
 
 describe("aiAgent authorization semantics", () => {
   beforeEach(() => {
@@ -67,14 +70,26 @@ describe("aiAgent authorization semantics", () => {
       {
         _id: "ai_response_1",
         conversationId,
+        messageId: "message_auth_1",
+        query: "How can I reset my password?",
         response: "Response 1",
+        sources: [],
         confidence: 0.8,
+        handedOff: false,
+        model: "openai/gpt-5-nano",
+        provider: "openai",
       },
       {
         _id: "ai_response_2",
         conversationId,
+        messageId: "message_auth_2",
+        query: "Can you help with billing?",
         response: "Response 2",
+        sources: [],
         confidence: 0.7,
+        handedOff: false,
+        model: "anthropic/claude-3-5-haiku-latest",
+        provider: "anthropic",
       },
     ];
 
@@ -118,6 +133,10 @@ describe("aiAgent authorization semantics", () => {
 
     expect(result).toHaveLength(2);
     expect(result[0].conversationId).toBe(conversationId);
+    expect(result[0].model).toBe("openai/gpt-5-nano");
+    expect(result[0].provider).toBe("openai");
+    expect(result[1].model).toBe("anthropic/claude-3-5-haiku-latest");
+    expect(result[1].provider).toBe("anthropic");
   });
 
   it("exposes delivered and generated contexts with legacy compatibility", async () => {
diff --git a/packages/convex/tests/aiAgentRuntimeSafety.test.ts b/packages/convex/tests/aiAgentRuntimeSafety.test.ts
index e16aad3..ef98aaf 100644
--- a/packages/convex/tests/aiAgentRuntimeSafety.test.ts
+++ b/packages/convex/tests/aiAgentRuntimeSafety.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 vi.mock("ai", () => ({
   generateText: vi.fn(),
@@ -11,29 +11,133 @@ vi.mock("@ai-sdk/openai", () => ({
 }));
 
 import { generateText } from "ai";
-import { generateResponse, getAIConfigurationDiagnostic } from "../convex/aiAgentActions";
+import { listAvailableModels as listAvailableModelsDefinition } from "../convex/aiAgent";
+import {
+  generateResponse as generateResponseDefinition,
+  getAIConfigurationDiagnostic,
+} from "../convex/aiAgentActions";
 
 const mockGenerateText = vi.mocked(generateText);
+type GenerateResponseHandlerResult = {
+  response: string;
+  confidence: number;
+  sources: Array<Record<string, unknown>>;
+  handoff: boolean;
+  handoffReason: string | null;
+  messageId: string | null;
+};
+const generateResponse = generateResponseDefinition as unknown as {
+  _handler: (ctx: unknown, args: Record<string, unknown>) => Promise<GenerateResponseHandlerResult>;
+};
+const generateResponseHandler = generateResponse;
+const listAvailableModels = listAvailableModelsDefinition as unknown as {
+  _handler: (
+    ctx: unknown,
+    args: Record<string, unknown>
+  ) => Promise<Array<{ id: string; name: string; provider: string }>>;
+};
+const listAvailableModelsHandler = listAvailableModels;
 
 describe("aiAgentActions runtime safety", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
   beforeEach(() => {
     vi.clearAllMocks();
     process.env.AI_GATEWAY_API_KEY = "test-ai-key";
+    process.env.AI_GATEWAY_BASE_URL = "https://api.openai.com/v1";
   });
 
   it("returns explicit diagnostics for invalid runtime configuration", () => {
     expect(getAIConfigurationDiagnostic("")).toMatchObject({
       code: "MISSING_MODEL",
     });
-    expect(getAIConfigurationDiagnostic("invalid-model-format")).toMatchObject({
+    expect(getAIConfigurationDiagnostic("invalid/model/format")).toMatchObject({
       code: "INVALID_MODEL_FORMAT",
     });
-    expect(getAIConfigurationDiagnostic("anthropic/claude-3-5-sonnet")).toMatchObject({
-      code: "UNSUPPORTED_PROVIDER",
-      provider: "anthropic",
+    expect(
+      getAIConfigurationDiagnostic("zai/glm-5-turbo", {
+        aiGatewayApiKey: "test-ai-key",
+        aiGatewayProviderLabel: "zai",
+      })
+    ).toBeNull();
+    expect(
+      getAIConfigurationDiagnostic("glm-5-turbo", {
+        aiGatewayApiKey: "test-ai-key",
+        aiGatewayProviderLabel: "zai",
+      })
+    ).toBeNull();
+    expect(getAIConfigurationDiagnostic("anthropic/claude-3-5-sonnet")).toBeNull();
+  });
+
+  it("uses the provided gateway provider label for raw-model diagnostics", () => {
+    expect(
+      getAIConfigurationDiagnostic("glm-5-turbo", {
+        aiGatewayApiKey: undefined,
+        aiGatewayProviderLabel: "zai",
+      })
+    ).toMatchObject({
+      code: "MISSING_PROVIDER_CREDENTIALS",
+      provider: "zai",
+      model: "glm-5-turbo",
     });
   });
 
+  it("filters provider-prefixed non-generation models and labels raw fallback models correctly", async () => {
+    const fetchMock = vi.fn(async () => ({
+      ok: true,
+      json: async () => ({
+        data: [
+          { id: "openai/text-embedding-3-small", created: 30 },
+          { id: "openai/gpt-5-nano", created: 20 },
+          { id: "gpt-5.1-mini", created: 10 },
+        ],
+      }),
+    }));
+    vi.stubGlobal("fetch", fetchMock as unknown as typeof fetch);
+
+    const runQuery = vi.fn(async (_reference: unknown, args: Record<string, unknown>) => {
+      if (Object.keys(args).length === 0) {
+        return {
+          user: {
+            _id: "user_1",
+          },
+        };
+      }
+      if ("permission" in args) {
+        return null;
+      }
+      throw new Error(`Unexpected query args: ${JSON.stringify(args)}`);
+    });
+
+    const result = await listAvailableModelsHandler._handler(
+      {
+        runQuery,
+      } as any,
+      {
+        workspaceId: "workspace_1" as any,
+        selectedModel: "custom-raw-model",
+      }
+    );
+
+    expect(result.some((model) => model.id === "openai/text-embedding-3-small")).toBe(false);
+    expect(result).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: "openai/gpt-5-nano",
+          name: "gpt-5-nano",
+          provider: "openai",
+        }),
+        expect.objectContaining({
+          id: "custom-raw-model",
+          name: "custom-raw-model",
+          provider: "openai",
+        }),
+      ])
+    );
+  });
+
   it("falls back to handoff and records diagnostics when configuration is invalid", async () => {
     const runQuery = vi.fn(async (_reference: unknown, args: Record<string, unknown>) => {
       if ("query" in args) {
@@ -42,7 +146,7 @@ describe("aiAgentActions runtime safety", () => {
       if ("workspaceId" in args && "conversationId" in args === false) {
         return {
           enabled: true,
-          model: "invalid-model-format",
+          model: "invalid/model/format",
           confidenceThreshold: 0.6,
           knowledgeSources: ["articles"],
           personality: null,
@@ -68,7 +172,7 @@ describe("aiAgentActions runtime safety", () => {
       throw new Error(`Unexpected mutation args: ${JSON.stringify(args)}`);
     });
 
-    const result = await generateResponse._handler(
+    const result = await generateResponseHandler._handler(
       {
         runQuery,
         runMutation,
@@ -121,7 +225,7 @@ describe("aiAgentActions runtime safety", () => {
       throw new Error(`Unexpected mutation args: ${JSON.stringify(args)}`);
     });
 
-    const result = await generateResponse._handler(
+    const result = await generateResponseHandler._handler(
       {
         runQuery,
         runMutation,
@@ -151,7 +255,7 @@ describe("aiAgentActions runtime safety", () => {
 
     const runMutation = vi.fn();
 
-    const result = await generateResponse._handler(
+    const result = await generateResponseHandler._handler(
       {
         runQuery,
         runMutation,
@@ -407,7 +511,7 @@ describe("aiAgentActions runtime safety", () => {
       throw new Error(`Unexpected mutation args: ${JSON.stringify(args)}`);
     });
 
-    await generateResponse._handler(
+    await generateResponseHandler._handler(
       {
         runQuery,
         runMutation,
@@ -852,7 +956,7 @@ describe("aiAgentActions runtime safety", () => {
     const runMutation = vi.fn();
 
     await expect(
-      generateResponse._handler(
+      generateResponseHandler._handler(
         {
           runQuery,
           runMutation,
diff --git a/packages/convex/tests/embeddingModels.test.ts b/packages/convex/tests/embeddingModels.test.ts
new file mode 100644
index 0000000..df6f7fa
--- /dev/null
+++ b/packages/convex/tests/embeddingModels.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  CONTENT_EMBEDDING_INDEX_DIMENSIONS,
+  DEFAULT_CONTENT_EMBEDDING_MODEL,
+  getContentEmbeddingModelCompatibilityMessage,
+  isContentEmbeddingModelSupportedByCurrentIndex,
+  LEGACY_CONTENT_EMBEDDING_MODEL,
+  resolveContentEmbeddingModel,
+} from "../convex/lib/embeddingModels";
+
+describe("content embedding model compatibility", () => {
+  it("keeps index-compatible models unchanged", () => {
+    expect(resolveContentEmbeddingModel(DEFAULT_CONTENT_EMBEDDING_MODEL)).toBe(
+      DEFAULT_CONTENT_EMBEDDING_MODEL
+    );
+    expect(resolveContentEmbeddingModel(LEGACY_CONTENT_EMBEDDING_MODEL)).toBe(
+      LEGACY_CONTENT_EMBEDDING_MODEL
+    );
+    expect(isContentEmbeddingModelSupportedByCurrentIndex(DEFAULT_CONTENT_EMBEDDING_MODEL)).toBe(true);
+    expect(isContentEmbeddingModelSupportedByCurrentIndex(LEGACY_CONTENT_EMBEDDING_MODEL)).toBe(true);
+  });
+
+  it("falls back from incompatible large embeddings to the default index-compatible model", () => {
+    expect(resolveContentEmbeddingModel("text-embedding-3-large")).toBe(
+      DEFAULT_CONTENT_EMBEDDING_MODEL
+    );
+    expect(isContentEmbeddingModelSupportedByCurrentIndex("text-embedding-3-large")).toBe(false);
+    expect(getContentEmbeddingModelCompatibilityMessage("text-embedding-3-large")).toContain(
+      String(CONTENT_EMBEDDING_INDEX_DIMENSIONS)
+    );
+  });
+
+  it("normalizes supported embedding model ids to canonical constants", () => {
+    expect(resolveContentEmbeddingModel("  Text-Embedding-3-Small  ")).toBe(
+      DEFAULT_CONTENT_EMBEDDING_MODEL
+    );
+    expect(resolveContentEmbeddingModel("TEXT-EMBEDDING-ADA-002")).toBe(
+      LEGACY_CONTENT_EMBEDDING_MODEL
+    );
+  });
+});
diff --git a/packages/convex/tests/helpers/testHelpers.ts b/packages/convex/tests/helpers/testHelpers.ts
index 37d6659..253eff1 100644
--- a/packages/convex/tests/helpers/testHelpers.ts
+++ b/packages/convex/tests/helpers/testHelpers.ts
@@ -24,7 +24,7 @@ async function callInternalTestMutation<T>(
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({
       path: "testAdmin:runTestMutation",
-      args: { secret, name, mutationArgs },
+      args: { secret, name, mutationArgsJson: JSON.stringify(mutationArgs) },
       format: "json",
     }),
   });
diff --git a/packages/convex/tests/setupTestAdminFallback.ts b/packages/convex/tests/setupTestAdminFallback.ts
index c5a4525..bf19b5e 100644
--- a/packages/convex/tests/setupTestAdminFallback.ts
+++ b/packages/convex/tests/setupTestAdminFallback.ts
@@ -26,7 +26,7 @@ async function callInternalTestMutation(name: string, mutationArgs: Record<strin
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({
       path: "testAdmin:runTestMutation",
-      args: { secret, name, mutationArgs },
+      args: { secret, name, mutationArgsJson: JSON.stringify(mutationArgs) },
       format: "json",
     }),
   });
diff --git a/packages/convex/tests/suggestions.test.ts b/packages/convex/tests/suggestions.test.ts
index 2906f53..d7b9dce 100644
--- a/packages/convex/tests/suggestions.test.ts
+++ b/packages/convex/tests/suggestions.test.ts
@@ -86,9 +86,16 @@ describe("suggestions", () => {
         conversationId: testConversationId,
         contentType: "article",
         contentId: testArticleId,
+        embeddingModel: "text-embedding-3-small",
       });
 
       expect(feedbackId).toBeDefined();
+
+      const feedback = await client.mutation(api.testing_helpers.listTestSuggestionFeedback, {
+        workspaceId: testWorkspaceId,
+      });
+      const stored = feedback.find((entry) => entry._id === feedbackId);
+      expect(stored?.embeddingModel).toBe("text-embedding-3-small");
     });
   });
 
@@ -99,9 +106,16 @@ describe("suggestions", () => {
         conversationId: testConversationId,
         contentType: "snippet",
         contentId: testSnippetId,
+        embeddingModel: "text-embedding-3-small",
       });
 
       expect(feedbackId).toBeDefined();
+
+      const feedback = await client.mutation(api.testing_helpers.listTestSuggestionFeedback, {
+        workspaceId: testWorkspaceId,
+      });
+      const stored = feedback.find((entry) => entry._id === feedbackId);
+      expect(stored?.embeddingModel).toBe("text-embedding-3-small");
     });
   });
 
diff --git a/packages/convex/tests/suggestionsMetadataSemantics.test.ts b/packages/convex/tests/suggestionsMetadataSemantics.test.ts
new file mode 100644
index 0000000..e8eb0d0
--- /dev/null
+++ b/packages/convex/tests/suggestionsMetadataSemantics.test.ts
@@ -0,0 +1,117 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Id } from "../convex/_generated/dataModel";
+
+vi.mock("../convex/auth", () => ({
+  getAuthenticatedUserFromSession: vi.fn(),
+}));
+
+vi.mock("../convex/permissions", async () => {
+  const actual =
+    await vi.importActual<typeof import("../convex/permissions")>("../convex/permissions");
+  return {
+    ...actual,
+    requirePermission: vi.fn(),
+  };
+});
+
+import { getAuthenticatedUserFromSession } from "../convex/auth";
+import { requirePermission } from "../convex/permissions";
+import {
+  trackDismissal as trackDismissalDefinition,
+  trackUsage as trackUsageDefinition,
+} from "../convex/suggestions";
+
+const mockGetAuthenticatedUserFromSession = vi.mocked(getAuthenticatedUserFromSession);
+const mockRequirePermission = vi.mocked(requirePermission);
+const trackUsage = trackUsageDefinition as unknown as {
+  _handler: (ctx: unknown, args: Record<string, unknown>) => Promise<string>;
+};
+const trackDismissal = trackDismissalDefinition as unknown as {
+  _handler: (ctx: unknown, args: Record<string, unknown>) => Promise<string>;
+};
+
+function workspaceId(value: string): Id<"workspaces"> {
+  return value as Id<"workspaces">;
+}
+
+function conversationId(value: string): Id<"conversations"> {
+  return value as Id<"conversations">;
+}
+
+describe("suggestions metadata semantics", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    mockGetAuthenticatedUserFromSession.mockResolvedValue({
+      _id: "user_meta" as Id<"users">,
+    } as never);
+    mockRequirePermission.mockResolvedValue(undefined as never);
+  });
+
+  it("persists embeddingModel on suggestion usage feedback", async () => {
+    const insert = vi.fn(async () => "feedback_usage_1");
+    const ctx = {
+      db: {
+        get: vi.fn(async () => ({
+          _id: conversationId("conversation_usage"),
+          workspaceId: workspaceId("workspace_usage"),
+        })),
+        insert,
+      },
+    };
+
+    const result = await trackUsage._handler(ctx as never, {
+      workspaceId: workspaceId("workspace_usage"),
+      conversationId: conversationId("conversation_usage"),
+      contentType: "article",
+      contentId: "article_1",
+      embeddingModel: "text-embedding-3-small",
+    });
+
+    expect(result).toBe("feedback_usage_1");
+    expect(insert).toHaveBeenCalledWith(
+      "suggestionFeedback",
+      expect.objectContaining({
+        workspaceId: workspaceId("workspace_usage"),
+        conversationId: conversationId("conversation_usage"),
+        contentType: "article",
+        contentId: "article_1",
+        action: "used",
+        embeddingModel: "text-embedding-3-small",
+      })
+    );
+  });
+
+  it("persists embeddingModel on suggestion dismissal feedback", async () => {
+    const insert = vi.fn(async () => "feedback_dismissal_1");
+    const ctx = {
+      db: {
+        get: vi.fn(async () => ({
+          _id: conversationId("conversation_dismissal"),
+          workspaceId: workspaceId("workspace_dismissal"),
+        })),
+        insert,
+      },
+    };
+
+    const result = await trackDismissal._handler(ctx as never, {
+      workspaceId: workspaceId("workspace_dismissal"),
+      conversationId: conversationId("conversation_dismissal"),
+      contentType: "snippet",
+      contentId: "snippet_1",
+      embeddingModel: "text-embedding-3-small",
+    });
+
+    expect(result).toBe("feedback_dismissal_1");
+    expect(insert).toHaveBeenCalledWith(
+      "suggestionFeedback",
+      expect.objectContaining({
+        workspaceId: workspaceId("workspace_dismissal"),
+        conversationId: conversationId("conversation_dismissal"),
+        contentType: "snippet",
+        contentId: "snippet_1",
+        action: "dismissed",
+        embeddingModel: "text-embedding-3-small",
+      })
+    );
+  });
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1e151e6..372e022 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,15 +6,24 @@ settings:
 
 overrides:
   '@isaacs/brace-expansion': 5.0.1
+  '@xmldom/xmldom@0.7.13': 0.8.12
+  '@xmldom/xmldom@0.8.11': 0.8.12
   esbuild: ^0.27.0
+  fast-xml-parser: 4.5.5
+  flatted: 3.4.2
   minimatch: 10.2.3
+  node-forge: 1.4.0
   '@expo/cli>minimatch': 10.2.3
   '@expo/fingerprint>minimatch': 10.2.3
   '@expo/metro-config>minimatch': 10.2.3
   glob@13.0.0>minimatch: 10.2.3
   glob@10.5.0>minimatch: 10.2.3
+  picomatch@2.3.1: 2.3.2
+  picomatch@3.0.1: 3.0.2
+  picomatch@4.0.3: 4.0.4
   rollup: 4.59.0
   tar: 7.5.11
+  vite@7.3.1: 7.3.2
   '@react-native-community/cli': 17.0.1
   '@react-native-community/cli-server-api': 17.0.1
   '@react-native-community/cli-tools': 17.0.1
@@ -95,13 +104,13 @@ importers:
         version: 12.34.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       geist:
         specifier: ^1.7.0
-        version: 1.7.0(next@15.5.12(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))
+        version: 1.7.0(next@15.5.15(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))
       lucide-react:
         specifier: ^0.469.0
         version: 0.469.0(react@19.2.3)
       next:
-        specifier: ^15.5.10
-        version: 15.5.12(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+        specifier: ^15.5.15
+        version: 15.5.15(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       react:
         specifier: ^19.2.3
         version: 19.2.3
@@ -240,8 +249,8 @@ importers:
         specifier: ^14.1.1
         version: 14.1.1
       next:
-        specifier: ^15.5.10
-        version: 15.5.12(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+        specifier: ^15.5.15
+        version: 15.5.15(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       react:
         specifier: ^19.2.3
         version: 19.2.3
@@ -269,7 +278,7 @@ importers:
         version: 19.2.3(@types/react@19.2.9)
       '@vitejs/plugin-react':
         specifier: ^4.3.0
-        version: 4.7.0(vite@7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
+        version: 4.7.0(vite@7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
       autoprefixer:
         specifier: ^10.4.16
         version: 10.4.23(postcss@8.5.6)
@@ -2014,53 +2023,53 @@ packages:
   '@jridgewell/trace-mapping@0.3.9':
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
 
-  '@next/env@15.5.12':
-    resolution: {integrity: sha512-pUvdJN1on574wQHjaBfNGDt9Mz5utDSZFsIIQkMzPgNS8ZvT4H2mwOrOIClwsQOb6EGx5M76/CZr6G8i6pSpLg==}
+  '@next/env@15.5.15':
+    resolution: {integrity: sha512-vcmyu5/MyFzN7CdqRHO3uHO44p/QPCZkuTUXroeUmhNP8bL5PHFEhik22JUazt+CDDoD6EpBYRCaS2pISL+/hg==}
 
-  '@next/swc-darwin-arm64@15.5.12':
-    resolution: {integrity: sha512-RnRjBtH8S8eXCpUNkQ+543DUc7ys8y15VxmFU9HRqlo9BG3CcBUiwNtF8SNoi2xvGCVJq1vl2yYq+3oISBS0Zg==}
+  '@next/swc-darwin-arm64@15.5.15':
+    resolution: {integrity: sha512-6PvFO2Tzt10GFK2Ro9tAVEtacMqRmTarYMFKAnV2vYMdwWc73xzmDQyAV7SwEdMhzmiRoo7+m88DuiXlJlGeaw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@15.5.12':
-    resolution: {integrity: sha512-nqa9/7iQlboF1EFtNhWxQA0rQstmYRSBGxSM6g3GxvxHxcoeqVXfGNr9stJOme674m2V7r4E3+jEhhGvSQhJRA==}
+  '@next/swc-darwin-x64@15.5.15':
+    resolution: {integrity: sha512-G+YNV+z6FDZTp/+IdGyIMFqalBTaQSnvAA+X/hrt+eaTRFSznRMz9K7rTmzvM6tDmKegNtyzgufZW0HwVzEqaQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-linux-arm64-gnu@15.5.12':
-    resolution: {integrity: sha512-dCzAjqhDHwmoB2M4eYfVKqXs99QdQxNQVpftvP1eGVppamXh/OkDAwV737Zr0KPXEqRUMN4uCjh6mjO+XtF3Mw==}
+  '@next/swc-linux-arm64-gnu@15.5.15':
+    resolution: {integrity: sha512-eVkrMcVIBqGfXB+QUC7jjZ94Z6uX/dNStbQFabewAnk13Uy18Igd1YZ/GtPRzdhtm7QwC0e6o7zOQecul4iC1w==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-arm64-musl@15.5.12':
-    resolution: {integrity: sha512-+fpGWvQiITgf7PUtbWY1H7qUSnBZsPPLyyq03QuAKpVoTy/QUx1JptEDTQMVvQhvizCEuNLEeghrQUyXQOekuw==}
+  '@next/swc-linux-arm64-musl@15.5.15':
+    resolution: {integrity: sha512-RwSHKMQ7InLy5GfkY2/n5PcFycKA08qI1VST78n09nN36nUPqCvGSMiLXlfUmzmpQpF6XeBYP2KRWHi0UW3uNg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-x64-gnu@15.5.12':
-    resolution: {integrity: sha512-jSLvgdRRL/hrFAPqEjJf1fFguC719kmcptjNVDJl26BnJIpjL3KH5h6mzR4mAweociLQaqvt4UyzfbFjgAdDcw==}
+  '@next/swc-linux-x64-gnu@15.5.15':
+    resolution: {integrity: sha512-nplqvY86LakS+eeiuWsNWvfmK8pFcOEW7ZtVRt4QH70lL+0x6LG/m1OpJ/tvrbwjmR8HH9/fH2jzW1GlL03TIg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-linux-x64-musl@15.5.12':
-    resolution: {integrity: sha512-/uaF0WfmYqQgLfPmN6BvULwxY0dufI2mlN2JbOKqqceZh1G4hjREyi7pg03zjfyS6eqNemHAZPSoP84x17vo6w==}
+  '@next/swc-linux-x64-musl@15.5.15':
+    resolution: {integrity: sha512-eAgl9NKQ84/sww0v81DQINl/vL2IBxD7sMybd0cWRw6wqgouVI53brVRBrggqBRP/NWeIAE1dm5cbKYoiMlqDQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-win32-arm64-msvc@15.5.12':
-    resolution: {integrity: sha512-xhsL1OvQSfGmlL5RbOmU+FV120urrgFpYLq+6U8C6KIym32gZT6XF/SDE92jKzzlPWskkbjOKCpqk5m4i8PEfg==}
+  '@next/swc-win32-arm64-msvc@15.5.15':
+    resolution: {integrity: sha512-GJVZC86lzSquh0MtvZT+L7G8+jMnJcldloOjA8Kf3wXvBrvb6OGe2MzPuALxFshSm/IpwUtD2mIoof39ymf52A==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-x64-msvc@15.5.12':
-    resolution: {integrity: sha512-Z1Dh6lhFkxvBDH1FoW6OU/L6prYwPSlwjLiZkExIAh8fbP6iI/M7iGTQAJPYJ9YFlWobCZ1PHbchFhFYb2ADkw==}
+  '@next/swc-win32-x64-msvc@15.5.15':
+    resolution: {integrity: sha512-nFucjVdwlFqxh/JG3hWSJ4p8+YJV7Ii8aPDuBQULB6DzUF4UNZETXLfEUk+oI2zEznWWULPt7MeuTE6xtK1HSA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -3077,7 +3086,7 @@ packages:
     resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+      vite: 7.3.2
 
   '@vitest/coverage-v8@4.0.17':
     resolution: {integrity: sha512-/6zU2FLGg0jsd+ePZcwHRy3+WpNTBBhDY56P4JTRqUN/Dp6CvOEa9HrikcQ4KfV2b2kAHUFB4dl1SuocWXSFEw==}
@@ -3095,7 +3104,7 @@ packages:
     resolution: {integrity: sha512-+ZtQhLA3lDh1tI2wxe3yMsGzbp7uuJSWBM1iTIKCbppWTSBN09PUC+L+fyNlQApQoR+Ps8twt2pbSSXg2fQVEQ==}
     peerDependencies:
       msw: ^2.4.9
-      vite: ^6.0.0 || ^7.0.0-0
+      vite: 7.3.2
     peerDependenciesMeta:
       msw:
         optional: true
@@ -3136,13 +3145,8 @@ packages:
   '@vscode/sudo-prompt@9.3.2':
     resolution: {integrity: sha512-gcXoCN00METUNFeQOFJ+C9xUI0DKB+0EGMVg7wbVYRHBw2Eq3fKisDZOkRdOz3kqXRKOENMfShPOmypw1/8nOw==}
 
-  '@xmldom/xmldom@0.7.13':
-    resolution: {integrity: sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==}
-    engines: {node: '>=10.0.0'}
-    deprecated: this version is no longer supported, please update to at least 0.8.*
-
-  '@xmldom/xmldom@0.8.11':
-    resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==}
+  '@xmldom/xmldom@0.8.12':
+    resolution: {integrity: sha512-9k/gHF6n/pAi/9tqr3m3aqkuiNosYTurLLUtc7xQ9sxB/wm7WPygCv8GYa6mS0fLJEHhqMC1ATYhz++U/lRHqg==}
     engines: {node: '>=10.0.0'}
 
   abort-controller@3.0.0:
@@ -4329,8 +4333,8 @@ packages:
   fast-sha256@1.3.0:
     resolution: {integrity: sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ==}
 
-  fast-xml-parser@4.5.3:
-    resolution: {integrity: sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==}
+  fast-xml-parser@4.5.5:
+    resolution: {integrity: sha512-cK9c5I/DwIOI7/Q7AlGN3DuTdwN61gwSfL8rvuVPK+0mcCNHHGxRrpiFtaZZRfRMJL3Gl8B2AFlBG6qXf03w9A==}
     hasBin: true
 
   fastq@1.20.1:
@@ -4343,7 +4347,7 @@ packages:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
-      picomatch: ^3 || ^4
+      picomatch: 3.0.2
     peerDependenciesMeta:
       picomatch:
         optional: true
@@ -4382,8 +4386,8 @@ packages:
     resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
     engines: {node: ^10.12.0 || >=12.0.0}
 
-  flatted@3.3.3:
-    resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
+  flatted@3.4.2:
+    resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
 
   flow-enums-runtime@0.0.6:
     resolution: {integrity: sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw==}
@@ -5437,8 +5441,8 @@ packages:
   nested-error-stacks@2.0.1:
     resolution: {integrity: sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A==}
 
-  next@15.5.12:
-    resolution: {integrity: sha512-Fi/wQ4Etlrn60rz78bebG1i1SR20QxvV8tVp6iJspjLUSHcZoeUXCt+vmWoEcza85ElZzExK/jJ/F6SvtGktjA==}
+  next@15.5.15:
+    resolution: {integrity: sha512-VSqCrJwtLVGwAVE0Sb/yikrQfkwkZW9p+lL/J4+xe+G3ZA+QnWPqgcfH1tDUEuk9y+pthzzVFp4L/U8JerMfMQ==}
     engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
     hasBin: true
     peerDependencies:
@@ -5462,8 +5466,8 @@ packages:
     resolution: {integrity: sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw==}
     engines: {node: '>=12.0.0'}
 
-  node-forge@1.3.3:
-    resolution: {integrity: sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==}
+  node-forge@1.4.0:
+    resolution: {integrity: sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==}
     engines: {node: '>= 6.13.0'}
 
   node-int64@0.4.0:
@@ -5686,16 +5690,16 @@ packages:
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
-  picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+  picomatch@2.3.2:
+    resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==}
     engines: {node: '>=8.6'}
 
-  picomatch@3.0.1:
-    resolution: {integrity: sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==}
+  picomatch@3.0.2:
+    resolution: {integrity: sha512-cfDHL6LStTEKlNilboNtobT/kEa30PtAf2Q1OgszfrG/rpVl1xaFWT9ktfkS306GmHgmnad1Sw4wabhlvFtsTw==}
     engines: {node: '>=10'}
 
-  picomatch@4.0.3:
-    resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
     engines: {node: '>=12'}
 
   pify@2.3.0:
@@ -6811,7 +6815,7 @@ packages:
   vite-plugin-css-injected-by-js@3.5.2:
     resolution: {integrity: sha512-2MpU/Y+SCZyWUB6ua3HbJCrgnF0KACAsmzOQt1UvRVJCGF6S8xdA3ZUhWcWdM9ivG4I5az8PnQmwwrkC2CAQrQ==}
     peerDependencies:
-      vite: '>2.0.0-0'
+      vite: 7.3.2
 
   vite@5.4.21:
     resolution: {integrity: sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==}
@@ -6844,8 +6848,8 @@ packages:
       terser:
         optional: true
 
-  vite@7.3.1:
-    resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==}
+  vite@7.3.2:
+    resolution: {integrity: sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -8328,10 +8332,10 @@ snapshots:
       glob: 13.0.0
       lan-network: 0.1.7
       minimatch: 10.2.3
-      node-forge: 1.3.3
+      node-forge: 1.4.0
       npm-package-arg: 11.0.3
       ora: 3.4.0
-      picomatch: 3.0.1
+      picomatch: 3.0.2
       pretty-bytes: 5.6.0
       pretty-format: 29.7.0
       progress: 2.0.3
@@ -8403,10 +8407,10 @@ snapshots:
       glob: 13.0.0
       lan-network: 0.1.7
       minimatch: 10.2.3
-      node-forge: 1.3.3
+      node-forge: 1.4.0
       npm-package-arg: 11.0.3
       ora: 3.4.0
-      picomatch: 3.0.1
+      picomatch: 3.0.2
       pretty-bytes: 5.6.0
       pretty-format: 29.7.0
       progress: 2.0.3
@@ -8478,10 +8482,10 @@ snapshots:
       glob: 13.0.0
       lan-network: 0.1.7
       minimatch: 10.2.3
-      node-forge: 1.3.3
+      node-forge: 1.4.0
       npm-package-arg: 11.0.3
       ora: 3.4.0
-      picomatch: 3.0.1
+      picomatch: 3.0.2
       pretty-bytes: 5.6.0
       pretty-format: 29.7.0
       progress: 2.0.3
@@ -8514,7 +8518,7 @@ snapshots:
 
   '@expo/code-signing-certificates@0.0.6':
     dependencies:
-      node-forge: 1.3.3
+      node-forge: 1.4.0
 
   '@expo/config-plugins@54.0.4':
     dependencies:
@@ -8810,13 +8814,13 @@ snapshots:
 
   '@expo/plist@0.1.3':
     dependencies:
-      '@xmldom/xmldom': 0.7.13
+      '@xmldom/xmldom': 0.8.12
       base64-js: 1.5.1
       xmlbuilder: 14.0.0
 
   '@expo/plist@0.4.8':
     dependencies:
-      '@xmldom/xmldom': 0.8.11
+      '@xmldom/xmldom': 0.8.12
       base64-js: 1.5.1
       xmlbuilder: 15.1.1
 
@@ -9136,30 +9140,30 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@next/env@15.5.12': {}
+  '@next/env@15.5.15': {}
 
-  '@next/swc-darwin-arm64@15.5.12':
+  '@next/swc-darwin-arm64@15.5.15':
     optional: true
 
-  '@next/swc-darwin-x64@15.5.12':
+  '@next/swc-darwin-x64@15.5.15':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@15.5.12':
+  '@next/swc-linux-arm64-gnu@15.5.15':
     optional: true
 
-  '@next/swc-linux-arm64-musl@15.5.12':
+  '@next/swc-linux-arm64-musl@15.5.15':
     optional: true
 
-  '@next/swc-linux-x64-gnu@15.5.12':
+  '@next/swc-linux-x64-gnu@15.5.15':
     optional: true
 
-  '@next/swc-linux-x64-musl@15.5.12':
+  '@next/swc-linux-x64-musl@15.5.15':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@15.5.12':
+  '@next/swc-win32-arm64-msvc@15.5.15':
     optional: true
 
-  '@next/swc-win32-x64-msvc@15.5.12':
+  '@next/swc-win32-x64-msvc@15.5.15':
     optional: true
 
   '@node-rs/argon2-android-arm-eabi@1.7.0':
@@ -10021,7 +10025,7 @@ snapshots:
       '@react-native-community/cli-tools': 17.0.1
       chalk: 4.1.2
       fast-glob: 3.3.3
-      fast-xml-parser: 4.5.3
+      fast-xml-parser: 4.5.5
 
   '@react-native-community/cli-config-apple@17.0.1':
     dependencies:
@@ -10106,7 +10110,7 @@ snapshots:
       '@react-native-community/cli-tools': 17.0.1
       chalk: 4.1.2
       execa: 5.1.1
-      fast-xml-parser: 4.5.3
+      fast-xml-parser: 4.5.5
 
   '@react-native-community/cli-platform-ios@17.0.1':
     dependencies:
@@ -10987,7 +10991,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-react@4.7.0(vite@7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
+  '@vitejs/plugin-react@4.7.0(vite@7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@babel/core': 7.28.6
       '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.6)
@@ -10995,7 +10999,7 @@ snapshots:
       '@rolldown/pluginutils': 1.0.0-beta.27
       '@types/babel__core': 7.20.5
       react-refresh: 0.17.0
-      vite: 7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - supports-color
 
@@ -11022,13 +11026,13 @@ snapshots:
       chai: 6.2.2
       tinyrainbow: 3.0.3
 
-  '@vitest/mocker@4.0.17(vite@7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
+  '@vitest/mocker@4.0.17(vite@7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@vitest/spy': 4.0.17
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
 
   '@vitest/pretty-format@4.0.17':
     dependencies:
@@ -11056,7 +11060,7 @@ snapshots:
     dependencies:
       '@vitest/utils': 4.0.17
       fflate: 0.8.2
-      flatted: 3.3.3
+      flatted: 3.4.2
       pathe: 2.0.3
       sirv: 3.0.2
       tinyglobby: 0.2.15
@@ -11067,7 +11071,7 @@ snapshots:
     dependencies:
       '@vitest/utils': 4.0.18
       fflate: 0.8.2
-      flatted: 3.3.3
+      flatted: 3.4.2
       pathe: 2.0.3
       sirv: 3.0.2
       tinyglobby: 0.2.15
@@ -11088,9 +11092,7 @@ snapshots:
 
   '@vscode/sudo-prompt@9.3.2': {}
 
-  '@xmldom/xmldom@0.7.13': {}
-
-  '@xmldom/xmldom@0.8.11': {}
+  '@xmldom/xmldom@0.8.12': {}
 
   abort-controller@3.0.0:
     dependencies:
@@ -11164,7 +11166,7 @@ snapshots:
   anymatch@3.1.3:
     dependencies:
       normalize-path: 3.0.0
-      picomatch: 2.3.1
+      picomatch: 2.3.2
 
   appdirsjs@1.2.7: {}
 
@@ -12854,7 +12856,7 @@ snapshots:
 
   fast-sha256@1.3.0: {}
 
-  fast-xml-parser@4.5.3:
+  fast-xml-parser@4.5.5:
     dependencies:
       strnum: 1.1.2
 
@@ -12866,9 +12868,9 @@ snapshots:
     dependencies:
       bser: 2.1.1
 
-  fdir@6.5.0(picomatch@4.0.3):
+  fdir@6.5.0(picomatch@4.0.4):
     optionalDependencies:
-      picomatch: 4.0.3
+      picomatch: 4.0.4
 
   fflate@0.8.2: {}
 
@@ -12912,11 +12914,11 @@ snapshots:
 
   flat-cache@3.2.0:
     dependencies:
-      flatted: 3.3.3
+      flatted: 3.4.2
       keyv: 4.5.4
       rimraf: 3.0.2
 
-  flatted@3.3.3: {}
+  flatted@3.4.2: {}
 
   flow-enums-runtime@0.0.6: {}
 
@@ -12982,9 +12984,9 @@ snapshots:
 
   functions-have-names@1.2.3: {}
 
-  geist@1.7.0(next@15.5.12(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)):
+  geist@1.7.0(next@15.5.15(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)):
     dependencies:
-      next: 15.5.12(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      next: 15.5.15(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
 
   generator-function@2.0.1: {}
 
@@ -13520,7 +13522,7 @@ snapshots:
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
-      picomatch: 2.3.1
+      picomatch: 2.3.2
 
   jest-validate@29.7.0:
     dependencies:
@@ -14009,7 +14011,7 @@ snapshots:
   micromatch@4.0.8:
     dependencies:
       braces: 3.0.3
-      picomatch: 2.3.1
+      picomatch: 2.3.2
 
   mime-db@1.52.0: {}
 
@@ -14090,9 +14092,9 @@ snapshots:
 
   nested-error-stacks@2.0.1: {}
 
-  next@15.5.12(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
+  next@15.5.15(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(@playwright/test@1.57.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
     dependencies:
-      '@next/env': 15.5.12
+      '@next/env': 15.5.15
       '@swc/helpers': 0.5.15
       caniuse-lite: 1.0.30001765
       postcss: 8.4.31
@@ -14100,14 +14102,14 @@ snapshots:
       react-dom: 19.2.3(react@19.2.3)
       styled-jsx: 5.1.6(@babel/core@7.28.6)(react@19.2.3)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 15.5.12
-      '@next/swc-darwin-x64': 15.5.12
-      '@next/swc-linux-arm64-gnu': 15.5.12
-      '@next/swc-linux-arm64-musl': 15.5.12
-      '@next/swc-linux-x64-gnu': 15.5.12
-      '@next/swc-linux-x64-musl': 15.5.12
-      '@next/swc-win32-arm64-msvc': 15.5.12
-      '@next/swc-win32-x64-msvc': 15.5.12
+      '@next/swc-darwin-arm64': 15.5.15
+      '@next/swc-darwin-x64': 15.5.15
+      '@next/swc-linux-arm64-gnu': 15.5.15
+      '@next/swc-linux-arm64-musl': 15.5.15
+      '@next/swc-linux-x64-gnu': 15.5.15
+      '@next/swc-linux-x64-musl': 15.5.15
+      '@next/swc-win32-arm64-msvc': 15.5.15
+      '@next/swc-win32-x64-msvc': 15.5.15
       '@opentelemetry/api': 1.9.0
       '@playwright/test': 1.57.0
       babel-plugin-react-compiler: 1.0.0
@@ -14118,7 +14120,7 @@ snapshots:
 
   nocache@3.0.4: {}
 
-  node-forge@1.3.3: {}
+  node-forge@1.4.0: {}
 
   node-int64@0.4.0: {}
 
@@ -14356,11 +14358,11 @@ snapshots:
 
   picocolors@1.1.1: {}
 
-  picomatch@2.3.1: {}
+  picomatch@2.3.2: {}
 
-  picomatch@3.0.1: {}
+  picomatch@3.0.2: {}
 
-  picomatch@4.0.3: {}
+  picomatch@4.0.4: {}
 
   pify@2.3.0: {}
 
@@ -14382,7 +14384,7 @@ snapshots:
 
   plist@3.1.0:
     dependencies:
-      '@xmldom/xmldom': 0.8.11
+      '@xmldom/xmldom': 0.8.12
       base64-js: 1.5.1
       xmlbuilder: 15.1.1
 
@@ -15020,7 +15022,7 @@ snapshots:
 
   readdirp@3.6.0:
     dependencies:
-      picomatch: 2.3.1
+      picomatch: 2.3.2
 
   readdirp@4.1.2: {}
 
@@ -15640,8 +15642,8 @@ snapshots:
 
   tinyglobby@0.2.15:
     dependencies:
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
 
   tinyrainbow@3.0.3: {}
 
@@ -15955,11 +15957,11 @@ snapshots:
       lightningcss: 1.31.0
       terser: 5.46.0
 
-  vite@7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2):
+  vite@7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       esbuild: 0.27.0
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
       postcss: 8.5.6
       rollup: 4.59.0
       tinyglobby: 0.2.15
@@ -15975,7 +15977,7 @@ snapshots:
   vitest@4.0.17(@opentelemetry/api@1.9.0)(@types/node@20.19.30)(@vitest/ui@4.0.17)(jiti@1.21.7)(jsdom@26.1.0)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       '@vitest/expect': 4.0.17
-      '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitest/mocker': 4.0.17(vite@7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
       '@vitest/pretty-format': 4.0.17
       '@vitest/runner': 4.0.17
       '@vitest/snapshot': 4.0.17
@@ -15986,13 +15988,13 @@ snapshots:
       magic-string: 0.30.21
       obug: 2.1.1
       pathe: 2.0.3
-      picomatch: 4.0.3
+      picomatch: 4.0.4
       std-env: 3.10.0
       tinybench: 2.9.0
       tinyexec: 1.0.2
       tinyglobby: 0.2.15
       tinyrainbow: 3.0.3
-      vite: 7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@opentelemetry/api': 1.9.0
@@ -16015,7 +16017,7 @@ snapshots:
   vitest@4.0.17(@opentelemetry/api@1.9.0)(@types/node@20.19.30)(@vitest/ui@4.0.18)(jiti@1.21.7)(jsdom@26.1.0)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       '@vitest/expect': 4.0.17
-      '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitest/mocker': 4.0.17(vite@7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
       '@vitest/pretty-format': 4.0.17
       '@vitest/runner': 4.0.17
       '@vitest/snapshot': 4.0.17
@@ -16026,13 +16028,13 @@ snapshots:
       magic-string: 0.30.21
       obug: 2.1.1
       pathe: 2.0.3
-      picomatch: 4.0.3
+      picomatch: 4.0.4
       std-env: 3.10.0
       tinybench: 2.9.0
       tinyexec: 1.0.2
       tinyglobby: 0.2.15
       tinyrainbow: 3.0.3
-      vite: 7.3.1(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.2(@types/node@20.19.30)(jiti@1.21.7)(lightningcss@1.31.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@opentelemetry/api': 1.9.0
diff --git a/scripts/screenshots/seed.ts b/scripts/screenshots/seed.ts
index 35af639..879da01 100644
--- a/scripts/screenshots/seed.ts
+++ b/scripts/screenshots/seed.ts
@@ -40,7 +40,7 @@ export async function callMutation(
     },
     body: JSON.stringify({
       path: "testAdmin:runTestMutation",
-      args: { secret, name: path, mutationArgs: args },
+      args: { secret, name: path, mutationArgsJson: JSON.stringify(args) },
       format: "json",
     }),
   });
diff --git a/security/convex-v-any-arg-exceptions.json b/security/convex-v-any-arg-exceptions.json
index 111381a..e9d524d 100644
--- a/security/convex-v-any-arg-exceptions.json
+++ b/security/convex-v-any-arg-exceptions.json
@@ -1,17 +1,5 @@
 {
   "version": 1,
   "description": "Temporary v.any() exceptions for exported handler args.",
-  "entries": [
-    {
-      "file": "packages/convex/convex/testAdmin.ts",
-      "handler": "runTestMutation",
-      "kind": "action",
-      "riskTier": "low",
-      "owner": "backend-security",
-      "reason": "Admin test gateway intentionally forwards arbitrary mutation args to internal test-only functions.",
-      "originalExpiresOn": "2026-04-15",
-      "expiresOn": "2026-04-15",
-      "justificationUpdatedOn": "2026-02-14"
-    }
-  ]
+  "entries": []
 }