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

package/src/channel-app/internal.tsx

@@ -3,6 +3,7 @@
 import { useCallback } from "react";
 import { cn } from "@stigmer/theme";
 import { TruncatedText } from "../internal/truncated-text.js";
+import { UnknownPublicAddressNotice } from "../internal/UnknownPublicAddressNotice.js";
 import { useCopyFeedback } from "../internal/useCopyFeedback.js";
 
 /**
@@ -89,6 +90,26 @@ export function CopyRow({
   );
 }
 
+/**
+ * The place of a {@link CopyRow} whose URL cannot be built because the
+ * server's public address is unknown: the same label, then the shared
+ * notice in place of the value and its copy button.
+ */
+export function UnknownAddressRow({
+  label,
+  subject,
+}: {
+  label: string;
+  subject: string;
+}) {
+  return (
+    <div className="stg:space-y-1">
+      <p className="stg:text-xs stg:font-medium stg:text-foreground">{label}</p>
+      <UnknownPublicAddressNotice subject={subject} />
+    </div>
+  );
+}
+
 /** A multi-line copyable value (the app manifest) in a scrollable block. */
 export function CopyBlock({
   label,

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
@@ -53,14 +54,16 @@ export const SLACK_CHANNEL_APP_BOT_EVENTS = [
  * The events webhook URL for one ChannelApp: the per-app route the
  * receiver resolves the app's signing secret by.
  *
- * @param apiBaseUrl the Stigmer API origin (`stigmer.baseUrl`)
+ * @param apiBaseUrl the server's public base URL, absolute (the one
+ *                   `StigmerProvider`'s `publicBaseUrl` names, or the
+ *                   client's `baseUrl` when that is absolute)
  * @param channelAppId the ChannelApp resource id (`chapp_...`)
  */
 export function slackChannelAppWebhookUrl(
   apiBaseUrl: string,
   channelAppId: string,
 ): string {
-  return `${apiBaseUrl.replace(/\/+$/, "")}/webhook/slack/${channelAppId}`;
+  return `${trimTrailing(apiBaseUrl, "/")}/webhook/slack/${channelAppId}`;
 }
 
 /**
@@ -77,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 —
@@ -36,14 +37,16 @@ export const WHATSAPP_CHANNEL_APP_WEBHOOK_FIELDS = ["messages"] as const;
  * The events webhook URL for one ChannelApp: the per-app route the
  * receiver resolves the app's secret and verify token by.
  *
- * @param apiBaseUrl the Stigmer API origin (`stigmer.baseUrl`)
+ * @param apiBaseUrl the server's public base URL, absolute (the one
+ *                   `StigmerProvider`'s `publicBaseUrl` names, or the
+ *                   client's `baseUrl` when that is absolute)
  * @param channelAppId the ChannelApp resource id (`chapp_...`)
  */
 export function whatsappChannelAppWebhookUrl(
   apiBaseUrl: string,
   channelAppId: string,
 ): string {
-  return `${apiBaseUrl.replace(/\/+$/, "")}/webhook/whatsapp/${channelAppId}`;
+  return `${trimTrailing(apiBaseUrl, "/")}/webhook/whatsapp/${channelAppId}`;
 }
 
 /**

package/src/composer/SessionComposer.tsx

@@ -39,11 +39,7 @@ import { FileReferenceChipList } from "../file-reference/FileReferenceChipList.j
 import { FILE_REF_MIME } from "../internal/file-tree/index.js";
 import { useSessionEnvPool } from "../environment/useSessionEnvPool.js";
 import { usePersonalEnvironment } from "../environment/usePersonalEnvironment.js";
-import { useStigmer } from "../hooks.js";
-import {
-  SYSTEM_ENV_VAR_KEYS,
-  resolveSystemEnvVarValues,
-} from "../environment/systemEnvVars.js";
+import { SYSTEM_ENV_VAR_KEYS } from "../environment/systemEnvVars.js";
 import { useRenderTracer } from "../internal/dev/index.js";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../internal/tooltip.js";
 import {
@@ -714,8 +710,6 @@ const SessionComposerInner = forwardRef<SessionComposerHandle, SessionComposerPr
     [personalEnv.environment],
   );
 
-  const stigmer = useStigmer();
-
   const pool = useSessionEnvPool({
     personalEnvKeys,
     manualSecrets: sessionVariables?.entries,
@@ -1025,14 +1019,11 @@ const SessionComposerInner = forwardRef<SessionComposerHandle, SessionComposerPr
         }
       }
 
+      // Only what the page collected for this run: the platform's own keys
+      // are filled in the runner, below every value a user saved
+      // (systemEnvVars.ts header, stigmer/stigmer#1446).
       const env: Record<string, EnvVarInput> = {};
 
-      // System env vars first (lowest priority) — auto-resolved from
-      // the Stigmer client's connection context so MCP servers and
-      // agents can reach the backend without manual user input.
-      const systemVars = await resolveSystemEnvVarValues(stigmer);
-      Object.assign(env, systemVars);
-
       if (
         agentSetup.state.status === "ready" &&
         agentSetup.state.resolution.mode === "oneTime"
@@ -1108,7 +1099,7 @@ const SessionComposerInner = forwardRef<SessionComposerHandle, SessionComposerPr
         fileRefs.clear();
       }
     },
-    [onSubmit, effective, stigmer, agentSetup.state, mcpSetup.pendingRuntimeEnv, sessionVariables, enableAttachments, attachments, personalEnv, showInteractionModePicker, interactionMode],
+    [onSubmit, effective, agentSetup.state, mcpSetup.pendingRuntimeEnv, sessionVariables, enableAttachments, attachments, personalEnv, showInteractionModePicker, interactionMode],
   );
 
   const composer = useComposer({

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);

package/src/dashboard/useDashboardSummary.ts

@@ -17,10 +17,8 @@ import type { DashboardSummary } from "./types.js";
 
 /** Options for {@link useDashboardSummary}. */
 export interface UseDashboardSummaryOptions {
-  /** Organization slug for execution summaries. */
+  /** The organization whose execution summaries and usage report to read. */
   readonly org: string | null | undefined;
-  /** Organization ID (metadata.id) for the usage report. */
-  readonly orgId: string | null | undefined;
   /** Refetch interval in milliseconds. @default 60_000 */
   readonly refetchInterval?: number;
 }
@@ -66,7 +64,7 @@ export function useDashboardSummary(
 
   const dateRange = useMemo(() => dateRangeFromPreset("7d"), []);
   const { report: orgUsage, isLoading: usageLoading, error: usageError, refetch: usageRefetch } =
-    useOrgUsageReport(options.orgId ?? null, dateRange);
+    useOrgUsageReport(options.org ?? null, dateRange);
 
   const isLoading = wfLoading || agLoading || usageLoading;
   const error = wfError ?? agError ?? usageError;

package/src/environment/EnvironmentListPanel.tsx

@@ -10,6 +10,7 @@ import { EditResourceYamlDialog } from "../manifest/EditResourceYamlDialog.js";
 import { useEnvironmentList } from "./useEnvironmentList.js";
 import { EnvironmentVariableEditor } from "./EnvironmentVariableEditor.js";
 import { isShareRestrictedEnvironment } from "./shareRestriction.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 // ---------------------------------------------------------------------------
 // Public API
@@ -132,10 +133,9 @@ export function EnvironmentListPanel({
 
   if (isLoading) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:space-y-2", className)}
-        aria-busy="true"
-        aria-label="Loading environments"
+        label="Loading environments"
       >
         {Array.from({ length: 2 }, (_, i) => (
           <div
@@ -143,7 +143,7 @@ export function EnvironmentListPanel({
             className="stg:bg-muted-subtle stg:h-14 stg:animate-pulse stg:rounded-lg"
           />
         ))}
-      </div>
+      </LoadingRegion>
     );
   }
 

package/src/environment/EnvironmentVariableEditor.tsx

@@ -18,6 +18,7 @@ import { useUpdateEnvironmentVariables } from "./useUpdateEnvironmentVariables.j
 import { useRemoveEnvironmentVariables } from "./useRemoveEnvironmentVariables.js";
 import { useRevealSecretValue } from "./useRevealSecretValue.js";
 import { SpinnerIcon } from "../internal/SpinnerIcon.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 // ---------------------------------------------------------------------------
 // Public API
@@ -152,10 +153,9 @@ export function EnvironmentVariableEditor({
 
   if (isLoading) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:space-y-2", className)}
-        aria-busy="true"
-        aria-label="Loading variables"
+        label="Loading variables"
       >
         {Array.from({ length: 3 }, (_, i) => (
           <div
@@ -164,7 +164,7 @@ export function EnvironmentVariableEditor({
             style={{ width: `${85 - i * 10}%` }}
           />
         ))}
-      </div>
+      </LoadingRegion>
     );
   }
 
@@ -586,7 +586,7 @@ function AddVariableForm({
             checked={isSecret}
             onChange={(e) => setIsSecret(e.target.checked)}
             disabled={isAdding}
-            className="stg:accent-primary stg:size-3"
+            className="stg:size-3"
           />
           Secret
         </label>

package/src/environment/index.ts

@@ -41,13 +41,7 @@ export type {
   SessionEnvPoolInput,
   UseSessionEnvPoolReturn,
 } from "./useSessionEnvPool.js";
-export {
-  SYSTEM_ENV_VAR_KEYS,
-  toGrpcAddress,
-  buildSystemEnvVars,
-  resolveSystemEnvVarValues,
-  resolveDeclaredSystemEnvVars,
-} from "./systemEnvVars.js";
+export { SYSTEM_ENV_VAR_KEYS } from "./systemEnvVars.js";
 export { EnvironmentPicker } from "./EnvironmentPicker.js";
 export type { EnvironmentPickerProps } from "./EnvironmentPicker.js";
 export { useToolCredentialsReadiness } from "./useToolCredentialsReadiness.js";

package/src/environment/systemEnvVars.ts

@@ -1,143 +1,31 @@
-import type { EnvVarInput, Stigmer } from "@stigmer/sdk";
-
 // ---------------------------------------------------------------------------
 // Well-known Stigmer platform environment variable keys
 //
-// These env vars configure MCP server subprocesses (and agents) to
-// communicate back to the Stigmer backend. Because the SDK client
-// already knows the server address and auth credential, the setup
-// hooks can skip prompting users for these values and inject them
-// automatically at session creation time.
+// A platform value comes from the component that knows it, fills only a key
+// that is still missing, and reaches only a server that declares it
+// (stigmer/stigmer#1446). The page is not that component for any key, so
+// this SDK supplies none: a value it wrote into a run's runtime env would
+// sit in the top merge layer, above every value a user saved, and a run
+// whose agent declares no env would carry it into the agent's shell.
+//
+// STIGMER_SERVER_ADDRESS is the one key the platform fills. The runner
+// writes it for a server that declares it and holds no value: from the
+// server's public address, which the server hands every sandbox it
+// provisions, or for a stdio child from the endpoint the runner dials
+// itself (backend/services/runner, the platform-server-address module).
+//
+// STIGMER_API_KEY is not a platform key. A server that calls the Stigmer
+// API declares it like any other secret, and its user saves an API key for
+// it; nothing hands a user-defined server the signed-in user's bearer.
 // ---------------------------------------------------------------------------
 
-const STIGMER_SERVER_ADDRESS = "STIGMER_SERVER_ADDRESS";
-const STIGMER_API_KEY = "STIGMER_API_KEY";
-
 /**
- * Environment variable keys that the SDK can resolve automatically
- * from the current {@link Stigmer} client context.
+ * Environment variable keys the platform fills itself, so the setup hooks
+ * never prompt a user for them and the credential forms never ask for them.
  *
- * Used by setup hooks to exclude these keys from the "missing
- * variables" prompt and by the session composer to inject their
- * values into runtime env at submit time.
- *
- * Platform builders who manage setup hooks directly can use this
- * set to extend their own `poolKeys`.
+ * Platform builders who manage setup hooks directly can use this set to
+ * extend their own `poolKeys`.
  */
 export const SYSTEM_ENV_VAR_KEYS: ReadonlySet<string> = new Set([
-  STIGMER_SERVER_ADDRESS,
-  STIGMER_API_KEY,
+  "STIGMER_SERVER_ADDRESS",
 ]);
-
-/**
- * Convert an HTTP(S) base URL to a gRPC host:port address.
- *
- * The Stigmer server serves both gRPC and gRPC-Web on the same
- * endpoint, so stripping the protocol and extracting host:port
- * produces a valid gRPC dial target.
- *
- * @example
- * ```ts
- * toGrpcAddress("http://localhost:7234")   // "localhost:7234"
- * toGrpcAddress("https://api.stigmer.ai")  // "api.stigmer.ai:443"
- * toGrpcAddress("https://api.stigmer.ai:8443") // "api.stigmer.ai:8443"
- * ```
- */
-export function toGrpcAddress(httpUrl: string): string {
-  try {
-    const url = new URL(httpUrl);
-    const host = url.hostname;
-    const port =
-      url.port || (url.protocol === "https:" ? "443" : "80");
-    return `${host}:${port}`;
-  } catch {
-    return httpUrl;
-  }
-}
-
-/**
- * Build system env var entries from raw connection parameters.
- *
- * Pure function — no side effects, no async. Suitable for unit
- * testing without a live Stigmer client.
- *
- * @param baseUrl - The Stigmer client's base URL (HTTP).
- * @param credential - Current auth credential, or `null` for
- *   unauthenticated (OSS) backends. When `null`, a placeholder
- *   value is used so the MCP server env var is always populated.
- */
-export function buildSystemEnvVars(
-  baseUrl: string,
-  credential: string | null,
-): Record<string, EnvVarInput> {
-  return {
-    [STIGMER_SERVER_ADDRESS]: {
-      value: toGrpcAddress(baseUrl),
-      isSecret: false,
-      description:
-        "Auto-resolved from the current Stigmer connection.",
-    },
-    [STIGMER_API_KEY]: {
-      value: credential || "unused",
-      isSecret: true,
-      description:
-        "Auto-resolved from the current Stigmer auth context.",
-    },
-  };
-}
-
-/**
- * Resolve system env var values from a live {@link Stigmer} client.
- *
- * Calls {@link Stigmer.getAuthCredential} to obtain the current
- * credential, then delegates to {@link buildSystemEnvVars}.
- *
- * Intended for use at session submit time — the returned values
- * are injected into `runtimeEnv` at the **lowest priority** so
- * any user-provided values (personal env, manual secrets) win.
- */
-export async function resolveSystemEnvVarValues(
-  stigmer: Stigmer,
-): Promise<Record<string, EnvVarInput>> {
-  const credential = await stigmer.getAuthCredential();
-  return buildSystemEnvVars(stigmer.baseUrl, credential);
-}
-
-/**
- * Resolve only the system env vars that the target resource actually
- * declares in its environment specification.
- *
- * System vars (`STIGMER_SERVER_ADDRESS`, `STIGMER_API_KEY`) should
- * only be injected when the resource needs them — blindly injecting
- * them causes `runtime_env` to be non-empty on the wire, which
- * changes the backend's missing-credential tolerance semantics.
- *
- * @param stigmer - Live Stigmer client for credential resolution.
- * @param declaredEnvKeys - The set of env var keys the target
- *   resource declares (e.g., `Object.keys(mcpServer.spec.env)`).
- *   Only system vars whose keys appear here are included.
- * @returns Filtered system env vars (may be empty).
- */
-export async function resolveDeclaredSystemEnvVars(
-  stigmer: Stigmer,
-  declaredEnvKeys: ReadonlySet<string> | readonly string[],
-): Promise<Record<string, EnvVarInput>> {
-  const keys =
-    declaredEnvKeys instanceof Set
-      ? declaredEnvKeys
-      : new Set(declaredEnvKeys);
-
-  const hasDeclared = [...SYSTEM_ENV_VAR_KEYS].some((k) => keys.has(k));
-  if (!hasDeclared) {
-    return {};
-  }
-
-  const all = await resolveSystemEnvVarValues(stigmer);
-  const filtered: Record<string, EnvVarInput> = {};
-  for (const [key, value] of Object.entries(all)) {
-    if (keys.has(key)) {
-      filtered[key] = value;
-    }
-  }
-  return filtered;
-}

package/src/execution/ArtifactFileContent.tsx

@@ -4,6 +4,7 @@
 // unavailable / text). Domain: execution (data-model-agnostic).
 
 import { ArtifactContentRenderer } from "./ArtifactContentRenderer.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 /** Props for {@link ArtifactFileContent}. */
 export interface ArtifactFileContentProps {
@@ -44,7 +45,7 @@ export function ArtifactFileContent({
 }: ArtifactFileContentProps) {
   if (isLoading) {
     return (
-      <div className="stg:space-y-2 stg:p-4" aria-busy="true" aria-label="Loading content">
+      <LoadingRegion className="stg:space-y-2 stg:p-4" label="Loading content">
         {SKELETON_LINE_WIDTHS.map((width, i) => (
           <div
             key={i}
@@ -53,7 +54,7 @@ export function ArtifactFileContent({
             aria-hidden="true"
           />
         ))}
-      </div>
+      </LoadingRegion>
     );
   }
 

package/src/execution/McpToolDetail.tsx

@@ -19,6 +19,7 @@ import { execIdFromStorageKey } from "./useFileChangeContent.js";
 import { useArtifactDownloadUrl } from "./useArtifactDownloadUrl.js";
 import { useArtifactDownload } from "./useArtifactDownload.js";
 import { useToolOutputContent } from "./useToolOutputContent.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 /** Props for {@link McpToolDetail}. */
 export interface McpToolDetailProps {
@@ -115,10 +116,9 @@ function McpOffloadedImage({ storageKey }: { readonly storageKey: string }) {
   }
   if (!url) {
     return (
-      <div
+      <LoadingRegion
         className="stg:h-40 stg:w-64 stg:animate-pulse stg:rounded-md stg:border stg:border-border stg:bg-muted"
-        aria-busy="true"
-        aria-label="Loading image output"
+        label="Loading image output"
       />
     );
   }

package/src/execution/RecalledMemoriesCard.tsx

@@ -90,7 +90,7 @@ export const RecalledMemoriesCard = memo(function RecalledMemoriesCard({
         onClick={() => setExpanded((prev) => !prev)}
         className={cn(
           "stg:flex stg:w-full stg:items-center stg:gap-3 stg:px-3 stg:py-2 stg:text-left",
-          "stg:text-xs stg:text-muted-foreground hover:stg:text-foreground",
+          "stg:text-xs stg:text-muted-foreground stg:hover:text-foreground",
         )}
       >
         <MemoryIcon />

package/src/execution/ResultView.tsx

@@ -25,6 +25,7 @@ import { execIdFromStorageKey } from "./useFileChangeContent.js";
 import { useArtifactDownloadUrl } from "./useArtifactDownloadUrl.js";
 import { useArtifactDownload } from "./useArtifactDownload.js";
 import { useToolOutputContent } from "./useToolOutputContent.js";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 /** Props for {@link ResultView}. */
 export interface ResultViewProps {
@@ -509,10 +510,9 @@ function OutputRefImage({ storageKey, className }: { storageKey: string; classNa
   }
   if (!url) {
     return (
-      <div
+      <LoadingRegion
         className={cn("stg:h-40 stg:w-64 stg:animate-pulse stg:rounded-md stg:border stg:border-border stg:bg-muted", className)}
-        aria-busy="true"
-        aria-label="Loading image output"
+        label="Loading image output"
       />
     );
   }

package/src/execution/TerminalSession.tsx

@@ -128,7 +128,7 @@ export function TerminalTail({
   const combined = [stdout, stderr]
     .filter((s): s is string => Boolean(s))
     .join("\n")
-    .replace(/\s+$/, "");
+    .trimEnd();
   const lines = combined ? normalize(combined).split("\n") : [];
   const tail = lines.slice(-TAIL_LINE_LIMIT);
   const hiddenCount = lines.length - tail.length;

package/src/execution/ThreadSkeleton.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { cn } from "@stigmer/theme";
+import { LoadingRegion } from "../internal/LoadingRegion.js";
 
 /** Props for {@link ThreadSkeleton}. */
 export interface ThreadSkeletonProps {
@@ -30,10 +31,9 @@ const AI_LINE_WIDTHS = [
  */
 export function ThreadSkeleton({ className }: ThreadSkeletonProps) {
   return (
-    <div
+    <LoadingRegion
       className={cn("stg:flex stg:flex-col stg:gap-4 stg:pt-6 stg:pb-4", className)}
-      aria-busy="true"
-      aria-label="Loading conversation"
+      label="Loading conversation"
     >
       <div className="stg:animate-pulse stg:space-y-4">
         {/* Turn 1: Human bubble */}
@@ -68,6 +68,6 @@ export function ThreadSkeleton({ className }: ThreadSkeletonProps) {
           ))}
         </div>
       </div>
-    </div>
+    </LoadingRegion>
   );
 }

package/src/execution/file-path-resolver.ts

@@ -1,4 +1,5 @@
 import type { WorkspaceEntry } from "@stigmer/protos/ai/stigmer/agentic/session/v1/workspace_pb";
+import { trimTrailing } from "../internal/trim.js";
 
 const PLATFORM_PREFIX = ".stigmer/";
 const PLATFORM_DIR_NAME = ".stigmer";
@@ -71,7 +72,7 @@ export interface DisplayPath {
  */
 export function splitDisplayPath(path: string): DisplayPath {
   if (!path) return { dir: "", base: "" };
-  const trimmed = path.replace(/\/+$/, "");
+  const trimmed = trimTrailing(path, "/");
   const idx = trimmed.lastIndexOf("/");
   if (idx < 0) return { dir: "", base: trimmed };
   const base = trimmed.slice(idx + 1);
@@ -239,7 +240,7 @@ function matchWorkspaceEntry(
 
 function joinLocalPath(base: string, rel: string): string {
   if (!rel) return base;
-  const cleanBase = base.replace(/\/+$/, "");
+  const cleanBase = trimTrailing(base, "/");
   const cleanRel = rel.replace(/^\/+/, "");
   return `${cleanBase}/${cleanRel}`;
 }