@stigmer/react 0.4.0 → 0.4.2

package/models/useModelRegistry.js

@@ -1,6 +1,6 @@
 "use client";
 import { useMemo } from "react";
-import { MODEL_REGISTRY, DEFAULT_MODEL_ID, DEFAULT_CURSOR_MODEL_ID, DISABLED_PROVIDERS, modelKey, } from "./registry";
+import { MODEL_REGISTRY, DEFAULT_MODEL_ID, DISABLED_PROVIDERS, resolveDefaultModelId, modelKey, } from "./registry";
 /**
  * Data hook that exposes the platform model registry with grouping
  * and lookup helpers.
@@ -26,10 +26,10 @@ import { MODEL_REGISTRY, DEFAULT_MODEL_ID, DEFAULT_CURSOR_MODEL_ID, DISABLED_PRO
 export function useModelRegistry(options) {
     const harness = options?.harness;
     return useMemo(() => {
-        const isCursor = harness === "cursor";
-        const isNative = harness === "native";
         const isUnified = harness === undefined;
-        const defaultId = isCursor ? DEFAULT_CURSOR_MODEL_ID : DEFAULT_MODEL_ID;
+        const { modelId: defaultId } = harness
+            ? resolveDefaultModelId(harness)
+            : { modelId: DEFAULT_MODEL_ID };
         const byProvider = new Map();
         const byId = new Map();
         const byCompoundKey = new Map();
@@ -37,18 +37,13 @@ export function useModelRegistry(options) {
         const featuredModels = [];
         let defaultModel;
         for (const model of MODEL_REGISTRY) {
-            if (isCursor) {
-                if (model.harness !== "cursor")
-                    continue;
-            }
-            else if (isNative) {
-                if (model.harness !== "native")
-                    continue;
+            if (isUnified) {
                 if (DISABLED_PROVIDERS.has(model.provider))
                     continue;
             }
             else {
-                // Unified — include both harnesses, still respect DISABLED_PROVIDERS
+                if (model.harness !== harness)
+                    continue;
                 if (DISABLED_PROVIDERS.has(model.provider))
                     continue;
             }

package/models/useModelRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModelRegistry.js","sourceRoot":"","sources":["../../src/models/useModelRegistry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useModelRegistry.js","sourceRoot":"","sources":["../../src/models/useModelRegistry.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EACL,cAAc,EACd,gBAAgB,EAEhB,kBAAkB,EAClB,qBAAqB,EACrB,QAAQ,GAGT,MAAM,YAAY,CAAC;AA2CpB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAiC;IAChE,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAEjC,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,MAAM,SAAS,GAAG,OAAO,KAAK,SAAS,CAAC;QACxC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,OAAO;YACpC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;QAElC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAyB,CAAC;QACpD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAqB,CAAC;QAC1C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAqB,CAAC;QACnD,MAAM,aAAa,GAAgB,EAAE,CAAC;QACtC,MAAM,cAAc,GAAgB,EAAE,CAAC;QACvC,IAAI,YAAmC,CAAC;QAExC,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC;oBAAE,SAAS;YACvD,CAAC;iBAAM,CAAC;gBACN,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO;oBAAE,SAAS;gBACxC,IAAI,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC;oBAAE,SAAS;YACvD,CAAC;YAED,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;YAEjE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACjC,CAAC;YAED,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1C,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBAChC,YAAY,KAAK,KAAK,CAAC;YACzB,CAAC;YAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACnB,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAEhD,OAAO;YACL,MAAM,EAAE,aAAa;YACrB,UAAU,EAAE,UAAyD;YACrE,YAAY,EAAE,YAAY,IAAI,aAAa,CAAC,CAAC,CAAC;YAC9C,QAAQ,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;YAChD,SAAS;YACT,QAAQ,EAAE,cAAc;YACxB,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC;SAClD,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stigmer/react",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "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.4.0",
+    "@stigmer/theme": "0.4.2",
     "react-markdown": "^10.1.0",
     "remark-gfm": "^4.0.1",
     "streamdown": "^2.5.0",
@@ -44,8 +44,8 @@
   "peerDependencies": {
     "@base-ui/react": "^1.0.0",
     "@bufbuild/protobuf": "^2.0.0",
-    "@stigmer/protos": "0.4.0",
-    "@stigmer/sdk": "0.4.0",
+    "@stigmer/protos": "0.4.2",
+    "@stigmer/sdk": "0.4.2",
     "lucide-react": ">=0.400.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",

package/src/mcp-server/McpServerDetailView.tsx

@@ -383,6 +383,7 @@ export function McpServerDetailView({
             credentials.setManualOverride(false);
             setShowCredentialForm(false);
           }}
+          onCancelOAuth={oauth.clearError}
         />
 
         {showCredentialForm && credentials.missingVariables.length > 0 && (
@@ -566,6 +567,7 @@ function ConnectBar({
   manualOverride,
   onManualOverride,
   onBackToOAuth,
+  onCancelOAuth,
 }: {
   readonly isConnecting: boolean;
   readonly connectionError: Error | null;
@@ -600,6 +602,7 @@ function ConnectBar({
   readonly manualOverride: boolean;
   readonly onManualOverride: () => void;
   readonly onBackToOAuth: () => void;
+  readonly onCancelOAuth: () => void;
 }) {
   const [disconnectPhase, setDisconnectPhase] = useState<DisconnectPhase>("idle");
   const [removeOrgAppPhase, setRemoveOrgAppPhase] = useState<RemoveOrgAppPhase>("idle");
@@ -853,6 +856,18 @@ function ConnectBar({
         </button>
       </div>
 
+      {oauthPhase === "awaiting-callback" && (
+        <div className="flex items-center gap-3 border-t border-border px-3 py-1.5">
+          <button
+            type="button"
+            onClick={onCancelOAuth}
+            className="text-[11px] text-muted-foreground underline decoration-muted-foreground/40 underline-offset-2 hover:text-foreground hover:decoration-foreground"
+          >
+            Cancel sign-in
+          </button>
+        </div>
+      )}
+
       {/* Vendor approval blocked banner with BYOA CTA */}
       {oauthSignInDisabled && (
         <div className="flex items-start gap-2 border-t border-amber-500/20 bg-amber-500/5 px-3 py-2">

package/src/mcp-server/useMcpServerOAuthConnect.ts

@@ -122,6 +122,7 @@ export function useMcpServerOAuthConnect(): UseMcpServerOAuthConnectReturn {
 
   const popupRef = useRef<Window | null>(null);
   const cleanupRef = useRef<(() => void) | null>(null);
+  const cancelledRef = useRef(false);
 
   useEffect(() => {
     return () => {
@@ -130,6 +131,13 @@ export function useMcpServerOAuthConnect(): UseMcpServerOAuthConnectReturn {
   }, []);
 
   const clearError = useCallback(() => {
+    if (cleanupRef.current || popupRef.current) {
+      cancelledRef.current = true;
+      cleanupRef.current?.();
+      closePopup(popupRef.current);
+      popupRef.current = null;
+      cleanupRef.current = null;
+    }
     setPhase("idle");
     setError(null);
   }, []);
@@ -138,6 +146,7 @@ export function useMcpServerOAuthConnect(): UseMcpServerOAuthConnectReturn {
     async (mcpServerId: string, org: string, declaredEnvKeys?: readonly string[]): Promise<McpServer> => {
       setPhase("initiating");
       setError(null);
+      cancelledRef.current = false;
 
       cleanupRef.current?.();
 
@@ -214,9 +223,12 @@ export function useMcpServerOAuthConnect(): UseMcpServerOAuthConnectReturn {
         return server;
       } catch (err) {
         const wrapped = toError(err);
-        setError(wrapped);
-        setPhase("idle");
-        closePopup(popup);
+        if (!cancelledRef.current) {
+          setError(wrapped);
+          setPhase("idle");
+          closePopup(popup);
+        }
+        cancelledRef.current = false;
         throw wrapped;
       } finally {
         popupRef.current = null;
@@ -241,9 +253,14 @@ export function useMcpServerOAuthConnect(): UseMcpServerOAuthConnectReturn {
 
 /**
  * Grace period (ms) after `popup.closed` is first detected before treating
- * it as a user-initiated close. COOP providers sever the opener reference
- * immediately, making `popup.closed` appear `true` while the popup is still
- * active. The grace period lets the BroadcastChannel callback arrive.
+ * it as a user-initiated close.
+ *
+ * Only used when BroadcastChannel is unavailable. When BC is available,
+ * `popup.closed` polling is skipped entirely because COOP providers
+ * (e.g. Sentry, GitHub) sever the opener reference on cross-origin
+ * navigation, making `popup.closed` permanently `true` while the popup
+ * is still active. The overall {@link POPUP_CALLBACK_TIMEOUT_MS} serves
+ * as the safety net for abandoned flows instead.
  */
 const POPUP_CLOSED_GRACE_MS = 5_000;
 
@@ -257,6 +274,7 @@ function waitForOAuthCallback(
     let timeoutId: ReturnType<typeof setTimeout>;
     let pollId: ReturnType<typeof setInterval>;
     let bc: BroadcastChannel | null = null;
+    let hasBroadcastChannel = false;
 
     function cleanup() {
       if (timeoutId) clearTimeout(timeoutId);
@@ -314,6 +332,7 @@ function waitForOAuthCallback(
     // BroadcastChannel — works even when COOP severs window.opener.
     try {
       bc = new BroadcastChannel(OAUTH_BROADCAST_CHANNEL);
+      hasBroadcastChannel = true;
       bc.onmessage = (event: MessageEvent) => {
         validateAndSettle(event.data as OAuthCallbackMessage | undefined);
       };
@@ -332,12 +351,21 @@ function waitForOAuthCallback(
       closePopup(popup);
     }, POPUP_CALLBACK_TIMEOUT_MS);
 
-    // COOP providers make popup.closed appear true immediately after
-    // cross-origin navigation. Wait a grace period before treating it
-    // as a real user-initiated close.
+    // When BroadcastChannel is available, skip popup.closed polling.
+    // COOP providers (Sentry, GitHub, etc.) sever the opener reference
+    // on cross-origin navigation, making popup.closed permanently true
+    // while the popup is still active. BroadcastChannel reliably
+    // delivers the callback regardless of COOP; the overall timeout
+    // above catches abandoned flows.
+    //
+    // When BroadcastChannel is NOT available (legacy browsers), fall
+    // back to popup.closed polling with a short grace period — it is
+    // the only signal we have in that degraded path.
     let popupClosedAt: number | null = null;
 
     pollId = setInterval(() => {
+      if (hasBroadcastChannel) return;
+
       if (popup.closed) {
         if (popupClosedAt === null) {
           popupClosedAt = Date.now();