@agent-native/toolkit 0.202.0 → 0.202.1-nightly-20261007011022

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/toolkit",
-  "version": "0.202.0",
+  "version": "0.202.1-nightly-20261007011022",
   "description": "Reusable app-building UI and helpers for Agent-Native apps.",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -673,7 +673,7 @@
     "y-protocols": "^1.0.7",
     "yjs": "^13.6.33",
     "zod": "^4.3.6",
-    "@agent-native/agentkit": "^0.202.0"
+    "@agent-native/agentkit": "^0.202.1-nightly-20261007011022"
   },
   "devDependencies": {
     "@excalidraw/excalidraw": "0.18.1",
@@ -697,10 +697,10 @@
     "typescript-7": "npm:typescript@^7.0.2",
     "vite": "8.1.0",
     "vitest": "^4.1.5",
-    "@agent-native/core": "^0.202.0"
+    "@agent-native/core": "^0.202.1-nightly-20261007011022"
   },
   "peerDependencies": {
-    "@agent-native/core": ">=0.196.0",
+    "@agent-native/core": "0.202.1-nightly-20261007011022",
     "@excalidraw/excalidraw": ">=0.18",
     "@excalidraw/mermaid-to-excalidraw": ">=2",
     "@tanstack/react-query": "^5.99.2",

package/src/app/settings/BuilderConnectPopover.spec.tsx

@@ -1,5 +1,6 @@
 // @vitest-environment happy-dom
 
+import { getOnboardingAppProfileForId } from "@agent-native/core/onboarding/app-profile-data";
 import { WORKSPACE_SERVICES } from "@agent-native/core/onboarding/workspace-services";
 import { TooltipProvider } from "@agent-native/toolkit/ui/tooltip";
 import React, { act } from "react";
@@ -15,48 +16,21 @@ vi.mock("@agent-native/core/client/i18n", () => ({
       ),
 }));
 
-vi.mock("@agent-native/core/client/onboarding/use-onboarding", () => ({
-  useOnboarding: () => ({
-    loading: false,
-    error: null,
-    profile: {
-      capabilities: [
-        {
-          id: "llm",
-          label: "AI model",
-          required: true,
-          builderIncluded: true,
-          service: "model",
-          keySummary: "Connect your own AI model",
-          why: "The agent uses a language model.",
-        },
-        {
-          id: "design-system-intelligence",
-          label: "Design system intelligence",
-          required: false,
-          builderIncluded: true,
-          service: "design-system-intelligence",
-        },
-        {
-          id: "background-agents",
-          label: "Background agents",
-          required: false,
-          builderIncluded: true,
-          service: "background-agents",
-        },
-      ],
-    },
-  }),
-}));
-
 import { BuilderConnectPopover } from "./BuilderConnectPopover.js";
 import { getBuilderIncludedBenefitCapabilities } from "./BuilderIncludedBenefitsDisclosure.js";
 import { DeferredBuilderConnectPopover } from "./deferred-builder-connect-popover.js";
 
+const appIdentity = vi.hoisted(() => ({ templateId: null as string | null }));
+
+vi.mock("./shell/app-identity.js", () => ({
+  currentTemplateId: () => appIdentity.templateId,
+}));
+
 let container: HTMLDivElement;
 let root: Root;
 
 beforeEach(() => {
+  appIdentity.templateId = null;
   (
     globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
   ).IS_REACT_ACT_ENVIRONMENT = true;
@@ -69,6 +43,7 @@ afterEach(() => {
   act(() => root.unmount());
   container.remove();
   vi.clearAllMocks();
+  vi.unstubAllGlobals();
 });
 
 it("shows all eight included services when an app profile omits design intelligence", () => {
@@ -424,6 +399,7 @@ describe("BuilderConnectPopover", () => {
     const props = {
       flow,
       onConnect: vi.fn(),
+      appId: "calendar",
       contentTestId: "consent",
       primaryTestId: "create",
       secondaryTestId: "sign-in",
@@ -464,11 +440,37 @@ describe("BuilderConnectPopover", () => {
     ).toEqual([
       "Included free",
       "60 monthly Agent Credits",
-      "+ 2 more services",
+      "+ 8 more services",
     ]);
     click(servicesToggle!);
     expect(servicesToggle?.getAttribute("aria-expanded")).toBe("true");
   });
+
+  it("prefers the assigned workspace profile over the template profile", () => {
+    appIdentity.templateId = "calendar";
+    vi.stubGlobal("__AGENT_NATIVE_APP_ID__", "assets");
+    const flow = {
+      connecting: false,
+      start: vi.fn(),
+      statusResolved: true,
+      agentNativeProvisioningEnabled: true,
+    };
+
+    render(React.createElement(BuilderConnectPopover, { flow }, trigger()));
+    click(connectButton());
+
+    const expectedMoreCount = getBuilderIncludedBenefitCapabilities(
+      getOnboardingAppProfileForId("assets").capabilities,
+    ).filter(
+      (capability) => capability.id !== "llm" && capability.service !== "model",
+    ).length;
+    const servicesToggle = document.querySelector<HTMLButtonElement>(
+      "[data-testid='builder-included-services'] button[aria-expanded]",
+    );
+    expect(servicesToggle?.textContent?.replace(/\s+/g, " ").trim()).toContain(
+      `+ ${expectedMoreCount} more services`,
+    );
+  });
 });
 
 it("shows a cancel action while the Builder connection is waiting", () => {

package/src/app/settings/BuilderConnectPopover.tsx

@@ -1,5 +1,6 @@
+import { injectedAgentNativeAppId } from "@agent-native/core/client/app-config";
 import { useT } from "@agent-native/core/client/i18n";
-import { useOnboarding } from "@agent-native/core/client/onboarding/use-onboarding";
+import { getOnboardingAppProfileForId } from "@agent-native/core/onboarding/app-profile-data";
 import { Button } from "@agent-native/toolkit/ui/button";
 import {
   Popover,
@@ -13,6 +14,7 @@ import {
   BuilderIncludedBenefitsDisclosure,
   getBuilderIncludedBenefitCapabilities,
 } from "./BuilderIncludedBenefitsDisclosure.js";
+import { currentTemplateId } from "./shell/app-identity.js";
 import type { BuilderConnectFlow } from "./useBuilderStatus.js";
 
 type BuilderConnectTrigger = React.ReactElement<{
@@ -39,6 +41,7 @@ export interface BuilderConnectPopoverProps {
   onConnect?: (provisionAccount: boolean) => void;
   onTriggerClick?: React.MouseEventHandler<HTMLElement>;
   openOnMount?: boolean;
+  appId?: string;
   contentTestId?: string;
   primaryTestId?: string;
   secondaryTestId?: string;
@@ -49,6 +52,7 @@ export interface BuilderConnectChoicePanelProps {
   canProvisionAccount: boolean;
   onCreateAndActivate: () => void;
   onExistingAccount: () => void;
+  appId?: string;
   contentTestId?: string;
   primaryTestId?: string;
   secondaryTestId?: string;
@@ -59,6 +63,7 @@ export function BuilderConnectChoicePanel({
   canProvisionAccount,
   onCreateAndActivate,
   onExistingAccount,
+  appId,
   contentTestId,
   primaryTestId,
   secondaryTestId,
@@ -126,7 +131,7 @@ export function BuilderConnectChoicePanel({
           ) : null}
         </div>
       ) : null}
-      <BuilderConnectIncludedServices />
+      <BuilderConnectIncludedServices appId={appId} />
       <div className="flex flex-col gap-2">
         <Button
           type="button"
@@ -197,6 +202,7 @@ export function BuilderConnectPopover({
   onConnect,
   onTriggerClick,
   openOnMount = false,
+  appId,
   contentTestId,
   primaryTestId,
   secondaryTestId,
@@ -272,6 +278,7 @@ export function BuilderConnectPopover({
           }
           onCreateAndActivate={() => start(true)}
           onExistingAccount={() => start(false)}
+          appId={appId}
           contentTestId={contentTestId}
           primaryTestId={primaryTestId}
           secondaryTestId={secondaryTestId}
@@ -290,12 +297,14 @@ export function BuilderConnectPopover({
   );
 }
 
-function BuilderConnectIncludedServices() {
+function BuilderConnectIncludedServices({ appId }: { appId?: string }) {
   const t = useT();
-  const { profile, loading, error } = useOnboarding();
-  const capabilities = profile
-    ? getBuilderIncludedBenefitCapabilities(profile.capabilities)
-    : [];
+  const profile = getOnboardingAppProfileForId(
+    appId ?? injectedAgentNativeAppId() ?? currentTemplateId() ?? undefined,
+  );
+  const capabilities = getBuilderIncludedBenefitCapabilities(
+    profile.capabilities,
+  );
 
   return (
     <BuilderIncludedBenefitsDisclosure
@@ -306,13 +315,7 @@ function BuilderConnectIncludedServices() {
       creditsLabel={t("agentChat.onboarding.builderMonthlyCredits", {
         defaultValue: "60 monthly Agent Credits",
       })}
-      loading={loading}
       loadingLabel={t("agentChat.common.loading")}
-      error={
-        error || (!loading && !profile)
-          ? t("agentChat.common.chunkLoadFailed")
-          : null
-      }
       testId="builder-included-services"
     />
   );

package/src/app/settings/model/ModelSettingsPage.spec.tsx

@@ -179,6 +179,7 @@ function listing(
     providers: PROVIDERS.map((provider) => ({
       provider,
       label: LABELS[provider],
+      deploymentConfigured: false,
       org: null,
       personal: null,
       ...entries[provider],
@@ -206,7 +207,7 @@ function models(): ProviderModelsRead {
       })),
       {
         provider: "builder",
-        recommendedModels: ["auto", "gpt-5.6-luna"],
+        recommendedModels: ["auto", "gpt-6-luna"],
         rows: { user: { models: null }, org: { models: null } },
       },
     ],
@@ -618,7 +619,7 @@ describe("ModelSettingsPage", () => {
     state.listing = listing({
       canManageOrg: true,
       canUpdateDefault: true,
-      defaultModel: null,
+      defaultModel: { engine: "ai-sdk:openai", model: "gpt-5.6-sol" },
     });
     state.builder = builderFlow({
       configured: false,
@@ -641,6 +642,11 @@ describe("ModelSettingsPage", () => {
     expect(document.getElementById("provider-org-builder")).toBeNull();
 
     const defaultRow = row("default-model");
+    await vi.waitFor(() => {
+      expect(
+        defaultRow.querySelector("[data-default-model-loading]"),
+      ).toBeNull();
+    });
     expect(defaultRow.textContent).toContain(
       "Add a provider to choose a default model.",
     );
@@ -648,7 +654,10 @@ describe("ModelSettingsPage", () => {
       defaultRow.querySelector<HTMLButtonElement>('[role="combobox"]')
         ?.disabled,
     ).toBe(true);
-    expect(defaultRow.textContent).not.toContain("Not set");
+    expect(defaultRow.textContent).not.toContain("gpt-5.6-sol");
+    expect(
+      defaultRow.querySelector('[role="combobox"]')?.textContent?.trim(),
+    ).toBe("");
 
     await act(async () => {
       (
@@ -666,6 +675,238 @@ describe("ModelSettingsPage", () => {
     expect(builderButton?.disabled).toBe(false);
   });
 
+  it("keeps a stored deployment-configured provider default visible and upgrades it", async () => {
+    state.listing = listing(
+      {
+        canManageOrg: true,
+        canUpdateDefault: true,
+        defaultModel: { engine: "ai-sdk:openai", model: "gpt-5.6-sol" },
+      },
+      { openai: { deploymentConfigured: true } },
+    );
+    state.models = {
+      providers: models().providers.map((provider) =>
+        provider.provider === "openai"
+          ? { ...provider, recommendedModels: ["gpt-6-sol", "gpt-6.1-sol"] }
+          : provider,
+      ),
+    };
+    state.builder = builderFlow({
+      configured: false,
+      grants: { org: null, personal: null },
+      canConnect: { org: true, personal: true },
+    });
+    await render();
+
+    const defaultRow = row("default-model");
+    await vi.waitFor(() => {
+      expect(defaultRow.textContent).toContain("gpt-6.1-sol · OpenAI");
+    });
+    expect(
+      defaultRow.querySelector<HTMLButtonElement>('[role="combobox"]')
+        ?.disabled,
+    ).toBe(false);
+    expect(row("llm").textContent).not.toContain("Add a model provider");
+  });
+
+  it("offers a deployment-configured provider when there is no saved key or default", async () => {
+    state.listing = listing(
+      { canManageOrg: true, canUpdateDefault: true, defaultModel: null },
+      { anthropic: { deploymentConfigured: true } },
+    );
+    state.builder = builderFlow({
+      configured: false,
+      grants: { org: null, personal: null },
+      canConnect: { org: true, personal: true },
+    });
+    await render();
+
+    expect(row("llm").textContent).not.toContain("Add a model provider");
+    const defaultRow = row("default-model");
+    expect(defaultRow.textContent).toContain("Choose a model");
+    expect(
+      defaultRow.querySelector<HTMLButtonElement>('[role="combobox"]')
+        ?.disabled,
+    ).toBe(false);
+  });
+
+  it("preserves a deployment OpenAI model when its saved model selection allows custom IDs", async () => {
+    state.listing = listing(
+      {
+        canManageOrg: true,
+        canUpdateDefault: true,
+        defaultModel: { engine: "ai-sdk:openai", model: "gpt-5.6-luna" },
+      },
+      { openai: { deploymentConfigured: true } },
+    );
+    state.models = {
+      providers: models().providers.map((provider) =>
+        provider.provider === "openai"
+          ? {
+              ...provider,
+              recommendedModels: ["gpt-6-luna", "gpt-6.1-luna"],
+              rows: {
+                ...provider.rows,
+                org: { models: null, preserveCustomModels: true },
+              },
+            }
+          : provider,
+      ),
+    };
+    state.builder = builderFlow({
+      configured: false,
+      grants: { org: null, personal: null },
+      canConnect: { org: true, personal: true },
+    });
+    await render();
+
+    const defaultRow = row("default-model");
+    await vi.waitFor(() => {
+      expect(defaultRow.textContent).toContain("gpt-5.6-luna · OpenAI");
+    });
+  });
+
+  it("keeps an OpenAI default hidden when the engine is not configured", async () => {
+    state.listing = listing({
+      canManageOrg: true,
+      canUpdateDefault: true,
+      defaultModel: { engine: "ai-sdk:openai", model: "gpt-5.6-sol" },
+    });
+    state.builder = builderFlow({
+      configured: false,
+      grants: { org: null, personal: null },
+      canConnect: { org: true, personal: true },
+    });
+    callActionMock.mockResolvedValue({
+      engines: [
+        {
+          name: "ai-sdk:openai",
+          configured: false,
+          credentialRejected: false,
+        },
+      ],
+    });
+    await render();
+
+    const defaultRow = row("default-model");
+    await vi.waitFor(() => {
+      expect(
+        defaultRow.querySelector("[data-default-model-loading]"),
+      ).toBeNull();
+    });
+    expect(defaultRow.textContent).not.toContain("gpt-5.6-sol");
+    expect(
+      defaultRow.querySelector<HTMLButtonElement>('[role="combobox"]')
+        ?.disabled,
+    ).toBe(true);
+    expect(row("llm").textContent).toContain("Add a model provider");
+  });
+
+  it("keeps custom OpenAI endpoint model IDs when displaying a stored default", async () => {
+    state.listing = listing(
+      {
+        canManageOrg: true,
+        canUpdateDefault: true,
+        defaultModel: { engine: "ai-sdk:openai", model: "gpt-5.6-luna" },
+      },
+      {
+        openai: {
+          org: {
+            scope: "org",
+            endpoint: "https://gateway.example/v1",
+            updatedAt: 1,
+          },
+        },
+      },
+    );
+    state.builder = builderFlow({
+      configured: false,
+      grants: { org: null, personal: null },
+    });
+    state.models = {
+      providers: [
+        {
+          provider: "openai",
+          recommendedModels: ["gpt-5.6-luna", "gpt-6-luna"],
+          rows: {
+            org: { models: null, preserveCustomModels: true },
+          },
+        },
+      ],
+    };
+    await render();
+
+    const defaultRow = row("default-model");
+    expect(defaultRow.textContent).toContain("gpt-5.6-luna");
+    expect(defaultRow.textContent).not.toContain("gpt-6-luna");
+  });
+
+  it("keeps custom endpoint defaults for members who cannot see the endpoint", async () => {
+    state.listing = listing(
+      {
+        canManageOrg: false,
+        canUpdateDefault: true,
+        defaultModel: { engine: "ai-sdk:openai", model: "gpt-5.6-luna" },
+      },
+      {
+        openai: { org: { scope: "org", updatedAt: 1 } },
+      },
+    );
+    state.builder = builderFlow({
+      configured: false,
+      grants: { org: null, personal: null },
+    });
+    state.models = {
+      providers: [
+        {
+          provider: "openai",
+          recommendedModels: ["gpt-5.6-luna", "gpt-6-luna"],
+          rows: {
+            org: { models: null, preserveCustomModels: true },
+          },
+        },
+      ],
+    };
+    await render();
+
+    const defaultRow = row("default-model");
+    expect(defaultRow.textContent).toContain("gpt-5.6-luna");
+    expect(defaultRow.textContent).not.toContain("gpt-6-luna");
+  });
+
+  it("hides a stored default whose provider key was rejected", async () => {
+    state.listing = listing(
+      {
+        canManageOrg: true,
+        canUpdateDefault: true,
+        defaultModel: { engine: "ai-sdk:openai", model: "gpt-5.6-sol" },
+      },
+      {
+        openai: {
+          org: { scope: "org", rejectedAt: 1, updatedAt: 1 },
+        },
+      },
+    );
+    state.builder = builderFlow({
+      configured: false,
+      grants: { org: null, personal: null },
+    });
+    await render();
+
+    expect(row("provider-org-openai").textContent).toContain("rejected");
+    const defaultRow = row("default-model");
+    await vi.waitFor(() => {
+      expect(
+        defaultRow.querySelector("[data-default-model-loading]"),
+      ).toBeNull();
+    });
+    expect(defaultRow.textContent).not.toContain("gpt-5.6-sol");
+    expect(
+      defaultRow.querySelector<HTMLButtonElement>('[role="combobox"]')
+        ?.disabled,
+    ).toBe(true);
+  });
+
   it("tells a restricted member with no provider to ask an admin", async () => {
     state.listing = listing({ personalKeysRestricted: true });
     state.builder = builderFlow({

package/src/app/settings/model/ModelSettingsPage.tsx

@@ -1,5 +1,6 @@
 import type { ProviderKeyPolicyStatus } from "@agent-native/core/agent/actions/manage-provider-key-policy";
 import { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "@agent-native/core/agent/chatgpt-subscription-contract";
+import { upgradeModelToLatestSupportedVersion } from "@agent-native/core/agent/model-version";
 import {
   setAgentEngineDefaultModel,
   type AgentEngineKeyScope,
@@ -347,6 +348,9 @@ function hasAnyProvider(
   builder: BuilderConnectFlow,
   chatgptConnected: boolean | null,
 ): boolean {
+  if (listing.providers.some((provider) => provider.deploymentConfigured)) {
+    return true;
+  }
   if (chatgptConnected !== false || !builder.hasFetchedStatus) return true;
   if (!listing.hasOrganization) {
     return builder.configured || rows.personal.length > 0;
@@ -787,16 +791,26 @@ function DefaultModelRow({
     chatgpt: chatgpt.status === "ready" ? chatgpt.catalog : undefined,
   });
   const stored = listing.defaultModel
-    ? {
-        engine: listing.defaultModel.engine,
-        model:
-          listing.defaultModel.model ??
-          groups.find((group) => group.engine === listing.defaultModel?.engine)
-            ?.models[0] ??
-          "",
-      }
+    ? (() => {
+        const group = groups.find(
+          (candidate) => candidate.engine === listing.defaultModel?.engine,
+        );
+        const supportedModels = group?.models ?? [];
+        const preserveCustomModels = group?.preserveCustomModels;
+        const model = listing.defaultModel.model ?? supportedModels[0] ?? "";
+        return {
+          engine: listing.defaultModel.engine,
+          model:
+            (!preserveCustomModels &&
+              upgradeModelToLatestSupportedVersion(model, supportedModels)) ||
+            model,
+        };
+      })()
     : null;
-  const current = pending ?? stored;
+  const storedGroup = stored
+    ? groups.find((group) => group.engine === stored.engine)
+    : undefined;
+  const current = pending ?? (storedGroup ? stored : null);
   const engineLabel = (engine: string) => {
     const provider = providerForEngine(engine);
     if (provider === "builder") return BUILDER_LABEL;
@@ -811,8 +825,8 @@ function DefaultModelRow({
         })
       : engineLabel(current.engine)
     : t(`${K}notSet`);
-  // A stored default no longer offered (personal, rejected, or unchecked)
-  // still shows as the value, so the select never reads blank.
+  // Keep a stored model visible if its provider is available but the model is
+  // no longer in that provider's checked list.
   const offered =
     current &&
     groups.some(
@@ -884,7 +898,13 @@ function DefaultModelRow({
               aria-label={t(DEFAULT_MODEL_LABEL)}
             >
               <SelectValue
-                placeholder={current ? currentLabel : t(`${K}chooseModel`)}
+                placeholder={
+                  current
+                    ? currentLabel
+                    : waitingForProvider
+                      ? ""
+                      : t(`${K}chooseModel`)
+                }
               />
             </SelectTrigger>
           </Select>

package/src/app/settings/model/ProviderDialog.spec.tsx

@@ -102,6 +102,7 @@ function listing(
     providers: PROVIDERS.map((provider) => ({
       provider,
       label: LABELS[provider],
+      deploymentConfigured: false,
       org: null,
       personal: null,
       ...entries[provider],

package/src/app/settings/model/model-page-state.spec.ts

@@ -63,8 +63,8 @@ const models: ProviderModelsRead = {
   providers: [
     {
       provider: "builder",
-      recommendedModels: ["auto", "gpt-5.6-luna"],
-      rows: { org: { models: ["gpt-5.6-luna"] } },
+      recommendedModels: ["auto", "gpt-6-luna"],
+      rows: { org: { models: ["gpt-6-luna"] } },
     },
     {
       provider: "anthropic",
@@ -207,7 +207,7 @@ describe("model page state", () => {
         engine: "builder",
         provider: "builder",
         label: "Builder.io",
-        models: ["gpt-5.6-luna"],
+        models: ["gpt-6-luna"],
       },
       {
         engine: "anthropic",

package/src/app/settings/model/model-page-state.ts

@@ -33,7 +33,10 @@ export interface ProviderModelsRead {
     provider: string;
     recommendedModels: string[];
     rows: Partial<
-      Record<ModelProviderKeyScope, { models: string[] | null } | undefined>
+      Record<
+        ModelProviderKeyScope,
+        { models: string[] | null; preserveCustomModels?: boolean } | undefined
+      >
     >;
   }>;
 }
@@ -49,6 +52,17 @@ export function selectedModelsAt(
   return entry.rows[scope]?.models ?? entry.recommendedModels;
 }
 
+function preservesCustomModelsAt(
+  read: ProviderModelsRead | undefined,
+  provider: string,
+  scope: ModelProviderKeyScope,
+): boolean {
+  return (
+    read?.providers.find((item) => item.provider === provider)?.rows[scope]
+      ?.preserveCustomModels === true
+  );
+}
+
 /** The models checked at `scope`, or null when nothing is chosen there. */
 export function explicitSelectionAt(
   read: ProviderModelsRead | undefined,
@@ -210,6 +224,7 @@ export interface DefaultModelGroup {
   provider: AgentProviderId | "builder" | "chatgpt";
   label: string;
   models: string[];
+  preserveCustomModels?: boolean;
   /** Names to show instead of the model ids, where the provider has them. */
   modelDisplayNames?: Record<string, string>;
 }
@@ -252,7 +267,7 @@ export function defaultModelGroups(input: {
   }
   for (const entry of listing.providers) {
     const key = scope === "org" ? entry.org : entry.personal;
-    if (!key || key.rejectedAt) continue;
+    if (key?.rejectedAt || (!key && !entry.deploymentConfigured)) continue;
     const checked = selectedModelsAt(models, entry.provider, scope) ?? [];
     if (checked.length === 0) continue;
     groups.push({
@@ -260,6 +275,10 @@ export function defaultModelGroups(input: {
       provider: entry.provider,
       label: entry.label,
       models: checked,
+      ...(entry.provider === "openai" &&
+      preservesCustomModelsAt(models, entry.provider, scope)
+        ? { preserveCustomModels: true }
+        : {}),
     });
   }
   if (