@stigmer/react 0.4.5 → 0.4.7

package/src/session/__tests__/usePersistedModel.test.tsx

@@ -1,7 +1,28 @@
 import { describe, it, expect, beforeEach, afterEach } from "vitest";
 import { renderHook, act } from "@testing-library/react";
+import type { ReactNode } from "react";
 import { usePersistedModel } from "../usePersistedModel";
-import { DEFAULT_MODEL_ID, DEFAULT_CURSOR_MODEL_ID } from "../../models/registry";
+import { DEFAULT_MODEL_ID, DEFAULT_CURSOR_MODEL_ID, parseRegistryJson } from "../../models/registry";
+import { ModelRegistryContext } from "../../models/ModelRegistryContext";
+import type { ModelRegistryState } from "../../models/ModelRegistryContext";
+
+const TEST_MODELS = parseRegistryJson({
+  models: [
+    { id: "claude-sonnet-4.6", displayName: "Claude Sonnet 4.6", shortDescription: "", speedTier: "fast", provider: "anthropic", harness: "native", costTier: "standard", featured: true, pricing: { inputPricePerMillion: 3, outputPricePerMillion: 15, cacheWritePricePerMillion: 3.75, cacheReadPricePerMillion: 0.3 } },
+    { id: "default", displayName: "Cursor Auto", shortDescription: "", speedTier: "fast", provider: "cursor", harness: "cursor", costTier: "standard", featured: true, pricing: { inputPricePerMillion: 1.25, outputPricePerMillion: 6, cacheWritePricePerMillion: 1.25, cacheReadPricePerMillion: 0.25 } },
+  ],
+});
+
+function createWrapper() {
+  const state: ModelRegistryState = { models: TEST_MODELS, isLoading: false, error: null };
+  return function Wrapper({ children }: { children: ReactNode }) {
+    return (
+      <ModelRegistryContext.Provider value={state}>
+        {children}
+      </ModelRegistryContext.Provider>
+    );
+  };
+}
 
 const STORAGE_KEY_NATIVE = "stigmer:session:model";
 const STORAGE_KEY_CURSOR = "stigmer:session:model:cursor";
@@ -17,24 +38,24 @@ describe("usePersistedModel", () => {
 
   describe("basic persistence", () => {
     it("returns undefined when localStorage is empty", () => {
-      const { result } = renderHook(() => usePersistedModel({ harness: "native" }));
+      const { result } = renderHook(() => usePersistedModel({ harness: "native" }), { wrapper: createWrapper() });
       expect(result.current[0]).toBeUndefined();
     });
 
     it("restores a valid model from localStorage", () => {
       localStorage.setItem(STORAGE_KEY_NATIVE, DEFAULT_MODEL_ID);
-      const { result } = renderHook(() => usePersistedModel({ harness: "native" }));
+      const { result } = renderHook(() => usePersistedModel({ harness: "native" }), { wrapper: createWrapper() });
       expect(result.current[0]).toBe(DEFAULT_MODEL_ID);
     });
 
     it("returns undefined for an invalid model in localStorage", () => {
       localStorage.setItem(STORAGE_KEY_NATIVE, "nonexistent-model-xyz");
-      const { result } = renderHook(() => usePersistedModel({ harness: "native" }));
+      const { result } = renderHook(() => usePersistedModel({ harness: "native" }), { wrapper: createWrapper() });
       expect(result.current[0]).toBeUndefined();
     });
 
     it("persists model on change", () => {
-      const { result } = renderHook(() => usePersistedModel({ harness: "native" }));
+      const { result } = renderHook(() => usePersistedModel({ harness: "native" }), { wrapper: createWrapper() });
 
       act(() => result.current[1](DEFAULT_MODEL_ID));
 
@@ -44,7 +65,7 @@ describe("usePersistedModel", () => {
 
     it("uses cursor-specific key for cursor harness", () => {
       localStorage.setItem(STORAGE_KEY_CURSOR, DEFAULT_CURSOR_MODEL_ID);
-      const { result } = renderHook(() => usePersistedModel({ harness: "cursor" }));
+      const { result } = renderHook(() => usePersistedModel({ harness: "cursor" }), { wrapper: createWrapper() });
       expect(result.current[0]).toBe(DEFAULT_CURSOR_MODEL_ID);
     });
   });
@@ -52,19 +73,19 @@ describe("usePersistedModel", () => {
   describe("compound key handling", () => {
     it("extracts plain modelId from compound key in localStorage", () => {
       localStorage.setItem(STORAGE_KEY_CURSOR, "cursor/default");
-      const { result } = renderHook(() => usePersistedModel({ harness: "cursor" }));
+      const { result } = renderHook(() => usePersistedModel({ harness: "cursor" }), { wrapper: createWrapper() });
       expect(result.current[0]).toBe(DEFAULT_CURSOR_MODEL_ID);
     });
 
     it("extracts plain modelId from native compound key", () => {
       localStorage.setItem(STORAGE_KEY_NATIVE, `native/${DEFAULT_MODEL_ID}`);
-      const { result } = renderHook(() => usePersistedModel({ harness: "native" }));
+      const { result } = renderHook(() => usePersistedModel({ harness: "native" }), { wrapper: createWrapper() });
       expect(result.current[0]).toBe(DEFAULT_MODEL_ID);
     });
 
     it("handles non-compound values unchanged", () => {
       localStorage.setItem(STORAGE_KEY_CURSOR, DEFAULT_CURSOR_MODEL_ID);
-      const { result } = renderHook(() => usePersistedModel({ harness: "cursor" }));
+      const { result } = renderHook(() => usePersistedModel({ harness: "cursor" }), { wrapper: createWrapper() });
       expect(result.current[0]).toBe(DEFAULT_CURSOR_MODEL_ID);
     });
   });
@@ -76,7 +97,7 @@ describe("usePersistedModel", () => {
 
       const { result, rerender } = renderHook(
         ({ harness }: { harness: "native" | "cursor" }) => usePersistedModel({ harness }),
-        { initialProps: { harness: "native" } },
+        { initialProps: { harness: "native" }, wrapper: createWrapper() },
       );
 
       expect(result.current[0]).toBe(DEFAULT_MODEL_ID);
@@ -91,7 +112,7 @@ describe("usePersistedModel", () => {
 
       const { result, rerender } = renderHook(
         ({ harness }: { harness: "native" | "cursor" }) => usePersistedModel({ harness }),
-        { initialProps: { harness: "native" } },
+        { initialProps: { harness: "native" }, wrapper: createWrapper() },
       );
 
       expect(result.current[0]).toBe(DEFAULT_MODEL_ID);
@@ -106,7 +127,7 @@ describe("usePersistedModel", () => {
 
       const { result, rerender } = renderHook(
         ({ harness }: { harness: "native" | "cursor" }) => usePersistedModel({ harness }),
-        { initialProps: { harness: "native" } },
+        { initialProps: { harness: "native" }, wrapper: createWrapper() },
       );
 
       rerender({ harness: "cursor" });

package/src/session/useNewSessionFlow.ts

@@ -10,6 +10,7 @@ import { DEFAULT_HARNESS, type HarnessOption } from "../models/harness";
 import { useWorkspaceEntries, type UseWorkspaceEntriesReturn } from "../workspace";
 import { useSessionVariables, type UseSessionVariablesReturn } from "../execution/useSessionVariables";
 import type { SessionComposerSubmitContext } from "../composer";
+import { useRunnerList } from "../runner/useRunnerList";
 import { useCreateSession } from "./useCreateSession";
 import { useCreateAgentExecution } from "../execution/useCreateAgentExecution";
 
@@ -155,7 +156,8 @@ export function useNewSessionFlow(
     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 {
@@ -192,8 +194,10 @@ export function useNewSessionFlow(
     [],
   );
 
-  // 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;
@@ -201,7 +205,7 @@ export function useNewSessionFlow(
         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.
@@ -212,13 +216,20 @@ export function useNewSessionFlow(
     }
   }, [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(() => {