@stigmer/react 0.0.79 → 0.0.80

package/src/mcp-server/useMcpServerSetup.ts

@@ -2,12 +2,14 @@
 
 import { useCallback, useEffect, useMemo, useReducer, useRef } from "react";
 import type { EnvVarInput, McpServerUsageInput, ResourceRef } from "@stigmer/sdk";
+import { create } from "@bufbuild/protobuf";
 import type { McpServer } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/api_pb";
+import { GetOAuthGrantStatusInputSchema } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/io_pb";
 import type { DiscoveredTool } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/status_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,
@@ -57,8 +59,8 @@ export interface UseMcpServerSetupReturn {
   /**
    * Add an MCP server to the setup flow.
    *
-   * Fetches the full server resource, checks `env_spec` against the
-   * personal environment, and resolves the entry to either `ready`
+   * Fetches the full server resource, checks `env` declarations against
+   * the personal environment, and resolves the entry to either `ready`
    * (no credentials needed or all present) or `needsSetup` (missing
    * variables). Also extracts discovered tools and approval policies
    * for the tool selector.
@@ -171,8 +173,8 @@ function computeDefaultEnabledTools(
  * 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.
  *
@@ -198,7 +200,7 @@ function computeDefaultEnabledTools(
  * @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.
@@ -264,9 +266,9 @@ export function useMcpServerSetup(
         const discoveredTools =
           mcpServer.status?.discoveredCapabilities?.tools ?? [];
         const toolApprovals = mcpServer.spec?.pinnedToolApprovals ?? [];
-        const envSpecData = mcpServer.spec?.envSpec?.data;
+        const envDeclarations = mcpServer.spec?.env;
 
-        if (!envSpecData || Object.keys(envSpecData).length === 0) {
+        if (!envDeclarations || Object.keys(envDeclarations).length === 0) {
           dispatch({
             type: "RESOLVE_READY",
             key,
@@ -284,9 +286,29 @@ export function useMcpServerSetup(
         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,
@@ -305,7 +327,7 @@ export function useMcpServerSetup(
           type: "RESOLVE_NEEDS_SETUP",
           key,
           mcpServer,
-          missingVariables,
+          missingVariables: requiredMissing,
           discoveredTools,
           toolApprovals,
         });
@@ -420,15 +442,16 @@ export function useMcpServerSetup(
     for (const [key, entry] of Object.entries(entriesRef.current)) {
       if (entry.status !== "needsSetup") continue;
 
-      const envSpecData = entry.mcpServer.spec?.envSpec?.data;
-      if (!envSpecData) continue;
+      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/src/mcp-server/useOAuthGrantStatus.ts

@@ -0,0 +1,125 @@
+"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";
+
+/** 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;
+}
+
+const BIGINT_ZERO = BigInt(0);
+
+const IDLE: UseOAuthGrantStatusReturn = {
+  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: string | null,
+  org: string | null,
+): UseOAuthGrantStatusReturn {
+  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<Error | null>(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,
+  };
+}

package/environment/diffEnvSpec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"diffEnvSpec.d.ts","sourceRoot":"","sources":["../../src/environment/diffEnvSpec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,WAAW,CACzB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EACxE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GACrB,kBAAkB,EAAE,CAetB"}

package/environment/diffEnvSpec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"diffEnvSpec.js","sourceRoot":"","sources":["../../src/environment/diffEnvSpec.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,UAAU,WAAW,CACzB,WAAwE,EACxE,YAAyB,EACzB,QAAsB;IAEtB,MAAM,OAAO,GAAyB,EAAE,CAAC;IAEzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACvD,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QACpC,IAAI,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QAEjC,OAAO,CAAC,IAAI,CAAC;YACX,GAAG;YACH,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;SAC7D,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}