Address latest review feedback

Author: aaditagrawal

apps/server/src/provider/Layers/ProviderRegistry.test.ts

@@ -526,6 +526,54 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest()))(
         }),
       );
 
+      it.effect("reports cursor as unavailable when its CLI command is missing", () =>
+        Effect.gen(function* () {
+          const serverSettingsLayer = ServerSettingsService.layerTest({
+            providers: {
+              cursor: {
+                enabled: true,
+                binaryPath: "/tmp/t3-missing-cursor-cli",
+              },
+            },
+          });
+          const providerRegistryLayer = ProviderRegistryLive.pipe(
+            Layer.provideMerge(serverSettingsLayer),
+            Layer.provideMerge(
+              mockCommandSpawnerLayer((command, args) => {
+                const joined = args.join(" ");
+                if (joined === "--version") {
+                  if (command === "codex") {
+                    return { stdout: "codex 1.0.0\n", stderr: "", code: 0 };
+                  }
+                  if (command === "claude") {
+                    return { stdout: "claude 1.0.0\n", stderr: "", code: 0 };
+                  }
+                  return { stdout: "", stderr: "spawn ENOENT", code: 1 };
+                }
+                if (joined === "login status") {
+                  return { stdout: "Logged in\n", stderr: "", code: 0 };
+                }
+                if (joined === "auth status") {
+                  return { stdout: "Authenticated\n", stderr: "", code: 0 };
+                }
+                throw new Error(`Unexpected command: ${command} ${joined}`);
+              }),
+            ),
+          );
+
+          const providers = yield* Effect.gen(function* () {
+            const registry = yield* ProviderRegistry;
+            return yield* registry.getProviders;
+          }).pipe(Effect.provide(providerRegistryLayer));
+
+          const cursor = providers.find((provider) => provider.provider === "cursor");
+          assert.isDefined(cursor);
+          assert.strictEqual(cursor?.status, "warning");
+          assert.strictEqual(cursor?.installed, false);
+          assert.strictEqual(cursor?.message, "Cursor CLI not found on PATH.");
+        }),
+      );
+
       it.effect("serves cached provider snapshots from getProviders without re-probing", () =>
         Effect.gen(function* () {
           let probeCount = 0;

apps/server/src/provider/Layers/ProviderRegistry.ts

@@ -261,15 +261,7 @@ const runBinaryBackedSnapshot = (
       ? yield* Effect.tryPromise({
           try: () => options.fetchDiscoveredModels?.(binaryPath) ?? Promise.resolve([]),
           catch: wrapProbeError,
-        }).pipe(
-          Effect.catchCause((cause) => {
-            const error = unwrapProbeError(Cause.squash(cause));
-            if (isCommandMissingCause(error)) {
-              return Effect.succeed<ReadonlyArray<{ slug: string; name: string }>>([]);
-            }
-            return Effect.failCause(cause);
-          }),
-        )
+        })
       : [];
 
     const baseModels =
@@ -367,16 +359,19 @@ const loadProviderSnapshot = (
         return yield* runBinaryBackedSnapshot("cursor", settings.providers.cursor, {
           fetchDiscoveredModels: (binaryPath) =>
             fetchCursorModels(binaryPath ? { binaryPath } : {}).then((models) => [...models]),
+          resolveProbeBinaryPath: (binaryPath) => binaryPath ?? "agent",
         });
       case "opencode":
         return yield* runBinaryBackedSnapshot("opencode", settings.providers.opencode, {
           fetchDiscoveredModels: (binaryPath) =>
             fetchOpenCodeModels(binaryPath ? { binaryPath } : {}).then((models) => [...models]),
+          resolveProbeBinaryPath: (binaryPath) => binaryPath ?? "opencode",
         });
       case "kilo":
         return yield* runBinaryBackedSnapshot("kilo", settings.providers.kilo, {
           fetchDiscoveredModels: (binaryPath) =>
             fetchKiloModels(binaryPath ? { binaryPath } : {}).then((models) => [...models]),
+          resolveProbeBinaryPath: (binaryPath) => binaryPath ?? "kilo",
         });
       case "geminiCli":
         if (settings.providers.geminiCli.enabled) {

apps/web/src/components/settings/SettingsPanels.tsx

@@ -382,7 +382,7 @@ function AboutVersionSection() {
 
   const updateState = updateStateQuery.data ?? null;
 
-  const handleButtonClick = useCallback(() => {
+  const handleButtonClick = useCallback(async () => {
     const bridge = window.desktopBridge;
     if (!bridge) return;
 
@@ -405,7 +405,8 @@ function AboutVersionSection() {
     }
 
     if (action === "install") {
-      const confirmed = window.confirm(
+      const api = readNativeApi();
+      const confirmed = await (api ?? ensureNativeApi()).dialogs.confirm(
         getDesktopUpdateInstallConfirmationMessage(
           updateState ?? { availableVersion: null, downloadedVersion: null },
         ),
@@ -586,6 +587,19 @@ export function GeneralSettingsPanel() {
   const refreshingRef = useRef(false);
   const queryClient = useQueryClient();
   const modelListRefs = useRef<Partial<Record<ProviderKind, HTMLDivElement | null>>>({});
+  const modelListObserverRef = useRef<MutationObserver | null>(null);
+  const modelListObserverTimeoutRef = useRef<number | null>(null);
+  const clearModelListObserver = useCallback(() => {
+    modelListObserverRef.current?.disconnect();
+    modelListObserverRef.current = null;
+    if (modelListObserverTimeoutRef.current !== null) {
+      window.clearTimeout(modelListObserverTimeoutRef.current);
+      modelListObserverTimeoutRef.current = null;
+    }
+  }, []);
+
+  useEffect(() => clearModelListObserver, [clearModelListObserver]);
+
   const refreshProviders = useCallback(() => {
     if (refreshingRef.current) return;
     refreshingRef.current = true;
@@ -708,14 +722,16 @@ export function GeneralSettingsPanel() {
       if (!el) return;
       const scrollToEnd = () => el.scrollTo({ top: el.scrollHeight, behavior: "smooth" });
       requestAnimationFrame(scrollToEnd);
+      clearModelListObserver();
       const observer = new MutationObserver(() => {
         scrollToEnd();
-        observer.disconnect();
+        clearModelListObserver();
       });
+      modelListObserverRef.current = observer;
       observer.observe(el, { childList: true, subtree: true });
-      setTimeout(() => observer.disconnect(), 2_000);
+      modelListObserverTimeoutRef.current = window.setTimeout(clearModelListObserver, 2_000);
     },
-    [customModelInputByProvider, serverProviders, settings, updateSettings],
+    [clearModelListObserver, customModelInputByProvider, serverProviders, settings, updateSettings],
   );
 
   const removeCustomModel = useCallback(