@stigmer/react 3.1.14 → 3.1.16

package/src/session/useNewSessionFlow.ts

@@ -10,8 +10,8 @@ import { DEFAULT_HARNESS, type HarnessOption } from "../models/harness.js";
 import { useWorkspaceEntries, type UseWorkspaceEntriesReturn } from "../workspace/index.js";
 import { useSessionVariables, type UseSessionVariablesReturn } from "../execution/useSessionVariables.js";
 import type { SessionComposerSubmitContext } from "../composer/index.js";
+import { useStigmer } from "../hooks.js";
 import { withTimeout } from "../internal/withTimeout.js";
-import { useCreateSession } from "./useCreateSession.js";
 import { useCreateAgentExecution } from "../execution/useCreateAgentExecution.js";
 import type { ExecutionTargetOption } from "./execution-target.js";
 import { useExecutionTarget } from "../execution-target-context.js";
@@ -140,8 +140,9 @@ export interface UseNewSessionFlowReturn {
    * Create a session with the first execution.
    *
    * Composes all managed state (agent, workspace, MCP servers, skills,
-   * model, session variables) into the session and execution
-   * creation RPCs, then calls `onSessionCreated` on success.
+   * model, session variables) into a single bootstrap RPC —
+   * `agentExecution.create` with an embedded session spec — then calls
+   * `onSessionCreated` on success.
    *
    * The `model` parameter overrides `modelId` for this submission only
    * (used when SessionComposer passes a per-message model selection).
@@ -160,7 +161,9 @@ export interface UseNewSessionFlowReturn {
  * model selection (with localStorage persistence), agent resolution,
  * MCP server/skill selection, workspace entries, and session
  * variables. On submission, creates the session and its first execution
- * in sequence, then notifies the consumer via `onSessionCreated`.
+ * with a single one-call bootstrap RPC (`agentExecution.create` with an
+ * embedded session spec), then notifies the consumer via
+ * `onSessionCreated`.
  *
  * This hook is framework-agnostic — it works identically in Next.js,
  * Vite, Tauri, or any React environment. Navigation, toast notifications,
@@ -210,8 +213,8 @@ export function useNewSessionFlow(
     return defaultHarness ?? DEFAULT_HARNESS;
   });
 
+  const stigmer = useStigmer();
   const { getModel, isLoading: isModelsLoading } = useModelRegistry({ harness });
-  const { create: createSession } = useCreateSession();
   const { create: createExecution } = useCreateAgentExecution();
   // Guests cannot read the org default agent (and must never run it) —
   // `null` puts the hook in its stable no-op mode, and the submit path
@@ -296,8 +299,7 @@ export function useNewSessionFlow(
           ? await resolveExecutionRuntimeEnv(getRuntimeEnv, context?.runtimeEnv)
           : context?.runtimeEnv;
 
-        const sessionFields = {
-          org,
+        const sessionSpecBase = {
           workspaceEntries: workspace.hasEntries
             ? workspace.toInput()
             : undefined,
@@ -317,19 +319,21 @@ export function useNewSessionFlow(
           workspaceFileRefs: context?.workspaceFileRefs,
         };
 
-        let sessionId: string;
+        // Resolve which agent the bootstrapped session runs against: an
+        // explicit instance when one is known, otherwise an agent ID the
+        // server resolves to its default instance (creating it if missing).
+        let agentInstanceId: string | undefined;
+        let agentId: string | undefined;
 
         if (agentRef && resolution) {
           if (resolution.mode === "saved") {
-            ({ sessionId } = await createSession({
-              ...sessionFields,
-              agentInstanceId: resolution.instanceId,
-            }));
+            agentInstanceId = resolution.instanceId;
           } else {
-            ({ sessionId } = await createSession({
-              ...sessionFields,
-              agentRef,
-            }));
+            // Slug reference → agent ID; the server handles instance
+            // resolution, including auto-creating a missing default
+            // instance (which a client-side lookup cannot).
+            const agent = await stigmer.agent.getByReference(agentRef);
+            agentId = agent.metadata!.id;
           }
         } else if (isGuest) {
           // Fail closed: a guest session is only ever created against the
@@ -360,32 +364,29 @@ export function useNewSessionFlow(
               );
             }
           }
-          ({ sessionId } = await createSession({
-            ...sessionFields,
-            agentInstanceId: resolvedInstanceId,
-          }));
+          agentInstanceId = resolvedInstanceId;
         }
 
-        // Local execution: attach the session's runner worker before creating
-        // the first execution. The session view (useSessionConversation) owns
-        // the steady-state lifecycle, but it is not mounted yet — navigation
-        // happens after onSessionCreated below — so without this eager attach
-        // the first execution would have no poller until the view mounts.
+        // One-call bootstrap: the embedded session spec and the first
+        // message travel in a single create — the server creates the
+        // session and dispatches the execution atomically.
+        const { sessionId } = await createExecution({
+          ...executionFields,
+          agentId,
+          sessionSpec: { ...sessionSpecBase, agentInstanceId },
+        });
+
+        // Local execution: attach the session's runner worker now that the
+        // session ID is known. The session view (useSessionConversation)
+        // owns the steady-state lifecycle, but it is not mounted yet —
+        // navigation happens after onSessionCreated below. Attaching after
+        // the create is safe: the first activity waits on the session's
+        // task queue for a worker (5-minute ScheduleToStart window), so the
+        // worker attached here picks it up immediately.
         if (adapter && executionTarget === "local") {
           await adapter.onSessionOpened(sessionId);
         }
 
-        try {
-          await createExecution({ ...executionFields, sessionId });
-        } catch (err) {
-          // The first execution failed and the session view will not mount,
-          // so detach the worker we just attached to avoid leaking it.
-          if (adapter && executionTarget === "local") {
-            adapter.onSessionClosed(sessionId).catch(() => {});
-          }
-          throw err;
-        }
-
         sessionVariables.clear();
         onSessionCreated(sessionId);
       } catch (err) {
@@ -414,7 +415,7 @@ export function useNewSessionFlow(
       isDefaultAgentLoading,
       defaultAgentError,
       waitForDefaultAgent,
-      createSession,
+      stigmer.agent,
       createExecution,
       sessionVariables,
       onSessionCreated,

package/src/sharing/AgentShareList.tsx

@@ -10,6 +10,8 @@ import {
 import type { Agent } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/api_pb";
 import type { AgentShare } from "@stigmer/protos/ai/stigmer/agentic/agentshare/v1/api_pb";
 import { toast } from "../feedback/toast.js";
+import { Button } from "../button/Button.js";
+import { EmptyState } from "../empty-state/EmptyState.js";
 import { PermissionGate } from "../iam-policy/PermissionGate.js";
 import { ConfirmDialog } from "../resource-detail/ConfirmDialog.js";
 import { useConfirmAction } from "../resource-detail/useConfirmAction.js";
@@ -30,9 +32,10 @@ export interface AgentShareListProps {
   /** The agent whose shares are managed. */
   readonly agent: Agent;
   /**
-   * The viewer's active organization slug. A share created from this
-   * list lands in this org — its URL, billing, and credentials belong
-   * to it (a **cross-org share** when it differs from the agent's org,
+   * The viewer's active organization slug. Scopes the list to this
+   * org's channels of the agent, and a share created from this list
+   * lands in this org — its URL, billing, and credentials belong to it
+   * (a **cross-org share** when it differs from the agent's org,
    * decision 013). Omit to default to the agent's own org.
    */
   readonly viewerOrg?: string;
@@ -52,10 +55,11 @@ export interface AgentShareListProps {
  * agent analog of {@link AgentInstanceList}, rendered in the agent
  * detail view's Shares tab.
  *
- * Lists every share the viewer can see (the server FGA-filters
- * `getByAgent`, so each org's members see their own org's channels and
- * never another org's — decision 013), with per-row copy link, edit,
- * pause/resume, reset link, and delete. Creation goes through the same
+ * Lists the viewer's active org's channels of the agent: `viewerOrg`
+ * scopes the `getByAgent` call server-side, so a member of several orgs
+ * sees exactly the current org context's channels — never a merged list
+ * of every org's (decision 013 amendment). Per-row actions: copy link,
+ * edit, pause/resume, reset link, delete. Creation goes through the same
  * {@link ShareAgentDialog} and always lands in the viewer's active org;
  * the create bar mirrors the server's via
  * {@link useCanCreateAgentShare}, so the button never appears to a user
@@ -74,7 +78,13 @@ export function AgentShareList({
   className,
 }: AgentShareListProps) {
   const agentId = agent.metadata?.id ?? "";
-  const { shares, isLoading, error, refetch } = useAgentShares(agentId);
+  // Scope the list to the org whose context the viewer is in; when the
+  // host passes no viewerOrg the scope falls back to the agent's own org
+  // (the same-org owner flow), matching where creation would land.
+  const { shares, isLoading, error, refetch } = useAgentShares(
+    agentId,
+    viewerOrg || (agent.metadata?.org ?? ""),
+  );
   const { allowed: canCreate, shareOrg } = useCanCreateAgentShare(
     agent,
     viewerOrg,
@@ -142,20 +152,14 @@ export function AgentShareList({
               {shares.length} {shares.length === 1 ? "share" : "shares"}
             </h3>
             {canCreate && (
-              <button
-                type="button"
+              <Button
+                variant="outline"
+                size="xs"
+                icon={<PlusIcon />}
                 onClick={() => setEditor({ mode: "create" })}
-                className={cn(
-                  "inline-flex items-center gap-1 rounded-md px-2.5 py-1",
-                  "text-xs font-medium",
-                  "border border-border text-foreground",
-                  "hover:bg-accent-hover",
-                  "focus:outline-none focus:ring-2 focus:ring-ring",
-                )}
               >
-                <PlusIcon />
                 Create share
-              </button>
+              </Button>
             )}
           </div>
 
@@ -428,30 +432,21 @@ function ShareEmptyState({
   readonly onCreateClick: () => void;
 }) {
   return (
-    <div className="flex flex-col items-center gap-2 py-12 text-center">
-      <ShareIcon className="size-10 text-muted-foreground-faint" />
-      <p className="text-sm font-medium text-muted-foreground">No shares yet</p>
-      <p className="max-w-sm text-xs text-muted-foreground-subtle">
-        A share gives this agent a hosted chat link you can send or embed —
-        each share is its own channel with its own audience, embed origins,
-        and tool credentials.
-      </p>
-      {canCreate && (
-        <button
-          type="button"
-          onClick={onCreateClick}
-          className={cn(
-            "mt-2 inline-flex items-center gap-1 rounded-md px-3 py-1.5",
-            "text-xs font-medium",
-            "bg-primary text-primary-foreground hover:bg-primary-hover",
-            "focus:outline-none focus:ring-2 focus:ring-ring",
-          )}
-        >
-          <PlusIcon />
-          Create share
-        </button>
-      )}
-    </div>
+    <EmptyState
+      variant="first-use"
+      icon={<ShareIcon className="size-10" />}
+      title="No shares yet"
+      description={
+        "A share gives this agent a hosted chat link you can send or embed — " +
+        "each share is its own channel with its own audience, embed origins, " +
+        "and tool credentials."
+      }
+      action={
+        canCreate
+          ? { label: "Create share", onClick: onCreateClick, icon: <PlusIcon /> }
+          : undefined
+      }
+    />
   );
 }
 

package/src/sharing/__tests__/useAgentShares.test.tsx

@@ -59,7 +59,48 @@ describe("useAgentShares", () => {
     expect(result.current.shares).toEqual([share]);
     expect(result.current.error).toBeNull();
     expect(getByAgent).toHaveBeenCalledWith(
-      expect.objectContaining({ agentId: "agt_1" }),
+      expect.objectContaining({ agentId: "agt_1", org: "" }),
+    );
+  });
+
+  it("threads the org scope into the request", async () => {
+    // The org scope belongs in the RPC, never client-side filtering: the
+    // server narrows a multi-org member's view to one org's channels.
+    const getByAgent = vi
+      .fn()
+      .mockResolvedValue({ totalCount: 0, items: [] });
+    const client = createMockStigmer({ getByAgent });
+
+    const { result } = renderHook(() => useAgentShares("agt_1", "acme"), {
+      wrapper: wrapper(client),
+    });
+
+    await waitFor(() => expect(result.current.isLoading).toBe(false));
+    expect(getByAgent).toHaveBeenCalledWith(
+      expect.objectContaining({ agentId: "agt_1", org: "acme" }),
+    );
+  });
+
+  it("refetches when the org scope changes", async () => {
+    const getByAgent = vi
+      .fn()
+      .mockResolvedValue({ totalCount: 0, items: [] });
+    const client = createMockStigmer({ getByAgent });
+
+    const { result, rerender } = renderHook(
+      ({ org }: { org: string }) => useAgentShares("agt_1", org),
+      { wrapper: wrapper(client), initialProps: { org: "acme" } },
+    );
+
+    await waitFor(() => expect(result.current.isLoading).toBe(false));
+    expect(getByAgent).toHaveBeenCalledTimes(1);
+
+    // Switching org context must re-query — a stale other-org list is
+    // exactly the bug the scope exists to prevent.
+    rerender({ org: "consumer-org" });
+    await waitFor(() => expect(getByAgent).toHaveBeenCalledTimes(2));
+    expect(getByAgent).toHaveBeenLastCalledWith(
+      expect.objectContaining({ agentId: "agt_1", org: "consumer-org" }),
     );
   });
 

package/src/sharing/useAgentShares.ts

@@ -26,33 +26,39 @@ export interface UseAgentSharesReturn {
 }
 
 /**
- * Data hook that loads all of an agent's {@link AgentShare} resources —
- * the channels carrying its hosted-chat configuration (audience, allowed
+ * Data hook that loads an agent's {@link AgentShare} resources — the
+ * channels carrying its hosted-chat configuration (audience, allowed
  * origins, visitor messages, tool credentials, link token).
  *
  * Sharing is channel configuration, not agent behavior (decision 011):
  * an agent can carry N shares, each with its own URL, billing org, and
- * credentials (decision 011 D3 + decision 013 cross-org shares). This
- * hook returns the full list; the server already scopes it to shares the
- * caller can view (FGA-filtered in cloud, unfiltered in the single-user
- * OSS edition), so a viewer sees their own org's channels and never
- * another org's.
+ * credentials (decision 011 D3 + decision 013 cross-org shares).
+ *
+ * Pass `org` to scope the list to one organization's channels — the
+ * org-context view a console tab needs. Permissions alone cannot provide
+ * this scope: a member of several orgs can view all of their orgs'
+ * channels of the agent, so the unscoped list merges them. The server
+ * applies the scope (it only ever narrows the permission-bounded view);
+ * omit `org` for the full permission-bounded list.
  *
  * Pass an empty `agentId` to skip fetching (stable no-op) — useful
  * while the agent is still loading.
  *
  * @example
  * ```tsx
- * const { shares, isLoading, refetch } = useAgentShares(agent?.metadata?.id ?? "");
+ * const { shares, isLoading, refetch } = useAgentShares(
+ *   agent?.metadata?.id ?? "",
+ *   viewerOrg,
+ * );
  * ```
  */
-export function useAgentShares(agentId: string): UseAgentSharesReturn {
+export function useAgentShares(agentId: string, org?: string): UseAgentSharesReturn {
   const stigmer = useStigmer();
 
   const fetchFn = agentId
     ? async () => {
         const result = await stigmer.agentShare.getByAgent(
-          create(GetAgentSharesByAgentRequestSchema, { agentId }),
+          create(GetAgentSharesByAgentRequestSchema, { agentId, org: org ?? "" }),
         );
         return result.items;
       }
@@ -60,7 +66,7 @@ export function useAgentShares(agentId: string): UseAgentSharesReturn {
 
   const { data: shares, isLoading, isRefetching, error, refetch } = useFetch(
     fetchFn,
-    [agentId, stigmer],
+    [agentId, org, stigmer],
     [] as AgentShare[],
   );
 

package/src/workflow/WorkflowDetailView.tsx

@@ -76,6 +76,13 @@ export interface WorkflowDetailViewProps {
    * Receives the execution ID — use for navigation to the execution viewer.
    */
   readonly onExecutionClick?: (executionId: string) => void;
+  /**
+   * The viewer's active organization slug, feeding the Instances tab:
+   * it scopes the list to this org's instances of the workflow, so a
+   * member of several orgs sees the current org context only. Omit to
+   * default to the workflow's own org.
+   */
+  readonly viewerOrg?: string;
   /**
    * Called when the user clicks "Create Instance" in the Instances tab.
    * Opens the create instance dialog.
@@ -157,6 +164,7 @@ export function WorkflowDetailView({
   onTabChange,
   defaultTab,
   onExecutionClick,
+  viewerOrg,
   onCreateInstanceClick,
   onInstanceClick,
   onInstanceRunClick,
@@ -300,6 +308,7 @@ export function WorkflowDetailView({
         workflowId={meta?.id ?? ""}
         defaultInstanceId={workflow?.status?.defaultInstanceId}
         org={org}
+        viewerOrg={viewerOrg}
         onCreateClick={onCreateInstanceClick}
         onInstanceClick={onInstanceClick}
         onRunClick={onInstanceRunClick}

package/src/workflow/instance/WorkflowInstanceEmptyState.tsx

@@ -1,10 +1,10 @@
 "use client";
 
-import { cn } from "@stigmer/theme";
+import { EmptyState } from "../../empty-state/EmptyState.js";
 
 /** Props for {@link WorkflowInstanceEmptyState}. */
 export interface WorkflowInstanceEmptyStateProps {
-  /** Called when the user clicks "Create Instance". */
+  /** Called when the user clicks "Create instance". */
   readonly onCreateClick?: () => void;
   /** Additional CSS class names. */
   readonly className?: string;
@@ -15,62 +15,43 @@ export interface WorkflowInstanceEmptyStateProps {
  *
  * Communicates the value proposition of workflow instances without
  * mentioning the platform-managed default instance (implementation detail).
+ *
+ * A thin composition over the shared {@link EmptyState} primitive: only the
+ * icon and copy are specific to workflow instances.
  */
 export function WorkflowInstanceEmptyState({
   onCreateClick,
   className,
 }: WorkflowInstanceEmptyStateProps) {
   return (
-    <div
-      className={cn(
-        "flex flex-col items-center justify-center py-12 px-6 text-center",
-        className,
-      )}
-    >
-      <div className="mb-4 rounded-full bg-muted p-3">
-        <LayersIcon />
-      </div>
-
-      <h3 className="text-sm font-semibold text-foreground mb-1">
-        No instances yet
-      </h3>
-
-      <p className="text-sm text-muted-foreground max-w-sm mb-6">
-        Create instances to run this workflow with different configurations
-        and access controls. Each instance binds environments (credentials,
-        secrets, settings) and can be shared independently.
-      </p>
-
-      {onCreateClick && (
-        <button
-          type="button"
-          onClick={onCreateClick}
-          className={cn(
-            "inline-flex items-center gap-1.5 rounded-md px-3 py-1.5",
-            "text-sm font-medium",
-            "bg-primary text-primary-foreground",
-            "hover:bg-primary/90",
-            "focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
-          )}
-        >
-          <PlusIcon />
-          Create Instance
-        </button>
-      )}
-    </div>
+    <EmptyState
+      variant="first-use"
+      icon={<LayersIcon />}
+      title="No instances yet"
+      description={
+        "Create instances to run this workflow with different configurations " +
+        "and access controls. Each instance binds environments (credentials, " +
+        "secrets, settings) and can be shared independently."
+      }
+      action={
+        onCreateClick
+          ? { label: "Create instance", onClick: onCreateClick, icon: <PlusIcon /> }
+          : undefined
+      }
+      className={className}
+    />
   );
 }
 
 function LayersIcon() {
   return (
-    <svg width="20" height="20" viewBox="0 0 20 20" fill="none" aria-hidden="true">
+    <svg width="24" height="24" viewBox="0 0 20 20" fill="none" aria-hidden="true">
       <path
         d="M10 2L2 6l8 4 8-4-8-4zM2 10l8 4 8-4M2 14l8 4 8-4"
         stroke="currentColor"
         strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
-        className="text-muted-foreground"
       />
     </svg>
   );
@@ -78,8 +59,8 @@ function LayersIcon() {
 
 function PlusIcon() {
   return (
-    <svg width="14" height="14" viewBox="0 0 14 14" fill="none" aria-hidden="true">
-      <path d="M7 2v10M2 7h10" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
+    <svg width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true">
+      <path d="M6 2v8M2 6h8" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
     </svg>
   );
 }

package/src/workflow/instance/WorkflowInstanceList.tsx

@@ -5,6 +5,7 @@ import { cn } from "@stigmer/theme";
 import type { WorkflowInstance } from "@stigmer/protos/ai/stigmer/agentic/workflowinstance/v1/api_pb";
 import { ApiResourceVisibility } from "@stigmer/protos/ai/stigmer/commons/apiresource/enum_pb";
 import { useWorkflowInstances } from "../useWorkflowInstances.js";
+import { Button } from "../../button/Button.js";
 import { useEnvironmentList } from "../../environment/useEnvironmentList.js";
 import { ResourceVisibilityControl } from "../../library/ResourceVisibilityControl.js";
 import { PermissionGate } from "../../iam-policy/PermissionGate.js";
@@ -16,8 +17,19 @@ export interface WorkflowInstanceListProps {
   readonly workflowId: string;
   /** The default instance ID (from workflow.status.defaultInstanceId) — filtered out of the list. */
   readonly defaultInstanceId?: string;
-  /** Organization slug (needed for environment resolution and create flow). */
+  /**
+   * The WORKFLOW's organization slug (needed for environment resolution
+   * and the create flow). Not the list scope — that is `viewerOrg`,
+   * which differs from `org` when viewing another org's workflow.
+   */
   readonly org: string;
+  /**
+   * The viewer's active organization slug. Scopes the list to this
+   * org's instances of the workflow, so a member of several orgs sees
+   * exactly the current org context's instances. Omit to default to
+   * the workflow's own org.
+   */
+  readonly viewerOrg?: string;
   /** Called when the user wants to create a new instance. */
   readonly onCreateClick?: () => void;
   /** Called when the user clicks an instance row. */
@@ -45,6 +57,7 @@ export function WorkflowInstanceList({
   workflowId,
   defaultInstanceId,
   org,
+  viewerOrg,
   onCreateClick,
   onInstanceClick,
   onRunClick,
@@ -52,7 +65,13 @@ export function WorkflowInstanceList({
   refreshKey,
   className,
 }: WorkflowInstanceListProps) {
-  const { instances, isLoading, error, refetch } = useWorkflowInstances(workflowId);
+  // Scope the list to the org whose context the viewer is in; when the
+  // host passes no viewerOrg the scope falls back to the workflow's own
+  // org (the same-org owner flow).
+  const { instances, isLoading, error, refetch } = useWorkflowInstances(
+    workflowId,
+    viewerOrg || org,
+  );
   const { environments } = useEnvironmentList(org);
 
   // Refetch when refreshKey changes (signals external mutation like create/delete)
@@ -100,27 +119,21 @@ export function WorkflowInstanceList({
           {userInstances.length} {userInstances.length === 1 ? "instance" : "instances"}
         </h3>
         {onCreateClick && (
-          <button
-            type="button"
+          <Button
+            variant="outline"
+            size="xs"
+            icon={<PlusIcon />}
             onClick={onCreateClick}
-            className={cn(
-              "inline-flex items-center gap-1 rounded-md px-2.5 py-1",
-              "text-xs font-medium",
-              "border border-border text-foreground",
-              "hover:bg-accent-hover",
-              "focus:outline-none focus:ring-2 focus:ring-ring",
-            )}
           >
-            <PlusIcon />
-            Create
-          </button>
+            Create instance
+          </Button>
         )}
       </div>
 
       <div className="overflow-hidden rounded-lg border border-border">
         <table className="w-full text-sm">
           <thead>
-            <tr className="border-b border-border bg-muted/50">
+            <tr className="border-b border-border bg-muted-subtle">
               <th className="px-4 py-2 text-left font-medium text-muted-foreground">Name</th>
               <th className="px-4 py-2 text-left font-medium text-muted-foreground">Environments</th>
               <th className="px-4 py-2 text-left font-medium text-muted-foreground">Visibility</th>
@@ -267,7 +280,7 @@ function LoadingSkeleton() {
   return (
     <div className="space-y-2 py-4">
       {[1, 2, 3].map((i) => (
-        <div key={i} className="h-12 rounded-md bg-muted/50 animate-pulse" />
+        <div key={i} className="h-12 animate-pulse rounded-md bg-muted-faint" />
       ))}
     </div>
   );

package/src/workflow/useWorkflowInstances.ts

@@ -21,21 +21,27 @@ export interface UseWorkflowInstancesReturn {
 }
 
 /**
- * Data hook that fetches all instances for a specific workflow.
+ * Data hook that fetches instances for a specific workflow.
  *
  * Wraps `stigmer.workflowInstance.getByWorkflow()` with loading
  * and error state management. Used on the Workflow detail page
  * "Instances" tab to show environment-bound deployments.
  *
+ * Pass `org` to scope the list to one organization's instances — the
+ * org-context view a console tab needs. The server applies the scope
+ * (it only ever narrows the permission-bounded view); omit `org` for
+ * the full permission-bounded list.
+ *
  * Pass `null` as `workflowId` to skip fetching (stable no-op).
  *
  * @example
  * ```tsx
- * const { instances, isLoading } = useWorkflowInstances(workflow.metadata?.id);
+ * const { instances, isLoading } = useWorkflowInstances(workflow.metadata?.id, viewerOrg);
  * ```
  */
 export function useWorkflowInstances(
   workflowId: string | null | undefined,
+  org?: string,
 ): UseWorkflowInstancesReturn {
   const stigmer = useStigmer();
 
@@ -44,6 +50,7 @@ export function useWorkflowInstances(
         const resp = await stigmer.workflowInstance.getByWorkflow(
           create(GetWorkflowInstancesByWorkflowRequestSchema, {
             workflowId,
+            org: org ?? "",
           }),
         );
         return resp.entries ? [...resp.entries] : [];
@@ -56,7 +63,7 @@ export function useWorkflowInstances(
     isRefetching,
     error,
     refetch,
-  } = useFetch<readonly WorkflowInstance[]>(fetchFn, [workflowId, stigmer], []);
+  } = useFetch<readonly WorkflowInstance[]>(fetchFn, [workflowId, org, stigmer], []);
 
   return { instances, isLoading, isRefetching, error, refetch };
 }