@vellumai/assistant 0.11.3 → 0.11.4-staging.1

package/src/runtime/routes/inbound-message-handler.ts

@@ -101,7 +101,6 @@ import {
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../assistant-scope.js";
 import { deliverChannelReply } from "../gateway-client.js";
 import { trustContextFromVerdict } from "../trust-verdict-consumer.js";
-import { canonicalChannelAssistantId } from "./channel-route-shared.js";
 import { BadRequestError } from "./errors.js";
 import { handleApprovalInterception } from "./guardian-approval-interception.js";
 import {
@@ -371,16 +370,6 @@ export async function handleChannelInbound({
     throw new BadRequestError("content or attachmentIds is required");
   }
 
-  // Canonicalize the assistant ID so all DB-facing operations use the
-  // consistent 'self' key regardless of what the gateway sent.
-  const canonicalAssistantId = canonicalChannelAssistantId(assistantId);
-  if (canonicalAssistantId !== assistantId) {
-    log.debug(
-      { raw: assistantId, canonical: canonicalAssistantId },
-      "Canonicalized channel assistant ID",
-    );
-  }
-
   // Coerce actorExternalId to a string at the boundary — the field
   // comes from unvalidated JSON and may be a number, object, or other
   // non-string type. Non-string truthy values would throw inside
@@ -438,7 +427,6 @@ export async function handleChannelInbound({
       sourceInterface,
       conversationExternalId,
       externalMessageId,
-      canonicalAssistantId,
       rawSenderId,
       canonicalSenderId,
       actorDisplayName: body.actorDisplayName,
@@ -486,7 +474,6 @@ export async function handleChannelInbound({
     rawSenderId,
     sourceChannel,
     conversationExternalId,
-    canonicalAssistantId,
     trimmedContent,
     sourceMetadata: body.sourceMetadata,
     actorDisplayName: body.actorDisplayName,
@@ -709,7 +696,6 @@ export async function handleChannelInbound({
       externalMessageId,
       sourceMessageId,
       sourceThreadId: channelThreadId,
-      canonicalAssistantId,
       assistantId,
       content,
       channelId: resolvedMember?.channelId,
@@ -723,28 +709,24 @@ export async function handleChannelInbound({
     externalMessageId,
     {
       sourceMessageId,
-      assistantId: canonicalAssistantId,
       sourceThreadId: channelThreadId,
     },
   );
 
   const replyCallbackUrl = body.replyCallbackUrl;
 
-  // external_conversation_bindings is assistant-agnostic. Restrict writes to
-  // self so assistant-scoped legacy routes do not overwrite each other's
-  // channel binding metadata for the same chat.
-  if (canonicalAssistantId === DAEMON_INTERNAL_ASSISTANT_ID) {
-    upsertBinding({
-      conversationId: result.conversationId,
-      sourceChannel,
-      externalChatId: conversationExternalId,
-      externalChatName: slackChannelName,
-      externalThreadId: channelThreadId ?? null,
-      externalUserId: canonicalSenderId ?? rawSenderId ?? null,
-      displayName: body.actorDisplayName ?? null,
-      username: body.actorUsername ?? null,
-    });
-  }
+  // `external_conversation_bindings` is assistant-agnostic: one row per chat,
+  // whichever caller writes it.
+  upsertBinding({
+    conversationId: result.conversationId,
+    sourceChannel,
+    externalChatId: conversationExternalId,
+    externalChatName: slackChannelName,
+    externalThreadId: channelThreadId ?? null,
+    externalUserId: canonicalSenderId ?? rawSenderId ?? null,
+    displayName: body.actorDisplayName ?? null,
+    username: body.actorUsername ?? null,
+  });
 
   // ── Actor role resolution ──
   // Built from the gateway-stamped trust verdict (ACL + identity). An absent
@@ -844,7 +826,6 @@ export async function handleChannelInbound({
     if (isCallbackInteraction) {
       if (floorSenderId) {
         handshakeInProgress = await isApprovalHandshakeInProgress({
-          canonicalAssistantId,
           sourceChannel,
           actorExternalId: floorSenderId,
         });
@@ -852,7 +833,6 @@ export async function handleChannelInbound({
     } else {
       try {
         const accessResult = await notifyGuardianOfAccessRequest({
-          canonicalAssistantId,
           sourceChannel,
           conversationExternalId,
           actorExternalId: floorSenderId,
@@ -925,7 +905,7 @@ export async function handleChannelInbound({
       const replyPayload: Parameters<typeof deliverChannelReply>[1] = {
         chatId: conversationExternalId,
         text: replyText,
-        assistantId: canonicalAssistantId,
+        assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
       };
       if (sourceChannel === "slack" && (canonicalSenderId ?? rawSenderId)) {
         replyPayload.ephemeral = true;
@@ -987,7 +967,7 @@ export async function handleChannelInbound({
       const replyPayload: Parameters<typeof deliverChannelReply>[1] = {
         chatId: conversationExternalId,
         text: DISK_PRESSURE_REMOTE_BLOCK_REPLY,
-        assistantId: canonicalAssistantId,
+        assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
       };
       if (sourceChannel === "slack" && (canonicalSenderId ?? rawSenderId)) {
         replyPayload.ephemeral = true;
@@ -1059,7 +1039,6 @@ export async function handleChannelInbound({
     isDuplicate: result.duplicate,
     commandIntent,
     rawSenderId,
-    canonicalAssistantId,
     sourceChannel,
     conversationExternalId,
     eventId: result.eventId,
@@ -1081,7 +1060,6 @@ export async function handleChannelInbound({
     callbackData: body.callbackData,
     rawSenderId,
     canonicalSenderId,
-    canonicalAssistantId,
     sourceChannel,
     conversationExternalId,
     conversationId: result.conversationId,
@@ -1123,7 +1101,7 @@ export async function handleChannelInbound({
       actorExternalId: canonicalSenderId ?? rawSenderId,
       replyCallbackUrl,
       trustCtx,
-      assistantId: canonicalAssistantId,
+      assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
       approvalCopyGenerator,
       approvalConversationGenerator,
       approvalMessageTs,
@@ -1219,7 +1197,7 @@ export async function handleChannelInbound({
           chatId: conversationExternalId,
           text: "This approval request has been resolved.",
           messageTs: approvalMessageTs,
-          assistantId: canonicalAssistantId,
+          assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
         }).catch((err) => {
           log.error(
             { err, conversationId: result.conversationId },
@@ -1255,7 +1233,6 @@ export async function handleChannelInbound({
       actorUsername: body.actorUsername,
       trustCtx,
       replyCallbackUrl,
-      canonicalAssistantId,
     });
 
     if (ingressResult.blocked) {
@@ -1296,7 +1273,6 @@ export async function handleChannelInbound({
         const admittedSenderId = canonicalSenderId ?? rawSenderId;
         if (admittedSenderId) {
           void maybeNotifyGuardianOfAdmittedContact({
-            canonicalAssistantId,
             sourceChannel,
             conversationExternalId,
             actorExternalId: admittedSenderId,
@@ -1497,7 +1473,7 @@ export async function handleChannelInbound({
         commandIntent,
         sourceLanguageCode,
         replyCallbackUrl,
-        assistantId: canonicalAssistantId,
+        assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
         approvalCopyGenerator,
         chatType: sourceChatType,
         clientTimezone: inboundClientTimezone,

package/src/runtime/routes/inbound-stages/acl-enforcement.test.ts

@@ -98,7 +98,6 @@ function makeParams(
     rawSenderId: "sender-1",
     sourceChannel: "telegram",
     conversationExternalId: "chat-1",
-    canonicalAssistantId: "assistant-1",
     trimmedContent: "hello",
     sourceMetadata: undefined,
     actorDisplayName: "Sender One",

package/src/runtime/routes/inbound-stages/acl-enforcement.ts

@@ -90,7 +90,6 @@ export interface AclEnforcementParams {
   rawSenderId: string | undefined;
   sourceChannel: ChannelId;
   conversationExternalId: string;
-  canonicalAssistantId: string;
   trimmedContent: string;
   sourceMetadata: SourceMetadata | undefined;
   actorDisplayName: string | undefined;
@@ -190,7 +189,6 @@ export async function enforceIngressAcl(
     rawSenderId,
     sourceChannel,
     conversationExternalId,
-    canonicalAssistantId,
     trimmedContent,
     sourceMetadata,
     actorDisplayName,
@@ -426,7 +424,6 @@ export async function enforceIngressAcl(
             // Still notify the guardian about the access attempt
             try {
               await notifyGuardianOfAccessRequest({
-                canonicalAssistantId,
                 sourceChannel,
                 conversationExternalId,
                 actorExternalId: canonicalSenderId ?? rawSenderId,
@@ -509,7 +506,6 @@ export async function enforceIngressAcl(
           if (emailVerifyResult.initiated) {
             try {
               await notifyGuardianOfAccessRequest({
-                canonicalAssistantId,
                 sourceChannel,
                 conversationExternalId,
                 actorExternalId: canonicalSenderId ?? rawSenderId,
@@ -554,14 +550,12 @@ export async function enforceIngressAcl(
         let handshakeInProgress = false;
         if (isCallbackInteraction) {
           handshakeInProgress = await isApprovalHandshakeInProgress({
-            canonicalAssistantId,
             sourceChannel,
             actorExternalId: (canonicalSenderId ?? rawSenderId)!,
           });
         } else {
           try {
             const accessResult = await notifyGuardianOfAccessRequest({
-              canonicalAssistantId,
               sourceChannel,
               conversationExternalId,
               actorExternalId: canonicalSenderId ?? rawSenderId,
@@ -730,7 +724,6 @@ export async function enforceIngressAcl(
             if (slackVerifyResult.initiated) {
               try {
                 await notifyGuardianOfAccessRequest({
-                  canonicalAssistantId,
                   sourceChannel,
                   conversationExternalId,
                   actorExternalId: canonicalSenderId ?? rawSenderId,
@@ -803,14 +796,12 @@ export async function enforceIngressAcl(
           if (!terminallyKeptOut) {
             if (isCallbackInteraction) {
               handshakeInProgress = await isApprovalHandshakeInProgress({
-                canonicalAssistantId,
                 sourceChannel,
                 actorExternalId: (canonicalSenderId ?? rawSenderId)!,
               });
             } else {
               try {
                 const accessResult = await notifyGuardianOfAccessRequest({
-                  canonicalAssistantId,
                   sourceChannel,
                   conversationExternalId,
                   actorExternalId: canonicalSenderId ?? rawSenderId,

package/src/runtime/routes/inbound-stages/admission-policy.ts

@@ -27,6 +27,7 @@ import {
   ADMISSION_FLOOR,
   type AdmissionPolicy,
   isAdmissionPolicyExemptChannel,
+  TRUST_CLASS_RANK,
 } from "@vellumai/gateway-client";
 
 import type { ChannelId } from "../../../channels/types.js";
@@ -73,23 +74,6 @@ export type AdmissionPolicyResult =
 // Public API
 // ---------------------------------------------------------------------------
 
-/**
- * Trust-class ordinal compared against {@link ADMISSION_FLOOR} to make the
- * admission decision (`rank >= floor`). Higher rank = more trusted.
- * Blocked/revoked never reach this comparison — they short-circuit to deny on
- * member status above — so they carry no rank here.
- *
- * The two halves of the floor check: this table is keyed by `TrustClass`,
- * `ADMISSION_FLOOR` (from `@vellumai/gateway-client`) by `AdmissionPolicy`.
- * They are only ever read together, here, so they live next to their use.
- */
-const TRUST_CLASS_RANK: Record<TrustClass, number> = {
-  guardian: 4,
-  trusted_contact: 3,
-  unverified_contact: 2,
-  unknown: 1,
-};
-
 /**
  * Policies under which completing verification could lift the sender past
  * the floor. Used to decide whether to fire the upgrade UX on deny.

package/src/runtime/routes/inbound-stages/bootstrap-intercept.test.ts

@@ -54,7 +54,6 @@ function makeParams(
     isDuplicate: false,
     commandIntent: { type: "start", payload: "gv_token123" },
     rawSenderId: "user-42",
-    canonicalAssistantId: "self",
     sourceChannel: "telegram",
     conversationExternalId: "chat-123",
     eventId: "event-1",

package/src/runtime/routes/inbound-stages/bootstrap-intercept.ts

@@ -24,6 +24,7 @@ import {
 import type { ChannelId } from "../../../channels/types.js";
 import { sendTelegramReply } from "../../../messaging/providers/telegram-bot/send.js";
 import { getLogger } from "../../../util/logger.js";
+import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../assistant-scope.js";
 import { RESEND_COOLDOWN_MS } from "../../verification-outbound-actions.js";
 import {
   composeVerificationText,
@@ -40,7 +41,6 @@ export interface BootstrapInterceptParams {
   isDuplicate: boolean;
   commandIntent: Record<string, unknown> | undefined;
   rawSenderId: string | undefined;
-  canonicalAssistantId: string;
   sourceChannel: ChannelId;
   conversationExternalId: string;
   eventId: string;
@@ -96,7 +96,6 @@ export async function handleBootstrapIntercept(
     isDuplicate,
     commandIntent,
     rawSenderId,
-    canonicalAssistantId,
     sourceChannel,
     conversationExternalId,
     eventId,
@@ -208,7 +207,7 @@ export async function handleBootstrapIntercept(
   deliverBootstrapVerificationTelegram(
     conversationExternalId,
     telegramBody,
-    canonicalAssistantId,
+    DAEMON_INTERNAL_ASSISTANT_ID,
   );
 
   // Update delivery tracking (best-effort — the code is already on its way)

package/src/runtime/routes/inbound-stages/edit-intercept.ts

@@ -45,7 +45,6 @@ export interface EditInterceptParams {
   externalMessageId: string;
   sourceMessageId: string;
   sourceThreadId?: string;
-  canonicalAssistantId: string;
   assistantId: string;
   content: string | undefined;
   /** Channel ID for channel-level interaction tracking. */
@@ -68,7 +67,6 @@ export async function handleEditIntercept(
     externalMessageId,
     sourceMessageId,
     sourceThreadId,
-    canonicalAssistantId,
     assistantId,
     content,
   } = params;
@@ -78,7 +76,7 @@ export async function handleEditIntercept(
     sourceChannel,
     conversationExternalId,
     externalMessageId,
-    { sourceMessageId, sourceThreadId, assistantId: canonicalAssistantId },
+    { sourceMessageId, sourceThreadId },
   );
 
   if (editResult.duplicate) {

package/src/runtime/routes/inbound-stages/guardian-reply-intercept.test.ts

@@ -51,7 +51,6 @@ function makeParams(
     callbackData: undefined,
     rawSenderId: "user-42",
     canonicalSenderId: "user-42",
-    canonicalAssistantId: "self",
     sourceChannel: "slack" as const,
     conversationExternalId: "chat-123",
     conversationId: "conv-abc",

package/src/runtime/routes/inbound-stages/guardian-reply-intercept.ts

@@ -15,6 +15,7 @@ import {
 } from "../../../channels/gateway-guardian-requests.js";
 import type { ChannelId } from "../../../channels/types.js";
 import { getLogger } from "../../../util/logger.js";
+import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../assistant-scope.js";
 import { deliverChannelReply } from "../../gateway-client.js";
 import {
   type GuardianPendingScope,
@@ -41,7 +42,6 @@ export interface GuardianReplyInterceptParams {
   reactedMessageTs?: string;
   rawSenderId: string | undefined;
   canonicalSenderId: string | null;
-  canonicalAssistantId: string;
   sourceChannel: ChannelId;
   conversationExternalId: string;
   conversationId: string;
@@ -77,7 +77,6 @@ export async function handleGuardianReplyIntercept(
     reactedMessageTs,
     rawSenderId,
     canonicalSenderId,
-    canonicalAssistantId,
     sourceChannel,
     conversationExternalId,
     conversationId,
@@ -178,7 +177,7 @@ export async function handleGuardianReplyIntercept(
     channelDeliveryContext: {
       replyCallbackUrl,
       guardianChatId: conversationExternalId,
-      assistantId: canonicalAssistantId,
+      assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
     },
   });
 
@@ -188,7 +187,7 @@ export async function handleGuardianReplyIntercept(
       const routerReplyPayload: Parameters<typeof deliverChannelReply>[1] = {
         chatId: conversationExternalId,
         text: routerResult.replyText,
-        assistantId: canonicalAssistantId,
+        assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
       };
       // On Slack, send guardian management replies (disambiguation, pending
       // request lists, etc.) as ephemeral so only the guardian sees them.

package/src/runtime/routes/inbound-stages/reaction-intercept.test.ts

@@ -172,7 +172,6 @@ function buildParams(overrides: {
     sourceInterface: "slack" as const,
     conversationExternalId: SLACK_CHANNEL_ID,
     externalMessageId: `${SLACK_CHANNEL_ID}:1700000000.1:${msgCounter}`,
-    canonicalAssistantId: "assistant-1",
     rawSenderId: overrides.rawSenderId,
     canonicalSenderId: overrides.rawSenderId,
     actorDisplayName: "Reactor",

package/src/runtime/routes/inbound-stages/reaction-intercept.ts

@@ -35,7 +35,6 @@ import {
 import { markProcessed } from "../../../persistence/delivery-status.js";
 import { upsertBinding } from "../../../persistence/external-conversation-store.js";
 import { getLogger } from "../../../util/logger.js";
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../assistant-scope.js";
 import type { ApprovalConversationGenerator } from "../../http-types.js";
 import {
   actorTrustContextFromVerdict,
@@ -100,7 +99,6 @@ export interface ReactionInterceptParams {
   sourceInterface: InterfaceId | undefined;
   conversationExternalId: string;
   externalMessageId: string;
-  canonicalAssistantId: string;
   rawSenderId: string | undefined;
   canonicalSenderId: string | null;
   actorDisplayName: string | undefined;
@@ -126,7 +124,6 @@ export async function handleSlackReactionIntercept(
     sourceInterface,
     conversationExternalId,
     externalMessageId,
-    canonicalAssistantId,
     rawSenderId,
     canonicalSenderId,
     actorDisplayName,
@@ -182,7 +179,6 @@ export async function handleSlackReactionIntercept(
     externalMessageId,
     {
       sourceMessageId: reactedMessageTs,
-      assistantId: canonicalAssistantId,
       sourceThreadId: threadTs,
     },
   );
@@ -216,21 +212,17 @@ export async function handleSlackReactionIntercept(
     };
   }
 
-  // Maintain the conversation binding, matching the message pipeline. Scoped to
-  // the daemon's own assistant so assistant-scoped legacy routes don't clobber
-  // each other's binding metadata.
-  if (canonicalAssistantId === DAEMON_INTERNAL_ASSISTANT_ID) {
-    upsertBinding({
-      conversationId: result.conversationId,
-      sourceChannel,
-      externalChatId: conversationExternalId,
-      externalChatName: slackChannelName,
-      externalThreadId: threadTs ?? null,
-      externalUserId: canonicalSenderId ?? rawSenderId ?? null,
-      displayName: actorDisplayName ?? null,
-      username: actorUsername ?? null,
-    });
-  }
+  // Maintain the conversation binding, matching the message pipeline.
+  upsertBinding({
+    conversationId: result.conversationId,
+    sourceChannel,
+    externalChatId: conversationExternalId,
+    externalChatName: slackChannelName,
+    externalThreadId: threadTs ?? null,
+    externalUserId: canonicalSenderId ?? rawSenderId ?? null,
+    displayName: actorDisplayName ?? null,
+    username: actorUsername ?? null,
+  });
 
   // Guardian approval-by-reaction → guardian decision pipeline, exactly like
   // buttons and text replies. Only `reaction:` (added) expresses intent;
@@ -247,7 +239,6 @@ export async function handleSlackReactionIntercept(
       reactedMessageTs,
       rawSenderId,
       canonicalSenderId,
-      canonicalAssistantId,
       sourceChannel,
       conversationExternalId,
       conversationId: result.conversationId,

package/src/runtime/routes/inbound-stages/secret-ingress-check.ts

@@ -14,6 +14,7 @@ import {
 } from "../../../persistence/delivery-crud.js";
 import { checkIngressForSecrets } from "../../../security/secret-ingress.js";
 import { getLogger } from "../../../util/logger.js";
+import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../assistant-scope.js";
 
 const log = getLogger("runtime-http");
 
@@ -36,7 +37,6 @@ export interface SecretIngressCheckParams {
   actorUsername: string | undefined;
   trustCtx: TrustContext;
   replyCallbackUrl: string | undefined;
-  canonicalAssistantId: string;
 }
 
 export interface SecretIngressCheckResult {
@@ -69,7 +69,6 @@ export function runSecretIngressCheck(
     actorUsername,
     trustCtx,
     replyCallbackUrl,
-    canonicalAssistantId,
   } = params;
 
   // Persist the raw payload so dead-lettered events can always be replayed.
@@ -85,7 +84,7 @@ export function runSecretIngressCheck(
     senderUsername: actorUsername,
     trustCtx,
     replyCallbackUrl,
-    assistantId: canonicalAssistantId,
+    assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
   });
 
   // ── Secret ingress scan ──

package/src/runtime/routes/inference-profiles-routes.ts

@@ -29,11 +29,14 @@ import {
   loadRawConfig,
 } from "../../config/loader.js";
 import {
-  LLMProvider,
   ProfileEntry,
   routingIdentityModelIssue,
 } from "../../config/schemas/llm.js";
 import { getDb } from "../../persistence/db-connection.js";
+import {
+  resolveEntryProviderKind,
+  writableProfileProviderIssue,
+} from "../../providers/connection-resolution.js";
 import { ROUTING_IDENTITY_PROVIDERS } from "../../providers/inference/auth.js";
 import type { ConnectionAvailability } from "../../providers/inference/connection-availability.js";
 import {
@@ -150,10 +153,9 @@ const updateRequestSchema = z.object({
 // ---------------------------------------------------------------------------
 
 function assertValidProvider(provider: string): void {
-  if (!LLMProvider.safeParse(provider).success) {
-    throw new BadRequestError(
-      `Invalid provider "${provider}". Valid providers: ${LLMProvider.options.join(", ")}.`,
-    );
+  const issue = writableProfileProviderIssue(provider);
+  if (issue) {
+    throw new BadRequestError(issue);
   }
 }
 
@@ -182,31 +184,38 @@ function validateModel(
     }
     return [];
   }
-  if (isModelInCatalog(provider, model)) {
+  // An entry-name provider validates against its row's dispatchable kind,
+  // the same translation dispatch uses; the entry itself also serves as the
+  // model-list connection for custom endpoints below.
+  const entryKind = resolveEntryProviderKind(provider, model);
+  const catalogProvider = entryKind ?? provider;
+  if (isModelInCatalog(catalogProvider, model)) {
     return [];
   }
   // The named connection's advertised model list is authoritative for models
   // the code-owned catalog doesn't know — a custom (openai-compatible)
   // endpoint declares its own models at connection-create time.
-  if (connectionName) {
-    const connection = getConnection(getDb(), connectionName);
+  const modelListConnection =
+    connectionName ?? (entryKind !== null ? provider : undefined);
+  if (modelListConnection) {
+    const connection = getConnection(getDb(), modelListConnection);
     if (connection?.models?.some((m) => m.id === model)) {
       return [];
     }
   }
   if (!allowUnlisted) {
     const remedy =
-      provider === "openai-compatible"
+      catalogProvider === "openai-compatible"
         ? `Pass allowUnlisted to create it anyway, or declare the model on the connection ` +
           `("assistant inference providers update <name> --model ${model}").`
         : `Pass allowUnlisted to create it anyway, or run ` +
           `"assistant inference models list --provider ${provider}" to see valid ids.`;
     throw new BadRequestError(
-      `Model "${model}" is not in the catalog for provider "${provider}". ${remedy}`,
+      `Model "${model}" is not in the catalog for provider "${catalogProvider}". ${remedy}`,
     );
   }
   return [
-    `Model "${model}" is not in the catalog for provider "${provider}" — created anyway (allowUnlisted).`,
+    `Model "${model}" is not in the catalog for provider "${catalogProvider}"; created anyway (allowUnlisted).`,
   ];
 }