@stigmer/react 0.0.79 → 0.0.80

package/mcp-server/useMcpServerSetup.js

@@ -1,9 +1,11 @@
 "use client";
 import { useCallback, useEffect, useMemo, useReducer, useRef } from "react";
+import { create } from "@bufbuild/protobuf";
+import { GetOAuthGrantStatusInputSchema } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/io_pb";
 import { ApiResourceKind } from "@stigmer/protos/ai/stigmer/commons/apiresource/apiresourcekind/api_resource_kind_pb";
 import { useStigmer } from "../hooks";
 import { usePersonalEnvironment } from "../environment/usePersonalEnvironment";
-import { diffEnvSpec } from "../environment/diffEnvSpec";
+import { diffEnv } from "../environment/diffEnv";
 import { toError } from "../internal/toError";
 import { mcpServerSetupReducer, INITIAL_MCP_SETUP_STATE, toServerKey, } from "./mcpServerSetupReducer";
 export { toServerKey } from "./mcpServerSetupReducer";
@@ -32,8 +34,8 @@ function computeDefaultEnabledTools(mcpServer, discoveredTools) {
  * MCP servers selected in the {@link McpServerPicker}.
  *
  * When a user toggles an MCP server ON, this hook fetches the server's
- * full resource, checks its `env_spec` against the personal environment
- * (via {@link diffEnvSpec}), and determines whether credentials are
+ * full resource, checks its `env` declarations against the personal
+ * environment (via {@link diffEnv}), and determines whether credentials are
  * needed. It also extracts discovered tools and approval policies for
  * the tool selector UI.
  *
@@ -59,7 +61,7 @@ function computeDefaultEnabledTools(mcpServer, discoveredTools) {
  * @param org - Organization slug. Pass `null` to disable.
  * @param poolKeys - Optional set of env-var keys already available
  *   from the session env pool (manual secrets, one-time env vars from
- *   other components). When provided, servers whose `env_spec` keys
+ *   other components). When provided, servers whose `env` keys
  *   are fully covered by `poolKeys` + personal env auto-resolve to
  *   `ready` without prompting. Reactive — when `poolKeys` changes,
  *   `needsSetup` entries are re-evaluated.
@@ -108,8 +110,8 @@ export function useMcpServerSetup(org, poolKeys) {
             const mcpServer = await stigmer.mcpServer.getByReference(ref);
             const discoveredTools = mcpServer.status?.discoveredCapabilities?.tools ?? [];
             const toolApprovals = mcpServer.spec?.pinnedToolApprovals ?? [];
-            const envSpecData = mcpServer.spec?.envSpec?.data;
-            if (!envSpecData || Object.keys(envSpecData).length === 0) {
+            const envDeclarations = mcpServer.spec?.env;
+            if (!envDeclarations || Object.keys(envDeclarations).length === 0) {
                 dispatch({
                     type: "RESOLVE_READY",
                     key,
@@ -121,8 +123,25 @@ export function useMcpServerSetup(org, poolKeys) {
                 return;
             }
             const existingKeys = new Set(Object.keys(personalEnv.environment?.spec?.data ?? {}));
-            const missingVariables = diffEnvSpec(envSpecData, existingKeys, poolKeys);
-            if (missingVariables.length === 0) {
+            const auth = mcpServer.spec?.auth;
+            if (auth?.targetEnvVar && mcpServer.metadata?.id) {
+                try {
+                    const grantStatus = await stigmer.mcpServer.getOAuthGrantStatus(create(GetOAuthGrantStatusInputSchema, {
+                        resourceId: mcpServer.metadata.id,
+                        org,
+                    }));
+                    if (grantStatus.connected) {
+                        existingKeys.add(auth.targetEnvVar);
+                    }
+                }
+                catch {
+                    // Non-fatal: if grant status lookup fails, the OAuth var stays
+                    // in missingVariables and the UI shows the sign-in button.
+                }
+            }
+            const allMissing = diffEnv(envDeclarations, existingKeys, poolKeys);
+            const requiredMissing = allMissing.filter((v) => !v.optional);
+            if (requiredMissing.length === 0) {
                 dispatch({
                     type: "RESOLVE_READY",
                     key,
@@ -137,7 +156,7 @@ export function useMcpServerSetup(org, poolKeys) {
                 type: "RESOLVE_NEEDS_SETUP",
                 key,
                 mcpServer,
-                missingVariables,
+                missingVariables: requiredMissing,
                 discoveredTools,
                 toolApprovals,
             });
@@ -215,12 +234,13 @@ export function useMcpServerSetup(org, poolKeys) {
         for (const [key, entry] of Object.entries(entriesRef.current)) {
             if (entry.status !== "needsSetup")
                 continue;
-            const envSpecData = entry.mcpServer.spec?.envSpec?.data;
-            if (!envSpecData)
+            const envDeclarations = entry.mcpServer.spec?.env;
+            if (!envDeclarations)
                 continue;
-            const missingVariables = diffEnvSpec(envSpecData, personalKeys, poolKeys);
+            const allMissing = diffEnv(envDeclarations, personalKeys, poolKeys);
+            const requiredMissing = allMissing.filter((v) => !v.optional);
             const enabledTools = computeDefaultEnabledTools(entry.mcpServer, entry.discoveredTools);
-            dispatch({ type: "POOL_RESOLVE", key, missingVariables, enabledTools });
+            dispatch({ type: "POOL_RESOLVE", key, missingVariables: requiredMissing, enabledTools });
         }
     }, [poolKeys, personalEnv.environment]);
     // -------------------------------------------------------------------------

package/mcp-server/useMcpServerSetup.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMcpServerSetup.js","sourceRoot":"","sources":["../../src/mcp-server/useMcpServerSetup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useMcpServerSetup.js","sourceRoot":"","sources":["../../src/mcp-server/useMcpServerSetup.ts"],"names":[],"mappings":"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"}

package/mcp-server/useOAuthGrantStatus.d.ts

@@ -0,0 +1,41 @@
+/** Return value of {@link useOAuthGrantStatus}. */
+export interface UseOAuthGrantStatusReturn {
+    /** Whether the user has an active OAuth grant for this resource + org. */
+    readonly connected: boolean;
+    /**
+     * When the access token expires (Unix timestamp seconds).
+     * `BigInt(0)` when no grant exists or the token does not expire.
+     */
+    readonly accessTokenExpiresAt: bigint;
+    /** The env var name managed by OAuth, or empty string when no grant exists. */
+    readonly targetEnvVar: string;
+    /** Auth method used (`"mcp_oauth"` or `"vendor_oauth"`), or empty string. */
+    readonly authMethod: string;
+    /** `true` while the grant status is being fetched. */
+    readonly isLoading: boolean;
+    /** Error from the last failed request, or `null` when healthy. */
+    readonly error: Error | null;
+    /** Discard cached data and re-fetch the grant status. */
+    readonly refetch: () => void;
+}
+/**
+ * Data hook that fetches the OAuth grant status for a single MCP server.
+ *
+ * Wraps `stigmer.mcpServer.getOAuthGrantStatus()` with loading, error,
+ * and idle state management. When `resourceId` or `org` changes, the
+ * previous in-flight request is discarded and a fresh fetch begins.
+ *
+ * Pass `null` for either parameter to skip fetching (stable no-op).
+ * This is useful when the MCP server resource has not loaded yet.
+ *
+ * @example
+ * ```tsx
+ * const grantStatus = useOAuthGrantStatus(mcpServer?.metadata?.id ?? null, org);
+ *
+ * if (grantStatus.isLoading) return <Spinner />;
+ * if (grantStatus.connected) return <span>Connected via OAuth</span>;
+ * return <button onClick={startOAuth}>Sign in</button>;
+ * ```
+ */
+export declare function useOAuthGrantStatus(resourceId: string | null, org: string | null): UseOAuthGrantStatusReturn;
+//# sourceMappingURL=useOAuthGrantStatus.d.ts.map

package/mcp-server/useOAuthGrantStatus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useOAuthGrantStatus.d.ts","sourceRoot":"","sources":["../../src/mcp-server/useOAuthGrantStatus.ts"],"names":[],"mappings":"AAQA,mDAAmD;AACnD,MAAM,WAAW,yBAAyB;IACxC,0EAA0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,+EAA+E;IAC/E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,sDAAsD;IACtD,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,kEAAkE;IAClE,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC7B,yDAAyD;IACzD,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;CAC9B;AAcD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,GAAG,EAAE,MAAM,GAAG,IAAI,GACjB,yBAAyB,CA6D3B"}

package/mcp-server/useOAuthGrantStatus.js

@@ -0,0 +1,91 @@
+"use client";
+import { useCallback, useEffect, useState } from "react";
+import { create } from "@bufbuild/protobuf";
+import { GetOAuthGrantStatusInputSchema } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/io_pb";
+import { useStigmer } from "../hooks";
+import { toError } from "../internal/toError";
+const BIGINT_ZERO = BigInt(0);
+const IDLE = {
+    connected: false,
+    accessTokenExpiresAt: BIGINT_ZERO,
+    targetEnvVar: "",
+    authMethod: "",
+    isLoading: false,
+    error: null,
+    refetch: () => { },
+};
+/**
+ * Data hook that fetches the OAuth grant status for a single MCP server.
+ *
+ * Wraps `stigmer.mcpServer.getOAuthGrantStatus()` with loading, error,
+ * and idle state management. When `resourceId` or `org` changes, the
+ * previous in-flight request is discarded and a fresh fetch begins.
+ *
+ * Pass `null` for either parameter to skip fetching (stable no-op).
+ * This is useful when the MCP server resource has not loaded yet.
+ *
+ * @example
+ * ```tsx
+ * const grantStatus = useOAuthGrantStatus(mcpServer?.metadata?.id ?? null, org);
+ *
+ * if (grantStatus.isLoading) return <Spinner />;
+ * if (grantStatus.connected) return <span>Connected via OAuth</span>;
+ * return <button onClick={startOAuth}>Sign in</button>;
+ * ```
+ */
+export function useOAuthGrantStatus(resourceId, org) {
+    const stigmer = useStigmer();
+    const [connected, setConnected] = useState(false);
+    const [accessTokenExpiresAt, setAccessTokenExpiresAt] = useState(BIGINT_ZERO);
+    const [targetEnvVar, setTargetEnvVar] = useState("");
+    const [authMethod, setAuthMethod] = useState("");
+    const [isLoading, setIsLoading] = useState(false);
+    const [error, setError] = useState(null);
+    const [fetchKey, setFetchKey] = useState(0);
+    const refetch = useCallback(() => setFetchKey((k) => k + 1), []);
+    useEffect(() => {
+        if (!resourceId || !org) {
+            setConnected(false);
+            setAccessTokenExpiresAt(BIGINT_ZERO);
+            setTargetEnvVar("");
+            setAuthMethod("");
+            setIsLoading(false);
+            setError(null);
+            return;
+        }
+        const cancelled = { current: false };
+        setIsLoading(true);
+        setError(null);
+        stigmer.mcpServer
+            .getOAuthGrantStatus(create(GetOAuthGrantStatusInputSchema, { resourceId, org }))
+            .then((result) => {
+            if (cancelled.current)
+                return;
+            setConnected(result.connected);
+            setAccessTokenExpiresAt(result.accessTokenExpiresAt);
+            setTargetEnvVar(result.targetEnvVar);
+            setAuthMethod(result.authMethod);
+            setIsLoading(false);
+        }, (err) => {
+            if (cancelled.current)
+                return;
+            setError(toError(err));
+            setIsLoading(false);
+        });
+        return () => {
+            cancelled.current = true;
+        };
+    }, [resourceId, org, stigmer, fetchKey]);
+    if (!resourceId || !org)
+        return { ...IDLE, refetch };
+    return {
+        connected,
+        accessTokenExpiresAt,
+        targetEnvVar,
+        authMethod,
+        isLoading,
+        error,
+        refetch,
+    };
+}
+//# sourceMappingURL=useOAuthGrantStatus.js.map

package/mcp-server/useOAuthGrantStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useOAuthGrantStatus.js","sourceRoot":"","sources":["../../src/mcp-server/useOAuthGrantStatus.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stigmer/react",
-  "version": "0.0.79",
+  "version": "0.0.80",
   "description": "React provider and client hook for the Stigmer platform SDK",
   "license": "Apache-2.0",
   "type": "module",
@@ -35,7 +35,7 @@
     }
   },
   "dependencies": {
-    "@stigmer/theme": "0.0.79",
+    "@stigmer/theme": "0.0.80",
     "react-markdown": "^10.1.0",
     "remark-gfm": "^4.0.1",
     "yaml": "^2.8.2"
@@ -43,8 +43,8 @@
   "peerDependencies": {
     "@base-ui/react": "^1.0.0",
     "@bufbuild/protobuf": "^2.0.0",
-    "@stigmer/protos": "0.0.79",
-    "@stigmer/sdk": "0.0.79",
+    "@stigmer/protos": "0.0.80",
+    "@stigmer/sdk": "0.0.80",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   }

package/src/agent/AgentDetailView.tsx

@@ -9,7 +9,7 @@ import type {
   SubAgent,
 } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/spec_pb";
 import type { ApiResourceReference } from "@stigmer/protos/ai/stigmer/commons/apiresource/io_pb";
-import type { EnvironmentValue } from "@stigmer/protos/ai/stigmer/agentic/environment/v1/spec_pb";
+import type { EnvVarDeclaration } from "@stigmer/protos/ai/stigmer/agentic/environment/v1/spec_pb";
 import { ApiResourceVisibility } from "@stigmer/protos/ai/stigmer/commons/apiresource/enum_pb";
 import { useAgent } from "./useAgent";
 import { ErrorMessage } from "../error/ErrorMessage";
@@ -155,8 +155,8 @@ export function AgentDetailView({
         <SubAgentsSection subAgents={spec.subAgents} />
       )}
 
-      {spec?.envSpec && Object.keys(spec.envSpec.data).length > 0 && (
-        <EnvSpecSection data={spec.envSpec.data} />
+      {spec?.env && Object.keys(spec.env).length > 0 && (
+        <EnvSection data={spec.env} />
       )}
     </div>
   );
@@ -534,10 +534,10 @@ function SubAgentDetails({
   );
 }
 
-function EnvSpecSection({
+function EnvSection({
   data,
 }: {
-  readonly data: { [key: string]: EnvironmentValue };
+  readonly data: { [key: string]: EnvVarDeclaration };
 }) {
   const entries = Object.entries(data).sort(([a], [b]) =>
     a.localeCompare(b),

package/src/agent/agentSetupReducer.ts

@@ -14,8 +14,8 @@ import type { AgentEnvFormVariable } from "./AgentEnvForm";
  *   existed). Use `instanceId` with `createSession`.
  * - `"oneTime"` — Secrets were collected but **not** persisted. Pass
  *   `runtimeEnv` to `createExecution` for this run only.
- * - `"direct"` — The agent has no `env_spec` and needs no secrets.
- *   Create the session with `agentRef` directly.
+ * - `"direct"` — The agent has no `env` declarations and needs no
+ *   secrets. Create the session with `agentRef` directly.
  */
 export type AgentResolution =
   | {
@@ -31,7 +31,7 @@ export type AgentResolution =
       readonly runtimeEnv: Record<string, EnvVarInput>;
     }
   | {
-      /** The agent has no `env_spec` and needs no secrets. */
+      /** The agent has no `env` declarations and needs no secrets. */
       readonly mode: "direct";
     };
 

package/src/agent/index.ts

@@ -26,7 +26,7 @@ export type {
   AgentEnvFormVariable,
 } from "./AgentEnvForm";
 
-export { diffEnvSpec } from "../environment/diffEnvSpec";
+export { diffEnv } from "../environment/diffEnv";
 
 export { useAgentSetup } from "./useAgentSetup";
 export type {

package/src/agent/useAgentSetup.ts

@@ -10,7 +10,7 @@ import { useStigmer } from "../hooks";
 import { toError } from "../internal/toError";
 import { usePersonalEnvironment } from "../environment/usePersonalEnvironment";
 import { buildPersonalInstanceInput } from "../agent-instance/buildPersonalInstanceInput";
-import { diffEnvSpec } from "../environment/diffEnvSpec";
+import { diffEnv } from "../environment/diffEnv";
 import {
   agentSetupReducer,
   INITIAL_STATE,
@@ -106,8 +106,8 @@ export interface UseAgentSetupReturn {
   /**
    * Evaluate whether an agent is ready to use or needs env var collection.
    *
-   * Fetches the full agent to read its `env_spec`, checks for an existing
-   * personal instance, and diffs env_spec keys against the personal
+   * Fetches the full agent to read its `env` declarations, checks for an
+   * existing personal instance, and diffs env keys against the personal
    * environment. Returns `"ready"` when the agent can be used immediately,
    * or `"needsEnvVars"` when the caller should present {@link AgentEnvForm}.
    */
@@ -143,7 +143,7 @@ export interface UseAgentSetupReturn {
  *
  * When a user picks an agent in the {@link AgentPicker}, this hook
  * determines whether the agent requires credentials (via its
- * `env_spec`), checks what the user has already provided in their
+ * `env` declarations), checks what the user has already provided in their
  * personal environment, and either reports the agent as ready or
  * identifies the missing variables so the caller can render
  * {@link AgentEnvForm}.
@@ -173,7 +173,7 @@ export interface UseAgentSetupReturn {
  * @param org - Organization slug. Pass `null` to disable.
  * @param poolKeys - Optional set of env-var keys already available
  *   from the session env pool (manual secrets, one-time env vars from
- *   other components). When provided, agents whose `env_spec` keys
+ *   other components). When provided, agents whose `env` keys
  *   are fully covered by `poolKeys` + personal env auto-resolve to
  *   `ready` without prompting. Reactive — when `poolKeys` changes,
  *   `needsEnvVars` is re-evaluated.
@@ -221,10 +221,10 @@ export function useAgentSetup(
       try {
         const agent = await stigmer.agent.getByReference(ref);
         const agentName = agent.metadata?.name ?? ref.slug;
-        const envSpecData = agent.spec?.envSpec?.data;
+        const envDeclarations = agent.spec?.env;
 
-        // No env_spec — agent is immediately ready (direct mode).
-        if (!envSpecData || Object.keys(envSpecData).length === 0) {
+        // No env declarations — agent is immediately ready (direct mode).
+        if (!envDeclarations || Object.keys(envDeclarations).length === 0) {
           const resolution: AgentResolution = { mode: "direct" };
           dispatch({
             type: "RESOLVE_READY",
@@ -235,7 +235,7 @@ export function useAgentSetup(
           return { status: "ready", agentRef: ref, agentName, resolution };
         }
 
-        // Agent has env_spec — check for existing personal instance.
+        // Agent has env declarations — check for existing personal instance.
         const agentLabel = `${ref.org}/${ref.slug}`;
         const instanceList = await stigmer.agentInstance.list(
           create(ListAgentInstancesRequestSchema, {
@@ -265,8 +265,8 @@ export function useAgentSetup(
         const existingKeys = new Set(
           Object.keys(personalEnv.environment?.spec?.data ?? {}),
         );
-        const personalOnlyMissing = diffEnvSpec(envSpecData, existingKeys);
-        const missingVariables = diffEnvSpec(envSpecData, existingKeys, poolKeys);
+        const personalOnlyMissing = diffEnv(envDeclarations, existingKeys);
+        const missingVariables = diffEnv(envDeclarations, existingKeys, poolKeys);
 
         if (personalOnlyMissing.length === 0) {
           // Personal env covers all keys — create personal instance.

package/src/environment/EnvVarForm.tsx

@@ -9,7 +9,7 @@ import { ScrollFade } from "../internal/ScrollFade";
 /**
  * Describes a single environment variable the form should collect.
  *
- * Typically derived from a resource's `env_spec.data` entries (Agent,
+ * Typically derived from a resource's `env` entries (Agent,
  * McpServer, or any resource that declares required environment
  * variables). The caller is responsible for filtering out variables
  * the user has already provided (i.e. only pass the *missing* ones).
@@ -19,8 +19,14 @@ export interface EnvVarFormVariable {
   readonly key: string;
   /** When true, the input renders as a password field with a visibility toggle. */
   readonly isSecret: boolean;
-  /** Help text shown below the input. From the resource's env_spec description. */
+  /** Help text shown below the input. From the resource's env declaration description. */
   readonly description?: string;
+  /**
+   * When true, this variable is not required for the resource to function.
+   * Callers can use this to filter optional vars out of forms or to show
+   * them separately from required vars.
+   */
+  readonly optional?: boolean;
 }
 
 /** Options reported by the form alongside the collected values on submit. */
@@ -110,7 +116,7 @@ export interface EnvVarFormProps {
 
 /**
  * Compact form that collects environment variable values for any
- * resource that declares an `env_spec` (Agents, MCP servers, etc.).
+ * resource that declares `env` variables (Agents, MCP servers, etc.).
  *
  * Renders one labeled input per variable. Secret variables use a
  * password field with a visibility toggle. The form validates that

package/src/environment/EnvironmentListPanel.tsx

@@ -18,11 +18,26 @@ export interface EnvironmentListPanelProps {
   /** Optional label filter — only environments matching ALL labels are shown. */
   readonly labels?: Record<string, string>;
   /**
-   * Exclude environments whose labels contain all key-value pairs in this
-   * record. Useful for filtering the personal environment out of the
-   * organization list: `excludeLabels={{ "stigmer.ai/personal": "true" }}`.
+   * Exclude environments whose labels match one or more label sets.
+   *
+   * A single record uses AND semantics — the environment must match
+   * **all** key-value pairs to be excluded. Pass an array of records
+   * for OR-of-AND semantics: the environment is excluded when **any**
+   * record fully matches.
+   *
+   * @example
+   * ```tsx
+   * // Exclude personal envs only (single record — backward-compatible)
+   * excludeLabels={{ "stigmer.ai/personal": "true" }}
+   *
+   * // Exclude personal AND managed envs (array of records)
+   * excludeLabels={[
+   *   { "stigmer.ai/personal": "true" },
+   *   { "stigmer.ai/managed": "true" },
+   * ]}
+   * ```
    */
-  readonly excludeLabels?: Record<string, string>;
+  readonly excludeLabels?: Record<string, string> | Record<string, string>[];
   /** Fired when a user selects (expands) an environment. */
   readonly onEnvironmentSelect?: (env: Environment) => void;
   /** When `true`, variable editors render in read-only mode. */
@@ -82,13 +97,16 @@ export function EnvironmentListPanel({
   }
 
   const filtered = useMemo(() => {
-    if (!excludeLabels || Object.keys(excludeLabels).length === 0) {
-      return environments;
-    }
+    if (!excludeLabels) return environments;
+    const labelSets = Array.isArray(excludeLabels)
+      ? excludeLabels
+      : [excludeLabels];
+    if (labelSets.length === 0) return environments;
+
     return environments.filter((env) => {
       const envLabels = env.metadata?.labels ?? {};
-      const shouldExclude = Object.entries(excludeLabels).every(
-        ([k, v]) => envLabels[k] === v,
+      const shouldExclude = labelSets.some((labelSet) =>
+        Object.entries(labelSet).every(([k, v]) => envLabels[k] === v),
       );
       return !shouldExclude;
     });

package/src/environment/{diffEnvSpec.ts → diffEnv.ts}

@@ -4,38 +4,38 @@ import type { EnvVarFormVariable } from "./EnvVarForm";
  * Computes the list of environment variables a resource requires that
  * the user has not yet provided.
  *
- * Compares a resource's declared `env_spec.data` keys against a set of
+ * Compares a resource's declared `env` keys against a set of
  * keys already present in the user's personal environment **and** an
  * optional session-level env pool (manual secrets, one-time env vars
  * from other components). Variables whose keys are missing from both
  * sources are returned as {@link EnvVarFormVariable} entries suitable
  * for rendering in {@link EnvVarForm}.
  *
- * Works with any resource that declares an `EnvironmentSpec` — Agents,
+ * Works with any resource that declares env var declarations — Agents,
  * MCP servers, or future resource types.
  *
  * This is a pure function with no side effects — it can be unit-tested
  * independently of hooks, providers, or API calls.
  *
- * @param envSpecData - The resource's `spec.envSpec.data` record.
- *   Each entry declares a variable the resource needs, with `isSecret`
- *   and an optional `description`.
+ * @param envDeclarations - The resource's `spec.env` record.
+ *   Each entry declares a variable the resource needs, with `isSecret`,
+ *   an optional `description`, and an `optional` flag.
  * @param existingKeys - Keys already present in the user's personal
  *   environment (or any environment being checked against).
  * @param poolKeys - Optional additional keys from the session env pool
  *   (manual secrets, one-time env vars from other agents/MCP servers).
  *   When provided, variables satisfied by the pool are also excluded
  *   from the "missing" list.
- * @returns Variables from `envSpecData` not found in either key set.
+ * @returns Variables from `envDeclarations` not found in either key set.
  */
-export function diffEnvSpec(
-  envSpecData: Record<string, { isSecret: boolean; description?: string }>,
+export function diffEnv(
+  envDeclarations: Record<string, { isSecret: boolean; description?: string; optional?: boolean }>,
   existingKeys: Set<string>,
   poolKeys?: Set<string>,
 ): EnvVarFormVariable[] {
   const missing: EnvVarFormVariable[] = [];
 
-  for (const [key, value] of Object.entries(envSpecData)) {
+  for (const [key, value] of Object.entries(envDeclarations)) {
     if (existingKeys.has(key)) continue;
     if (poolKeys?.has(key)) continue;
 
@@ -43,6 +43,7 @@ export function diffEnvSpec(
       key,
       isSecret: value.isSecret,
       ...(value.description && { description: value.description }),
+      ...(value.optional && { optional: true }),
     });
   }
 

package/src/environment/index.ts

@@ -35,7 +35,7 @@ export type {
   EnvVarFormVariable,
   EnvVarFormSubmitOptions,
 } from "./EnvVarForm";
-export { diffEnvSpec } from "./diffEnvSpec";
+export { diffEnv } from "./diffEnv";
 export { useSessionEnvPool } from "./useSessionEnvPool";
 export type {
   SessionEnvPoolInput,

package/src/execution/SessionVariablesInput.tsx

@@ -22,7 +22,7 @@ export interface SessionVariablesInputProps {
    * between the variable and the agent/MCP server that needs it.
    *
    * Built by `SessionComposer` from the selected agent's and MCP
-   * servers' `env_spec` declarations.
+   * servers' `env` declarations.
    *
    * @example
    * ```ts

package/src/index.ts

@@ -221,6 +221,7 @@ export {
   useMcpServerConnect,
   useMcpServerOAuthConnect,
   useMcpServerCredentials,
+  useOAuthGrantStatus,
   OAuthCallbackHandler,
   McpServerPicker,
   McpServerConfigPanel,
@@ -255,6 +256,7 @@ export type {
   OAuthCallbackHandlerProps,
   OAuthCallbackParams,
   UseMcpServerCredentialsReturn,
+  UseOAuthGrantStatusReturn,
   McpServerAuthMode,
 } from "./mcp-server";
 
@@ -298,7 +300,7 @@ export type {
   GitHubRepoPickerProps,
 } from "./github";
 
-// Agent — data hook, count hook, list hook, search hook, picker, detail view, env form, setup orchestration, env_spec diffing, and default agent
+// Agent — data hook, count hook, list hook, search hook, picker, detail view, env form, setup orchestration, env diffing, and default agent
 export {
   useAgent,
   useAgentCount,
@@ -307,7 +309,7 @@ export {
   AgentPicker,
   AgentDetailView,
   AgentEnvForm,
-  diffEnvSpec,
+  diffEnv,
   useAgentSetup,
   useDefaultAgent,
 } from "./agent";