Address PR feedback for OpenCode integration

ui/src/components/AgentConfigForm.tsx

@@ -23,6 +23,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { FolderOpen, Heart, ChevronDown, X } from "lucide-react";
 import { cn } from "../lib/utils";
+import { extractModelName, extractProviderId } from "../lib/model-utils";
 import { queryKeys } from "../lib/queryKeys";
 import { useCompany } from "../context/CompanyContext";
 import {
@@ -123,19 +124,6 @@ function formatArgList(value: unknown): string {
   return typeof value === "string" ? value : "";
 }
 
-function extractProviderId(modelId: string): string | null {
-  const trimmed = modelId.trim();
-  if (!trimmed.includes("/")) return null;
-  const provider = trimmed.slice(0, trimmed.indexOf("/")).trim();
-  return provider || null;
-}
-
-function extractModelName(modelId: string): string {
-  const trimmed = modelId.trim();
-  if (!trimmed.includes("/")) return trimmed;
-  return trimmed.slice(trimmed.indexOf("/") + 1);
-}
-
 const codexThinkingEffortOptions = [
   { id: "", label: "Auto" },
   { id: "minimal", label: "Minimal" },

ui/src/components/NewAgentDialog.tsx

@@ -58,6 +58,8 @@ export function NewAgentDialog() {
   const {
     data: adapterModels,
     error: adapterModelsError,
+    isLoading: adapterModelsLoading,
+    isFetching: adapterModelsFetching,
   } = useQuery({
     queryKey:
       selectedCompanyId
@@ -126,6 +128,10 @@ export function NewAgentDialog() {
         );
         return;
       }
+      if (adapterModelsLoading || adapterModelsFetching) {
+        setFormError("OpenCode models are still loading. Please wait and try again.");
+        return;
+      }
       const discovered = adapterModels ?? [];
       if (!discovered.some((entry) => entry.id === selectedModel)) {
         setFormError(

ui/src/components/NewIssueDialog.tsx

@@ -36,6 +36,7 @@ import {
   Paperclip,
 } from "lucide-react";
 import { cn } from "../lib/utils";
+import { extractProviderIdWithFallback } from "../lib/model-utils";
 import { issueStatusText, issueStatusTextDefault, priorityColor, priorityColorDefault } from "../lib/status-colors";
 import { MarkdownEditor, type MarkdownEditorRef, type MentionOption } from "./MarkdownEditor";
 import { AgentIcon } from "./AgentIconPicker";
@@ -54,12 +55,6 @@ function getContrastTextColor(hexColor: string): string {
   return luminance > 0.5 ? "#000000" : "#ffffff";
 }
 
-function extractProviderId(modelId: string): string {
-  const trimmed = modelId.trim();
-  if (!trimmed.includes("/")) return "other";
-  return trimmed.slice(0, trimmed.indexOf("/")).trim() || "other";
-}
-
 interface IssueDraft {
   title: string;
   description: string;
@@ -505,8 +500,8 @@ export function NewIssueDialog() {
     () => {
       return [...(assigneeAdapterModels ?? [])]
         .sort((a, b) => {
-          const providerA = extractProviderId(a.id);
-          const providerB = extractProviderId(b.id);
+          const providerA = extractProviderIdWithFallback(a.id);
+          const providerB = extractProviderIdWithFallback(b.id);
           const byProvider = providerA.localeCompare(providerB);
           if (byProvider !== 0) return byProvider;
           return a.id.localeCompare(b.id);
@@ -514,7 +509,7 @@ export function NewIssueDialog() {
         .map((model) => ({
           id: model.id,
           label: model.label,
-          searchText: `${model.id} ${extractProviderId(model.id)}`,
+          searchText: `${model.id} ${extractProviderIdWithFallback(model.id)}`,
         }));
     },
     [assigneeAdapterModels],

ui/src/components/OnboardingWizard.tsx

@@ -17,6 +17,7 @@ import {
 } from "@/components/ui/popover";
 import { Button } from "@/components/ui/button";
 import { cn } from "../lib/utils";
+import { extractModelName, extractProviderIdWithFallback } from "../lib/model-utils";
 import { getUIAdapter } from "../adapters";
 import { defaultCreateValues } from "./agent-config-defaults";
 import {
@@ -61,19 +62,6 @@ Ensure you have a folder agents/ceo and then download this AGENTS.md as well as
 
 And after you've finished that, hire yourself a Founding Engineer agent`;
 
-function extractProviderId(modelId: string): string | null {
-  const trimmed = modelId.trim();
-  if (!trimmed.includes("/")) return null;
-  const provider = trimmed.slice(0, trimmed.indexOf("/")).trim();
-  return provider || null;
-}
-
-function extractModelName(modelId: string): string {
-  const trimmed = modelId.trim();
-  if (!trimmed.includes("/")) return trimmed;
-  return trimmed.slice(trimmed.indexOf("/") + 1);
-}
-
 export function OnboardingWizard() {
   const { onboardingOpen, onboardingOptions, closeOnboarding } = useDialog();
   const { selectedCompanyId, companies, setSelectedCompanyId } = useCompany();
@@ -185,7 +173,7 @@ export function OnboardingWizard() {
     const query = modelSearch.trim().toLowerCase();
     return (adapterModels ?? []).filter((entry) => {
       if (!query) return true;
-      const provider = extractProviderId(entry.id) ?? "";
+      const provider = extractProviderIdWithFallback(entry.id, "");
       return (
         entry.id.toLowerCase().includes(query) ||
         entry.label.toLowerCase().includes(query) ||
@@ -204,7 +192,7 @@ export function OnboardingWizard() {
     }
     const groups = new Map<string, Array<{ id: string; label: string }>>();
     for (const entry of filteredModels) {
-      const provider = extractProviderId(entry.id) ?? "other";
+      const provider = extractProviderIdWithFallback(entry.id);
       const bucket = groups.get(provider) ?? [];
       bucket.push(entry);
       groups.set(provider, bucket);