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

package/src/mcp-server/useMcpServerOAuthConnect.ts

@@ -10,7 +10,6 @@ import {
   ConnectInputSchema,
 } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/io_pb";
 import { useStigmer } from "../hooks.js";
-import { resolveDeclaredSystemEnvVars } from "../environment/systemEnvVars.js";
 import { toError } from "../internal/toError.js";
 import {
   openOAuthPopup,
@@ -81,11 +80,9 @@ export interface UseMcpServerOAuthConnectReturn {
    *
    * @param mcpServerId - System-generated ID (metadata.id) of the MCP server.
    * @param org - Organization context for token storage (caller's active org).
-   * @param declaredEnvKeys - Keys from the server's `spec.env` declaration.
-   *   System vars are only injected when declared here.
    * @returns The updated McpServer after tool discovery completes.
    */
-  readonly startOAuth: (mcpServerId: string, org: string, declaredEnvKeys?: readonly string[]) => Promise<McpServer>;
+  readonly startOAuth: (mcpServerId: string, org: string) => Promise<McpServer>;
   /** `true` while any phase of the OAuth flow is in progress. */
   readonly isInProgress: boolean;
   /** Current phase of the OAuth flow. */
@@ -182,7 +179,7 @@ export function useMcpServerOAuthConnect(): UseMcpServerOAuthConnectReturn {
   }, [advancePhase]);
 
   const startOAuth = useCallback(
-    async (mcpServerId: string, org: string, declaredEnvKeys?: readonly string[]): Promise<McpServer> => {
+    async (mcpServerId: string, org: string): Promise<McpServer> => {
       advancePhase("initiating");
       setError(null);
       setFailedPhase(null);
@@ -229,24 +226,11 @@ export function useMcpServerOAuthConnect(): UseMcpServerOAuthConnectReturn {
 
         advancePhase("connecting");
 
-        const systemEnv = declaredEnvKeys
-          ? await resolveDeclaredSystemEnvVars(stigmer, declaredEnvKeys)
-          : {};
-        const runtimeEnvMap: Record<string, { value: string; isSecret: boolean }> = {};
-        for (const [key, envInput] of Object.entries(systemEnv)) {
-          runtimeEnvMap[key] = {
-            value: envInput.value,
-            isSecret: envInput.isSecret ?? false,
-          };
-        }
-
-        const input = create(ConnectInputSchema, {
-          mcpServerId,
-          org,
-          ...(Object.keys(runtimeEnvMap).length > 0
-            ? { runtimeEnv: runtimeEnvMap }
-            : {}),
-        });
+        // No runtime env: the backend resolves the token this flow just
+        // stored from the managed grant, and every other declared variable
+        // from the caller's personal environment. A runtime env would
+        // replace that resolution whole (stigmer/stigmer#1453).
+        const input = create(ConnectInputSchema, { mcpServerId, org });
 
         // Async connect lane (stigmer/stigmer#425): startConnect + poll via
         // the SDK's shared protocol, so the discovery wait can outlive the

package/src/memory/MemoryListPanel.tsx

@@ -14,6 +14,7 @@ import { useDeleteMemory } from "./useDeleteMemory.js";
 import { useMemories } from "./useMemories.js";
 import { useRejectMemory } from "./useRejectMemory.js";
 import { useUpdateMemoryContent } from "./useUpdateMemoryContent.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 // ---------------------------------------------------------------------------
 // Public API
@@ -71,10 +72,9 @@ export function MemoryListPanel({ org, className, now }: MemoryListPanelProps) {
 
   if (isLoading) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:space-y-2", className)}
-        aria-busy="true"
-        aria-label="Loading memories"
+        label="Loading memories"
       >
         {Array.from({ length: 2 }, (_, i) => (
           <div
@@ -82,7 +82,7 @@ export function MemoryListPanel({ org, className, now }: MemoryListPanelProps) {
             className="stg:bg-muted-subtle stg:h-14 stg:animate-pulse stg:rounded-lg"
           />
         ))}
-      </div>
+      </LoadingRegion>
     );
   }
 

package/src/models/HarnessSelector.tsx

@@ -1,9 +1,7 @@
 "use client";
 
 import { useCallback, useRef, type KeyboardEvent } from "react";
-import { HARNESS_LABELS, type HarnessOption } from "./harness.js";
-
-const OPTIONS: readonly HarnessOption[] = ["native", "cursor"];
+import { HARNESS_LABELS, HARNESS_OPTIONS as OPTIONS, type HarnessOption } from "./harness.js";
 
 /** Props for {@link HarnessSelector}. */
 export interface HarnessSelectorProps {

package/src/models/ModelSelector.tsx

@@ -47,7 +47,7 @@ export interface ModelSelectorProps {
   readonly onHarnessChange?: (harness: HarnessOption) => void;
   /**
    * Restrict which harnesses appear in the dropdown.
-   * When omitted, shows all registered harnesses that have models in the registry.
+   * When omitted, shows every harness the platform runs ({@link HARNESS_OPTIONS}).
    */
   readonly availableHarnesses?: readonly HarnessOption[];
   /** Override the curated (featured) list for the current harness. */
@@ -218,12 +218,7 @@ export function ModelSelector({
   const searchRef = useRef<HTMLInputElement>(null);
   const listRef = useRef<HTMLDivElement>(null);
 
-  const resolvedHarnesses = useMemo(() => {
-    if (availableHarnesses) return availableHarnesses;
-    // For now, show native and cursor (the two harnesses with models in the registry).
-    // Future harnesses will be added to the registry and appear here automatically.
-    return HARNESS_OPTIONS.filter((h) => h === "native" || h === "cursor");
-  }, [availableHarnesses]);
+  const resolvedHarnesses = availableHarnesses ?? HARNESS_OPTIONS;
 
   const selectedModel = (value ? getModel(value) : undefined) ?? defaultModel ?? undefined;
 

package/src/models/harness.ts

@@ -4,18 +4,33 @@ import { Harness } from "@stigmer/protos/ai/stigmer/agentic/session/v1/enum_pb";
  * String literal alias for the proto {@link Harness} enum.
  *
  * Used on component props and hook options so platform builders
- * do not need to import proto enums to use the SDK.
- *
- * This union grows as new execution engines are integrated.
- * Each value must have a corresponding entry in {@link HARNESS_META}.
+ * do not need to import proto enums to use the SDK. Exactly the
+ * engines the platform runs; it grows only when the proto enum does.
+ */
+export type HarnessOption = "native" | "cursor";
+
+/**
+ * The proto {@link Harness} member for each option — the one table the
+ * option set is read from, so the SDK can never offer an engine the proto
+ * does not name (stigmer/stigmer#1143: four extra options once mapped
+ * silently to NATIVE). Listed in proto enum order.
+ */
+const HARNESS_BY_OPTION = {
+  native: Harness.NATIVE,
+  cursor: Harness.CURSOR,
+} as const satisfies Record<HarnessOption, Exclude<Harness, Harness.UNSPECIFIED>>;
+
+/**
+ * The reverse of {@link HARNESS_BY_OPTION}, keyed by every engine the proto
+ * names. Typed over the whole enum (minus UNSPECIFIED), so a member added
+ * to the proto is a compile error here until it has an option — and then
+ * in {@link HARNESS_BY_OPTION} and {@link HARNESS_META} until it has an
+ * entry in each.
  */
-export type HarnessOption =
-  | "native"
-  | "cursor"
-  | "copilot"
-  | "claude_code"
-  | "codex"
-  | "devin";
+const OPTION_BY_HARNESS: Readonly<Record<Exclude<Harness, Harness.UNSPECIFIED>, HarnessOption>> = {
+  [Harness.NATIVE]: "native",
+  [Harness.CURSOR]: "cursor",
+};
 
 /** Display metadata for a single harness. */
 export interface HarnessDisplayInfo {
@@ -34,10 +49,6 @@ export interface HarnessDisplayInfo {
 export const HARNESS_META: Readonly<Record<HarnessOption, HarnessDisplayInfo>> = {
   native: { label: "Stigmer", description: "Stigmer's native agent runtime" },
   cursor: { label: "Cursor", description: "Cursor IDE agent with codebase indexing" },
-  copilot: { label: "GitHub Copilot", description: "GitHub-native sub-agent orchestration" },
-  claude_code: { label: "Claude Agent SDK", description: "Anthropic's agent SDK with built-in tools" },
-  codex: { label: "OpenAI Codex", description: "Thread-based execution with structured output" },
-  devin: { label: "Devin", description: "Full autonomous engineer, session-based" },
 };
 
 /**
@@ -50,28 +61,24 @@ export const HARNESS_LABELS: Readonly<Record<HarnessOption, string>> = Object.fr
   Object.entries(HARNESS_META).map(([k, v]) => [k, v.label]),
 ) as Record<HarnessOption, string>;
 
-/** Ordered list of all registered harness IDs. */
-export const HARNESS_OPTIONS: readonly HarnessOption[] = [
-  "native",
-  "cursor",
-  "copilot",
-  "claude_code",
-  "codex",
-  "devin",
-];
+/** Ordered list of all registered harness IDs, in proto enum order. */
+export const HARNESS_OPTIONS: readonly HarnessOption[] = Object.keys(HARNESS_BY_OPTION) as HarnessOption[];
 
 /** Platform default — resolves to the native engine. */
 export const DEFAULT_HARNESS: HarnessOption = "native";
 
+/**
+ * Whether a string names a {@link HarnessOption} — the check for a value
+ * the SDK did not write itself (a stored preference, a URL parameter),
+ * which may name an engine this platform does not run.
+ */
+export function isHarnessOption(value: string): value is HarnessOption {
+  return Object.hasOwn(HARNESS_BY_OPTION, value);
+}
+
 /** Convert a {@link HarnessOption} string to the proto {@link Harness} enum. */
 export function toProtoHarness(h: HarnessOption): Harness {
-  switch (h) {
-    case "cursor":
-      return Harness.CURSOR;
-    case "native":
-    default:
-      return Harness.NATIVE;
-  }
+  return HARNESS_BY_OPTION[h];
 }
 
 /**
@@ -80,12 +87,7 @@ export function toProtoHarness(h: HarnessOption): Harness {
  * `UNSPECIFIED` and any unknown values map to `"native"`.
  */
 export function fromProtoHarness(h: Harness): HarnessOption {
-  switch (h) {
-    case Harness.CURSOR:
-      return "cursor";
-    case Harness.NATIVE:
-    case Harness.UNSPECIFIED:
-    default:
-      return "native";
-  }
+  // A wire value may be UNSPECIFIED, or an engine newer than this build.
+  const known: Partial<Record<Harness, HarnessOption>> = OPTION_BY_HARNESS;
+  return known[h] ?? DEFAULT_HARNESS;
 }

package/src/models/index.ts

@@ -9,7 +9,7 @@ export { ModelSelector } from "./ModelSelector.js";
 export type { ModelSelectorProps } from "./ModelSelector.js";
 export { HarnessSelector } from "./HarnessSelector.js";
 export type { HarnessSelectorProps } from "./HarnessSelector.js";
-export { DEFAULT_HARNESS, HARNESS_LABELS, HARNESS_META, HARNESS_OPTIONS, toProtoHarness, fromProtoHarness } from "./harness.js";
+export { DEFAULT_HARNESS, HARNESS_LABELS, HARNESS_META, HARNESS_OPTIONS, isHarnessOption, toProtoHarness, fromProtoHarness } from "./harness.js";
 export type { HarnessOption, HarnessDisplayInfo } from "./harness.js";
 export { FAST_SERVICE_TIER, toProtoServiceTier, fromProtoServiceTier } from "./service-tier.js";
 export type { ServiceTierOption } from "./service-tier.js";

package/src/oauth-app/OAuthAppListPanel.tsx

@@ -7,6 +7,7 @@ import { timestampDate } from "@bufbuild/protobuf/wkt";
 import type { OAuthApp } from "@stigmer/protos/ai/stigmer/iam/oauthapp/v1/api_pb";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../internal/tooltip.js";
 import { useOAuthAppList } from "./useOAuthAppList.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 // ---------------------------------------------------------------------------
 // Public API
@@ -76,10 +77,9 @@ export function OAuthAppListPanel({
 
   if (isLoading) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:space-y-2", className)}
-        aria-busy="true"
-        aria-label="Loading OAuth apps"
+        label="Loading OAuth apps"
       >
         {Array.from({ length: 2 }, (_, i) => (
           <div
@@ -87,7 +87,7 @@ export function OAuthAppListPanel({
             className="stg:bg-muted-subtle stg:h-14 stg:animate-pulse stg:rounded-lg"
           />
         ))}
-      </div>
+      </LoadingRegion>
     );
   }
 

package/src/organization/OrgPreferencesPanel.tsx

@@ -7,14 +7,24 @@ import type { Organization } from "@stigmer/protos/ai/stigmer/tenancy/organizati
 import { useOrganization } from "./useOrganization.js";
 import { useUpdateOrganization } from "./useUpdateOrganization.js";
 import { useCheckPermission } from "../iam-policy/useCheckPermission.js";
+import { useServerInfo } from "../server-info.js";
 import { MemoryEnabledRow } from "../internal/MemoryEnabledRow.js";
 import { StandingContextField } from "../internal/StandingContextField.js";
 import { SpinnerIcon } from "../internal/SpinnerIcon.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
+
+/** The memory row's copy where each member's own switch must also be on. */
+const MEMBER_CONSENT_MEMORY_HELPER_TEXT =
+  "Allow agents to remember confirmed facts about members of this organization. Each member must also turn memory on in their own account preferences; once a member has many memories, each conversation recalls their most relevant ones, shown on the execution. Changes apply immediately.";
+
+/** The memory row's copy on a server where this switch alone decides memory. */
+const ORG_ALONE_MEMORY_HELPER_TEXT =
+  "Allow agents to remember confirmed facts. On this server this switch alone decides memory; once there are many memories, each conversation recalls the most relevant ones, shown on the execution. Changes apply immediately.";
 
 /** Props for {@link OrgPreferencesPanel}. */
 export interface OrgPreferencesPanelProps {
   /** The ID of the organization whose preferences to display and edit. */
-  readonly orgId: string;
+  readonly org: string;
   /** Fired with the updated resource after a successful save. */
   readonly onUpdated?: (org: Organization) => void;
   /** Additional CSS class names for the root container. */
@@ -38,11 +48,11 @@ export interface OrgPreferencesPanelProps {
  *
  * @example
  * ```tsx
- * <OrgPreferencesPanel orgId="org-id-123" />
+ * <OrgPreferencesPanel org="org-id-123" />
  * ```
  */
 export function OrgPreferencesPanel({
-  orgId,
+  org,
   onUpdated,
   className,
 }: OrgPreferencesPanelProps) {
@@ -52,7 +62,7 @@ export function OrgPreferencesPanel({
     isLoading: isFetching,
     error: fetchError,
     refetch,
-  } = useOrganization(orgId || null);
+  } = useOrganization(org || null);
 
   const {
     update,
@@ -69,10 +79,19 @@ export function OrgPreferencesPanel({
     error: memoryFlagError,
   } = useUpdateOrganization();
 
+  // On a server that trusts every request, this switch alone decides memory:
+  // there is no person's switch to also turn on (the account panel says so
+  // in its place).
+  const { serverInfo } = useServerInfo();
+  const memoryHelperText =
+    serverInfo?.authenticationRequired === false
+      ? ORG_ALONE_MEMORY_HELPER_TEXT
+      : MEMBER_CONSENT_MEMORY_HELPER_TEXT;
+
   // Fail-open: OSS local mode has no IAM service, so editing stays
   // available there; cloud gets a genuine server verdict.
   const { allowed: canEdit } = useCheckPermission(
-    orgId ? { kind: "organization", id: orgId } : null,
+    org ? { kind: "organization", id: org } : null,
     "can_edit",
   );
 
@@ -159,14 +178,13 @@ export function OrgPreferencesPanel({
 
   if (isFetching && !organization) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:space-y-4", className)}
-        aria-busy="true"
-        aria-label="Loading organization preferences"
+        label="Loading organization preferences"
       >
         <div className="stg:bg-muted-subtle stg:h-28 stg:animate-pulse stg:rounded" />
         <div className="stg:bg-muted-subtle stg:h-8 stg:w-32 stg:animate-pulse stg:rounded" />
-      </div>
+      </LoadingRegion>
     );
   }
 
@@ -221,7 +239,7 @@ export function OrgPreferencesPanel({
         saving={isSavingMemoryFlag}
         readOnly={!canEdit}
         error={memoryFlagError}
-        helperText="Allow agents to remember confirmed facts about members of this organization. Each member must also turn memory on in their own account preferences; once a member has many memories, each conversation recalls their most relevant ones, shown on the execution. Changes apply immediately."
+        helperText={memoryHelperText}
       />
 
       {!canEdit && (

package/src/organization/OrgProfilePanel.tsx

@@ -12,6 +12,7 @@ import { useResourceAvailable, ApiResourceKind } from "../deployment-mode.js";
 import { useCheckPermission } from "../iam-policy/useCheckPermission.js";
 import { SpinnerIcon } from "../internal/SpinnerIcon.js";
 import { useCopyFeedback } from "../internal/useCopyFeedback.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -27,7 +28,7 @@ const LOGO_URL_MAX_LEN = 2048;
 /** Props for {@link OrgProfilePanel}. */
 export interface OrgProfilePanelProps {
   /** The ID of the organization to display and edit. */
-  readonly orgId: string;
+  readonly org: string;
   /** Fired with the updated resource after a successful save. */
   readonly onUpdated?: (org: Organization) => void;
   /** Additional CSS class names for the root container. */
@@ -48,13 +49,13 @@ export interface OrgProfilePanelProps {
  * @example
  * ```tsx
  * <OrgProfilePanel
- *   orgId="org-id-123"
+ *   org="org-id-123"
  *   onUpdated={(org) => console.log("Saved:", org.metadata?.name)}
  * />
  * ```
  */
 export function OrgProfilePanel({
-  orgId,
+  org,
   onUpdated,
   className,
 }: OrgProfilePanelProps) {
@@ -64,7 +65,7 @@ export function OrgProfilePanel({
     isLoading: isFetching,
     error: fetchError,
     refetch,
-  } = useOrganization(orgId || null);
+  } = useOrganization(org || null);
 
   const {
     update,
@@ -152,10 +153,9 @@ export function OrgProfilePanel({
 
   if (isFetching && !organization) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:space-y-4", className)}
-        aria-busy="true"
-        aria-label="Loading organization profile"
+        label="Loading organization profile"
       >
         {Array.from({ length: 4 }, (_, i) => (
           <div
@@ -164,7 +164,7 @@ export function OrgProfilePanel({
             style={{ width: `${90 - i * 12}%` }}
           />
         ))}
-      </div>
+      </LoadingRegion>
     );
   }
 
@@ -342,7 +342,7 @@ export function OrgProfilePanel({
       </div>
 
       {/* -- Identity Providers summary -- */}
-      <IdentityProvidersSummary orgId={orgId} orgSlug={serverSlug} />
+      <IdentityProvidersSummary org={org} orgSlug={serverSlug} />
     </form>
   );
 }
@@ -357,10 +357,10 @@ export function OrgProfilePanel({
  * not create providers; otherwise it says who manages them.
  */
 function IdentityProvidersSummary({
-  orgId,
+  org,
   orgSlug,
 }: {
-  orgId: string;
+  org: string;
   orgSlug: string;
 }) {
   const idpAvailable = useResourceAvailable(ApiResourceKind.identity_provider);
@@ -368,7 +368,7 @@ function IdentityProvidersSummary({
     idpAvailable && orgSlug ? orgSlug : null,
   );
   const createCheck = useCheckPermission(
-    idpAvailable && orgId ? { kind: "organization", id: orgId } : null,
+    idpAvailable && org ? { kind: "organization", id: org } : null,
     "can_create_idp",
   );
   const deniedCreate = !createCheck.isLoading && !createCheck.allowed;

package/src/organization/index.ts

@@ -1,5 +1,6 @@
 export { OrgProvider, useOrg, useActiveOrgSlug, useActiveOrgId } from "./OrgProvider.js";
 export type { OrgContextValue } from "./OrgProvider.js";
+export { useFollowSessionOrganization } from "./useFollowSessionOrganization.js";
 export { useOrgGate } from "./useOrgGate.js";
 export type {
   UseOrgGateOptions,

package/src/organization/useFollowSessionOrganization.ts

@@ -0,0 +1,54 @@
+"use client";
+
+/**
+ * useFollowSessionOrganization: a session page's shell follows the session
+ * into its own organization (stigmer/stigmer#1580).
+ *
+ * Session URLs name no organization, so a link can open a conversation
+ * that belongs to an organization other than the active one. The session
+ * surface already acts in the session's organization (SessionViewer reads
+ * `session.metadata.org`); this hook makes the rest of the shell agree
+ * with it: when the loaded session's organization is one of the person's
+ * and is not the active one, it becomes the active one, so the
+ * organization menu, the sidebar and every host control keyed on the
+ * active organization name the conversation's.
+ *
+ * It aligns once per visit to a conversation, when that session and the
+ * organization list have both loaded. A choice the person makes while the
+ * conversation stays open stands, so the hook never fights the
+ * organization menu; opening a conversation again is a new visit, and it
+ * follows that conversation again, as a link to it would. A session in an organization
+ * the person does not belong to (a guest's view of a share) switches
+ * nothing. The switch goes through OrgProvider's `setActiveOrg`, the
+ * programmatic path: it persists the choice and clears the fetch cache
+ * like any switch, and it fires no host `onOrgChanged` navigation.
+ */
+import { useEffect, useRef } from "react";
+import type { Session } from "@stigmer/protos/ai/stigmer/agentic/session/v1/api_pb";
+
+import { useOrg } from "./OrgProvider.js";
+
+/**
+ * Makes the loaded session's organization the active one, once per visit
+ * to the conversation, when the person belongs to it.
+ *
+ * @param session - The session the page shows, or null while it loads.
+ */
+export function useFollowSessionOrganization(session: Session | null): void {
+  const { orgs, activeOrg, setActiveOrg, isLoading } = useOrg();
+  const followedSessionRef = useRef<string | null>(null);
+
+  const sessionId = session?.metadata?.id ?? "";
+  const sessionOrg = session?.metadata?.org ?? "";
+  const activeSlug = activeOrg?.metadata?.slug ?? "";
+
+  useEffect(() => {
+    if (sessionId === "" || sessionOrg === "" || isLoading || activeSlug === "")
+      return;
+    if (followedSessionRef.current === sessionId) return;
+    followedSessionRef.current = sessionId;
+    if (sessionOrg === activeSlug) return;
+    const target = orgs.find((org) => org.metadata?.slug === sessionOrg);
+    if (target !== undefined) setActiveOrg(target);
+  }, [sessionId, sessionOrg, activeSlug, isLoading, orgs, setActiveOrg]);
+}

package/src/plan-catalog/plan-draft.ts

@@ -81,7 +81,7 @@ export function planInputFromDraft(draft: PlanDraft): PlanDraftResult {
   }
   const managed = draft.features.includes(Feature.managed_organizations);
   let includedManagedOrganizations: number | undefined;
-  let perExtraOrganizationMicros: bigint | undefined;
+  let perExtraOrgMicros: bigint | undefined;
   if (managed && draft.includedManagedOrganizations.trim() !== "") {
     const included = Number(draft.includedManagedOrganizations.trim());
     if (!Number.isInteger(included) || included < 0) {
@@ -92,7 +92,7 @@ export function planInputFromDraft(draft: PlanDraft): PlanDraftResult {
     if (fee === null) {
       return { ok: false, field: "perExtraOrganizationUsd", message: "A dollar amount per organization, e.g. 25." };
     }
-    perExtraOrganizationMicros = fee;
+    perExtraOrgMicros = fee;
   }
   return {
     ok: true,
@@ -108,7 +108,7 @@ export function planInputFromDraft(draft: PlanDraft): PlanDraftResult {
       terms: {
         monthlyMinimumMicros: minimum,
         usageShareBasisPoints: share,
-        ...(perExtraOrganizationMicros === undefined ? {} : { perExtraOrganizationMicros }),
+        ...(perExtraOrgMicros === undefined ? {} : { perExtraOrgMicros }),
       },
     },
   };

package/src/platform-client/PlatformClientListPanel.tsx

@@ -13,6 +13,7 @@ import { usePlatformClientList } from "./usePlatformClientList.js";
 import { useDeletePlatformClient } from "./useDeletePlatformClient.js";
 import { SpinnerIcon } from "../internal/SpinnerIcon.js";
 import { isPlatformClientExpired } from "./expiry.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 /** Props for {@link PlatformClientListPanel}. */
 export interface PlatformClientListPanelProps {
@@ -87,10 +88,9 @@ export function PlatformClientListPanel({
 
   if (isLoading) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:space-y-2", className)}
-        aria-busy="true"
-        aria-label="Loading platform clients"
+        label="Loading platform clients"
       >
         {Array.from({ length: 2 }, (_, i) => (
           <div
@@ -98,7 +98,7 @@ export function PlatformClientListPanel({
             className="stg:bg-muted-subtle stg:h-14 stg:animate-pulse stg:rounded-lg"
           />
         ))}
-      </div>
+      </LoadingRegion>
     );
   }
 

package/src/plugin/PluginDetailView.tsx

@@ -49,6 +49,7 @@ import { PluginIcon } from "./PluginIcon.js";
 import { usePlugin } from "./usePlugin.js";
 import { usePluginMembers } from "./usePluginMembers.js";
 import { usePluginVersions } from "./usePluginVersions.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 const OVERVIEW_TAB: TabItem = { id: "overview", label: "Overview" };
 const VERSIONS_TAB: TabItem = { id: "versions", label: "Versions" };
@@ -526,7 +527,7 @@ function stateLabel(state: PluginState): string | undefined {
 
 function LoadingSkeleton({ className }: { readonly className?: string }) {
   return (
-    <div className={cn("stg:flex stg:flex-col stg:gap-6", className)} aria-busy="true" aria-label="Loading plugin details">
+    <LoadingRegion className={cn("stg:flex stg:flex-col stg:gap-6", className)} label="Loading plugin details">
       <div className="stg:flex stg:items-start stg:gap-3">
         <div className="stg:mt-1 stg:size-6 stg:shrink-0 stg:animate-pulse stg:rounded stg:bg-muted" />
         <div className="stg:flex-1 stg:space-y-2">
@@ -535,7 +536,7 @@ function LoadingSkeleton({ className }: { readonly className?: string }) {
         </div>
       </div>
       <div className="stg:h-24 stg:animate-pulse stg:rounded-lg stg:bg-muted" />
-    </div>
+    </LoadingRegion>
   );
 }
 

package/src/plugin/useMcpServerReadiness.ts

@@ -109,14 +109,14 @@ export function useMcpServerReadiness(
     oauth.clearError();
     // A sign-in that fails leaves the row on "Sign in" with the reason; one
     // that lands refetches so the row says "Signed in" from the grant.
-    void oauth.startOAuth(id, org, declaredVariables).then(
+    void oauth.startOAuth(id, org).then(
       () => {
         refetch();
         onSignedIn?.(id);
       },
       () => undefined,
     );
-  }, [kind, mcpServer, org, oauth.clearError, oauth.startOAuth, declaredVariables, refetch, onSignedIn]);
+  }, [kind, mcpServer, org, oauth.clearError, oauth.startOAuth, refetch, onSignedIn]);
 
   const error = useMemo(() => {
     if (readError) return readError;

package/src/portal-container.ts

@@ -29,6 +29,14 @@ import { createContext, useContext } from "react";
  * - an `HTMLElement` (the mounted themed container): portaled content
  *   renders inside it and inherits the `--stgm-*` token scope.
  *
+ * One more source sets the value: an SDK modal dialog (`DialogShell`)
+ * re-provides it with an element inside the `<dialog>`, `null` until that
+ * element mounts. A modal dialog is in the browser's top layer and makes
+ * the rest of the document inert, so a popup portaled to `document.body`
+ * from inside it would paint beneath it and take no input (stigmer#1509).
+ * The element inherits the theme from the provider's in-tree scope, and
+ * carries no `data-stgm-portal` marker.
+ *
  * The default MUST stay `undefined`, never `null`: an explicit `null`
  * makes Base UI portals render NOWHERE, which breaks every popup for
  * consumers embedding components outside a provider (stigmer-cloud#271).

package/src/provider-standing/ProviderStandingConsole.tsx

@@ -110,7 +110,7 @@ export function ProviderStandingConsole({ className }: ProviderStandingConsolePr
           completed a pass since this deployment came up.
         </p>
       ) : (
-        <ul className="stg:m-0 stg:grid stg:list-none stg:gap-2 stg:p-0 sm:stg:grid-cols-2">
+        <ul className="stg:m-0 stg:grid stg:list-none stg:gap-2 stg:p-0 stg:sm:grid-cols-2">
           {providers.map((entry) => (
             <StandingCard key={entry.provider} entry={entry} />
           ))}