@stigmer/react 3.41.0 → 3.41.1-dev.20261003094357.g39d6aa748646

package/src/billing/useBillingAccount.ts

@@ -41,13 +41,13 @@ export interface UseBillingAccountReturn {
  * the embedded `CreditBalance` with available, reserved,
  * promotional, and purchased breakdowns.
  *
- * Pass `null` as `orgId` to skip fetching (stable no-op).
+ * Pass `null` as `org` to skip fetching (stable no-op).
  *
- * @param orgId - Organization ID, or `null` to skip.
+ * @param org - Organization ID, or `null` to skip.
  *
  * @example
  * ```tsx
- * const { account, isLoading, error } = useBillingAccount(orgId);
+ * const { account, isLoading, error } = useBillingAccount(org);
  *
  * if (isLoading) return <Skeleton />;
  * if (error) return <ErrorMessage error={error} />;
@@ -57,17 +57,17 @@ export interface UseBillingAccountReturn {
  * ```
  */
 export function useBillingAccount(
-  orgId: string | null,
+  org: string | null,
   options?: UseBillingAccountOptions,
 ): UseBillingAccountReturn {
   const stigmer = useStigmer();
 
   const { data: account, isLoading, isRefetching, error, refetch } = useFetch(
-    orgId
+    org
       ? () =>
-          stigmer.billing.getOrCreateBillingAccount(orgId)
+          stigmer.billing.getOrCreateBillingAccount(org)
       : null,
-    [orgId, stigmer],
+    [org, stigmer],
     null as BillingAccount | null,
     { refetchOnWindowFocus: options?.refetchOnWindowFocus ?? false },
   );

package/src/billing/useBillingUsageReport.ts

@@ -26,16 +26,16 @@ export interface UseBillingUsageReportReturn {
  * Returns total provider cost, total billable amount, execution and LLM
  * call counts, and a per-model breakdown with cost tier attribution.
  *
- * Pass `null` as `orgId` to skip fetching (stable no-op).
+ * Pass `null` as `org` to skip fetching (stable no-op).
  *
- * @param orgId - Organization ID, or `null` to skip.
+ * @param org - Organization ID, or `null` to skip.
  * @param startTime - Start of the reporting period.
  * @param endTime - End of the reporting period.
  *
  * @example
  * ```tsx
  * const { report, isLoading } = useBillingUsageReport(
- *   orgId,
+ *   org,
  *   new Date("2026-05-01"),
  *   new Date("2026-05-31"),
  * );
@@ -47,7 +47,7 @@ export interface UseBillingUsageReportReturn {
  * ```
  */
 export function useBillingUsageReport(
-  orgId: string | null,
+  org: string | null,
   startTime: Date,
   endTime: Date,
 ): UseBillingUsageReportReturn {
@@ -57,15 +57,15 @@ export function useBillingUsageReport(
   const endKey = endTime.toISOString();
 
   const { data: report, isLoading, isRefetching, error, refetch } = useFetch(
-    orgId
+    org
       ? () =>
           stigmer.billing.getBillingUsageReport({
-            orgId,
+            org,
             startTime,
             endTime,
           })
       : null,
-    [orgId, startKey, endKey, stigmer],
+    [org, startKey, endKey, stigmer],
     null as BillingUsageReportResponse | null,
   );
 

package/src/billing/useChangePlan.ts

@@ -24,7 +24,7 @@ export interface UseChangePlanReturn {
    * {@link useCreatePaymentMethodSetupSession}). Resolves with the
    * subscription as it stands after the change.
    */
-  readonly changePlan: (orgId: string, planId: string) => Promise<Subscription>;
+  readonly changePlan: (org: string, planId: string) => Promise<Subscription>;
   /** `true` while a change is in flight. */
   readonly isSubmitting: boolean;
   /** Error from the last failed attempt, or `null` when healthy. */
@@ -45,11 +45,11 @@ export function useChangePlan(): UseChangePlanReturn {
   const [error, setError] = useState<Error | null>(null);
 
   const changePlan = useCallback(
-    async (orgId: string, planId: string): Promise<Subscription> => {
+    async (org: string, planId: string): Promise<Subscription> => {
       setIsSubmitting(true);
       setError(null);
       try {
-        return await stigmer.subscription.changePlan(create(ChangePlanInputSchema, { orgId, planId }));
+        return await stigmer.subscription.changePlan(create(ChangePlanInputSchema, { org, planId }));
       } catch (e) {
         const err = toError(e);
         setError(err);
@@ -75,7 +75,7 @@ export interface UseCancelSubscriptionReturn {
    * of the current period and is on Free after it; nothing it built is
    * deleted. Choosing the same plan again before then resumes it.
    */
-  readonly cancel: (orgId: string) => Promise<Subscription>;
+  readonly cancel: (org: string) => Promise<Subscription>;
   /** `true` while a cancel is in flight. */
   readonly isSubmitting: boolean;
   /** Error from the last failed attempt, or `null` when healthy. */
@@ -94,11 +94,11 @@ export function useCancelSubscription(): UseCancelSubscriptionReturn {
   const [error, setError] = useState<Error | null>(null);
 
   const cancel = useCallback(
-    async (orgId: string): Promise<Subscription> => {
+    async (org: string): Promise<Subscription> => {
       setIsSubmitting(true);
       setError(null);
       try {
-        return await stigmer.subscription.cancel(create(CancelSubscriptionInputSchema, { orgId }));
+        return await stigmer.subscription.cancel(create(CancelSubscriptionInputSchema, { org }));
       } catch (e) {
         const err = toError(e);
         setError(err);

package/src/billing/useCreateBillingPortalSession.ts

@@ -15,7 +15,7 @@ export interface UseCreateBillingPortalSessionReturn {
    * portal returns to `redirect.returnUrl` when given, else to the page
    * the person is on.
    */
-  readonly openPortal: (orgId: string) => Promise<void>;
+  readonly openPortal: (org: string) => Promise<void>;
   /** `true` while the portal session is being created. */
   readonly isLoading: boolean;
   /** Error from the last failed attempt, or `null` when healthy. */
@@ -36,7 +36,7 @@ export interface UseCreateBillingPortalSessionReturn {
  * ```tsx
  * const { openPortal, isLoading } = useCreateBillingPortalSession();
  *
- * <button onClick={() => openPortal(orgId)} disabled={isLoading}>
+ * <button onClick={() => openPortal(org)} disabled={isLoading}>
  *   Manage payment methods
  * </button>
  * ```
@@ -53,7 +53,7 @@ export function useCreateBillingPortalSession(
   const clearError = useCallback(() => setError(null), []);
 
   const openPortal = useCallback(
-    async (orgId: string): Promise<void> => {
+    async (org: string): Promise<void> => {
       setIsLoading(true);
       setError(null);
 
@@ -66,7 +66,7 @@ export function useCreateBillingPortalSession(
               : "";
 
         const response = await stigmer.billing.createBillingPortalSession({
-          orgId,
+          org,
           returnUrl,
         });
 

package/src/billing/useCreateCheckoutSession.ts

@@ -9,7 +9,7 @@ import { leaveForStripe, type BillingRedirect } from "./redirect.js";
 /** Parameters for {@link useCreateCheckoutSession}'s `createSession` callback. */
 export interface CreateCheckoutSessionInput {
   /** Organization purchasing credits. */
-  readonly orgId: string;
+  readonly org: string;
   /** Credit pack to purchase: its id, e.g. "starter", "growth" or "team" (the pack named Scale). */
   readonly packId: string;
   /** URL to redirect to after successful payment. */
@@ -54,7 +54,7 @@ export interface UseCreateCheckoutSessionReturn {
  *
  * const handleBuy = () => {
  *   createSession({
- *     orgId,
+ *     org,
  *     packId: "growth",
  *     successUrl: `${window.location.origin}/settings/billing?checkout=success`,
  *     cancelUrl: `${window.location.origin}/settings/billing`,
@@ -81,7 +81,7 @@ export function useCreateCheckoutSession(
 
       try {
         const response = await stigmer.billing.createCreditCheckoutSession({
-          orgId: input.orgId,
+          org: input.org,
           packId: input.packId,
           successUrl: input.successUrl,
           cancelUrl: input.cancelUrl,

package/src/billing/useCreatePaymentMethodSetupSession.ts

@@ -14,7 +14,7 @@ export interface UseCreatePaymentMethodSetupSessionReturn {
    * page can reopen that choice), or without a query when they leave.
    * The saved card becomes the organization's default for every invoice.
    */
-  readonly addPaymentMethod: (orgId: string, planId?: string) => Promise<void>;
+  readonly addPaymentMethod: (org: string, planId?: string) => Promise<void>;
   /** `true` while the setup session is being created. */
   readonly isSubmitting: boolean;
   /** Error from the last failed attempt, or `null` when healthy. */
@@ -41,7 +41,7 @@ export function useCreatePaymentMethodSetupSession(
   const [error, setError] = useState<Error | null>(null);
 
   const addPaymentMethod = useCallback(
-    async (orgId: string, planId?: string): Promise<void> => {
+    async (org: string, planId?: string): Promise<void> => {
       setIsSubmitting(true);
       setError(null);
       try {
@@ -51,7 +51,7 @@ export function useCreatePaymentMethodSetupSession(
           success.set("plan", planId);
         }
         const response = await stigmer.billing.createPaymentMethodSetupSession({
-          orgId,
+          org,
           successUrl: `${billingPage}?${success.toString()}`,
           cancelUrl: billingPage,
         });

package/src/billing/useCreditLedger.ts

@@ -48,14 +48,14 @@ export interface UseCreditLedgerOptions {
  * filtering. Returns the entries and total page count for building
  * pagination controls.
  *
- * Pass `null` as `orgId` to skip fetching (stable no-op).
+ * Pass `null` as `org` to skip fetching (stable no-op).
  *
- * @param orgId - Organization ID, or `null` to skip.
+ * @param org - Organization ID, or `null` to skip.
  * @param options - Pagination and filter options.
  *
  * @example
  * ```tsx
- * const { ledger, isLoading } = useCreditLedger(orgId, { pageNum: 1 });
+ * const { ledger, isLoading } = useCreditLedger(org, { pageNum: 1 });
  *
  * if (isLoading) return <Skeleton />;
  * if (!ledger) return null;
@@ -64,7 +64,7 @@ export interface UseCreditLedgerOptions {
  * ```
  */
 export function useCreditLedger(
-  orgId: string | null,
+  org: string | null,
   options: UseCreditLedgerOptions = {},
 ): UseCreditLedgerReturn {
   const stigmer = useStigmer();
@@ -73,10 +73,10 @@ export function useCreditLedger(
   const typeFilterKey = typeFilter?.join(",") ?? "";
 
   const { data: ledger, isLoading, isRefetching, error, refetch } = useFetch(
-    orgId
+    org
       ? () =>
           stigmer.billing.getCreditLedger({
-            orgId,
+            org,
             // The SDK page number is 0-based (matches the proto/backend); the
             // hook's pageNum is 1-based for ergonomic UI controls.
             page: { num: pageNum - 1, size: pageSize },
@@ -84,7 +84,7 @@ export function useCreditLedger(
             view,
           })
       : null,
-    [orgId, pageNum, pageSize, typeFilterKey, view, stigmer],
+    [org, pageNum, pageSize, typeFilterKey, view, stigmer],
     null as CreditLedgerResponse | null,
   );
 

package/src/billing/useCustomerModelPricing.ts

@@ -27,15 +27,15 @@ export interface UseCustomerModelPricingReturn {
  * billing policy markup already applied, organized by harness
  * and cost tier.
  *
- * Pass `null` as `orgId` to skip fetching (stable no-op).
+ * Pass `null` as `org` to skip fetching (stable no-op).
  * Pass `undefined` to fetch default pricing (no org override).
  *
- * @param orgId - Organization ID for org-specific overrides,
+ * @param org - Organization ID for org-specific overrides,
  *   `undefined` for default pricing, or `null` to skip.
  *
  * @example
  * ```tsx
- * const { pricing, isLoading } = useCustomerModelPricing(orgId);
+ * const { pricing, isLoading } = useCustomerModelPricing(org);
  *
  * if (isLoading) return <Skeleton />;
  * if (!pricing) return null;
@@ -46,20 +46,20 @@ export interface UseCustomerModelPricingReturn {
  * ```
  */
 export function useCustomerModelPricing(
-  orgId: string | undefined | null,
+  org: string | undefined | null,
 ): UseCustomerModelPricingReturn {
   const stigmer = useStigmer();
 
-  const skip = orgId === null;
+  const skip = org === null;
 
   const { data: pricing, isLoading, isRefetching, error, refetch } = useFetch(
     skip
       ? null
       : () =>
           stigmer.billing.getCustomerModelPricing(
-            orgId ? { orgId } : undefined,
+            org ? { org } : undefined,
           ),
-    [orgId, stigmer],
+    [org, stigmer],
     null as CustomerModelPricingResponse | null,
   );
 

package/src/billing/useEntitlements.ts

@@ -50,19 +50,19 @@ export interface UseEntitlementsReturn {
  *
  * @example
  * ```tsx
- * const { allows } = useEntitlements(orgId);
+ * const { allows } = useEntitlements(org);
  * if (allows(Feature.teams) === false) return <UpgradeNotice feature={Feature.teams} />;
  * ```
  */
 export function useEntitlements(
-  orgId: string | null,
+  org: string | null,
   options?: UseEntitlementsOptions,
 ): UseEntitlementsReturn {
   const stigmer = useStigmer();
-  const enabled = (options?.enabled ?? true) && orgId !== null && orgId !== "";
+  const enabled = (options?.enabled ?? true) && org !== null && org !== "";
   const { data: entitlements, isLoading, error, refetch } = useFetch(
-    enabled && orgId ? () => stigmer.subscription.getEntitlements(create(GetEntitlementsInputSchema, { orgId })) : null,
-    [enabled, orgId, stigmer],
+    enabled && org ? () => stigmer.subscription.getEntitlements(create(GetEntitlementsInputSchema, { org })) : null,
+    [enabled, org, stigmer],
     null as GetEntitlementsOutput | null,
     { refetchOnWindowFocus: true },
   );

package/src/billing/usePeriodEstimate.ts

@@ -44,14 +44,14 @@ export interface UsePeriodEstimateReturn {
  * Cloud-only; the caller needs `can_view_billing` on the organization.
  */
 export function usePeriodEstimate(
-  orgId: string | null,
+  org: string | null,
   options?: UsePeriodEstimateOptions,
 ): UsePeriodEstimateReturn {
   const stigmer = useStigmer();
-  const enabled = (options?.enabled ?? true) && orgId !== null && orgId !== "";
+  const enabled = (options?.enabled ?? true) && org !== null && org !== "";
   const { data: estimate, isLoading, error, refetch } = useFetch(
-    enabled && orgId ? () => stigmer.subscription.getPeriodEstimate(create(GetPeriodEstimateInputSchema, { orgId })) : null,
-    [enabled, orgId, stigmer],
+    enabled && org ? () => stigmer.subscription.getPeriodEstimate(create(GetPeriodEstimateInputSchema, { org })) : null,
+    [enabled, org, stigmer],
     null as PeriodEstimate | null,
     { refetchOnWindowFocus: true },
   );

package/src/billing/useProviderKeys.ts

@@ -44,22 +44,22 @@ export interface UseProviderKeysReturn {
  * four characters, who saved it and when, when it last served a call, and
  * whether the organization's plan still lets it be used. A managed
  * organization's list includes its integrator's keys for the providers it
- * holds none of (`inheritedFromOrgId`). Every member may read it
+ * holds none of (`inheritedFromOrg`). Every member may read it
  * (`can_view_billing`).
  *
  * Cloud-only.
  *
  * @example
  * ```tsx
- * const { keys } = useProviderKeys(orgId);
+ * const { keys } = useProviderKeys(org);
  * ```
  */
-export function useProviderKeys(orgId: string | null, options?: UseProviderKeysOptions): UseProviderKeysReturn {
+export function useProviderKeys(org: string | null, options?: UseProviderKeysOptions): UseProviderKeysReturn {
   const stigmer = useStigmer();
-  const enabled = (options?.enabled ?? true) && orgId !== null && orgId !== "";
+  const enabled = (options?.enabled ?? true) && org !== null && org !== "";
   const { data, isLoading, error, refetch } = useFetch(
-    enabled && orgId ? () => stigmer.providerkey.list(create(ListProviderKeysInputSchema, { orgId })) : null,
-    [enabled, orgId, stigmer],
+    enabled && org ? () => stigmer.providerkey.list(create(ListProviderKeysInputSchema, { org })) : null,
+    [enabled, org, stigmer],
     null as { readonly keys: readonly ProviderKey[] } | null,
   );
   const keys = data?.keys ?? null;
@@ -75,9 +75,9 @@ export interface UseProviderKeyActionsReturn {
    * organization's plan does not include bring-your-own provider keys.
    * Resolves with the saved key, without its secret.
    */
-  readonly setKey: (orgId: string, provider: ProviderKeyProvider, apiKey: string) => Promise<ProviderKey>;
+  readonly setKey: (org: string, provider: ProviderKeyProvider, apiKey: string) => Promise<ProviderKey>;
   /** Remove the organization's key for a provider; allowed on every plan. */
-  readonly removeKey: (orgId: string, provider: ProviderKeyProvider) => Promise<ProviderKey>;
+  readonly removeKey: (org: string, provider: ProviderKeyProvider) => Promise<ProviderKey>;
   /** `true` while a save or a removal is in flight. */
   readonly isSubmitting: boolean;
   /** Error from the last failed attempt, or `null` when healthy. */
@@ -111,13 +111,13 @@ export function useProviderKeyActions(): UseProviderKeyActionsReturn {
   }, []);
 
   const setKey = useCallback(
-    (orgId: string, provider: ProviderKeyProvider, apiKey: string) =>
-      run(() => stigmer.providerkey.set(create(SetProviderKeyInputSchema, { orgId, provider, apiKey }))),
+    (org: string, provider: ProviderKeyProvider, apiKey: string) =>
+      run(() => stigmer.providerkey.set(create(SetProviderKeyInputSchema, { org, provider, apiKey }))),
     [run, stigmer.providerkey],
   );
   const removeKey = useCallback(
-    (orgId: string, provider: ProviderKeyProvider) =>
-      run(() => stigmer.providerkey.delete(create(DeleteProviderKeyInputSchema, { orgId, provider }))),
+    (org: string, provider: ProviderKeyProvider) =>
+      run(() => stigmer.providerkey.delete(create(DeleteProviderKeyInputSchema, { org, provider }))),
     [run, stigmer.providerkey],
   );
   const clearError = useCallback(() => setError(null), []);

package/src/billing/useSetAutoRechargeConfig.ts

@@ -8,7 +8,7 @@ import type { BillingAccount } from "@stigmer/protos/ai/stigmer/billing/v1/billi
 /** Input for {@link useSetAutoRechargeConfig}. */
 export interface SetAutoRechargeConfigInput {
   /** Organization ID to configure auto-recharge for. */
-  readonly orgId: string;
+  readonly org: string;
   /** Whether auto-recharge is enabled. */
   readonly enabled: boolean;
   /** Trigger threshold in micro-USD. */
@@ -46,7 +46,7 @@ export interface UseSetAutoRechargeConfigReturn {
  * const { setConfig, isSubmitting, error } = useSetAutoRechargeConfig();
  *
  * await setConfig({
- *   orgId,
+ *   org,
  *   enabled: true,
  *   thresholdMicros: BigInt(5_000_000),
  *   rechargeAmountMicros: BigInt(50_000_000),
@@ -68,7 +68,7 @@ export function useSetAutoRechargeConfig(): UseSetAutoRechargeConfigReturn {
 
       try {
         const account = await stigmer.billing.setAutoRechargeConfig({
-          orgId: input.orgId,
+          org: input.org,
           enabled: input.enabled,
           thresholdMicros: input.thresholdMicros,
           rechargeAmountMicros: input.rechargeAmountMicros,

package/src/billing/useSubscription.ts

@@ -4,7 +4,7 @@ import { useMemo } from "react";
 import { create } from "@bufbuild/protobuf";
 import { isNotFound } from "@stigmer/sdk";
 import type { Subscription } from "@stigmer/protos/ai/stigmer/billing/subscription/v1/api_pb";
-import { GetSubscriptionForOrganizationInputSchema } from "@stigmer/protos/ai/stigmer/billing/subscription/v1/io_pb";
+import { GetSubscriptionForOrgInputSchema } from "@stigmer/protos/ai/stigmer/billing/subscription/v1/io_pb";
 import { useStigmer } from "../hooks.js";
 import { useFetch } from "../internal/useFetch.js";
 
@@ -34,7 +34,7 @@ export interface UseSubscriptionReturn {
  * this hook reads that as `null`, because never subscribed is a state (the
  * Free plan), not a failure.
  *
- * Pass `null` as `orgId` to skip fetching. Refetches when the window
+ * Pass `null` as `org` to skip fetching. Refetches when the window
  * regains focus, so a plan changed in another window, or a card saved in
  * the system browser, shows on return.
  *
@@ -42,16 +42,16 @@ export interface UseSubscriptionReturn {
  *
  * @example
  * ```tsx
- * const { subscription } = useSubscription(orgId);
+ * const { subscription } = useSubscription(org);
  * ```
  */
-export function useSubscription(orgId: string | null): UseSubscriptionReturn {
+export function useSubscription(org: string | null): UseSubscriptionReturn {
   const stigmer = useStigmer();
   const { data: subscription, isLoading, isRefetching, error, refetch } = useFetch(
-    orgId
+    org
       ? () =>
           stigmer.subscription
-            .getForOrganization(create(GetSubscriptionForOrganizationInputSchema, { orgId }))
+            .getForOrg(create(GetSubscriptionForOrgInputSchema, { org }))
             .catch((err: unknown) => {
               if (isNotFound(err)) {
                 return null;
@@ -59,7 +59,7 @@ export function useSubscription(orgId: string | null): UseSubscriptionReturn {
               throw err;
             })
       : null,
-    [orgId, stigmer],
+    [org, stigmer],
     null as Subscription | null,
     { refetchOnWindowFocus: true },
   );

package/src/channel-app/ChannelAppListPanel.tsx

@@ -7,6 +7,7 @@ import { timestampDate } from "@bufbuild/protobuf/wkt";
 import type { ChannelApp } from "@stigmer/protos/ai/stigmer/agentic/channelapp/v1/api_pb";
 import { channelProviderOf } from "../channel/providers.js";
 import { useChannelAppList } from "./useChannelAppList.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 // ---------------------------------------------------------------------------
 // Public API
@@ -69,15 +70,14 @@ export function ChannelAppListPanel({
 
   if (isLoading) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:space-y-2", className)}
-        aria-busy="true"
-        aria-label="Loading channel apps"
+        label="Loading channel apps"
       >
         {Array.from({ length: 2 }, (_, i) => (
           <div key={i} className="stg:bg-muted-subtle stg:h-14 stg:animate-pulse stg:rounded-lg" />
         ))}
-      </div>
+      </LoadingRegion>
     );
   }
 

package/src/channel-app/slackAppSetup.ts

@@ -21,6 +21,7 @@
  *     the webhook URL — paste it into the app's Event Subscriptions (or
  *     re-apply the completed manifest).
  */
+import { trimTrailing } from "../internal/trim.js";
 
 /**
  * The bot scopes every Stigmer channel app requests — the platform app's
@@ -62,7 +63,7 @@ export function slackChannelAppWebhookUrl(
   apiBaseUrl: string,
   channelAppId: string,
 ): string {
-  return `${apiBaseUrl.replace(/\/+$/, "")}/webhook/slack/${channelAppId}`;
+  return `${trimTrailing(apiBaseUrl, "/")}/webhook/slack/${channelAppId}`;
 }
 
 /**
@@ -79,7 +80,7 @@ export function slackChannelAppRedirectUrl(consoleOrigin?: string): string {
   const origin =
     consoleOrigin ??
     (typeof window !== "undefined" ? window.location.origin : "");
-  return `${origin.replace(/\/+$/, "")}/oauth/slack/callback`;
+  return `${trimTrailing(origin, "/")}/oauth/slack/callback`;
 }
 
 /** Inputs for {@link buildSlackChannelAppManifest}. */

package/src/channel-app/whatsappAppSetup.ts

@@ -24,6 +24,7 @@
  *     show the webhook URL — paste it and the verify token into the
  *     app's WhatsApp webhook configuration.
  */
+import { trimTrailing } from "../internal/trim.js";
 
 /**
  * The webhook fields every Stigmer WhatsApp channel app subscribes to —
@@ -45,7 +46,7 @@ export function whatsappChannelAppWebhookUrl(
   apiBaseUrl: string,
   channelAppId: string,
 ): string {
-  return `${apiBaseUrl.replace(/\/+$/, "")}/webhook/whatsapp/${channelAppId}`;
+  return `${trimTrailing(apiBaseUrl, "/")}/webhook/whatsapp/${channelAppId}`;
 }
 
 /**

package/src/cursor-accounts/CursorAccountEditor.tsx

@@ -68,7 +68,7 @@ export function CursorAccountEditor({
     !(initial?.onDemandUsageDisabled ?? false),
   );
   const [orgIdsText, setOrgIdsText] = useState(
-    (initial?.orgIds ?? []).join("\n"),
+    (initial?.orgs ?? []).join("\n"),
   );
   // Unlike the admin key, the invite link round-trips readable (the
   // server decrypts it on read — operators must be able to copy it), so
@@ -90,10 +90,10 @@ export function CursorAccountEditor({
         adminApiKey: adminApiKey.trim(),
         enabled,
         // is_platform_default is deprecated (DD-008): the shared pool is
-        // derived from empty org_ids, so current clients never write it.
+        // derived from empty orgs, so current clients never write it.
         onDemandUsageDisabled: !onDemandEnabled,
         teamInviteLink: teamInviteLink.trim(),
-        orgIds: orgIdsText
+        orgs: orgIdsText
           .split(/[\s,]+/)
           .map((s) => s.trim())
           .filter((s) => s !== ""),

package/src/cursor-accounts/CursorAccountsConsole.tsx

@@ -224,16 +224,16 @@ function AccountRow({
           <span className="stg:block stg:truncate stg:font-medium stg:text-foreground">
             {account.displayName}
           </span>
-          {/* Account class is DERIVED from org_ids (DD-008): no org
+          {/* Account class is DERIVED from orgs: no org
               assignment means the account belongs to the shared pool. */}
-          {account.orgIds.length === 0 && (
+          {account.orgs.length === 0 && (
             <span className="stg:block stg:text-[11px] stg:text-muted-foreground">
               shared pool
             </span>
           )}
         </span>
         <span className="stg:text-muted-foreground">
-          {account.orgIds.length > 0 ? account.orgIds.length : "—"}
+          {account.orgs.length > 0 ? account.orgs.length : "—"}
         </span>
         <span>
           <StateBadge
@@ -408,8 +408,8 @@ function AccountDetail({
             {account.displayName}
           </h3>
           <p className="stg:text-[11px] stg:text-muted-foreground">
-            {account.orgIds.length > 0
-              ? `Dedicated to ${account.orgIds.length} org(s): ${account.orgIds.join(", ")}`
+            {account.orgs.length > 0
+              ? `Dedicated to ${account.orgs.length} org(s): ${account.orgs.join(", ")}`
               : "Shared pool — serves every org with no dedicated account"}
             {" · "}
             {account.enabled ? "enabled" : "disabled"}

package/src/dashboard/OperationalDashboard.tsx

@@ -11,10 +11,8 @@ import { DashboardFailedRuns } from "./DashboardFailedRuns.js";
 import type { DashboardFailedRun } from "./types.js";
 
 export interface OperationalDashboardProps {
-  /** Organization slug for execution summaries and pending approvals. */
+  /** The organization whose executions, approvals and usage the dashboard shows. */
   readonly org: string | null | undefined;
-  /** Organization ID (metadata.id) for the usage report. */
-  readonly orgId: string | null | undefined;
   /** Called when the user clicks "Review" on a pending approval. */
   readonly onApprovalClick?: (executionId: string) => void;
   /** Called when the user clicks "View" on a failed execution. */
@@ -37,7 +35,6 @@ export interface OperationalDashboardProps {
  * ```tsx
  * <OperationalDashboard
  *   org="acme"
- *   orgId={activeOrg?.metadata?.id}
  *   onApprovalClick={(id) => navigate(`/executions/${id}`)}
  *   onFailedRunClick={(id, type) => navigate(`/executions/${id}`)}
  * />
@@ -47,14 +44,12 @@ export interface OperationalDashboardProps {
  */
 export const OperationalDashboard = memo(function OperationalDashboard({
   org,
-  orgId,
   onApprovalClick,
   onFailedRunClick,
   className,
 }: OperationalDashboardProps) {
   const summaryOptions: UseDashboardSummaryOptions = {
     org,
-    orgId,
     refetchInterval: 60_000,
   };
   const { summary, isLoading: summaryLoading } = useDashboardSummary(summaryOptions);