@stigmer/react 0.4.5 → 0.4.7

package/session/useNewSessionFlow.js

@@ -7,6 +7,7 @@ import { parseModelKey } from "../models/registry";
 import { DEFAULT_HARNESS } from "../models/harness";
 import { useWorkspaceEntries } from "../workspace";
 import { useSessionVariables } from "../execution/useSessionVariables";
+import { useRunnerList } from "../runner/useRunnerList";
 import { useCreateSession } from "./useCreateSession";
 import { useCreateAgentExecution } from "../execution/useCreateAgentExecution";
 const STORAGE_KEY_HARNESS = "stigmer:session:harness";
@@ -65,7 +66,8 @@ export function useNewSessionFlow(options) {
         const stored = localStorage.getItem(STORAGE_KEY_HARNESS);
         return stored === "cursor" ? "cursor" : DEFAULT_HARNESS;
     });
-    const { getModel } = useModelRegistry({ harness });
+    const { getModel, isLoading: isModelsLoading } = useModelRegistry({ harness });
+    const { runners, isLoading: isRunnersLoading } = useRunnerList(org);
     const { create: createSession } = useCreateSession();
     const { create: createExecution } = useCreateAgentExecution();
     const { agent: defaultAgent, isLoading: isDefaultAgentLoading, error: defaultAgentError, } = useDefaultAgent(org);
@@ -90,8 +92,11 @@ export function useNewSessionFlow(options) {
         const plain = storedModel ? (parseModelKey(storedModel)?.modelId ?? storedModel) : undefined;
         setModelId(plain);
     }, []);
-    // Restore persisted model on mount (using current harness key)
+    // Restore persisted model — only after the registry has loaded so
+    // getModel can actually validate the stored ID against live data.
     useEffect(() => {
+        if (isModelsLoading)
+            return;
         const stored = localStorage.getItem(modelStorageKey(harness));
         if (stored) {
             const plain = parseModelKey(stored)?.modelId ?? stored;
@@ -99,7 +104,7 @@ export function useNewSessionFlow(options) {
                 setModelId(plain);
             }
         }
-    }, [getModel, harness]);
+    }, [getModel, harness, isModelsLoading]);
     // Persist model on change (using current harness key).
     // Strip compound keys (e.g. "cursor/default") to plain modelId before storing.
     useEffect(() => {
@@ -108,13 +113,22 @@ export function useNewSessionFlow(options) {
             localStorage.setItem(modelStorageKey(harness), plain);
         }
     }, [modelId, harness]);
-    // Restore persisted runner on mount
+    // Restore persisted runner — validate against the live runner list.
+    // If the stored runner no longer exists, discard it and clean up localStorage.
     useEffect(() => {
+        if (isRunnersLoading)
+            return;
         const stored = localStorage.getItem(STORAGE_KEY_RUNNER);
-        if (stored) {
+        if (!stored)
+            return;
+        const exists = runners.some((r) => r.metadata?.id === stored);
+        if (exists) {
             setRunnerId(stored);
         }
-    }, []);
+        else {
+            localStorage.removeItem(STORAGE_KEY_RUNNER);
+        }
+    }, [runners, isRunnersLoading]);
     // Persist runner on change
     useEffect(() => {
         if (runnerId) {

package/session/useNewSessionFlow.js.map

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

package/src/composer/ComposerToolbar.tsx

@@ -174,6 +174,7 @@ export function ComposerToolbar({
             value={modelId}
             onValueChange={onModelChange}
             harness={showHarnessSelector ? undefined : harness}
+            initialHarness={showHarnessSelector ? harness : undefined}
             onHarnessChange={showHarnessSelector ? onHarnessChange : undefined}
             disabled={disabled}
           />

package/src/index.ts

@@ -27,13 +27,15 @@ export { CloudFeatureNotice, type CloudFeatureNoticeProps } from "./internal/Clo
 
 // Models — data hook, styled components, and registry data
 export {
-  MODEL_REGISTRY,
   DEFAULT_MODEL_ID,
   DEFAULT_CURSOR_MODEL_ID,
   DISABLED_PROVIDERS,
   modelKey,
   parseModelKey,
+  fetchModelRegistry,
+  parseRegistryJson,
   useModelRegistry,
+  ModelRegistryContext,
   ModelSelector,
   HarnessSelector,
   DEFAULT_HARNESS,
@@ -43,6 +45,7 @@ export {
 } from "./models";
 export type {
   ModelInfo,
+  ModelRegistryState,
   ParsedModelKey,
   Provider,
   CostTier,

package/src/models/ModelRegistryContext.ts

@@ -0,0 +1,32 @@
+"use client";
+
+import { createContext, useContext } from "react";
+import type { ModelInfo } from "./registry";
+
+/** Internal state held by the model registry context provider. */
+export interface ModelRegistryState {
+  readonly models: readonly ModelInfo[];
+  readonly isLoading: boolean;
+  readonly error: Error | null;
+}
+
+/**
+ * React context that holds the model registry fetched from the public API.
+ *
+ * Populated by {@link StigmerProvider} on mount. Consumer hooks read from
+ * this context instead of a static JSON import, enabling always-fresh
+ * model data without npm package updates.
+ */
+export const ModelRegistryContext = createContext<ModelRegistryState>({
+  models: [],
+  isLoading: true,
+  error: null,
+});
+
+/**
+ * Internal hook to read the model registry from context.
+ * Throws if called outside a StigmerProvider.
+ */
+export function useModelRegistryContext(): ModelRegistryState {
+  return useContext(ModelRegistryContext);
+}

package/src/models/ModelSelector.tsx

@@ -32,6 +32,14 @@ export interface ModelSelectorProps {
    * to that harness (dropdown hidden). When omitted, shows the harness dropdown.
    */
   readonly harness?: HarnessOption;
+  /**
+   * Initial harness value for the internal state when `harness` prop is
+   * undefined (unlocked mode). Prevents desync when the parent knows the
+   * active harness but delegates the dropdown to this component.
+   *
+   * When `harness` is provided (locked mode), this prop is ignored.
+   */
+  readonly initialHarness?: HarnessOption;
   /** Called when user changes harness in the dropdown. */
   readonly onHarnessChange?: (harness: HarnessOption) => void;
   /**
@@ -85,6 +93,7 @@ export function ModelSelector({
   value,
   onValueChange,
   harness,
+  initialHarness,
   onHarnessChange,
   onHarnessResolved,
   availableHarnesses,
@@ -99,9 +108,17 @@ export function ModelSelector({
   const portalContainer = useStigmerPortalContainer();
 
   const isHarnessLocked = harness !== undefined;
-  const [internalHarness, setInternalHarness] = useState<HarnessOption>(harness ?? "native");
+  const [internalHarness, setInternalHarness] = useState<HarnessOption>(
+    harness ?? initialHarness ?? "native",
+  );
   const activeHarness = harness ?? internalHarness;
 
+  useEffect(() => {
+    if (!isHarnessLocked && initialHarness !== undefined) {
+      setInternalHarness(initialHarness);
+    }
+  }, [initialHarness, isHarnessLocked]);
+
   const { models, featured, defaultModel, getModel, byProvider } = useModelRegistry(
     { harness: activeHarness },
   );
@@ -122,7 +139,7 @@ export function ModelSelector({
     return HARNESS_OPTIONS.filter((h) => h === "native" || h === "cursor");
   }, [availableHarnesses]);
 
-  const selectedModel = (value ? getModel(value) : undefined) ?? defaultModel;
+  const selectedModel = (value ? getModel(value) : undefined) ?? defaultModel ?? undefined;
 
   const isSearching = searchQuery.length > 0;
   const lowerQuery = searchQuery.toLowerCase();
@@ -248,7 +265,7 @@ export function ModelSelector({
 
   const showShowAllButton = !isSearching && !showAll && featuredModels.length > 0 && featuredModels.length < models.length;
 
-  const triggerLabel = selectedModel.displayName;
+  const triggerLabel = selectedModel?.displayName ?? "Select model";
   const triggerHarness = !isHarnessLocked ? HARNESS_META[activeHarness].label : undefined;
 
   return (
@@ -393,7 +410,7 @@ export function ModelSelector({
                       <ModelRow
                         key={model.modelId}
                         model={model}
-                        isSelected={model.modelId === selectedModel.modelId}
+                        isSelected={model.modelId === selectedModel?.modelId}
                         showDescription={false}
                         showSpeedBadge={showSpeedBadge}
                         onClick={() => selectModel(model)}
@@ -406,7 +423,7 @@ export function ModelSelector({
                   <ModelRow
                     key={model.modelId}
                     model={model}
-                    isSelected={model.modelId === selectedModel.modelId}
+                    isSelected={model.modelId === selectedModel?.modelId}
                     isHighlighted={idx === highlightIdx}
                     showDescription={showDescriptions && !compact && !isSearching && !showAll}
                     showSpeedBadge={showSpeedBadge}

package/src/models/__tests__/useModelRegistry.test.tsx

@@ -1,45 +1,137 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, vi, beforeEach } from "vitest";
 import { renderHook } from "@testing-library/react";
+import { type ReactNode } from "react";
 import { useModelRegistry } from "../useModelRegistry";
 import {
-  MODEL_REGISTRY,
   DEFAULT_MODEL_ID,
   DEFAULT_CURSOR_MODEL_ID,
   DISABLED_PROVIDERS,
   modelKey,
+  parseRegistryJson,
 } from "../registry";
+import { ModelRegistryContext } from "../ModelRegistryContext";
+import type { ModelRegistryState } from "../ModelRegistryContext";
+import type { ModelInfo } from "../registry";
+
+/**
+ * Minimal inline registry data for tests. Mirrors the shape of the
+ * API response without depending on a static JSON file.
+ */
+const TEST_REGISTRY_JSON = {
+  models: [
+    {
+      id: "claude-sonnet-4.6",
+      displayName: "Claude Sonnet 4.6",
+      shortDescription: "Balanced capability",
+      speedTier: "fast",
+      provider: "anthropic",
+      harness: "native",
+      costTier: "standard",
+      featured: true,
+      pricing: { inputPricePerMillion: 3, outputPricePerMillion: 15, cacheWritePricePerMillion: 3.75, cacheReadPricePerMillion: 0.3 },
+    },
+    {
+      id: "claude-opus-4.6",
+      displayName: "Claude Opus 4.6",
+      shortDescription: "Complex reasoning",
+      speedTier: "slow",
+      provider: "anthropic",
+      harness: "native",
+      costTier: "premium",
+      featured: true,
+      pricing: { inputPricePerMillion: 5, outputPricePerMillion: 25, cacheWritePricePerMillion: 6.25, cacheReadPricePerMillion: 0.5 },
+    },
+    {
+      id: "gpt-4o",
+      displayName: "GPT-4o",
+      shortDescription: "Fast reasoning",
+      speedTier: "fast",
+      provider: "openai",
+      harness: "native",
+      costTier: "standard",
+      featured: true,
+      pricing: { inputPricePerMillion: 2.5, outputPricePerMillion: 10, cacheWritePricePerMillion: 2.5, cacheReadPricePerMillion: 1.25 },
+    },
+    {
+      id: "default",
+      displayName: "Cursor Auto",
+      shortDescription: "Automatic model selection",
+      speedTier: "fast",
+      provider: "cursor",
+      harness: "cursor",
+      costTier: "standard",
+      featured: true,
+      pricing: { inputPricePerMillion: 1.25, outputPricePerMillion: 6, cacheWritePricePerMillion: 1.25, cacheReadPricePerMillion: 0.25 },
+    },
+    {
+      id: "claude-4.6-sonnet",
+      displayName: "Claude 4.6 Sonnet",
+      shortDescription: "Balanced Cursor model",
+      speedTier: "fast",
+      provider: "anthropic",
+      harness: "cursor",
+      costTier: "standard",
+      featured: false,
+      pricing: { inputPricePerMillion: 3, outputPricePerMillion: 15, cacheWritePricePerMillion: 3.75, cacheReadPricePerMillion: 0.3 },
+    },
+    {
+      id: "ollama-local",
+      displayName: "Ollama Local",
+      shortDescription: "Local model",
+      speedTier: "fast",
+      provider: "ollama",
+      harness: "native",
+      costTier: "economy",
+      featured: false,
+      pricing: { inputPricePerMillion: 0, outputPricePerMillion: 0, cacheWritePricePerMillion: 0, cacheReadPricePerMillion: 0 },
+    },
+  ],
+};
+
+const TEST_MODELS: readonly ModelInfo[] = parseRegistryJson(TEST_REGISTRY_JSON);
+
+function createWrapper(models: readonly ModelInfo[] = TEST_MODELS) {
+  const state: ModelRegistryState = { models, isLoading: false, error: null };
+  return function Wrapper({ children }: { children: ReactNode }) {
+    return (
+      <ModelRegistryContext.Provider value={state}>
+        {children}
+      </ModelRegistryContext.Provider>
+    );
+  };
+}
 
 describe("useModelRegistry", () => {
   describe("unified mode (no harness)", () => {
     it("excludes DISABLED_PROVIDERS from models", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       for (const model of result.current.models) {
         expect(DISABLED_PROVIDERS.has(model.provider)).toBe(false);
       }
     });
 
     it("includes models from both native and cursor harnesses", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       const harnesses = new Set(result.current.models.map((m) => m.harness));
       expect(harnesses.has("native")).toBe(true);
       expect(harnesses.has("cursor")).toBe(true);
     });
 
-    it("includes all non-disabled models from MODEL_REGISTRY", () => {
-      const { result } = renderHook(() => useModelRegistry());
-      const expected = MODEL_REGISTRY.filter(
+    it("includes all non-disabled models", () => {
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
+      const expected = TEST_MODELS.filter(
         (m) => !DISABLED_PROVIDERS.has(m.provider),
       );
       expect(result.current.models).toHaveLength(expected.length);
     });
 
     it("resolves defaultModel to DEFAULT_MODEL_ID", () => {
-      const { result } = renderHook(() => useModelRegistry());
-      expect(result.current.defaultModel.modelId).toBe(DEFAULT_MODEL_ID);
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
+      expect(result.current.defaultModel!.modelId).toBe(DEFAULT_MODEL_ID);
     });
 
     it("groups models by provider in byProvider map", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       for (const [provider, models] of result.current.byProvider) {
         for (const m of models) {
           expect(m.provider).toBe(provider);
@@ -48,21 +140,21 @@ describe("useModelRegistry", () => {
     });
 
     it("returns providers matching byProvider keys in order", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       const fromMap = Array.from(result.current.byProvider.keys());
       expect(result.current.providers).toEqual(fromMap);
     });
 
     it("looks up enabled models by getModel", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       const model = result.current.getModel(DEFAULT_MODEL_ID);
       expect(model).toBeDefined();
       expect(model!.modelId).toBe(DEFAULT_MODEL_ID);
     });
 
     it("returns undefined for disabled provider models via getModel", () => {
-      const { result } = renderHook(() => useModelRegistry());
-      const disabledModel = MODEL_REGISTRY.find((m) =>
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
+      const disabledModel = TEST_MODELS.find((m) =>
         DISABLED_PROVIDERS.has(m.provider),
       );
       if (disabledModel) {
@@ -71,12 +163,12 @@ describe("useModelRegistry", () => {
     });
 
     it("returns undefined for unknown model IDs via getModel", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       expect(result.current.getModel("nonexistent-model")).toBeUndefined();
     });
 
     it("returns featured models subset", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       expect(result.current.featured.length).toBeGreaterThan(0);
       for (const model of result.current.featured) {
         expect(model.featured).toBe(true);
@@ -84,7 +176,7 @@ describe("useModelRegistry", () => {
     });
 
     it("featured models are a subset of all models", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       const allKeys = new Set(
         result.current.models.map((m) => modelKey(m.harness, m.modelId)),
       );
@@ -94,7 +186,7 @@ describe("useModelRegistry", () => {
     });
 
     it("resolves models by compound key via getByKey", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       const key = modelKey("native", DEFAULT_MODEL_ID);
       const model = result.current.getByKey(key);
       expect(model).toBeDefined();
@@ -103,7 +195,7 @@ describe("useModelRegistry", () => {
     });
 
     it("resolves cursor models by compound key via getByKey", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       const key = modelKey("cursor", DEFAULT_CURSOR_MODEL_ID);
       const model = result.current.getByKey(key);
       expect(model).toBeDefined();
@@ -112,7 +204,7 @@ describe("useModelRegistry", () => {
     });
 
     it("returns undefined for unknown compound keys via getByKey", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       expect(result.current.getByKey("native/nonexistent")).toBeUndefined();
     });
   });
@@ -121,7 +213,7 @@ describe("useModelRegistry", () => {
     it("shows only native-harness models", () => {
       const { result } = renderHook(() =>
         useModelRegistry({ harness: "native" }),
-      );
+      { wrapper: createWrapper() });
       for (const model of result.current.models) {
         expect(model.harness).toBe("native");
       }
@@ -130,7 +222,7 @@ describe("useModelRegistry", () => {
     it("excludes cursor-harness models", () => {
       const { result } = renderHook(() =>
         useModelRegistry({ harness: "native" }),
-      );
+      { wrapper: createWrapper() });
       const cursorModels = result.current.models.filter(
         (m) => m.harness === "cursor",
       );
@@ -140,10 +232,10 @@ describe("useModelRegistry", () => {
     it("resolves defaultModel to the first featured native model", () => {
       const { result } = renderHook(() =>
         useModelRegistry({ harness: "native" }),
-      );
+      { wrapper: createWrapper() });
       const featured = result.current.featured;
       expect(featured.length).toBeGreaterThan(0);
-      expect(result.current.defaultModel.modelId).toBe(featured[0].modelId);
+      expect(result.current.defaultModel!.modelId).toBe(featured[0].modelId);
     });
   });
 
@@ -151,7 +243,7 @@ describe("useModelRegistry", () => {
     it("shows only cursor-harness models", () => {
       const { result } = renderHook(() =>
         useModelRegistry({ harness: "cursor" }),
-      );
+      { wrapper: createWrapper() });
       for (const model of result.current.models) {
         expect(model.harness).toBe("cursor");
       }
@@ -160,26 +252,16 @@ describe("useModelRegistry", () => {
     it("includes cursor-harness models from multiple providers", () => {
       const { result } = renderHook(() =>
         useModelRegistry({ harness: "cursor" }),
-      );
+      { wrapper: createWrapper() });
       const providers = new Set(result.current.models.map((m) => m.provider));
       expect(providers.size).toBeGreaterThan(1);
     });
 
-    it("includes all cursor-harness models from MODEL_REGISTRY", () => {
-      const { result } = renderHook(() =>
-        useModelRegistry({ harness: "cursor" }),
-      );
-      const cursorModels = MODEL_REGISTRY.filter(
-        (m) => m.harness === "cursor",
-      );
-      expect(result.current.models).toHaveLength(cursorModels.length);
-    });
-
     it("resolves defaultModel to DEFAULT_CURSOR_MODEL_ID", () => {
       const { result } = renderHook(() =>
         useModelRegistry({ harness: "cursor" }),
-      );
-      expect(result.current.defaultModel.modelId).toBe(
+      { wrapper: createWrapper() });
+      expect(result.current.defaultModel!.modelId).toBe(
         DEFAULT_CURSOR_MODEL_ID,
       );
     });
@@ -187,7 +269,7 @@ describe("useModelRegistry", () => {
     it("looks up cursor models via getModel", () => {
       const { result } = renderHook(() =>
         useModelRegistry({ harness: "cursor" }),
-      );
+      { wrapper: createWrapper() });
       expect(
         result.current.getModel(DEFAULT_CURSOR_MODEL_ID),
       ).toBeDefined();
@@ -196,14 +278,41 @@ describe("useModelRegistry", () => {
     it("cannot look up native-only models via getModel", () => {
       const { result } = renderHook(() =>
         useModelRegistry({ harness: "cursor" }),
-      );
+      { wrapper: createWrapper() });
       expect(result.current.getModel(DEFAULT_MODEL_ID)).toBeUndefined();
     });
   });
 
+  describe("loading state", () => {
+    it("exposes isLoading from context", () => {
+      const loadingState: ModelRegistryState = { models: [], isLoading: true, error: null };
+      const wrapper = ({ children }: { children: ReactNode }) => (
+        <ModelRegistryContext.Provider value={loadingState}>
+          {children}
+        </ModelRegistryContext.Provider>
+      );
+      const { result } = renderHook(() => useModelRegistry(), { wrapper });
+      expect(result.current.isLoading).toBe(true);
+      expect(result.current.models).toHaveLength(0);
+    });
+
+    it("exposes error from context", () => {
+      const err = new Error("fetch failed");
+      const errorState: ModelRegistryState = { models: [], isLoading: false, error: err };
+      const wrapper = ({ children }: { children: ReactNode }) => (
+        <ModelRegistryContext.Provider value={errorState}>
+          {children}
+        </ModelRegistryContext.Provider>
+      );
+      const { result } = renderHook(() => useModelRegistry(), { wrapper });
+      expect(result.current.error).toBe(err);
+      expect(result.current.isLoading).toBe(false);
+    });
+  });
+
   describe("defaultModel fallback", () => {
     it("falls back to the first enabled model when default ID is missing", () => {
-      const { result } = renderHook(() => useModelRegistry());
+      const { result } = renderHook(() => useModelRegistry(), { wrapper: createWrapper() });
       expect(result.current.defaultModel).toBeDefined();
       expect(result.current.models).toContain(result.current.defaultModel);
     });

package/src/models/index.ts

@@ -1,8 +1,10 @@
-export { MODEL_REGISTRY, DEFAULT_MODEL_ID, DEFAULT_CURSOR_MODEL_ID, DISABLED_PROVIDERS, modelKey, parseModelKey, resolveDefaultModelId } from "./registry";
+export { DEFAULT_MODEL_ID, DEFAULT_CURSOR_MODEL_ID, DISABLED_PROVIDERS, modelKey, parseModelKey, resolveDefaultModelId, fetchModelRegistry, parseRegistryJson } from "./registry";
 export type { ParsedModelKey, DefaultModelResolution, DefaultModelSource } from "./registry";
 export type { ModelInfo, Provider, CostTier, SpeedTier } from "./registry";
 export { useModelRegistry } from "./useModelRegistry";
 export type { UseModelRegistryReturn, UseModelRegistryOptions } from "./useModelRegistry";
+export { ModelRegistryContext, useModelRegistryContext } from "./ModelRegistryContext";
+export type { ModelRegistryState } from "./ModelRegistryContext";
 export { ModelSelector } from "./ModelSelector";
 export type { ModelSelectorProps } from "./ModelSelector";
 export { HarnessSelector } from "./HarnessSelector";